Merge pull request #762 from austinvazquez/remove-ioutil-package

Remove io/ioutil package references.

Author: giuseppe

cgroups/cgroups.go

@@ -3,7 +3,6 @@ package cgroups
 import (
 	"bufio"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
@@ -78,7 +77,7 @@ func FindCgroup() (Cgroup, error) {
 
 // GetSubsystemPath gets path of subsystem
 func GetSubsystemPath(pid int, subsystem string) (string, error) {
-	contents, err := ioutil.ReadFile(fmt.Sprintf("/proc/%d/cgroup", pid))
+	contents, err := os.ReadFile(fmt.Sprintf("/proc/%d/cgroup", pid))
 	if err != nil {
 		return "", err
 	}

cgroups/cgroups_v1.go

@@ -2,7 +2,6 @@ package cgroups
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"regexp"
@@ -62,7 +61,7 @@ func (cg *CgroupV1) GetBlockIOData(pid int, cgPath string) (*rspec.LinuxBlockIO,
 			}
 			filePath = filepath.Join(cg.MountPath, "blkio", subPath, fileName)
 		}
-		contents, err := ioutil.ReadFile(filePath)
+		contents, err := os.ReadFile(filePath)
 		if err != nil {
 			if os.IsNotExist(err) {
 				return nil, specerror.NewError(specerror.CgroupsPathAttach, fmt.Errorf("The runtime MUST consistently attach to the same place in the cgroups hierarchy given the same value of `cgroupsPath`"), rspec.Version)
@@ -237,7 +236,7 @@ func (cg *CgroupV1) GetCPUData(pid int, cgPath string) (*rspec.LinuxCPU, error)
 			}
 			filePath = filepath.Join(cg.MountPath, "cpu", subPath, fileName)
 		}
-		contents, err := ioutil.ReadFile(filePath)
+		contents, err := os.ReadFile(filePath)
 		if err != nil {
 			if os.IsNotExist(err) {
 				return nil, specerror.NewError(specerror.CgroupsPathAttach, fmt.Errorf("The runtime MUST consistently attach to the same place in the cgroups hierarchy given the same value of `cgroupsPath`"), rspec.Version)
@@ -271,7 +270,7 @@ func (cg *CgroupV1) GetCPUData(pid int, cgPath string) (*rspec.LinuxCPU, error)
 	}
 	// CONFIG_RT_GROUP_SCHED may be not set
 	// Can always get rt data from /proc
-	contents, err := ioutil.ReadFile("/proc/sys/kernel/sched_rt_period_us")
+	contents, err := os.ReadFile("/proc/sys/kernel/sched_rt_period_us")
 	if err != nil {
 		return nil, err
 	}
@@ -280,7 +279,7 @@ func (cg *CgroupV1) GetCPUData(pid int, cgPath string) (*rspec.LinuxCPU, error)
 		return nil, err
 	}
 	lc.RealtimePeriod = &rtPeriod
-	contents, err = ioutil.ReadFile("/proc/sys/kernel/sched_rt_runtime_us")
+	contents, err = os.ReadFile("/proc/sys/kernel/sched_rt_runtime_us")
 	if err != nil {
 		return nil, err
 	}
@@ -304,7 +303,7 @@ func (cg *CgroupV1) GetCPUData(pid int, cgPath string) (*rspec.LinuxCPU, error)
 			}
 			filePath = filepath.Join(cg.MountPath, "cpuset", subPath, fileName)
 		}
-		contents, err := ioutil.ReadFile(filePath)
+		contents, err := os.ReadFile(filePath)
 		if err != nil {
 			return nil, err
 		}
@@ -334,7 +333,7 @@ func (cg *CgroupV1) GetDevicesData(pid int, cgPath string) ([]rspec.LinuxDeviceC
 		}
 		filePath = filepath.Join(cg.MountPath, "devices", subPath, fileName)
 	}
-	contents, err := ioutil.ReadFile(filePath)
+	contents, err := os.ReadFile(filePath)
 	if err != nil {
 		return nil, err
 	}
@@ -403,12 +402,12 @@ func inBytes(size string) (int64, error) {
 // eg. ["64KB", "2MB", "1GB"]
 func GetHugePageSize() ([]string, error) {
 	var pageSizes []string
-	files, err := ioutil.ReadDir("/sys/kernel/mm/hugepages")
+	entries, err := os.ReadDir("/sys/kernel/mm/hugepages")
 	if err != nil {
 		return pageSizes, err
 	}
-	for _, st := range files {
-		nameArray := strings.Split(st.Name(), "-")
+	for _, entry := range entries {
+		nameArray := strings.Split(entry.Name(), "-")
 		pageSize, err := inBytes(nameArray[1])
 		if err != nil {
 			return []string{}, err
@@ -457,7 +456,7 @@ func (cg *CgroupV1) GetHugepageLimitData(pid int, cgPath string) ([]rspec.LinuxH
 			}
 			filePath = filepath.Join(cg.MountPath, "hugetlb", subPath, maxUsage)
 		}
-		contents, err := ioutil.ReadFile(filePath)
+		contents, err := os.ReadFile(filePath)
 		if err != nil {
 			if os.IsNotExist(err) {
 				return nil, specerror.NewError(specerror.CgroupsPathAttach, fmt.Errorf("The runtime MUST consistently attach to the same place in the cgroups hierarchy given the same value of `cgroupsPath`"), rspec.Version)
@@ -504,7 +503,7 @@ func (cg *CgroupV1) GetMemoryData(pid int, cgPath string) (*rspec.LinuxMemory, e
 			}
 			filePath = filepath.Join(cg.MountPath, "memory", subPath, fileName)
 		}
-		contents, err := ioutil.ReadFile(filePath)
+		contents, err := os.ReadFile(filePath)
 		if err != nil {
 			if os.IsNotExist(err) {
 				return nil, specerror.NewError(specerror.CgroupsPathAttach, fmt.Errorf("The runtime MUST consistently attach to the same place in the cgroups hierarchy given the same value of `cgroupsPath`"), rspec.Version)
@@ -597,7 +596,7 @@ func (cg *CgroupV1) GetNetworkData(pid int, cgPath string) (*rspec.LinuxNetwork,
 		}
 		filePath = filepath.Join(cg.MountPath, "net_cls", subPath, fileName)
 	}
-	contents, err := ioutil.ReadFile(filePath)
+	contents, err := os.ReadFile(filePath)
 	if err != nil {
 		if os.IsNotExist(err) {
 			return nil, specerror.NewError(specerror.CgroupsPathAttach, fmt.Errorf("The runtime MUST consistently attach to the same place in the cgroups hierarchy given the same value of `cgroupsPath`"), rspec.Version)
@@ -624,7 +623,7 @@ func (cg *CgroupV1) GetNetworkData(pid int, cgPath string) (*rspec.LinuxNetwork,
 		}
 		filePath = filepath.Join(cg.MountPath, "net_prio", subPath, fileName)
 	}
-	contents, err = ioutil.ReadFile(filePath)
+	contents, err = os.ReadFile(filePath)
 	if err != nil {
 		return nil, err
 	}
@@ -668,7 +667,7 @@ func (cg *CgroupV1) GetPidsData(pid int, cgPath string) (*rspec.LinuxPids, error
 		}
 		filePath = filepath.Join(cg.MountPath, "pids", subPath, fileName)
 	}
-	contents, err := ioutil.ReadFile(filePath)
+	contents, err := os.ReadFile(filePath)
 	if err != nil {
 		return nil, err
 	}

cmd/runtimetest/main.go

@@ -7,7 +7,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"runtime"
@@ -230,7 +229,7 @@ func (c *complianceTester) validateLinuxProcess(spec *rspec.Spec) error {
 		return nil
 	}
 
-	cmdlineBytes, err := ioutil.ReadFile("/proc/self/cmdline")
+	cmdlineBytes, err := os.ReadFile("/proc/self/cmdline")
 	if err != nil {
 		return err
 	}
@@ -399,7 +398,7 @@ func (c *complianceTester) validateSysctls(spec *rspec.Spec) error {
 
 	for k, v := range spec.Linux.Sysctl {
 		keyPath := filepath.Join("/proc/sys", strings.Replace(k, ".", "/", -1))
-		vBytes, err := ioutil.ReadFile(keyPath)
+		vBytes, err := os.ReadFile(keyPath)
 		if err != nil {
 			return err
 		}
@@ -437,8 +436,8 @@ func testReadAccess(path string) (readable bool, err error) {
 }
 
 func testDirectoryReadAccess(path string) (readable bool, err error) {
-	files, err := ioutil.ReadDir(path)
-	if err == io.EOF || len(files) == 0 {
+	entries, err := os.ReadDir(path)
+	if err == io.EOF || len(entries) == 0 {
 		// Our validation/ tests only use non-empty directories for read-access
 		// tests. So if we get an EOF on the first read, the runtime did
 		// successfully block readability. So it should not be considered as test
@@ -493,7 +492,7 @@ func testWriteAccess(path string) (writable bool, err error) {
 }
 
 func testDirectoryWriteAccess(path string) (writable bool, err error) {
-	tmpfile, err := ioutil.TempFile(path, "Test")
+	tmpfile, err := os.CreateTemp(path, "Test")
 	if err != nil {
 		return false, nil
 	}
@@ -502,7 +501,7 @@ func testDirectoryWriteAccess(path string) (writable bool, err error) {
 }
 
 func testFileWriteAccess(path string) (readable bool, err error) {
-	err = ioutil.WriteFile(path, []byte("a"), 0644)
+	err = os.WriteFile(path, []byte("a"), 0644)
 	if err == nil {
 		return true, nil
 	}
@@ -542,7 +541,7 @@ func (c *complianceTester) validateRootfsPropagation(spec *rspec.Spec) error {
 		return nil
 	}
 
-	targetDir, err := ioutil.TempDir("/", "target")
+	targetDir, err := os.MkdirTemp("/", "target")
 	if err != nil {
 		return err
 	}
@@ -564,19 +563,19 @@ func (c *complianceTester) validateRootfsPropagation(spec *rspec.Spec) error {
 		if mountErr != nil {
 			return fmt.Errorf("bind-mount / %s: %w", targetDir, err)
 		}
-		mountDir, err := ioutil.TempDir("/", "mount")
+		mountDir, err := os.MkdirTemp("/", "mount")
 		if err != nil {
 			return err
 		}
 		defer os.RemoveAll(mountDir)
 
-		testDir, err := ioutil.TempDir("/", "test")
+		testDir, err := os.MkdirTemp("/", "test")
 		if err != nil {
 			return err
 		}
 		defer os.RemoveAll(testDir)
 
-		tmpfile, err := ioutil.TempFile(testDir, "example")
+		tmpfile, err := os.CreateTemp(testDir, "example")
 		if err != nil {
 			return err
 		}

generate/generate_test.go

@@ -1,7 +1,6 @@
 package generate_test
 
 import (
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"runtime"
@@ -31,7 +30,7 @@ func TestGenerateValid(t *testing.T) {
 			continue
 		}
 
-		bundle, err := ioutil.TempDir("", "TestGenerateValid_bundle")
+		bundle, err := os.MkdirTemp("", "TestGenerateValid_bundle")
 		if err != nil {
 			t.Fatal(err)
 		}

validate/validate.go

@@ -5,7 +5,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"net"
 	"os"
 	"path/filepath"
@@ -88,7 +87,7 @@ func NewValidatorFromPath(bundlePath string, hostSpecific bool, platform string)
 	}
 
 	configPath := filepath.Join(bundlePath, specConfig)
-	content, err := ioutil.ReadFile(configPath)
+	content, err := os.ReadFile(configPath)
 	if err != nil {
 		return Validator{}, specerror.NewError(specerror.ConfigInRootBundleDir, err, rspec.Version)
 	}

validate/validate_test.go

@@ -2,7 +2,6 @@ package validate
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"runtime"
@@ -263,7 +262,7 @@ func TestJSONSchema(t *testing.T) {
 }
 
 func TestCheckRoot(t *testing.T) {
-	tmpBundle, err := ioutil.TempDir("", "oci-check-rootfspath")
+	tmpBundle, err := os.MkdirTemp("", "oci-check-rootfspath")
 	if err != nil {
 		t.Fatalf("Failed to create a TempDir in 'CheckRoot'")
 	}

validation/delete_only_create_resources/delete_only_create_resources.go

@@ -2,18 +2,17 @@ package main
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strconv"
 	"time"
 
+	"github.com/google/uuid"
 	tap "github.com/mndrix/tap-go"
 	"github.com/mrunalp/fileutils"
 	rspec "github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/opencontainers/runtime-tools/specerror"
 	"github.com/opencontainers/runtime-tools/validation/util"
-	"github.com/google/uuid"
 )
 
 func main() {
@@ -62,7 +61,7 @@ func main() {
 		util.Fatal(err)
 	}
 	// Add the container to the cgroup
-	err = ioutil.WriteFile(filepath.Join(testPath, "tasks"), []byte(strconv.Itoa(state.Pid)), 0644)
+	err = os.WriteFile(filepath.Join(testPath, "tasks"), []byte(strconv.Itoa(state.Pid)), 0644)
 	if err != nil {
 		util.Fatal(err)
 	}

validation/hooks/hooks.go

@@ -2,16 +2,16 @@ package main
 
 import (
 	"fmt"
-	"io/ioutil"
+	"os"
 	"os/exec"
 	"path/filepath"
 	"time"
 
+	"github.com/google/uuid"
 	tap "github.com/mndrix/tap-go"
 	rspec "github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/opencontainers/runtime-tools/specerror"
 	"github.com/opencontainers/runtime-tools/validation/util"
-	"github.com/google/uuid"
 )
 
 func main() {
@@ -75,7 +75,7 @@ func main() {
 	}
 
 	err := util.RuntimeLifecycleValidate(config)
-	outputData, _ := ioutil.ReadFile(output)
+	outputData, _ := os.ReadFile(output)
 	if err == nil && string(outputData) != "pre-start1 called\npre-start2 called\npost-start1\npost-start2\npost-stop1\npost-stop2\n" {
 		err = specerror.NewError(specerror.PosixHooksCalledInOrder, fmt.Errorf("Hooks MUST be called in the listed order"), rspec.Version)
 		diagnostic := map[string]string{

validation/hooks_stdin/hooks_stdin.go

@@ -4,23 +4,22 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"reflect"
 	"time"
 
+	"github.com/google/uuid"
 	multierror "github.com/hashicorp/go-multierror"
 	tap "github.com/mndrix/tap-go"
 	rspecs "github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/opencontainers/runtime-tools/specerror"
 	"github.com/opencontainers/runtime-tools/validation/util"
-	"github.com/google/uuid"
 )
 
 func stdinStateCheck(outputDir, hookName string, expectedState rspecs.State) (errs *multierror.Error) {
 	var state rspecs.State
-	data, err := ioutil.ReadFile(filepath.Join(outputDir, hookName))
+	data, err := os.ReadFile(filepath.Join(outputDir, hookName))
 	if err != nil {
 		errs = multierror.Append(errs, err)
 		return

validation/linux_masked_paths/linux_masked_paths.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 
@@ -41,7 +40,7 @@ func checkMaskedPaths(t *tap.T) error {
 			return err
 		}
 		// create a temp file to make testDir non-empty
-		tmpfile, err := ioutil.TempFile(testDir, "tmp")
+		tmpfile, err := os.CreateTemp(testDir, "tmp")
 		if err != nil {
 			return err
 		}
@@ -50,17 +49,17 @@ func checkMaskedPaths(t *tap.T) error {
 		// runtimetest cannot check the readability of empty files, so
 		// write something.
 		testSubSubFile := filepath.Join(path, maskedFileSubSub)
-		if err := ioutil.WriteFile(testSubSubFile, []byte("secrets"), 0777); err != nil {
+		if err := os.WriteFile(testSubSubFile, []byte("secrets"), 0777); err != nil {
 			return err
 		}
 
 		testSubFile := filepath.Join(path, maskedFileSub)
-		if err := ioutil.WriteFile(testSubFile, []byte("secrets"), 0777); err != nil {
+		if err := os.WriteFile(testSubFile, []byte("secrets"), 0777); err != nil {
 			return err
 		}
 
 		testFile := filepath.Join(path, maskedFile)
-		return ioutil.WriteFile(testFile, []byte("secrets"), 0777)
+		return os.WriteFile(testFile, []byte("secrets"), 0777)
 	})
 	return err
 }