Fix gosec issue

base-org · Feb 7, 2024 · 01a41a7 · 01a41a7
1 parent 6e7646b
commit 01a41a7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -27,12 +27,13 @@ go-gen-mocks:
 
 .PHONY: test
 test:
-	@ go test ./internal/... -timeout $(TEST_LIMIT)
+	@go test ./internal/... -timeout $(TEST_LIMIT)
 
 .PHONY: test-e2e
 e2e-test:
 	@docker compose up -d
 	@go test ./e2e/...  -timeout $(TEST_LIMIT) -deploy-config ../.devnet/devnetL1.json -parallel=4 -v
+	@docker compose down
 
 .PHONY: lint
 lint:

diff --git a/e2e/setup.go b/e2e/setup.go
@@ -115,9 +115,15 @@ func CreateSysTestSuite(t *testing.T, topicArn string) *SysTestSuite {
 
 	pagerdutyServer := NewTestPagerDutyServer("127.0.0.1", 0)
 
-	os.Setenv("AWS_REGION", "us-east-1")       //nolint:tenv // Cannot use t.SetEnv in parallel tests
-	os.Setenv("AWS_SECRET_ACCESS_KEY", "test") //nolint:tenv // Cannot use t.SetEnv in parallel tests
-	os.Setenv("AWS_ACCESS_KEY_ID", "test")     //nolint:tenv // Cannot use t.SetEnv in parallel tests
+	if err := os.Setenv("AWS_REGION", "us-east-1"); err != nil { //nolint:tenv // Cannot use t.SetEnv in parallel tests
+		t.Fatal(err)
+	}
+	if err := os.Setenv("AWS_SECRET_ACCESS_KEY", "test"); err != nil { //nolint:tenv // Cannot use t.SetEnv in parallel tests
+		t.Fatal(err)
+	}
+	if err := os.Setenv("AWS_ACCESS_KEY_ID", "test"); err != nil { //nolint:tenv // Cannot use t.SetEnv in parallel tests
+		t.Fatal(err)
+	}
 
 	slackURL := fmt.Sprintf("http://127.0.0.1:%d", slackServer.Port)
 	pagerdutyURL := fmt.Sprintf("http://127.0.0.1:%d", pagerdutyServer.Port)