diff --git a/.golangci.yaml b/.golangci.yaml index d899273a0..72711e99a 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -276,6 +276,9 @@ linters: # with golangci-lint call it on a directory with the changed file. check-exported: false + usetesting: + os-setenv: false + whitespace: multi-if: false # Enforces newlines (or comments) after every multi-line if statement multi-func: false # Enforces newlines (or comments) after every multi-line function signature @@ -335,6 +338,7 @@ linters: - unparam - unused - usestdlibvars + - usetesting - whitespace exclusions: diff --git a/pkg/backup/item_collector_test.go b/pkg/backup/item_collector_test.go index bbdad7e43..3bcf4c345 100644 --- a/pkg/backup/item_collector_test.go +++ b/pkg/backup/item_collector_test.go @@ -17,7 +17,6 @@ limitations under the License. package backup import ( - "os" "testing" "github.com/sirupsen/logrus" @@ -254,8 +253,7 @@ func TestItemCollectorBackupNamespaces(t *testing.T) { for _, tc := range tests { t.Run(tc.name, func(*testing.T) { - tempDir, err := os.MkdirTemp("", "") - require.NoError(t, err) + tempDir := t.TempDir() var unstructuredNSList unstructured.UnstructuredList for _, ns := range tc.namespaces { diff --git a/pkg/repository/config/aws_test.go b/pkg/repository/config/aws_test.go index 8c7527370..0aedef26e 100644 --- a/pkg/repository/config/aws_test.go +++ b/pkg/repository/config/aws_test.go @@ -149,7 +149,7 @@ func TestGetS3CredentialsCorrectlyUseProfile(t *testing.T) { t.Setenv("AWS_SECRET_ACCESS_KEY", "") t.Setenv("AWS_SHARED_CREDENTIALS_FILE", "") - tmpFile, err := os.CreateTemp("", "velero-test-aws-credentials") + tmpFile, err := os.CreateTemp(t.TempDir(), "velero-test-aws-credentials") defer os.Remove(tmpFile.Name()) if err != nil { t.Errorf("GetS3Credentials() error = %v", err) diff --git a/pkg/uploader/provider/restic_test.go b/pkg/uploader/provider/restic_test.go index f865604ef..ee3e27014 100644 --- a/pkg/uploader/provider/restic_test.go +++ b/pkg/uploader/provider/restic_test.go @@ -237,13 +237,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 := os.CreateTemp("", "credentialsFile") + credentialsFile, err := os.CreateTemp(t.TempDir(), "credentialsFile") if err != nil { t.Fatalf("failed to create temp file: %v", err) } defer os.Remove(credentialsFile.Name()) - caCertFile, err := os.CreateTemp("", "caCertFile") + caCertFile, err := os.CreateTemp(t.TempDir(), "caCertFile") if err != nil { t.Fatalf("failed to create temp file: %v", err) } @@ -266,7 +266,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 := os.CreateTemp("", "caCertFile") + caCertFile, err := os.CreateTemp(t.TempDir(), "caCertFile") if err != nil { t.Fatalf("failed to create temp file: %v", err) } diff --git a/pkg/util/logging/log_merge_hook_test.go b/pkg/util/logging/log_merge_hook_test.go index f894a8bcc..43b5ae1cb 100644 --- a/pkg/util/logging/log_merge_hook_test.go +++ b/pkg/util/logging/log_merge_hook_test.go @@ -94,7 +94,7 @@ func (fw *fakeWriter) Write(p []byte) (n int, err error) { } func TestMergeHook_Write(t *testing.T) { - sourceFile, err := os.CreateTemp("", "") + sourceFile, err := os.CreateTemp(t.TempDir(), "") require.NoError(t, err) logMessage := "fake-message-1\nfake-message-2"