Merge pull request #1223 from umagnus/replace-deprecated-ioutil

cleanup: replace deprecated ioutil method

pkg/azurefile/azure_test.go

@@ -19,7 +19,6 @@ package azurefile
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"reflect"
 	"runtime"
@@ -151,7 +150,7 @@ users:
 				}
 			}()
 
-			if err := ioutil.WriteFile(fakeKubeConfig, []byte(fakeContent), 0666); err != nil {
+			if err := os.WriteFile(fakeKubeConfig, []byte(fakeContent), 0666); err != nil {
 				t.Error(err)
 			}
 		}
@@ -364,7 +363,7 @@ users:
 		}
 	}()
 
-	if err := ioutil.WriteFile(validKubeConfig, []byte(fakeContent), 0666); err != nil {
+	if err := os.WriteFile(validKubeConfig, []byte(fakeContent), 0666); err != nil {
 		t.Error(err)
 	}
 

pkg/azurefile/azurefile_test.go

@@ -20,7 +20,6 @@ import (
 	"context"
 	"encoding/base64"
 	"fmt"
-	"io/ioutil"
 	"net/url"
 	"os"
 	"path/filepath"
@@ -544,7 +543,7 @@ func TestGetSnapshot(t *testing.T) {
 
 func TestIsCorruptedDir(t *testing.T) {
 	skipIfTestingOnWindows(t)
-	existingMountPath, err := ioutil.TempDir(os.TempDir(), "csi-mount-test")
+	existingMountPath, err := os.MkdirTemp(os.TempDir(), "csi-mount-test")
 	if err != nil {
 		t.Fatalf("failed to create tmp dir: %v", err)
 	}
@@ -912,7 +911,7 @@ func TestRun(t *testing.T) {
 		{
 			name: "Successful run",
 			testFunc: func(t *testing.T) {
-				if err := ioutil.WriteFile(fakeCredFile, []byte(fakeCredContent), 0666); err != nil {
+				if err := os.WriteFile(fakeCredFile, []byte(fakeCredContent), 0666); err != nil {
 					t.Error(err)
 				}
 
@@ -937,7 +936,7 @@ func TestRun(t *testing.T) {
 		{
 			name: "Successful run with node ID missing",
 			testFunc: func(t *testing.T) {
-				if err := ioutil.WriteFile(fakeCredFile, []byte(fakeCredContent), 0666); err != nil {
+				if err := os.WriteFile(fakeCredFile, []byte(fakeCredContent), 0666); err != nil {
 					t.Error(err)
 				}
 

pkg/azurefile/nodeserver.go

@@ -18,7 +18,6 @@ package azurefile
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"runtime"
@@ -524,7 +523,7 @@ func (d *Driver) ensureMountPoint(target string, perm os.FileMode) (bool, error)
 
 	if !notMnt {
 		// testing original mount point, make sure the mount link is valid
-		_, err := ioutil.ReadDir(target)
+		_, err := os.ReadDir(target)
 		if err == nil {
 			klog.V(2).Infof("already mounted to target %s", target)
 			return !notMnt, nil

test/utils/credentials/credentials.go

@@ -19,7 +19,6 @@ package credentials
 import (
 	"fmt"
 	"html/template"
-	"io/ioutil"
 	"log"
 	"os"
 
@@ -168,7 +167,7 @@ func DeleteAzureCredentialFile() error {
 // getCredentialsFromAzureCredentials parses the azure credentials toml (AZURE_CREDENTIALS)
 // in Prow and returns the credential information usable to Azure File CSI driver
 func getCredentialsFromAzureCredentials(azureCredentialsPath string) (*FromProw, error) {
-	content, err := ioutil.ReadFile(azureCredentialsPath)
+	content, err := os.ReadFile(azureCredentialsPath)
 	log.Printf("Reading credentials file %v", azureCredentialsPath)
 	if err != nil {
 		return nil, fmt.Errorf("error reading credentials file %v %v", azureCredentialsPath, err)

test/utils/credentials/credentials_test.go

@@ -18,7 +18,6 @@ package credentials
 
 import (
 	"bytes"
-	"io/ioutil"
 	"os"
 	"testing"
 	"text/template"
@@ -83,7 +82,7 @@ func TestCreateAzureCredentialFileOnAzurePublicCloud(t *testing.T) {
 }
 
 func withAzureCredentials(t *testing.T, isAzureChinaCloud bool) {
-	tempFile, err := ioutil.TempFile("", "azure.toml")
+	tempFile, err := os.CreateTemp("", "azure.toml")
 	assert.NoError(t, err)
 	defer func() {
 		err := os.Remove(tempFile.Name())
@@ -117,7 +116,7 @@ func withAzureCredentials(t *testing.T, isAzureChinaCloud bool) {
 	assert.Equal(t, "test-resource-group", creds.ResourceGroup)
 	assert.Equal(t, "test-location", creds.Location)
 
-	azureCredentialFileContent, err := ioutil.ReadFile(TempAzureCredentialFilePath)
+	azureCredentialFileContent, err := os.ReadFile(TempAzureCredentialFilePath)
 	assert.NoError(t, err)
 
 	const expectedAzureCredentialFileContent = `
@@ -171,7 +170,7 @@ func withEnvironmentVariables(t *testing.T, isAzureChinaCloud bool) {
 	assert.Equal(t, "test-resource-group", creds.ResourceGroup)
 	assert.Equal(t, "test-location", creds.Location)
 
-	azureCredentialFileContent, err := ioutil.ReadFile(TempAzureCredentialFilePath)
+	azureCredentialFileContent, err := os.ReadFile(TempAzureCredentialFilePath)
 	assert.NoError(t, err)
 
 	const expectedAzureCredentialFileContent = `