Replace use of deprecated io/ioutil

All the calls have been converted to their new equivalent. Signed-off-by: Andrea Barberio <[email protected]>
maxzerker · Oct 18, 2023 · db61ab1 · db61ab1
1 parent 60d5d29
commit db61ab1
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 27 deletions.
diff --git a/cmds/coredhcp-generator/README.md b/cmds/coredhcp-generator/README.md
@@ -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:
 
 ```
-$ ./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   1) github.com/coredhcp/coredhcp/plugins/file
 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
-`-from`:
+`--from`:
 ```
-$ ./coredhcp-generator -from core-plugins.txt \
+$ ./coredhcp-generator --from core-plugins.txt \
     github.com/coredhcp/plugins/redis
 ```
 

diff --git a/cmds/coredhcp-generator/coredhcp.go.template b/cmds/coredhcp-generator/coredhcp.go.template
@@ -9,7 +9,7 @@ package main
 
 import (
 	"fmt"
-	"io/ioutil"
+	"io"
 	"os"
 	"time"
 
@@ -36,7 +36,7 @@ var (
 )
 
 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) },
 	"info":    func(l *logrus.Logger) { l.SetLevel(logrus.InfoLevel) },
 	"warning": func(l *logrus.Logger) { l.SetLevel(logrus.WarnLevel) },

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

diff --git a/cmds/coredhcp/main.go b/cmds/coredhcp/main.go
@@ -8,7 +8,7 @@ package main
 
 import (
 	"fmt"
-	"io/ioutil"
+	"io"
 	"os"
 	"time"
 
@@ -44,7 +44,7 @@ var (
 )
 
 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) },
 	"info":    func(l *logrus.Logger) { l.SetLevel(logrus.InfoLevel) },
 	"warning": func(l *logrus.Logger) { l.SetLevel(logrus.WarnLevel) },

diff --git a/logger/logger.go b/logger/logger.go
@@ -5,7 +5,7 @@
 package logger
 
 import (
-	"io/ioutil"
+	"io"
 	"sync"
 
 	log_prefixed "github.com/chappjc/logrus-prefix"
@@ -42,5 +42,5 @@ func WithFile(log *logrus.Entry, logfile string) {
 
 // WithNoStdOutErr disables logging to stdout/stderr.
 func WithNoStdOutErr(log *logrus.Entry) {
-	log.Logger.SetOutput(ioutil.Discard)
+	log.Logger.SetOutput(io.Discard)
 }
diff --git a/plugins/file/plugin.go b/plugins/file/plugin.go
@@ -31,8 +31,8 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"net"
+	"os"
 	"strings"
 	"sync"
 	"time"
@@ -75,7 +75,7 @@ var (
 // IPv4 address.
 func LoadDHCPv4Records(filename string) (map[string]net.IP, error) {
 	log.Infof("reading leases from %s", filename)
-	data, err := ioutil.ReadFile(filename)
+	data, err := os.ReadFile(filename)
 	if err != nil {
 		return nil, err
 	}
@@ -111,7 +111,7 @@ func LoadDHCPv4Records(filename string) (map[string]net.IP, error) {
 // IPv6 address.
 func LoadDHCPv6Records(filename string) (map[string]net.IP, error) {
 	log.Infof("reading leases from %s", filename)
-	data, err := ioutil.ReadFile(filename)
+	data, err := os.ReadFile(filename)
 	if err != nil {
 		return nil, err
 	}

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