Migrate away from deprecated ioutil

Author: sebrandon1

pkg/metrics/server_test.go

@@ -8,7 +8,6 @@ import (
 	"encoding/pem"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"math/big"
 	mr "math/rand"
 	"net/http"
@@ -76,7 +75,7 @@ func generateTempCertificates() (string, string, error) {
 		return "", "", err
 	}
 
-	cert, err := ioutil.TempFile("", "testcert-")
+	cert, err := os.CreateTemp("", "testcert-")
 	if err != nil {
 		return "", "", err
 	}
@@ -86,7 +85,7 @@ func generateTempCertificates() (string, string, error) {
 		Bytes: derBytes,
 	})
 
-	keyPath, err := ioutil.TempFile("", "testkey-")
+	keyPath, err := os.CreateTemp("", "testkey-")
 	if err != nil {
 		return "", "", err
 	}

pkg/stub/handler.go

@@ -5,7 +5,6 @@ import (
 	"crypto/tls"
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"net"
 	"os"
 	"runtime"
@@ -1267,7 +1266,7 @@ func getImageClient(restconfig *restclient.Config) (*imagev1client.ImageV1Client
 }
 
 func GetNamespace() string {
-	b, _ := ioutil.ReadFile("/var/run/secrets/kubernetes.io/serviceaccount/" + corev1.ServiceAccountNamespaceKey)
+	b, _ := os.ReadFile("/var/run/secrets/kubernetes.io/serviceaccount/" + corev1.ServiceAccountNamespaceKey)
 	return string(b)
 }
 

pkg/stub/interfaces.go

@@ -3,7 +3,6 @@ package stub
 import (
 	"context"
 	"encoding/json"
-	"io/ioutil"
 	"os"
 	"time"
 
@@ -158,7 +157,7 @@ type DefaultImageStreamFromFileGetter struct {
 }
 
 func (g *DefaultImageStreamFromFileGetter) Get(fullFilePath string) (is *imagev1.ImageStream, err error) {
-	isjsonfile, err := ioutil.ReadFile(fullFilePath)
+	isjsonfile, err := os.ReadFile(fullFilePath)
 	if err != nil {
 		return nil, err
 	}
@@ -183,7 +182,7 @@ type DefaultTemplateFromFileGetter struct {
 }
 
 func (g *DefaultTemplateFromFileGetter) Get(fullFilePath string) (t *templatev1.Template, err error) {
-	tjsonfile, err := ioutil.ReadFile(fullFilePath)
+	tjsonfile, err := os.ReadFile(fullFilePath)
 	if err != nil {
 		return nil, err
 	}
@@ -207,8 +206,19 @@ type DefaultResourceFileLister struct {
 }
 
 func (g *DefaultResourceFileLister) List(dir string) (files []os.FileInfo, err error) {
-	files, err = ioutil.ReadDir(dir)
-	return files, err
+	entries, err := os.ReadDir(dir)
+	if err != nil {
+		return nil, err
+	}
+	files = make([]os.FileInfo, 0, len(entries))
+	for _, entry := range entries {
+		info, err := entry.Info()
+		if err != nil {
+			return nil, err
+		}
+		files = append(files, info)
+	}
+	return files, nil
 
 }
 

test/e2e/cluster_samples_operator_test.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net"
 	"os"
 	"path/filepath"
@@ -108,7 +108,7 @@ func dumpPod(t *testing.T) {
 				if err != nil {
 					t.Fatalf("error getting pod logs for container %s: %s", container.Name, err.Error())
 				}
-				b, err := ioutil.ReadAll(readCloser)
+				b, err := io.ReadAll(readCloser)
 				if err != nil {
 					t.Fatalf("error reading pod stream %s", err.Error())
 				}