Fix acceptance tests (#55)

cockroachdb · Nov 4, 2022 · 4c0fed6 · 4c0fed6
1 parent 994030e
commit 4c0fed6
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 12 deletions.
diff --git a/internal/provider/cluster_resource_test.go b/internal/provider/cluster_resource_test.go
@@ -46,8 +46,9 @@ func TestAccServerlessClusterResource(t *testing.T) {
 func TestIntegrationServerlessClusterResource(t *testing.T) {
 	clusterName := fmt.Sprintf("tftest-serverless-%s", GenerateRandomString(2))
 	clusterID := "cluster-id"
-	os.Setenv("COCKROACH_API_KEY", "fake")
-	defer os.Unsetenv("COCKROACH_API_KEY")
+	if os.Getenv(CockroachAPIKey) == "" {
+		os.Setenv(CockroachAPIKey, "fake")
+	}
 
 	ctrl := gomock.NewController(t)
 	s := mock_client.NewMockService(ctrl)
@@ -122,8 +123,9 @@ func TestAccDedicatedClusterResource(t *testing.T) {
 func TestIntegrationDedicatedClusterResource(t *testing.T) {
 	clusterName := fmt.Sprintf("tftest-dedicated-%s", GenerateRandomString(3))
 	clusterID := "cluster-id"
-	os.Setenv("COCKROACH_API_KEY", "fake")
-	defer os.Unsetenv("COCKROACH_API_KEY")
+	if os.Getenv(CockroachAPIKey) == "" {
+		os.Setenv(CockroachAPIKey, "fake")
+	}
 
 	ctrl := gomock.NewController(t)
 	s := mock_client.NewMockService(ctrl)

diff --git a/internal/provider/networking_resource_test.go b/internal/provider/networking_resource_test.go
@@ -60,8 +60,9 @@ func TestIntegrationAllowlistEntryResource(t *testing.T) {
 		Sql:      true,
 		Ui:       true,
 	}
-	os.Setenv("COCKROACH_API_KEY", "fake")
-	defer os.Unsetenv("COCKROACH_API_KEY")
+	if os.Getenv(CockroachAPIKey) == "" {
+		os.Setenv(CockroachAPIKey, "fake")
+	}
 
 	ctrl := gomock.NewController(t)
 	s := mock_client.NewMockService(ctrl)

diff --git a/internal/provider/private_endpoint_connection_resource_test.go b/internal/provider/private_endpoint_connection_resource_test.go
@@ -40,8 +40,9 @@ func TestIntegrationPrivateEndpointConnectionResource(t *testing.T) {
 	clusterName := fmt.Sprintf("aws-connection-%s", GenerateRandomString(5))
 	clusterID := "cluster-id"
 	endpointID := "endpoint-id"
-	os.Setenv("COCKROACH_API_KEY", "fake")
-	defer os.Unsetenv("COCKROACH_API_KEY")
+	if os.Getenv(CockroachAPIKey) == "" {
+		os.Setenv(CockroachAPIKey, "fake")
+	}
 
 	ctrl := gomock.NewController(t)
 	s := mock_client.NewMockService(ctrl)

diff --git a/internal/provider/private_endpoint_services_resource_test.go b/internal/provider/private_endpoint_services_resource_test.go
@@ -41,8 +41,9 @@ func TestAccPrivateEndpointServicesResource(t *testing.T) {
 func TestIntegrationPrivateEndpointServicesResource(t *testing.T) {
 	clusterName := fmt.Sprintf("endpoint-services-%s", GenerateRandomString(3))
 	clusterID := "cluster-id"
-	os.Setenv("COCKROACH_API_KEY", "fake")
-	defer os.Unsetenv("COCKROACH_API_KEY")
+	if os.Getenv(CockroachAPIKey) == "" {
+		os.Setenv(CockroachAPIKey, "fake")
+	}
 
 	ctrl := gomock.NewController(t)
 	s := mock_client.NewMockService(ctrl)

diff --git a/internal/provider/sql_user_resource_test.go b/internal/provider/sql_user_resource_test.go
@@ -49,8 +49,9 @@ func TestIntegrationSqlUserResource(t *testing.T) {
 	sqlUserName := "cockroach-user"
 	sqlPassword := "cockroach@123456"
 	clusterID := "cluster-id"
-	os.Setenv("COCKROACH_API_KEY", "fake")
-	defer os.Unsetenv("COCKROACH_API_KEY")
+	if os.Getenv(CockroachAPIKey) == "" {
+		os.Setenv(CockroachAPIKey, "fake")
+	}
 
 	ctrl := gomock.NewController(t)
 	s := mock_client.NewMockService(ctrl)