chore: CLOUDP-214958: Run acc tests faster in local reusing cluster d…

…atabase_user (#1775)
mongodb · Dec 20, 2023 · 97e74ba · 97e74ba
1 parent e63be0c
commit 97e74ba
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 38 deletions.
diff --git a/internal/service/databaseuser/resource_database_user_migration_test.go b/internal/service/databaseuser/resource_database_user_migration_test.go
@@ -289,16 +289,15 @@ func TestAccMigrationConfigRSDatabaseUser_WithScopes(t *testing.T) {
 		username     = acctest.RandomWithPrefix("test-acc-user-")
 		password     = acctest.RandomWithPrefix("test-acc-pass-")
 		orgID        = os.Getenv("MONGODB_ATLAS_ORG_ID")
-		projectName  = acctest.RandomWithPrefix("test-acc")
-		clusterName  = acctest.RandomWithPrefix("test-acc-cluster")
+		clusterInfo  = acc.GetClusterInfo(orgID)
 	)
 
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck: func() { mig.PreCheckBasic(t) },
 		Steps: []resource.TestStep{
 			{
 				ExternalProviders: mig.ExternalProviders(),
-				Config: acc.ConfigDatabaseUserWithScopes(username, password, projectName, orgID, "atlasAdmin", clusterName,
+				Config: acc.ConfigDatabaseUserWithScopes(username, password, "atlasAdmin", clusterInfo.ProjectIDStr, clusterInfo.ClusterName, clusterInfo.ClusterTerraformStr,
 					[]*admin.UserScope{
 						{
 							Name: "test-acc-nurk4llu2z",
@@ -316,7 +315,7 @@ func TestAccMigrationConfigRSDatabaseUser_WithScopes(t *testing.T) {
 			},
 			{
 				ProtoV6ProviderFactories: acc.TestAccProviderV6Factories,
-				Config: acc.ConfigDatabaseUserWithScopes(username, password, projectName, orgID, "atlasAdmin", clusterName,
+				Config: acc.ConfigDatabaseUserWithScopes(username, password, "atlasAdmin", clusterInfo.ProjectIDStr, clusterInfo.ClusterName, clusterInfo.ClusterTerraformStr,
 					[]*admin.UserScope{
 						{
 							Name: "test-acc-nurk4llu2z",
@@ -341,16 +340,15 @@ func TestAccMigrationConfigRSDatabaseUser_WithScopesAndEmpty(t *testing.T) {
 		username     = acctest.RandomWithPrefix("test-acc-user-")
 		password     = acctest.RandomWithPrefix("test-acc-pass-")
 		orgID        = os.Getenv("MONGODB_ATLAS_ORG_ID")
-		projectName  = acctest.RandomWithPrefix("test-acc")
-		clusterName  = acctest.RandomWithPrefix("test-acc-cluster")
+		clusterInfo  = acc.GetClusterInfo(orgID)
 	)
 
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck: func() { mig.PreCheckBasic(t) },
 		Steps: []resource.TestStep{
 			{
 				ExternalProviders: mig.ExternalProviders(),
-				Config: acc.ConfigDatabaseUserWithScopes(username, password, projectName, orgID, "atlasAdmin", clusterName,
+				Config: acc.ConfigDatabaseUserWithScopes(username, password, "atlasAdmin", clusterInfo.ProjectIDStr, clusterInfo.ClusterName, clusterInfo.ClusterTerraformStr,
 					[]*admin.UserScope{},
 				),
 				Check: resource.ComposeTestCheckFunc(
@@ -363,7 +361,7 @@ func TestAccMigrationConfigRSDatabaseUser_WithScopesAndEmpty(t *testing.T) {
 			},
 			{
 				ProtoV6ProviderFactories: acc.TestAccProviderV6Factories,
-				Config: acc.ConfigDatabaseUserWithScopes(username, password, projectName, orgID, "atlasAdmin", clusterName,
+				Config: acc.ConfigDatabaseUserWithScopes(username, password, "atlasAdmin", clusterInfo.ProjectIDStr, clusterInfo.ClusterName, clusterInfo.ClusterTerraformStr,
 					[]*admin.UserScope{},
 				),
 				ConfigPlanChecks: resource.ConfigPlanChecks{

diff --git a/internal/service/databaseuser/resource_database_user_test.go b/internal/service/databaseuser/resource_database_user_test.go
@@ -342,8 +342,7 @@ func TestAccConfigRSDatabaseUser_withScopes(t *testing.T) {
 		username     = acctest.RandomWithPrefix("test-acc-user-")
 		password     = acctest.RandomWithPrefix("test-acc-pass-")
 		orgID        = os.Getenv("MONGODB_ATLAS_ORG_ID")
-		projectName  = acctest.RandomWithPrefix("test-acc")
-		clusterName  = acctest.RandomWithPrefix("test-acc-cluster")
+		clusterInfo  = acc.GetClusterInfo(orgID)
 	)
 
 	resource.ParallelTest(t, resource.TestCase{
@@ -352,7 +351,7 @@ func TestAccConfigRSDatabaseUser_withScopes(t *testing.T) {
 		CheckDestroy:             acc.CheckDestroyDatabaseUser,
 		Steps: []resource.TestStep{
 			{
-				Config: acc.ConfigDatabaseUserWithScopes(username, password, projectName, orgID, "atlasAdmin", clusterName,
+				Config: acc.ConfigDatabaseUserWithScopes(username, password, "atlasAdmin", clusterInfo.ProjectIDStr, clusterInfo.ClusterName, clusterInfo.ClusterTerraformStr,
 					[]*admin.UserScope{
 						{
 							Name: "test-acc-nurk4llu2z",
@@ -375,7 +374,7 @@ func TestAccConfigRSDatabaseUser_withScopes(t *testing.T) {
 				),
 			},
 			{
-				Config: acc.ConfigDatabaseUserWithScopes(username, password, projectName, orgID, "atlasAdmin", clusterName,
+				Config: acc.ConfigDatabaseUserWithScopes(username, password, "atlasAdmin", clusterInfo.ProjectIDStr, clusterInfo.ClusterName, clusterInfo.ClusterTerraformStr,
 					[]*admin.UserScope{
 						{
 							Name: "test-acc-nurk4llu2z",
@@ -404,8 +403,7 @@ func TestAccConfigRSDatabaseUser_withScopesAndEmpty(t *testing.T) {
 		username     = acctest.RandomWithPrefix("test-acc-user-")
 		password     = acctest.RandomWithPrefix("test-acc-pass-")
 		orgID        = os.Getenv("MONGODB_ATLAS_ORG_ID")
-		projectName  = acctest.RandomWithPrefix("test-acc")
-		clusterName  = acctest.RandomWithPrefix("test-acc-cluster")
+		clusterInfo  = acc.GetClusterInfo(orgID)
 	)
 
 	resource.ParallelTest(t, resource.TestCase{
@@ -414,7 +412,7 @@ func TestAccConfigRSDatabaseUser_withScopesAndEmpty(t *testing.T) {
 		CheckDestroy:             acc.CheckDestroyDatabaseUser,
 		Steps: []resource.TestStep{
 			{
-				Config: acc.ConfigDatabaseUserWithScopes(username, password, projectName, orgID, "atlasAdmin", clusterName,
+				Config: acc.ConfigDatabaseUserWithScopes(username, password, "atlasAdmin", clusterInfo.ProjectIDStr, clusterInfo.ClusterName, clusterInfo.ClusterTerraformStr,
 					[]*admin.UserScope{
 						{
 							Name: "test-acc-nurk4llu2z",
@@ -437,7 +435,7 @@ func TestAccConfigRSDatabaseUser_withScopesAndEmpty(t *testing.T) {
 				),
 			},
 			{
-				Config: acc.ConfigDatabaseUserWithScopes(username, password, projectName, orgID, "atlasAdmin", clusterName,
+				Config: acc.ConfigDatabaseUserWithScopes(username, password, "atlasAdmin", clusterInfo.ProjectIDStr, clusterInfo.ClusterName, clusterInfo.ClusterTerraformStr,
 					[]*admin.UserScope{},
 				),
 				Check: resource.ComposeTestCheckFunc(

diff --git a/internal/testutil/acc/database_user.go b/internal/testutil/acc/database_user.go
@@ -237,7 +237,7 @@ func ConfigDatabaseUserWithAWSIAMType(projectName, orgID, roleName, username, ke
 	`, projectName, orgID, roleName, username, keyLabel, valueLabel)
 }
 
-func ConfigDatabaseUserWithScopes(username, password, projectName, orgID, roleName, clusterName string, scopesArr []*admin.UserScope) string {
+func ConfigDatabaseUserWithScopes(username, password, roleName, projectID, clusterName, clusterTerraformStr string, scopesArr []*admin.UserScope) string {
 	var scopes string
 
 	for _, scope := range scopesArr {
@@ -249,33 +249,17 @@ func ConfigDatabaseUserWithScopes(username, password, projectName, orgID, roleNa
 
 		scopes += fmt.Sprintf(`
 			scopes {
-				name = "${mongodbatlas_cluster.my_cluster.name}"
+				name = "%s"
 				%s
 			}
-		`, scopeType)
+		`, clusterName, scopeType)
 	}
 
-	return fmt.Sprintf(`
-		resource "mongodbatlas_project" "test" {
-			name   = "%s"
-			org_id = "%s"
-		}
-
-		resource "mongodbatlas_cluster" "my_cluster" {
-			project_id   = "${mongodbatlas_project.test.id}"
-			name         = "%s"
-			
-			// Provider Settings "block"
-			provider_name               = "AWS"
-			provider_region_name        = "US_EAST_2"
-			provider_instance_size_name = "M10"
-			cloud_backup                = true //enable cloud provider snapshots
-		}
-
+	return clusterTerraformStr + fmt.Sprintf(`
 		resource "mongodbatlas_database_user" "test" {
 			username           = "%s"
 			password           = "%s"
-			project_id         = "${mongodbatlas_project.test.id}"
+			project_id         = %s
 			auth_database_name = "admin"
 
 			roles {
@@ -286,7 +270,7 @@ func ConfigDatabaseUserWithScopes(username, password, projectName, orgID, roleNa
 			%s
 
 		}
-	`, projectName, orgID, clusterName, username, password, roleName, scopes)
+	`, username, password, projectID, roleName, scopes)
 }
 
 func ConfigDatabaseUserWithLDAPAuthType(projectName, orgID, roleName, username, keyLabel, valueLabel string) string {