mirrors/coredhcp
1
0
Fork 0
mirror of https://github.com/coredhcp/coredhcp.git synced 2025-08-06 22:27:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Replace use of deprecated io/ioutil

Browse Source 
All the calls have been converted to their new equivalent.

Signed-off-by: Andrea Barberio <insomniac@slackware.it>
This commit is contained in:
Andrea Barberio 2023-10-17 10:54:03 +01:00 committed by insomniac
parent 60d5d298be
commit db61ab1cea
7 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmds/coredhcp-generator/README.md
View File

@ -12,7 +12,7 @@ You can use `coredhcp-generator` to generate a `main.go` that includes all the
plugins you wish. Just use it as follows: plugins you wish. Just use it as follows:
``` ```
$ ./coredhcp-generator -from core-plugins.txt $ ./coredhcp-generator --from core-plugins.txt
2019/11/21 23:32:04 Generating output file '/tmp/coredhcp547019106/coredhcp.go' with 7 plugin(s): 2019/11/21 23:32:04 Generating output file '/tmp/coredhcp547019106/coredhcp.go' with 7 plugin(s):
2019/11/21 23:32:04 1) github.com/coredhcp/coredhcp/plugins/file 2019/11/21 23:32:04 1) github.com/coredhcp/coredhcp/plugins/file
2019/11/21 23:32:04 2) github.com/coredhcp/coredhcp/plugins/lease_time 2019/11/21 23:32:04 2) github.com/coredhcp/coredhcp/plugins/lease_time
@ -25,9 +25,9 @@ $ ./coredhcp-generator -from core-plugins.txt
``` ```
You can also specify the plugin list on the command line, or mix it with You can also specify the plugin list on the command line, or mix it with
`-from`: `--from`:
``` ```
$ ./coredhcp-generator -from core-plugins.txt \ $ ./coredhcp-generator --from core-plugins.txt \
github.com/coredhcp/plugins/redis github.com/coredhcp/plugins/redis
``` ```

4
cmds/coredhcp-generator/coredhcp.go.template
View File

@ -9,7 +9,7 @@ package main
import ( import (
"fmt" "fmt"
"io/ioutil" "io"
"os" "os"
"time" "time"
@ -36,7 +36,7 @@ var (
) )
var logLevels = map[string]func(*logrus.Logger){ var logLevels = map[string]func(*logrus.Logger){
"none": func(l *logrus.Logger) { l.SetOutput(ioutil.Discard) }, "none": func(l *logrus.Logger) { l.SetOutput(io.Discard) },
"debug": func(l *logrus.Logger) { l.SetLevel(logrus.DebugLevel) }, "debug": func(l *logrus.Logger) { l.SetLevel(logrus.DebugLevel) },
"info": func(l *logrus.Logger) { l.SetLevel(logrus.InfoLevel) }, "info": func(l *logrus.Logger) { l.SetLevel(logrus.InfoLevel) },
"warning": func(l *logrus.Logger) { l.SetLevel(logrus.WarnLevel) }, "warning": func(l *logrus.Logger) { l.SetLevel(logrus.WarnLevel) },

5
cmds/coredhcp-generator/main.go
View File

@ -8,7 +8,6 @@ import (
"bufio" "bufio"
"fmt" "fmt"
"html/template" "html/template"
"io/ioutil"
"log" "log"
"os" "os"
"path" "path"
@ -54,7 +53,7 @@ func main() {
flag.Usage = usage flag.Usage = usage
flag.Parse() flag.Parse()
data, err := ioutil.ReadFile(*flagTemplate) data, err := os.ReadFile(*flagTemplate)
if err != nil { if err != nil {
log.Fatalf("Failed to read template file '%s': %v", *flagTemplate, err) log.Fatalf("Failed to read template file '%s': %v", *flagTemplate, err)
} }
@ -109,7 +108,7 @@ func main() {
} }
outfile := *flagOutfile outfile := *flagOutfile
if outfile == "" { if outfile == "" {
tmpdir, err := ioutil.TempDir("", "coredhcp") tmpdir, err := os.MkdirTemp("", "coredhcp")
if err != nil { if err != nil {
log.Fatalf("Cannot create temporary directory: %v", err) log.Fatalf("Cannot create temporary directory: %v", err)
} }

4
cmds/coredhcp/main.go
View File

@ -8,7 +8,7 @@ package main
import ( import (
"fmt" "fmt"
"io/ioutil" "io"
"os" "os"
"time" "time"
@ -44,7 +44,7 @@ var (
) )
var logLevels = map[string]func(*logrus.Logger){ var logLevels = map[string]func(*logrus.Logger){
"none": func(l *logrus.Logger) { l.SetOutput(ioutil.Discard) }, "none": func(l *logrus.Logger) { l.SetOutput(io.Discard) },
"debug": func(l *logrus.Logger) { l.SetLevel(logrus.DebugLevel) }, "debug": func(l *logrus.Logger) { l.SetLevel(logrus.DebugLevel) },
"info": func(l *logrus.Logger) { l.SetLevel(logrus.InfoLevel) }, "info": func(l *logrus.Logger) { l.SetLevel(logrus.InfoLevel) },
"warning": func(l *logrus.Logger) { l.SetLevel(logrus.WarnLevel) }, "warning": func(l *logrus.Logger) { l.SetLevel(logrus.WarnLevel) },

4
logger/logger.go
View File

@ -5,7 +5,7 @@
package logger package logger
import ( import (
"io/ioutil" "io"
"sync" "sync"
log_prefixed "github.com/chappjc/logrus-prefix" log_prefixed "github.com/chappjc/logrus-prefix"
@ -42,5 +42,5 @@ func WithFile(log *logrus.Entry, logfile string) {
// WithNoStdOutErr disables logging to stdout/stderr. // WithNoStdOutErr disables logging to stdout/stderr.
func WithNoStdOutErr(log *logrus.Entry) { func WithNoStdOutErr(log *logrus.Entry) {
log.Logger.SetOutput(ioutil.Discard) log.Logger.SetOutput(io.Discard)
} }

6
plugins/file/plugin.go
View File

@ -31,8 +31,8 @@ import (
"bytes" "bytes"
"errors" "errors"
"fmt" "fmt"
"io/ioutil"
"net" "net"
"os"
"strings" "strings"
"sync" "sync"
"time" "time"
@ -75,7 +75,7 @@ var (
// IPv4 address. // IPv4 address.
func LoadDHCPv4Records(filename string) (map[string]net.IP, error) { func LoadDHCPv4Records(filename string) (map[string]net.IP, error) {
log.Infof("reading leases from %s", filename) log.Infof("reading leases from %s", filename)
data, err := ioutil.ReadFile(filename) data, err := os.ReadFile(filename)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -111,7 +111,7 @@ func LoadDHCPv4Records(filename string) (map[string]net.IP, error) {
// IPv6 address. // IPv6 address.
func LoadDHCPv6Records(filename string) (map[string]net.IP, error) { func LoadDHCPv6Records(filename string) (map[string]net.IP, error) {
log.Infof("reading leases from %s", filename) log.Infof("reading leases from %s", filename)
data, err := ioutil.ReadFile(filename) data, err := os.ReadFile(filename)
if err != nil { if err != nil {
return nil, err return nil, err
} }

23
plugins/file/plugin_test.go
View File

@ -5,7 +5,6 @@
package file package file
import ( import (
"io/ioutil"
"net" "net"
"os" "os"
"testing" "testing"
@ -20,7 +19,7 @@ import (
func TestLoadDHCPv4Records(t *testing.T) { func TestLoadDHCPv4Records(t *testing.T) {
t.Run("valid leases", func(t *testing.T) { t.Run("valid leases", func(t *testing.T) {
// setup temp leases file // setup temp leases file
tmp, err := ioutil.TempFile("", "test_plugin_file") tmp, err := os.CreateTemp("", "test_plugin_file")
require.NoError(t, err) require.NoError(t, err)
defer func() { defer func() {
tmp.Close() tmp.Close()
@ -52,7 +51,7 @@ func TestLoadDHCPv4Records(t *testing.T) {
t.Run("missing field", func(t *testing.T) { t.Run("missing field", func(t *testing.T) {
// setup temp leases file // setup temp leases file
tmp, err := ioutil.TempFile("", "test_plugin_file") tmp, err := os.CreateTemp("", "test_plugin_file")
require.NoError(t, err) require.NoError(t, err)
defer func() { defer func() {
tmp.Close() tmp.Close()
@ -68,7 +67,7 @@ func TestLoadDHCPv4Records(t *testing.T) {
t.Run("invalid MAC", func(t *testing.T) { t.Run("invalid MAC", func(t *testing.T) {
// setup temp leases file // setup temp leases file
tmp, err := ioutil.TempFile("", "test_plugin_file") tmp, err := os.CreateTemp("", "test_plugin_file")
require.NoError(t, err) require.NoError(t, err)
defer func() { defer func() {
tmp.Close() tmp.Close()
@ -84,7 +83,7 @@ func TestLoadDHCPv4Records(t *testing.T) {
t.Run("invalid IP address", func(t *testing.T) { t.Run("invalid IP address", func(t *testing.T) {
// setup temp leases file // setup temp leases file
tmp, err := ioutil.TempFile("", "test_plugin_file") tmp, err := os.CreateTemp("", "test_plugin_file")
require.NoError(t, err) require.NoError(t, err)
defer func() { defer func() {
tmp.Close() tmp.Close()
@ -100,7 +99,7 @@ func TestLoadDHCPv4Records(t *testing.T) {
t.Run("lease with IPv6 address", func(t *testing.T) { t.Run("lease with IPv6 address", func(t *testing.T) {
// setup temp leases file // setup temp leases file
tmp, err := ioutil.TempFile("", "test_plugin_file") tmp, err := os.CreateTemp("", "test_plugin_file")
require.NoError(t, err) require.NoError(t, err)
defer func() { defer func() {
tmp.Close() tmp.Close()
@ -118,7 +117,7 @@ func TestLoadDHCPv4Records(t *testing.T) {
func TestLoadDHCPv6Records(t *testing.T) { func TestLoadDHCPv6Records(t *testing.T) {
t.Run("valid leases", func(t *testing.T) { t.Run("valid leases", func(t *testing.T) {
// setup temp leases file // setup temp leases file
tmp, err := ioutil.TempFile("", "test_plugin_file") tmp, err := os.CreateTemp("", "test_plugin_file")
require.NoError(t, err) require.NoError(t, err)
defer func() { defer func() {
tmp.Close() tmp.Close()
@ -150,7 +149,7 @@ func TestLoadDHCPv6Records(t *testing.T) {
t.Run("missing field", func(t *testing.T) { t.Run("missing field", func(t *testing.T) {
// setup temp leases file // setup temp leases file
tmp, err := ioutil.TempFile("", "test_plugin_file") tmp, err := os.CreateTemp("", "test_plugin_file")
require.NoError(t, err) require.NoError(t, err)
defer func() { defer func() {
tmp.Close() tmp.Close()
@ -166,7 +165,7 @@ func TestLoadDHCPv6Records(t *testing.T) {
t.Run("invalid MAC", func(t *testing.T) { t.Run("invalid MAC", func(t *testing.T) {
// setup temp leases file // setup temp leases file
tmp, err := ioutil.TempFile("", "test_plugin_file") tmp, err := os.CreateTemp("", "test_plugin_file")
require.NoError(t, err) require.NoError(t, err)
defer func() { defer func() {
tmp.Close() tmp.Close()
@ -182,7 +181,7 @@ func TestLoadDHCPv6Records(t *testing.T) {
t.Run("invalid IP address", func(t *testing.T) { t.Run("invalid IP address", func(t *testing.T) {
// setup temp leases file // setup temp leases file
tmp, err := ioutil.TempFile("", "test_plugin_file") tmp, err := os.CreateTemp("", "test_plugin_file")
require.NoError(t, err) require.NoError(t, err)
defer func() { defer func() {
tmp.Close() tmp.Close()
@ -198,7 +197,7 @@ func TestLoadDHCPv6Records(t *testing.T) {
t.Run("lease with IPv4 address", func(t *testing.T) { t.Run("lease with IPv4 address", func(t *testing.T) {
// setup temp leases file // setup temp leases file
tmp, err := ioutil.TempFile("", "test_plugin_file") tmp, err := os.CreateTemp("", "test_plugin_file")
require.NoError(t, err) require.NoError(t, err)
defer func() { defer func() {
tmp.Close() tmp.Close()
@ -325,7 +324,7 @@ func TestSetupFile(t *testing.T) {
assert.Error(t, err) assert.Error(t, err)
// setup temp leases file // setup temp leases file
tmp, err := ioutil.TempFile("", "test_plugin_file") tmp, err := os.CreateTemp("", "test_plugin_file")
require.NoError(t, err) require.NoError(t, err)
defer func() { defer func() {
tmp.Close() tmp.Close()