IR-295: use os or io instead of deprecated io/ioutil

Author: flavianmissi

pkg/metrics/server_test.go

@@ -7,7 +7,6 @@ import (
 	"crypto/x509"
 	"encoding/pem"
 	"io"
-	"io/ioutil"
 	"log"
 	"math/big"
 	"net/http"
@@ -64,7 +63,7 @@ func generateTempCertificates() (string, string, error) {
 		return "", "", err
 	}
 
-	cert, err := ioutil.TempFile("", "testcert-")
+	cert, err := os.CreateTemp("", "testcert-")
 	if err != nil {
 		return "", "", err
 	}
@@ -77,7 +76,7 @@ func generateTempCertificates() (string, string, error) {
 		return "", "", err
 	}
 
-	keyPath, err := ioutil.TempFile("", "testkey-")
+	keyPath, err := os.CreateTemp("", "testkey-")
 	if err != nil {
 		return "", "", err
 	}

pkg/operator/azurestackcloud.go

@@ -3,7 +3,6 @@ package operator
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"time"
@@ -110,7 +109,7 @@ func (c *AzureStackCloudController) syncConfig() error {
 		return err
 	}
 
-	f, err := ioutil.TempFile(filepath.Dir(filename), "azurestackcloud")
+	f, err := os.CreateTemp(filepath.Dir(filename), "azurestackcloud")
 	if err != nil {
 		return err
 	}

pkg/storage/gcs/gcs_test.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"strings"
 	"testing"
@@ -32,7 +32,7 @@ func (r *tripper) RoundTrip(req *http.Request) (*http.Response, error) {
 	}()
 	return &http.Response{
 		StatusCode: r.responseCodes[r.req],
-		Body:       ioutil.NopCloser(bytes.NewBufferString(r.responseBodies[r.req])),
+		Body:       io.NopCloser(bytes.NewBufferString(r.responseBodies[r.req])),
 	}, nil
 }
 

pkg/storage/ibmcos/ibmcos_test.go

@@ -3,7 +3,7 @@ package ibmcos
 import (
 	"bytes"
 	"context"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"path/filepath"
 	"testing"
@@ -361,7 +361,7 @@ func (r *tripper) RoundTrip(req *http.Request) (*http.Response, error) {
 	return &http.Response{
 		StatusCode: r.responseCodes[r.req],
 		Header:     http.Header{"Content-Type": {"application/json"}},
-		Body:       ioutil.NopCloser(bytes.NewBufferString(r.responseBodies[r.req])),
+		Body:       io.NopCloser(bytes.NewBufferString(r.responseBodies[r.req])),
 	}, nil
 }
 

pkg/storage/oss/oss_test.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"reflect"
 	"testing"
@@ -251,7 +251,7 @@ func (r *tripper) RoundTrip(req *http.Request) (*http.Response, error) {
 	}()
 
 	if req.Body != nil {
-		dt, err := ioutil.ReadAll(req.Body)
+		dt, err := io.ReadAll(req.Body)
 		if err != nil {
 			return nil, err
 		}
@@ -269,7 +269,7 @@ func (r *tripper) RoundTrip(req *http.Request) (*http.Response, error) {
 	}
 	return &http.Response{
 		StatusCode: code,
-		Body:       ioutil.NopCloser(bytes.NewBufferString(respBody)),
+		Body:       io.NopCloser(bytes.NewBufferString(respBody)),
 	}, nil
 }
 

pkg/storage/s3/s3.go

@@ -6,7 +6,6 @@ import (
 	"crypto/tls"
 	"crypto/x509"
 	"fmt"
-	"io/ioutil"
 	"net"
 	"net/http"
 	"net/url"
@@ -936,7 +935,7 @@ func (d *driver) ID() string {
 // an AWS ini-style credentials configuration file.
 // Caller is responsible for cleaning up the created file.
 func saveSharedCredentialsFile(data []byte) (string, error) {
-	f, err := ioutil.TempFile("", "aws-shared-credentials")
+	f, err := os.CreateTemp("", "aws-shared-credentials")
 	if err != nil {
 		return "", fmt.Errorf("failed to create file for shared credentials: %v", err)
 	}

pkg/storage/s3/s3_test.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"context"
 	"encoding/xml"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"path/filepath"
 	"reflect"
@@ -362,7 +362,7 @@ func (r *tripper) RoundTrip(req *http.Request) (*http.Response, error) {
 	}()
 
 	if req.Body != nil {
-		dt, err := ioutil.ReadAll(req.Body)
+		dt, err := io.ReadAll(req.Body)
 		if err != nil {
 			return nil, err
 		}
@@ -376,7 +376,7 @@ func (r *tripper) RoundTrip(req *http.Request) (*http.Response, error) {
 
 	return &http.Response{
 		StatusCode: code,
-		Body:       ioutil.NopCloser(bytes.NewBufferString("{}")),
+		Body:       io.NopCloser(bytes.NewBufferString("{}")),
 	}, nil
 }
 

test/e2e/aws_test.go

@@ -3,7 +3,6 @@ package e2e
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"reflect"
 	"strings"
@@ -428,7 +427,7 @@ func TestAWSUpdateCredentials(t *testing.T) {
 	}
 	defer os.Remove(sharedCredentialsFile)
 
-	credsBytes, err := ioutil.ReadFile(sharedCredentialsFile)
+	credsBytes, err := os.ReadFile(sharedCredentialsFile)
 	if err != nil {
 		t.Fatalf("failed to read in S3 driver's AWS configuration file: %s", err)
 	}
@@ -802,7 +801,7 @@ func createAWSConfigFile(awsSecret *corev1.Secret, kubeClient *framework.Clients
 		}
 
 		var tokenTempFile *os.File
-		if tokenTempFile, err = ioutil.TempFile("", "cluster-image-registry-operator-test-token"); err != nil {
+		if tokenTempFile, err = os.CreateTemp("", "cluster-image-registry-operator-test-token"); err != nil {
 			return
 		}
 		defer tokenTempFile.Close()
@@ -814,7 +813,7 @@ func createAWSConfigFile(awsSecret *corev1.Secret, kubeClient *framework.Clients
 		}
 
 		// create AWS config file pointing to token file
-		if awsConfigTempFile, err = ioutil.TempFile("", "cluster-image-registry-operator-test-awsconfig"); err != nil {
+		if awsConfigTempFile, err = os.CreateTemp("", "cluster-image-registry-operator-test-awsconfig"); err != nil {
 			return
 		}
 		defer awsConfigTempFile.Close()
@@ -831,7 +830,7 @@ func createAWSConfigFile(awsSecret *corev1.Secret, kubeClient *framework.Clients
 
 	} else {
 		// just use the Secret contents as-is
-		if awsConfigTempFile, err = ioutil.TempFile("", "cluster-image-registry-operator-test-awsconfig"); err != nil {
+		if awsConfigTempFile, err = os.CreateTemp("", "cluster-image-registry-operator-test-awsconfig"); err != nil {
 			return
 		}
 		defer awsConfigTempFile.Close()