Remove all io/ioutil imports. (#4106)

* Remove all io/ioutil imports.

* Convert DirEntry to FileInfo for mode checks.

dev-tools/mage/common.go

@@ -19,7 +19,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"log"
 	"net/http"
 	"os"
@@ -118,7 +117,7 @@ func joinMaps(args ...map[string]interface{}) map[string]interface{} {
 }
 
 func expandFile(src, dst string, args ...map[string]interface{}) error {
-	tmplData, err := ioutil.ReadFile(src)
+	tmplData, err := os.ReadFile(src)
 	if err != nil {
 		return fmt.Errorf("failed reading from template %v, %w", src, err)
 	}
@@ -133,7 +132,7 @@ func expandFile(src, dst string, args ...map[string]interface{}) error {
 		return err
 	}
 
-	if err = ioutil.WriteFile(createDir(dst), []byte(output), 0644); err != nil {
+	if err = os.WriteFile(createDir(dst), []byte(output), 0644); err != nil {
 		return fmt.Errorf("failed to write rendered template: %w", err)
 	}
 
@@ -236,13 +235,13 @@ func FindReplace(file string, re *regexp.Regexp, repl string) error {
 		return err
 	}
 
-	contents, err := ioutil.ReadFile(file)
+	contents, err := os.ReadFile(file)
 	if err != nil {
 		return err
 	}
 
 	out := re.ReplaceAllString(string(contents), repl)
-	return ioutil.WriteFile(file, []byte(out), info.Mode().Perm())
+	return os.WriteFile(file, []byte(out), info.Mode().Perm())
 }
 
 // MustFindReplace invokes FindReplace and panics if an error occurs.

dev-tools/mage/config.go

@@ -7,7 +7,6 @@ package mage
 import (
 	"bytes"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"regexp"
@@ -159,7 +158,7 @@ func makeConfigTemplate(destination string, mode os.FileMode, confParams ConfigF
 		}
 	}
 
-	data, err := ioutil.ReadFile(confFile.Template)
+	data, err := os.ReadFile(confFile.Template)
 	if err != nil {
 		return errors.Wrapf(err, "failed to read config template %q", confFile.Template)
 	}

dev-tools/mage/copy.go

@@ -5,8 +5,9 @@
 package mage
 
 import (
+	"fmt"
 	"io"
-	"io/ioutil"
+	"io/fs"
 	"os"
 	"path/filepath"
 	"regexp"
@@ -41,7 +42,7 @@ func (t *CopyTask) Execute() error {
 		return errors.Wrapf(err, "copy failed: cannot stat source file %v", t.Source)
 	}
 
-	return errors.Wrap(t.recursiveCopy(t.Source, t.Dest, info), "copy failed")
+	return errors.Wrap(t.recursiveCopy(t.Source, t.Dest, fs.FileInfoToDirEntry(info)), "copy failed")
 }
 
 func (t *CopyTask) init() error {
@@ -64,14 +65,14 @@ func (t *CopyTask) isExcluded(src string) bool {
 	return false
 }
 
-func (t *CopyTask) recursiveCopy(src, dest string, info os.FileInfo) error {
-	if info.IsDir() {
-		return t.dirCopy(src, dest, info)
+func (t *CopyTask) recursiveCopy(src, dest string, entry fs.DirEntry) error {
+	if entry.IsDir() {
+		return t.dirCopy(src, dest, entry)
 	}
-	return t.fileCopy(src, dest, info)
+	return t.fileCopy(src, dest, entry)
 }
 
-func (t *CopyTask) fileCopy(src, dest string, info os.FileInfo) error {
+func (t *CopyTask) fileCopy(src, dest string, entry fs.DirEntry) error {
 	if t.isExcluded(src) {
 		return nil
 	}
@@ -82,6 +83,11 @@ func (t *CopyTask) fileCopy(src, dest string, info os.FileInfo) error {
 	}
 	defer srcFile.Close()
 
+	info, err := entry.Info()
+	if err != nil {
+		return fmt.Errorf("converting dir entry: %w", err)
+	}
+
 	if !info.Mode().IsRegular() {
 		return errors.Errorf("failed to copy source file because it is not a " +
 			"regular file")
@@ -104,28 +110,34 @@ func (t *CopyTask) fileCopy(src, dest string, info os.FileInfo) error {
 	return destFile.Close()
 }
 
-func (t *CopyTask) dirCopy(src, dest string, info os.FileInfo) error {
+func (t *CopyTask) dirCopy(src, dest string, entry fs.DirEntry) error {
 	if t.isExcluded(src) {
 		return nil
 	}
 
+	info, err := entry.Info()
+	if err != nil {
+		return fmt.Errorf("converting dir entry: %w", err)
+	}
+
 	mode := t.DirMode
 	if mode == 0 {
 		mode = info.Mode()
 	}
+
 	if err := os.MkdirAll(dest, mode&os.ModePerm); err != nil {
 		return errors.Wrap(err, "failed creating dirs")
 	}
 
-	contents, err := ioutil.ReadDir(src)
+	contents, err := os.ReadDir(src)
 	if err != nil {
 		return errors.Wrapf(err, "failed to read dir %v", src)
 	}
 
-	for _, info := range contents {
+	for _, entry := range contents {
 		srcFile := filepath.Join(src, info.Name())
 		destFile := filepath.Join(dest, info.Name())
-		if err = t.recursiveCopy(srcFile, destFile, info); err != nil {
+		if err = t.recursiveCopy(srcFile, destFile, entry); err != nil {
 			return errors.Wrapf(err, "failed to copy %v to %v", srcFile, destFile)
 		}
 	}

dev-tools/mage/gotest.go

@@ -10,7 +10,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"log"
 	"os"
 	"os/exec"
@@ -126,14 +125,14 @@ func DefaultTestBinaryArgs() TestBinaryArgs {
 // Use MODULE=module to run only tests for `module`.
 func GoTestIntegrationForModule(ctx context.Context) error {
 	module := EnvOr("MODULE", "")
-	modulesFileInfo, err := ioutil.ReadDir("./module")
+	modulesDirEntry, err := os.ReadDir("./module")
 	if err != nil {
 		return err
 	}
 
 	foundModule := false
 	failedModules := []string{}
-	for _, fi := range modulesFileInfo {
+	for _, fi := range modulesDirEntry {
 		if !fi.IsDir() {
 			continue
 		}
@@ -327,7 +326,7 @@ func GoTest(ctx context.Context, params GoTestArgs) error {
 		codecovReport = strings.TrimSuffix(params.CoverageProfileFile,
 			filepath.Ext(params.CoverageProfileFile)) + "-cov.xml"
 
-		coverage, err := ioutil.ReadFile(params.CoverageProfileFile)
+		coverage, err := os.ReadFile(params.CoverageProfileFile)
 		if err != nil {
 			return fmt.Errorf("failed to read code coverage report: %w", err)
 		}
@@ -364,7 +363,7 @@ func makeCommand(ctx context.Context, env map[string]string, cmd string, args ..
 	for k, v := range env {
 		c.Env = append(c.Env, k+"="+v)
 	}
-	c.Stdout = ioutil.Discard
+	c.Stdout = io.Discard
 	if mg.Verbose() {
 		c.Stdout = os.Stdout
 	}

dev-tools/mage/integtest_docker.go

@@ -7,7 +7,7 @@ package mage
 import (
 	"fmt"
 	"go/build"
-	"io/ioutil"
+	"io"
 	"os"
 	"path"
 	"path/filepath"
@@ -138,14 +138,14 @@ func (d *DockerIntegrationTester) Test(dir string, mageTarget string, env map[st
 	}
 
 	// Docker-compose rm is noisy. So only pass through stderr when in verbose.
-	out := ioutil.Discard
+	out := io.Discard
 	if mg.Verbose() {
 		out = os.Stderr
 	}
 
 	_, err = sh.Exec(
 		composeEnv,
-		ioutil.Discard,
+		io.Discard,
 		out,
 		"docker-compose",
 		"-p", dockerComposeProjectName(),
@@ -266,7 +266,7 @@ func dockerComposeBuildImages() error {
 		args = append(args, "--pull")
 	}
 
-	out := ioutil.Discard
+	out := io.Discard
 	if mg.Verbose() {
 		out = os.Stderr
 	}

dev-tools/mage/kubernetes/kind.go

@@ -6,7 +6,7 @@ package kubernetes
 
 import (
 	"fmt"
-	"io/ioutil"
+	"io"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -53,8 +53,8 @@ func (m *KindIntegrationTestStep) Setup(env map[string]string) error {
 	}
 
 	clusterName := kubernetesClusterName()
-	stdOut := ioutil.Discard
-	stdErr := ioutil.Discard
+	stdOut := io.Discard
+	stdErr := io.Discard
 	if mg.Verbose() {
 		stdOut = os.Stdout
 		stdErr = os.Stderr
@@ -103,8 +103,8 @@ func (m *KindIntegrationTestStep) Setup(env map[string]string) error {
 
 // Teardown destroys the kubernetes cluster.
 func (m *KindIntegrationTestStep) Teardown(env map[string]string) error {
-	stdOut := ioutil.Discard
-	stdErr := ioutil.Discard
+	stdOut := io.Discard
+	stdErr := io.Discard
 	if mg.Verbose() {
 		stdOut = os.Stdout
 		stdErr = os.Stderr

dev-tools/mage/kubernetes/kuberemote.go

@@ -14,10 +14,10 @@ import (
 	"encoding/pem"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net"
 	"net/http"
 	"net/url"
+	"os"
 	"os/exec"
 	"strings"
 	"time"
@@ -610,7 +610,7 @@ func podDone(event watch.Event) (bool, error) {
 func createTempFile(content []byte) (string, error) {
 	randBytes := make([]byte, 16)
 	rand.Read(randBytes)
-	tmpfile, err := ioutil.TempFile("", hex.EncodeToString(randBytes))
+	tmpfile, err := os.CreateTemp("", hex.EncodeToString(randBytes))
 	if err != nil {
 		return "", err
 	}

dev-tools/mage/kubernetes/kubernetes.go

@@ -7,7 +7,6 @@ package kubernetes
 import (
 	"fmt"
 	"io"
-	"io/ioutil"
 	"log"
 	"os"
 	"path/filepath"
@@ -58,8 +57,8 @@ func (d *IntegrationTester) StepRequirements() mage.IntegrationTestSteps {
 
 // Test performs the tests with kubernetes.
 func (d *IntegrationTester) Test(dir string, mageTarget string, env map[string]string) error {
-	stdOut := ioutil.Discard
-	stdErr := ioutil.Discard
+	stdOut := io.Discard
+	stdErr := io.Discard
 	if mg.Verbose() {
 		stdOut = os.Stdout
 		stdErr = os.Stderr

dev-tools/mage/pkgspecs.go

@@ -7,8 +7,8 @@ package mage
 import (
 	"bytes"
 	"fmt"
-	"io/ioutil"
 	"log"
+	"os"
 	"path/filepath"
 
 	"gopkg.in/yaml.v2"
@@ -138,7 +138,7 @@ func LoadNamedSpec(name string, files ...string) error {
 func LoadSpecs(files ...string) (map[string][]OSPackageArgs, error) {
 	var data [][]byte
 	for _, file := range files {
-		d, err := ioutil.ReadFile(file)
+		d, err := os.ReadFile(file)
 		if err != nil {
 			return nil, fmt.Errorf("failed to read from spec file: %w", err)
 		}