cleanup io/ioutil

Signed-off-by: cndoit18 <cndoit18@outlook.com>

examples/scratch-env/main.go

@@ -4,7 +4,6 @@ import (
 	goflag "flag"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
 
 	flag "github.com/spf13/pflag"
@@ -74,7 +73,7 @@ func runMain() int {
 	log.Info("apiserver running", "host", cfg.Host)
 
 	// TODO(directxman12): add support for writing to a new context in an existing file
-	kubeconfigFile, err := ioutil.TempFile("", "scratch-env-kubeconfig-")
+	kubeconfigFile, err := os.CreateTemp("", "scratch-env-kubeconfig-")
 	if err != nil {
 		log.Error(err, "unable to create kubeconfig file, continuing on without it")
 	} else {

pkg/client/config/config_test.go

@@ -17,7 +17,6 @@ limitations under the License.
 package config
 
 import (
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
@@ -45,7 +44,7 @@ var _ = Describe("Config", func() {
 	BeforeEach(func() {
 		// create temporary directory for test case
 		var err error
-		dir, err = ioutil.TempDir("", "cr-test")
+		dir, err = os.MkdirTemp("", "cr-test")
 		Expect(err).NotTo(HaveOccurred())
 
 		// override $HOME/.kube/config
@@ -192,7 +191,7 @@ func setConfigs(tc testCase, dir string) {
 
 func createFiles(files map[string]string, dir string) error {
 	for path, data := range files {
-		if err := ioutil.WriteFile(filepath.Join(dir, path), []byte(data), 0644); err != nil {
+		if err := os.WriteFile(filepath.Join(dir, path), []byte(data), 0644); err != nil {
 			return err
 		}
 	}

pkg/config/config.go

@@ -18,7 +18,7 @@ package config
 
 import (
 	"fmt"
-	ioutil "io/ioutil"
+	"os"
 	"sync"
 
 	"k8s.io/apimachinery/pkg/runtime"
@@ -96,7 +96,7 @@ func (d *DeferredFileLoader) loadFile() {
 		return
 	}
 
-	content, err := ioutil.ReadFile(d.path)
+	content, err := os.ReadFile(d.path)
 	if err != nil {
 		d.err = fmt.Errorf("could not read file at %s", d.path)
 		return

pkg/envtest/crd.go

@@ -310,6 +310,8 @@ func renderCRDs(options *CRDInstallOptions) ([]client.Object, error) {
 		if !info.IsDir() {
 			filePath, files = filepath.Dir(path), []os.FileInfo{info}
 		} else {
+			// TODO: Migrate to os.ReadDir
+			// information: https://go-review.googlesource.com/c/go/+/293649/
 			if files, err = ioutil.ReadDir(path); err != nil {
 				return nil, err
 			}
@@ -388,7 +390,7 @@ func readCRDs(basePath string, files []os.FileInfo) ([]*unstructured.Unstructure
 
 // readDocuments reads documents from file
 func readDocuments(fp string) ([][]byte, error) {
-	b, err := ioutil.ReadFile(fp)
+	b, err := os.ReadFile(fp)
 	if err != nil {
 		return nil, err
 	}

pkg/envtest/webhook.go

@@ -281,7 +281,7 @@ func (o *WebhookInstallOptions) setupCA() ([]byte, error) {
 		return nil, fmt.Errorf("unable to set up webhook serving certs: %v", err)
 	}
 
-	localServingCertsDir, err := ioutil.TempDir("", "envtest-serving-certs-")
+	localServingCertsDir, err := os.MkdirTemp("", "envtest-serving-certs-")
 	o.LocalServingCertDir = localServingCertsDir
 	if err != nil {
 		return nil, fmt.Errorf("unable to create directory for webhook serving certs: %v", err)
@@ -292,10 +292,10 @@ func (o *WebhookInstallOptions) setupCA() ([]byte, error) {
 		return nil, fmt.Errorf("unable to marshal webhook serving certs: %v", err)
 	}
 
-	if err := ioutil.WriteFile(filepath.Join(localServingCertsDir, "tls.crt"), certData, 0640); err != nil {
+	if err := os.WriteFile(filepath.Join(localServingCertsDir, "tls.crt"), certData, 0640); err != nil {
 		return nil, fmt.Errorf("unable to write webhook serving cert to disk: %v", err)
 	}
-	if err := ioutil.WriteFile(filepath.Join(localServingCertsDir, "tls.key"), keyData, 0640); err != nil {
+	if err := os.WriteFile(filepath.Join(localServingCertsDir, "tls.key"), keyData, 0640); err != nil {
 		return nil, fmt.Errorf("unable to write webhook serving key to disk: %v", err)
 	}
 
@@ -382,6 +382,8 @@ func readWebhooks(path string) ([]client.Object, []client.Object, error) {
 	if !info.IsDir() {
 		path, files = filepath.Dir(path), []os.FileInfo{info}
 	} else {
+		// TODO: Migrate to os.ReadDir
+		// information: https://go-review.googlesource.com/c/go/+/293649/
 		if files, err = ioutil.ReadDir(path); err != nil {
 			return nil, nil, err
 		}

pkg/internal/testing/integration/apiserver.go

@@ -3,7 +3,6 @@ package integration
 import (
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net/url"
 	"os"
 	"path/filepath"
@@ -150,10 +149,10 @@ func (s *APIServer) populateAPIServerCerts() error {
 		return err
 	}
 
-	if err := ioutil.WriteFile(filepath.Join(s.CertDir, "apiserver.crt"), certData, 0640); err != nil {
+	if err := os.WriteFile(filepath.Join(s.CertDir, "apiserver.crt"), certData, 0640); err != nil {
 		return err
 	}
-	if err := ioutil.WriteFile(filepath.Join(s.CertDir, "apiserver.key"), keyData, 0640); err != nil {
+	if err := os.WriteFile(filepath.Join(s.CertDir, "apiserver.key"), keyData, 0640); err != nil {
 		return err
 	}
 

pkg/internal/testing/integration/internal/integration_tests/integration_test.go

@@ -3,7 +3,7 @@ package integrationtests
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net"
 	"time"
 
@@ -69,7 +69,7 @@ var _ = Describe("The Testing Framework", func() {
 		kubeCtl := controlPlane.KubeCtl()
 		stdout, stderr, err := kubeCtl.Run("get", "pods")
 		Expect(err).NotTo(HaveOccurred())
-		bytes, err := ioutil.ReadAll(stdout)
+		bytes, err := io.ReadAll(stdout)
 		Expect(err).NotTo(HaveOccurred())
 		Expect(bytes).To(BeEmpty())
 		Expect(stderr).To(ContainSubstring("No resources found"))

pkg/internal/testing/integration/internal/process.go

@@ -3,7 +3,6 @@ package internal
 import (
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net"
 	"net/http"
 	"net/url"
@@ -95,7 +94,7 @@ func DoDefaulting(
 	}
 
 	if dir == "" {
-		newDir, err := ioutil.TempDir("", "k8s_test_framework_")
+		newDir, err := os.MkdirTemp("", "k8s_test_framework_")
 		if err != nil {
 			return DefaultedProcessInput{}, err
 		}

pkg/internal/testing/integration/internal/process_test.go

@@ -2,7 +2,6 @@ package internal_test
 
 import (
 	"bytes"
-	"io/ioutil"
 	"net"
 	"net/http"
 	"net/url"
@@ -274,8 +273,9 @@ var _ = Describe("Stop method", func() {
 			processState := &ProcessState{}
 			processState.Session, err = gexec.Start(getSimpleCommand(), nil, nil)
 			Expect(err).NotTo(HaveOccurred())
-			processState.Dir, err = ioutil.TempDir("", "k8s_test_framework_")
+			tmp, err := os.MkdirTemp("", "k8s_test_framework_")
 			Expect(err).NotTo(HaveOccurred())
+			processState.Dir = tmp
 			processState.DirNeedsCleaning = true
 			processState.StopTimeout = 400 * time.Millisecond
 

pkg/internal/testing/integration/kubectl_test.go

@@ -1,7 +1,7 @@
 package integration_test
 
 import (
-	"io/ioutil"
+	"io"
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
@@ -16,7 +16,7 @@ var _ = Describe("Kubectl", func() {
 		stdout, stderr, err := k.Run(args...)
 		Expect(err).NotTo(HaveOccurred())
 		Expect(stdout).To(ContainSubstring("something"))
-		bytes, err := ioutil.ReadAll(stderr)
+		bytes, err := io.ReadAll(stderr)
 		Expect(err).NotTo(HaveOccurred())
 		Expect(bytes).To(BeEmpty())
 	})

pkg/leaderelection/leader_election.go

@@ -19,7 +19,6 @@ package leaderelection
 import (
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"os"
 
 	"k8s.io/apimachinery/pkg/util/uuid"
@@ -112,7 +111,7 @@ func getInClusterNamespace() (string, error) {
 	}
 
 	// Load the namespace file and return its content
-	namespace, err := ioutil.ReadFile(inClusterNamespacePath)
+	namespace, err := os.ReadFile(inClusterNamespacePath)
 	if err != nil {
 		return "", fmt.Errorf("error reading namespace file: %w", err)
 	}

pkg/manager/manager_test.go

@@ -20,7 +20,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net"
 	"net/http"
 	"path"
@@ -1132,7 +1132,7 @@ var _ = Describe("manger.Manager", func() {
 				Expect(err).NotTo(HaveOccurred())
 				Expect(resp.StatusCode).To(Equal(200))
 
-				data, err := ioutil.ReadAll(resp.Body)
+				data, err := io.ReadAll(resp.Body)
 				Expect(err).NotTo(HaveOccurred())
 				Expect(string(data)).To(ContainSubstring("%s\n%s\n%s\n",
 					`# HELP test_one test metric for testing`,
@@ -1174,7 +1174,7 @@ var _ = Describe("manger.Manager", func() {
 				Expect(err).NotTo(HaveOccurred())
 				Expect(resp.StatusCode).To(Equal(http.StatusOK))
 
-				body, err := ioutil.ReadAll(resp.Body)
+				body, err := io.ReadAll(resp.Body)
 				Expect(err).NotTo(HaveOccurred())
 				Expect(string(body)).To(Equal("Some debug info"))
 			})

pkg/webhook/admission/http.go

@@ -21,7 +21,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net/http"
 
 	v1 "k8s.io/api/admission/v1"
@@ -52,7 +51,7 @@ func (wh *Webhook) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 
 	var reviewResponse Response
 	if r.Body != nil {
-		if body, err = ioutil.ReadAll(r.Body); err != nil {
+		if body, err = io.ReadAll(r.Body); err != nil {
 			wh.log.Error(err, "unable to read the body from the incoming request")
 			reviewResponse = Errored(http.StatusBadRequest, err)
 			wh.writeResponse(w, reviewResponse)

pkg/webhook/conversion/conversion_test.go

@@ -19,7 +19,7 @@ package conversion
 import (
 	"bytes"
 	"encoding/json"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/http/httptest"
 
@@ -70,7 +70,7 @@ var _ = Describe("Conversion Webhook", func() {
 
 		convReview := &apix.ConversionReview{}
 		req := &http.Request{
-			Body: ioutil.NopCloser(bytes.NewReader(payload.Bytes())),
+			Body: io.NopCloser(bytes.NewReader(payload.Bytes())),
 		}
 		webhook.ServeHTTP(respRecorder, req)
 		Expect(json.NewDecoder(respRecorder.Result().Body).Decode(convReview)).To(Succeed())

pkg/webhook/server.go

@@ -21,7 +21,6 @@ import (
 	"crypto/tls"
 	"crypto/x509"
 	"fmt"
-	"io/ioutil"
 	"net"
 	"net/http"
 	"os"
@@ -205,7 +204,7 @@ func (s *Server) Start(ctx context.Context) error {
 	// load CA to verify client certificate
 	if s.ClientCAName != "" {
 		certPool := x509.NewCertPool()
-		clientCABytes, err := ioutil.ReadFile(filepath.Join(s.CertDir, s.ClientCAName))
+		clientCABytes, err := os.ReadFile(filepath.Join(s.CertDir, s.ClientCAName))
 		if err != nil {
 			return fmt.Errorf("failed to read client CA cert: %v", err)
 		}

pkg/webhook/server_test.go

@@ -19,7 +19,7 @@ package webhook_test
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net"
 	"net/http"
 
@@ -134,7 +134,7 @@ var _ = Describe("Webhook Server", func() {
 				resp, err := client.Get(fmt.Sprintf("https://%s/somepath", testHostPort))
 				Expect(err).NotTo(HaveOccurred())
 				defer resp.Body.Close()
-				return ioutil.ReadAll(resp.Body)
+				return io.ReadAll(resp.Body)
 			}).Should(Equal([]byte("gadzooks!")))
 
 			ctxCancel()
@@ -172,7 +172,7 @@ var _ = Describe("Webhook Server", func() {
 			Expect(err).NotTo(HaveOccurred())
 			defer resp.Body.Close()
 
-			Expect(ioutil.ReadAll(resp.Body)).To(Equal([]byte("gadzooks!")))
+			Expect(io.ReadAll(resp.Body)).To(Equal([]byte("gadzooks!")))
 		})
 
 		It("should inject dependencies, if an inject func has been provided already", func() {
@@ -197,7 +197,7 @@ var _ = Describe("Webhook Server", func() {
 			resp, err := client.Get(fmt.Sprintf("https://%s/somepath", testHostPort))
 			Expect(err).NotTo(HaveOccurred())
 			defer resp.Body.Close()
-			return ioutil.ReadAll(resp.Body)
+			return io.ReadAll(resp.Body)
 		}).Should(Equal([]byte("gadzooks!")))
 
 		ctxCancel()