diff --git a/pkg/controller/backup_finalizer_controller_test.go b/pkg/controller/backup_finalizer_controller_test.go index 1e0f88511..011a6561b 100644 --- a/pkg/controller/backup_finalizer_controller_test.go +++ b/pkg/controller/backup_finalizer_controller_test.go @@ -19,7 +19,7 @@ package controller import ( "bytes" "context" - "io/ioutil" + "io" "testing" "time" @@ -163,7 +163,7 @@ func TestBackupFinalizerReconcile(t *testing.T) { reconciler, backupper := mockBackupFinalizerReconciler(fakeClient, fakeClock) pluginManager.On("CleanupClients").Return(nil) backupStore.On("GetBackupItemOperations", test.backup.Name).Return(test.backupOperations, nil) - backupStore.On("GetBackupContents", mock.Anything).Return(ioutil.NopCloser(bytes.NewReader([]byte("hello world"))), nil) + backupStore.On("GetBackupContents", mock.Anything).Return(io.NopCloser(bytes.NewReader([]byte("hello world"))), nil) backupStore.On("PutBackupContents", mock.Anything, mock.Anything).Return(nil) backupStore.On("PutBackupMetadata", mock.Anything, mock.Anything).Return(nil) pluginManager.On("GetBackupItemActionsV2").Return(nil, nil) diff --git a/pkg/uploader/provider/restic_test.go b/pkg/uploader/provider/restic_test.go index 379d4f265..eaf0273ff 100644 --- a/pkg/uploader/provider/restic_test.go +++ b/pkg/uploader/provider/restic_test.go @@ -19,7 +19,6 @@ package provider import ( "context" "errors" - "io/ioutil" "os" "strings" "testing" @@ -211,13 +210,13 @@ func TestResticRunRestore(t *testing.T) { func TestClose(t *testing.T) { t.Run("Delete existing credentials file", func(t *testing.T) { // Create temporary files for the credentials and caCert - credentialsFile, err := ioutil.TempFile("", "credentialsFile") + credentialsFile, err := os.CreateTemp("", "credentialsFile") if err != nil { t.Fatalf("failed to create temp file: %v", err) } defer os.Remove(credentialsFile.Name()) - caCertFile, err := ioutil.TempFile("", "caCertFile") + caCertFile, err := os.CreateTemp("", "caCertFile") if err != nil { t.Fatalf("failed to create temp file: %v", err) } @@ -240,7 +239,7 @@ func TestClose(t *testing.T) { t.Run("Delete existing caCert file", func(t *testing.T) { // Create temporary files for the credentials and caCert - caCertFile, err := ioutil.TempFile("", "caCertFile") + caCertFile, err := os.CreateTemp("", "caCertFile") if err != nil { t.Fatalf("failed to create temp file: %v", err) } diff --git a/test/e2e/basic/api-group/enable_api_group_versions.go b/test/e2e/basic/api-group/enable_api_group_versions.go index 61d7ba08e..b2901be31 100644 --- a/test/e2e/basic/api-group/enable_api_group_versions.go +++ b/test/e2e/basic/api-group/enable_api_group_versions.go @@ -21,7 +21,6 @@ import ( "encoding/json" "flag" "fmt" - "io/ioutil" "os" "os/exec" "regexp" @@ -376,7 +375,7 @@ func installTestCRD(ctx context.Context, index int, group, path string) error { } func rerenderTestYaml(index int, group, path string) (string, error) { - content, err := ioutil.ReadFile(path) + content, err := os.ReadFile(path) if err != nil { return "", errors.Wrapf(err, "failed to get %s when install test yaml", path) } @@ -399,7 +398,7 @@ func rerenderTestYaml(index int, group, path string) (string, error) { newContent = strings.ReplaceAll(newContent, group, fmt.Sprintf("%s.%d", group, index)) By(fmt.Sprintf("\n%s\n", newContent)) - tmpFile, err := ioutil.TempFile("", "test-yaml") + tmpFile, err := os.CreateTemp("", "test-yaml") if err != nil { return "", errors.Wrapf(err, "failed to create temp file when install storage class") } diff --git a/test/e2e/resourcepolicies/resource_policies.go b/test/e2e/resourcepolicies/resource_policies.go index 9f60dab72..1fa2d4946 100644 --- a/test/e2e/resourcepolicies/resource_policies.go +++ b/test/e2e/resourcepolicies/resource_policies.go @@ -19,7 +19,6 @@ package filtering import ( "context" "fmt" - "io/ioutil" "os" "strings" "time" @@ -270,7 +269,7 @@ func (r *ResourcePoliciesCase) installTestStorageClasses(path string) error { if err != nil { return err } - content, err := ioutil.ReadFile(path) + content, err := os.ReadFile(path) if err != nil { return errors.Wrapf(err, "failed to get %s when install storage class", path) } @@ -278,7 +277,7 @@ func (r *ResourcePoliciesCase) installTestStorageClasses(path string) error { // replace sc to new value newContent := strings.ReplaceAll(string(content), "name: e2e-storage-class", "name: e2e-storage-class-2") - tmpFile, err := ioutil.TempFile("", "sc-file") + tmpFile, err := os.CreateTemp("", "sc-file") if err != nil { return errors.Wrapf(err, "failed to create temp file when install storage class") }