Migrate away from deprecated ioutil

cmd/cpulist/main.go

@@ -18,7 +18,7 @@ package main
 
 import (
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"os"
 	"strings"
@@ -41,9 +41,9 @@ func main() {
 		var err error
 		var data []byte
 		if *srcFile == "-" {
-			data, err = ioutil.ReadAll(os.Stdin)
+			data, err = io.ReadAll(os.Stdin)
 		} else {
-			data, err = ioutil.ReadFile(*srcFile)
+			data, err = os.ReadFile(*srcFile)
 		}
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "error reading cpulist from %q: %v\n", *srcFile, err)
@@ -68,7 +68,7 @@ func parseCPUsOrDie(cpuList string) cpuset.CPUSet {
 }
 
 func allowedCPUsOrDie(procfsRoot string) cpuset.CPUSet {
-	nullLog := log.New(ioutil.Discard, "", 0)
+	nullLog := log.New(io.Discard, "", 0)
 	ph := procs.New(nullLog, procfsRoot)
 	info, err := ph.FromPID(0)
 	if err != nil {

pkg/cli/knit/root.go

@@ -18,7 +18,7 @@ package knit
 
 import (
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"os"
 
@@ -62,7 +62,7 @@ func NewRootCommand(extraCmds ...NewCommandFunc) *cobra.Command {
 			if knitOpts.Debug {
 				knitOpts.Log = log.New(os.Stderr, "knit ", log.LstdFlags)
 			} else {
-				knitOpts.Log = log.New(ioutil.Discard, "", 0)
+				knitOpts.Log = log.New(io.Discard, "", 0)
 			}
 			return nil
 		},

pkg/cli/knit/wait.go

@@ -17,7 +17,6 @@
 package knit
 
 import (
-	"io/ioutil"
 	"os"
 	"os/signal"
 	"syscall"
@@ -32,7 +31,7 @@ type waitOpts struct {
 func waitForever(dwOpts *waitOpts) error {
 	if dwOpts.healthFile != "" {
 		message := []byte("ok")
-		ioutil.WriteFile(dwOpts.healthFile, message, 0644) // intentionally ignore error
+		os.WriteFile(dwOpts.healthFile, message, 0644) // intentionally ignore error
 	}
 
 	exitSignal := make(chan os.Signal)

pkg/fswrap/fswrap.go

@@ -17,7 +17,6 @@
 package fswrap
 
 import (
-	"io/ioutil"
 	"log"
 	"os"
 )
@@ -33,10 +32,22 @@ func (fs FSWrapper) Open(name string) (*os.File, error) {
 
 func (fs FSWrapper) ReadFile(filename string) ([]byte, error) {
 	fs.Log.Printf("fswrap %-8s %q", "ReadFile", filename)
-	return ioutil.ReadFile(filename)
+	return os.ReadFile(filename)
 }
 
 func (fs FSWrapper) ReadDir(dirname string) ([]os.FileInfo, error) {
 	fs.Log.Printf("fswrap %-8s %q", "ReadDir", dirname)
-	return ioutil.ReadDir(dirname)
+	entries, err := os.ReadDir(dirname)
+	if err != nil {
+		return nil, err
+	}
+	infos := make([]os.FileInfo, 0, len(entries))
+	for _, entry := range entries {
+		info, err := entry.Info()
+		if err != nil {
+			return nil, err
+		}
+		infos = append(infos, info)
+	}
+	return infos, nil
 }

pkg/irqs/info_test.go

@@ -21,7 +21,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"os"
 	"path/filepath"
@@ -36,10 +36,10 @@ import (
 	"github.com/openshift-kni/debug-tools/pkg/irqs"
 )
 
-var nullLog = log.New(ioutil.Discard, "", 0)
+var nullLog = log.New(io.Discard, "", 0)
 
 func TestReadStats(t *testing.T) {
-	rootDir, err := ioutil.TempDir("", "test")
+	rootDir, err := os.MkdirTemp("", "test")
 	if err != nil {
 		t.Fatalf("creating temp dir %v", err)
 	}
@@ -49,7 +49,7 @@ func TestReadStats(t *testing.T) {
 	if err := os.Mkdir(procDir, 0755); err != nil {
 		t.Fatalf("Mkdir(%s) failed: %v", procDir, err)
 	}
-	if err := ioutil.WriteFile(filepath.Join(procDir, "interrupts"), []byte(fakeInterrupts), 0644); err != nil {
+	if err := os.WriteFile(filepath.Join(procDir, "interrupts"), []byte(fakeInterrupts), 0644); err != nil {
 		t.Fatalf("WriteFile failed: %v", err)
 	}
 
@@ -201,7 +201,7 @@ type irqAffinity struct {
 }
 
 func TestReadInfo(t *testing.T) {
-	rootDir, err := ioutil.TempDir("", "test")
+	rootDir, err := os.MkdirTemp("", "test")
 	if err != nil {
 		t.Fatalf("creating temp dir %v", err)
 	}
@@ -216,7 +216,7 @@ func TestReadInfo(t *testing.T) {
 	if err := os.MkdirAll(irqAll, 0755); err != nil {
 		t.Fatalf("Mkdir(%s) failed: %v", irqDir, err)
 	}
-	if err := ioutil.WriteFile(filepath.Join(irqDir, "smp_affinity_list"), []byte("3,7"), 0644); err != nil {
+	if err := os.WriteFile(filepath.Join(irqDir, "smp_affinity_list"), []byte("3,7"), 0644); err != nil {
 		t.Fatalf("WriteFile failed: %v", err)
 	}
 

pkg/irqs/soft/info_test.go

@@ -18,7 +18,7 @@ package soft_test
 
 import (
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"os"
 	"path/filepath"
@@ -34,10 +34,10 @@ func TestNames(t *testing.T) {
 	}
 }
 
-var nullLog = log.New(ioutil.Discard, "", 0)
+var nullLog = log.New(io.Discard, "", 0)
 
 func TestReadInfo(t *testing.T) {
-	rootDir, err := ioutil.TempDir("", "test")
+	rootDir, err := os.MkdirTemp("", "test")
 	if err != nil {
 		t.Fatalf("creating temp dir %v", err)
 	}
@@ -47,7 +47,7 @@ func TestReadInfo(t *testing.T) {
 	if err := os.Mkdir(procDir, 0755); err != nil {
 		t.Fatalf("Mkdir(%s) failed: %v", procDir, err)
 	}
-	if err := ioutil.WriteFile(filepath.Join(procDir, "softirqs"), []byte(fakeSoftirqs), 0644); err != nil {
+	if err := os.WriteFile(filepath.Join(procDir, "softirqs"), []byte(fakeSoftirqs), 0644); err != nil {
 		t.Fatalf("WriteFile failed: %v", err)
 	}