Merge branch 'main' into gcp-cache-poison

gomods · Jun 2, 2024 · 57e0605 · 57e0605
2 parents 4ac9013 + c1891f1
commit 57e0605
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -74,7 +74,7 @@ test-unit-docker: ## run unit tests with docker
 
 .PHONY: test-e2e
 test-e2e:
-	cd e2etests && go test --tags e2etests
+	./scripts/test_e2e.sh
 
 .PHONY: test-e2e-docker
 test-e2e-docker:

diff --git a/pkg/storage/s3/s3.go b/pkg/storage/s3/s3.go
@@ -40,10 +40,6 @@ func New(s3Conf *config.S3Config, timeout time.Duration, options ...func(*aws.Co
 		return nil, errors.E(op, err)
 	}
 
-	// Remove anonymous credentials from the default config so that
-	// session.NewSession can auto-resolve credentials from role, profile, env etc.
-	awsConfig.Credentials = nil
-
 	for _, o := range options {
 		o(&awsConfig)
 	}

diff --git a/scripts/test_e2e.sh b/scripts/test_e2e.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# test_e2e.sh
+
+# Run the e2e tests with the race detector enabled
+set -xeuo pipefail
+cd e2etests && go test --tags e2etests -race