Remove deprecated ioutil calls

Signed-off-by: Micah Hausler <[email protected]>

Author: micahhausler

provider/secrets_manager_provider.go

@@ -3,7 +3,7 @@ package provider
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
+	"os"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/session"
@@ -246,7 +246,7 @@ func (p *SecretsManagerProvider) fetchSecret(
 // Reads a secret back in from the file system.
 func (p *SecretsManagerProvider) reloadSecret(descriptor *SecretDescriptor) (val *SecretValue, e error) {
 
-	sValue, err := ioutil.ReadFile(descriptor.GetMountPath())
+	sValue, err := os.ReadFile(descriptor.GetMountPath())
 	if err != nil {
 		return nil, err
 	}

server/server.go

@@ -11,7 +11,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"strconv"
 	"strings"
@@ -303,7 +302,7 @@ func (s *CSIDriverProviderServer) writeFile(secret *provider.SecretValue, mode o
 	}
 
 	// Write to a tempfile first
-	tmpFile, err := ioutil.TempFile(secret.Descriptor.GetMountDir(), secret.Descriptor.GetFileName())
+	tmpFile, err := os.CreateTemp(secret.Descriptor.GetMountDir(), secret.Descriptor.GetFileName())
 	if err != nil {
 		return nil, err
 	}

server/server_test.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"regexp"
@@ -297,7 +296,7 @@ func validateMounts(t *testing.T, dir string, tst testCase, rsp *v1alpha1.MountR
 
 	// Check for the expected secrets
 	for file, val := range tst.expSecrets {
-		secretVal, err := ioutil.ReadFile(filepath.Join(dir, file))
+		secretVal, err := os.ReadFile(filepath.Join(dir, file))
 		if err != nil {
 			t.Errorf("%s: Can not read file %s", tst.testName, file)
 			return false
@@ -349,7 +348,7 @@ func validateResponse(t *testing.T, dir string, tst testCase, rsp *v1alpha1.Moun
 			t.Errorf("%s: could not create base directory: %v", tst.testName, err)
 			return false
 		}
-		if err := ioutil.WriteFile(fullPath, secretVal, os.FileMode(perm)); err != nil {
+		if err := os.WriteFile(fullPath, secretVal, os.FileMode(perm)); err != nil {
 			t.Errorf("%s: could not write secret: %v", tst.testName, err)
 			return false
 		}
@@ -1994,11 +1993,7 @@ func TestMounts(t *testing.T) {
 
 		t.Run(tst.testName, func(t *testing.T) {
 
-			dir, err := ioutil.TempDir("", strings.Map(nameMapper, tst.testName))
-			if err != nil {
-				panic(err)
-			}
-			defer os.RemoveAll(dir) // Cleanup
+			dir := t.TempDir() // t.TempDir() handles cleanup automatically
 
 			svr := newServerWithMocks(&tst, false)
 
@@ -2035,11 +2030,7 @@ func TestMountsNoWrite(t *testing.T) {
 
 		t.Run(tst.testName, func(t *testing.T) {
 
-			dir, err := ioutil.TempDir("", strings.Map(nameMapper, tst.testName))
-			if err != nil {
-				panic(err)
-			}
-			defer os.RemoveAll(dir) // Cleanup
+			dir := t.TempDir() // t.TempDir() handles cleanup automatically
 
 			svr := newServerWithMocks(&tst, true)
 
@@ -2452,11 +2443,7 @@ var remountTests []testCase = []testCase{
 // Validate rotation
 func TestReMounts(t *testing.T) {
 
-	dir, err := ioutil.TempDir("", "TestReMounts")
-	if err != nil {
-		panic(err)
-	}
-	defer os.RemoveAll(dir) // Cleanup
+	dir := t.TempDir() // t.TempDir() handles cleanup automatically
 
 	curState := []*v1alpha1.ObjectVersion{}
 
@@ -2494,11 +2481,7 @@ func TestReMounts(t *testing.T) {
 // Validate rotation
 func TestNoWriteReMounts(t *testing.T) {
 
-	dir, err := ioutil.TempDir("", "TestReMounts")
-	if err != nil {
-		panic(err)
-	}
-	defer os.RemoveAll(dir) // Cleanup
+	dir := t.TempDir() // t.TempDir() handles cleanup automatically
 
 	curState := []*v1alpha1.ObjectVersion{}