chore: remove refs to deprecated io/ioutil (#378)

Signed-off-by: guoguangwu <[email protected]>

Author: testwill

cmd/container-structure-test/app/cmd/test.go

@@ -17,8 +17,6 @@ package cmd
 import (
 	"fmt"
 	"io"
-	"io/ioutil"
-
 	"os"
 
 	"github.com/GoogleContainerTools/container-structure-test/cmd/container-structure-test/app/cmd/test"
@@ -78,7 +76,7 @@ func NewCmdTest(out io.Writer) *cobra.Command {
 			}
 
 			if opts.Quiet {
-				out = ioutil.Discard
+				out = io.Discard
 			}
 
 			color.NoColor = opts.NoColor

cmd/container-structure-test/app/cmd/test/util.go

@@ -18,7 +18,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"io/ioutil"
+	"os"
 	"strings"
 	"time"
 
@@ -55,7 +55,7 @@ func ValidateArgs(opts *config.StructureTestOptions) error {
 }
 
 func Parse(fp string, args *drivers.DriverConfig, driverImpl func(drivers.DriverConfig) (drivers.Driver, error)) (types.StructureTest, error) {
-	testContents, err := ioutil.ReadFile(fp)
+	testContents, err := os.ReadFile(fp)
 	if err != nil {
 		return nil, err
 	}

pkg/drivers/host_driver.go

@@ -16,7 +16,7 @@ package drivers
 
 import (
 	"encoding/json"
-	"io/ioutil"
+	"io/fs"
 	"os"
 	"os/exec"
 	"strings"
@@ -144,15 +144,27 @@ func (d *HostDriver) StatFile(path string) (os.FileInfo, error) {
 }
 
 func (d *HostDriver) ReadFile(path string) ([]byte, error) {
-	return ioutil.ReadFile(path)
+	return os.ReadFile(path)
 }
 
 func (d *HostDriver) ReadDir(path string) ([]os.FileInfo, error) {
-	return ioutil.ReadDir(path)
+	entries, err := os.ReadDir(path)
+	if err != nil {
+		return nil, err
+	}
+	infos := make([]fs.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
 }
 
 func (d *HostDriver) GetConfig() (unversioned.Config, error) {
-	file, err := ioutil.ReadFile(d.ConfigPath)
+	file, err := os.ReadFile(d.ConfigPath)
 	if err != nil {
 		return unversioned.Config{}, errors.Wrap(err, "Error retrieving config")
 	}

pkg/drivers/tar_driver.go

@@ -15,7 +15,7 @@
 package drivers
 
 import (
-	"io/ioutil"
+	"io/fs"
 	"os"
 	"path/filepath"
 	"strings"
@@ -143,11 +143,23 @@ func (d *TarDriver) StatFile(path string) (os.FileInfo, error) {
 }
 
 func (d *TarDriver) ReadFile(path string) ([]byte, error) {
-	return ioutil.ReadFile(filepath.Join(d.Image.FSPath, path))
+	return os.ReadFile(filepath.Join(d.Image.FSPath, path))
 }
 
 func (d *TarDriver) ReadDir(path string) ([]os.FileInfo, error) {
-	return ioutil.ReadDir(filepath.Join(d.Image.FSPath, path))
+	entries, err := os.ReadDir(filepath.Join(d.Image.FSPath, path))
+	if err != nil {
+		return nil, err
+	}
+	infos := make([]fs.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
 }
 
 func (d *TarDriver) GetConfig() (unversioned.Config, error) {