Merge pull request #15890 from cevich/more_ioutil_fixes

Fix a few missed io/ioutil -> os updates
containers · Sep 21, 2022 · ecaefee · ecaefee
2 parents 1265548 + ba6f846
commit ecaefee
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 17 deletions.
diff --git a/pkg/bindings/generator/generator.go b/pkg/bindings/generator/generator.go
@@ -12,7 +12,6 @@ import (
 	"go/ast"
 	"go/parser"
 	"go/token"
-	"io/ioutil"
 	"os"
 	"os/exec"
 	"strings"
@@ -72,7 +71,7 @@ func main() {
 	)
 	srcFile := os.Getenv("GOFILE")
 	inputStructName := os.Args[1]
-	b, err := ioutil.ReadFile(srcFile)
+	b, err := os.ReadFile(srcFile)
 	if err != nil {
 		panic(err)
 	}

diff --git a/pkg/bindings/images/build.go b/pkg/bindings/images/build.go
@@ -9,7 +9,6 @@ import (
 	"fmt"
 	"io"
 	"io/fs"
-	"io/ioutil"
 	"net/http"
 	"net/url"
 	"os"
@@ -395,11 +394,11 @@ func Build(ctx context.Context, containerFiles []string, options entities.BuildO
 	dontexcludes := []string{"!Dockerfile", "!Containerfile", "!.dockerignore", "!.containerignore"}
 	for _, c := range containerFiles {
 		if c == "/dev/stdin" {
-			content, err := ioutil.ReadAll(os.Stdin)
+			content, err := io.ReadAll(os.Stdin)
 			if err != nil {
 				return nil, err
 			}
-			tmpFile, err := ioutil.TempFile("", "build")
+			tmpFile, err := os.CreateTemp("", "build")
 			if err != nil {
 				return nil, err
 			}
@@ -465,7 +464,7 @@ func Build(ctx context.Context, containerFiles []string, options entities.BuildO
 						if arr[0] == "src" {
 							// read specified secret into a tmp file
 							// move tmp file to tar and change secret source to relative tmp file
-							tmpSecretFile, err := ioutil.TempFile(options.ContextDirectory, "podman-build-secret")
+							tmpSecretFile, err := os.CreateTemp(options.ContextDirectory, "podman-build-secret")
 							if err != nil {
 								return nil, err
 							}
@@ -531,7 +530,7 @@ func Build(ctx context.Context, containerFiles []string, options entities.BuildO
 	if logrus.IsLevelEnabled(logrus.DebugLevel) {
 		if v, found := os.LookupEnv("PODMAN_RETAIN_BUILD_ARTIFACT"); found {
 			if keep, _ := strconv.ParseBool(v); keep {
-				t, _ := ioutil.TempFile("", "build_*_client")
+				t, _ := os.CreateTemp("", "build_*_client")
 				defer t.Close()
 				body = io.TeeReader(response.Body, t)
 			}
@@ -737,10 +736,10 @@ func nTar(excludes []string, sources ...string) (io.ReadCloser, error) {
 }
 
 func parseDockerignore(root string) ([]string, error) {
-	ignore, err := ioutil.ReadFile(filepath.Join(root, ".containerignore"))
+	ignore, err := os.ReadFile(filepath.Join(root, ".containerignore"))
 	if err != nil {
 		var dockerIgnoreErr error
-		ignore, dockerIgnoreErr = ioutil.ReadFile(filepath.Join(root, ".dockerignore"))
+		ignore, dockerIgnoreErr = os.ReadFile(filepath.Join(root, ".dockerignore"))
 		if dockerIgnoreErr != nil && !os.IsNotExist(dockerIgnoreErr) {
 			return nil, err
 		}

diff --git a/pkg/bindings/test/auth_test.go b/pkg/bindings/test/auth_test.go
@@ -1,7 +1,6 @@
 package bindings_test
 
 import (
-	"io/ioutil"
 	"os"
 	"time"
 
@@ -76,7 +75,7 @@ var _ = Describe("Podman images", func() {
 		imageRef := imageRep + ":" + imageTag
 
 		// Create a temporary authentication file.
-		tmpFile, err := ioutil.TempFile("", "auth.json.")
+		tmpFile, err := os.CreateTemp("", "auth.json.")
 		Expect(err).To(BeNil())
 		_, err = tmpFile.Write([]byte{'{', '}'})
 		Expect(err).To(BeNil())

diff --git a/pkg/bindings/test/common_test.go b/pkg/bindings/test/common_test.go
@@ -3,7 +3,6 @@ package bindings_test
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -146,7 +145,7 @@ func newBindingTest() *bindingTest {
 
 // createTempDirinTempDir create a temp dir with prefix podman_test
 func createTempDirInTempDir() (string, error) {
-	return ioutil.TempDir("", "libpod_api")
+	return os.MkdirTemp("", "libpod_api")
 }
 
 func (b *bindingTest) startAPIService() *gexec.Session {
@@ -264,7 +263,7 @@ var _ = ginkgo.SynchronizedBeforeSuite(func() []byte {
 	// If running localized tests, the cache dir is created and populated. if the
 	// tests are remote, this is a no-op
 	createCache()
-	path, err := ioutil.TempDir("", "libpodlock")
+	path, err := os.MkdirTemp("", "libpodlock")
 	if err != nil {
 		fmt.Println(err)
 		os.Exit(1)

diff --git a/test/e2e/libpod_suite_test.go b/test/e2e/libpod_suite_test.go
@@ -5,7 +5,6 @@ package integration
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 
@@ -48,7 +47,7 @@ func (p *PodmanTestIntegration) setDefaultRegistriesConfigEnv() {
 func (p *PodmanTestIntegration) setRegistriesConfigEnv(b []byte) {
 	outfile := filepath.Join(p.TempDir, "registries.conf")
 	os.Setenv("CONTAINERS_REGISTRIES_CONF", outfile)
-	err := ioutil.WriteFile(outfile, b, 0644)
+	err := os.WriteFile(outfile, b, 0644)
 	Expect(err).ToNot(HaveOccurred())
 }
 

diff --git a/test/e2e/secret_test.go b/test/e2e/secret_test.go
@@ -311,7 +311,7 @@ var _ = Describe("Podman secret", func() {
 
 	It("podman secret with labels", func() {
 		secretFilePath := filepath.Join(podmanTest.TempDir, "secret")
-		err := ioutil.WriteFile(secretFilePath, []byte("mysecret"), 0755)
+		err := os.WriteFile(secretFilePath, []byte("mysecret"), 0755)
 		Expect(err).To(BeNil())
 
 		session := podmanTest.Podman([]string{"secret", "create", "--label", "foo=bar", "a", secretFilePath})