chore: Fix TestMigCloudUserProjectAssignmentRS_basic (#3692)

lantoli · Copilot · web-flow · commit 3fe9be2018fa · 2025-09-16T12:56:33.000+02:00
Co-authored-by: Copilot &lt;175728472+Copilot@users.noreply.github.com&gt;
diff --git a/internal/service/cloudbackupsnapshot/resource.go b/internal/service/cloudbackupsnapshot/resource.go
@@ -133,7 +133,7 @@ func Resource() *schema.Resource {
 }
 
 const (
-	oneMinute = 1 * time.Minute
+	timeout = 1 * time.Minute
 )
 
 func resourceCreate(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {
@@ -165,9 +165,9 @@ func resourceCreate(ctx context.Context, d *schema.ResourceData, meta any) diag.
 		Pending:    []string{"queued", "inProgress"},
 		Target:     []string{"completed", "failed"},
 		Refresh:    resourceRefreshFunc(ctx, requestParams, connV2),
-		Timeout:    d.Timeout(schema.TimeoutCreate) - time.Minute,
-		MinTimeout: oneMinute,
-		Delay:      oneMinute,
+		Timeout:    d.Timeout(schema.TimeoutCreate),
+		MinTimeout: timeout,
+		Delay:      timeout,
 	}
 	_, errWait := stateConf.WaitForStateContext(ctx)
 	deleteOnCreateTimeout := true // default value when not set
diff --git a/internal/service/clouduserprojectassignment/resource_migration_test.go b/internal/service/clouduserprojectassignment/resource_migration_test.go
@@ -14,13 +14,12 @@ import (
 
 const (
 	resourceInvitationName            = "mongodbatlas_project_invitation.mig_test"
-	resourceProjectName               = "mongodbatlas_project.mig_test"
 	resourceUserProjectAssignmentName = "mongodbatlas_cloud_user_project_assignment.user_mig_test"
 )
 
 func TestMigCloudUserProjectAssignmentRS_basic(t *testing.T) {
 	mig.SkipIfVersionBelow(t, "2.0.0") // when resource 1st released
-	mig.CreateAndRunTest(t, basicTestCase(t))
+	mig.CreateAndRunTestNonParallel(t, basicTestCase(t))
 }
 
 func TestMigCloudUserProjectAssignmentRS_migrationJourney(t *testing.T) {
diff --git a/internal/service/clouduserprojectassignment/resource_test.go b/internal/service/clouduserprojectassignment/resource_test.go
@@ -19,13 +19,14 @@ var DSNameUsername = "data.mongodbatlas_cloud_user_project_assignment.test_usern
 var DSNameUserID = "data.mongodbatlas_cloud_user_project_assignment.test_user_id"
 
 func TestAccCloudUserProjectAssignment_basic(t *testing.T) {
-	resource.ParallelTest(t, *basicTestCase(t))
+	resource.Test(t, *basicTestCase(t))
 }
 
 func TestAccCloudUserProjectAssignmentDS_error(t *testing.T) {
 	resource.ParallelTest(t, *errorTestCase(t))
 }
 
+// basicTestCase must be called in serial to avoid multiple tests to use the same Atlas resources and interfere with each other.
 func basicTestCase(t *testing.T) *resource.TestCase {
 	t.Helper()
 
@@ -39,7 +40,7 @@ func basicTestCase(t *testing.T) *resource.TestCase {
 	updatedRoles := []string{"GROUP_OWNER", "GROUP_SEARCH_INDEX_EDITOR", "GROUP_READ_ONLY"}
 
 	return &resource.TestCase{
-		PreCheck:                 func() { acc.PreCheckBasic(t); acc.PreCheckAtlasUsernames(t) },
+		PreCheck:                 func() { acc.PreCheckAtlasUsernames(t) },
 		ProtoV6ProviderFactories: acc.TestAccProviderV6Factories,
 		CheckDestroy:             checkDestroy,
 		Steps: []resource.TestStep{
diff --git a/internal/service/clusteroutagesimulation/resource.go b/internal/service/clusteroutagesimulation/resource.go
@@ -22,7 +22,7 @@ const (
 	errorClusterOutageSimulationDelete  = "error ending MongoDB Atlas Cluster Outage Simulation for Project (%s), Cluster (%s): %s"
 	errorClusterOutageSimulationSetting = "error setting `%s` for MongoDB Atlas Cluster Outage Simulation: %s"
 	defaultOutageFilterType             = "REGION"
-	oneMinute                           = 1 * time.Minute
+	timeout                             = 1 * time.Minute
 )
 
 func Resource() *schema.Resource {
@@ -106,8 +106,8 @@ func resourceCreate(ctx context.Context, d *schema.ResourceData, meta any) diag.
 		Target:     []string{"SIMULATING"},
 		Refresh:    resourceRefreshFunc(ctx, clusterName, projectID, connV2),
 		Timeout:    d.Timeout(schema.TimeoutCreate),
-		MinTimeout: oneMinute,
-		Delay:      oneMinute,
+		MinTimeout: timeout,
+		Delay:      timeout,
 	}
 
 	_, errWait := stateConf.WaitForStateContext(ctx)
@@ -187,8 +187,8 @@ func waitForDeletableState(ctx context.Context, connV2 *admin.APIClient, project
 		Target:     []string{"SIMULATING", "FAILED", "DELETED"},
 		Refresh:    resourceRefreshFunc(ctx, clusterName, projectID, connV2),
 		Timeout:    timeout,
-		MinTimeout: oneMinute,
-		Delay:      oneMinute,
+		MinTimeout: timeout,
+		Delay:      timeout,
 	}
 
 	result, err := stateConf.WaitForStateContext(ctx)
@@ -236,8 +236,8 @@ func endOutageSimulationAndWait(ctx context.Context, connV2 *admin.APIClient, pr
 		Target:     []string{"DELETED"},
 		Refresh:    resourceRefreshFunc(ctx, clusterName, projectID, connV2),
 		Timeout:    timeout,
-		MinTimeout: oneMinute,
-		Delay:      oneMinute,
+		MinTimeout: timeout,
+		Delay:      timeout,
 	}
 
 	_, err = stateConf.WaitForStateContext(ctx)
diff --git a/internal/service/networkpeering/resource.go b/internal/service/networkpeering/resource.go
@@ -261,7 +261,7 @@ func resourceCreate(ctx context.Context, d *schema.ResourceData, meta any) diag.
 		Pending:    []string{"INITIATING", "FINALIZING", "ADDING_PEER", "WAITING_FOR_USER"},
 		Target:     []string{"FAILED", "AVAILABLE", "PENDING_ACCEPTANCE"},
 		Refresh:    resourceRefreshFunc(ctx, peerID, projectID, peerRequest.GetContainerId(), conn.NetworkPeeringApi),
-		Timeout:    d.Timeout(schema.TimeoutCreate) - time.Minute, // When using a CRUD function with a timeout, any StateChangeConf timeouts must be configured below that duration to avoid returning the SDK context: deadline exceeded error instead of the retry logic error.
+		Timeout:    d.Timeout(schema.TimeoutCreate),
 		MinTimeout: minTimeout,
 		Delay:      minTimeout,
 	}
diff --git a/internal/service/onlinearchive/resource.go b/internal/service/onlinearchive/resource.go
@@ -23,7 +23,7 @@ const (
 	errorOnlineArchivesCreate = "error creating MongoDB Atlas Online Archive:: %s"
 	errorOnlineArchivesDelete = "error deleting MongoDB Atlas Online Archive: %s archive_id (%s)"
 	scheduleTypeDefault       = "DEFAULT"
-	oneMinute                 = 1 * time.Minute
+	timeout                   = 1 * time.Minute
 )
 
 func Resource() *schema.Resource {
@@ -250,9 +250,9 @@ func resourceCreate(ctx context.Context, d *schema.ResourceData, meta any) diag.
 			Pending:    []string{"PENDING", "ARCHIVING", "PAUSING", "PAUSED", "ORPHANED", "REPEATING"},
 			Target:     []string{"IDLE", "ACTIVE"},
 			Refresh:    resourceOnlineRefreshFunc(ctx, projectID, clusterName, archiveID, connV2),
-			Timeout:    d.Timeout(schema.TimeoutCreate) - oneMinute, // When using a CRUD function with a timeout, any StateChangeConf timeouts must be configured below that duration to avoid returning the SDK context: deadline exceeded error instead of the retry logic error.
-			MinTimeout: oneMinute,
-			Delay:      oneMinute,
+			Timeout:    d.Timeout(schema.TimeoutCreate),
+			MinTimeout: timeout,
+			Delay:      timeout,
 		}
 
 		// Wait, catching any errors
diff --git a/internal/service/privatelinkendpointservice/resource.go b/internal/service/privatelinkendpointservice/resource.go
@@ -26,7 +26,6 @@ const (
 	ErrorServiceEndpointRead = "error reading MongoDB Private Service Endpoint Connection(%s): %s"
 	errorEndpointDelete      = "error deleting MongoDB Private Service Endpoint Connection(%s): %s"
 	ErrorEndpointSetting     = "error setting `%s` for MongoDB Private Service Endpoint Connection(%s): %s"
-	oneMinute                = 1 * time.Minute
 	delayAndMinTimeout       = 10 * time.Second
 )
 
@@ -183,7 +182,7 @@ func resourceCreate(ctx context.Context, d *schema.ResourceData, meta any) diag.
 		Pending:    []string{"NONE", "INITIATING", "PENDING_ACCEPTANCE", "PENDING", "DELETING", "VERIFIED"},
 		Target:     []string{"AVAILABLE", "REJECTED", "DELETED", "FAILED"},
 		Refresh:    resourceRefreshFunc(ctx, connV2, projectID, providerName, privateLinkID, endpointServiceID),
-		Timeout:    d.Timeout(schema.TimeoutCreate) - oneMinute, // When using a CRUD function with a timeout, any StateChangeConf timeouts must be configured below that duration to avoid returning the SDK context: deadline exceeded error instead of the retry logic error.
+		Timeout:    d.Timeout(schema.TimeoutCreate),
 		MinTimeout: delayAndMinTimeout,
 		Delay:      delayAndMinTimeout,
 	}
@@ -205,7 +204,7 @@ func resourceCreate(ctx context.Context, d *schema.ResourceData, meta any) diag.
 		Pending:    []string{"REPEATING", "PENDING"},
 		Target:     []string{"IDLE", "DELETED"},
 		Refresh:    advancedcluster.ResourceClusterListAdvancedRefreshFunc(ctx, projectID, connV2.ClustersApi),
-		Timeout:    d.Timeout(schema.TimeoutCreate) - oneMinute, // When using a CRUD function with a timeout, any StateChangeConf timeouts must be configured below that duration to avoid returning the SDK context: deadline exceeded error instead of the retry logic error.
+		Timeout:    d.Timeout(schema.TimeoutCreate),
 		MinTimeout: delayAndMinTimeout,
 		Delay:      delayAndMinTimeout,
 	}

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ func Resource() *schema.Resource {`
`133`	`133`	`}`
`134`	`134`
`135`	`135`	`const (`
`136`		`- oneMinute = 1 * time.Minute`
	`136`	`+ timeout = 1 * time.Minute`
`137`	`137`	`)`
`138`	`138`
`139`	`139`	`func resourceCreate(ctx context.Context, d *schema.ResourceData, meta any) diag.Diagnostics {`
`@@ -165,9 +165,9 @@ func resourceCreate(ctx context.Context, d *schema.ResourceData, meta any) diag.`
`165`	`165`	`Pending: []string{"queued", "inProgress"},`
`166`	`166`	`Target: []string{"completed", "failed"},`
`167`	`167`	`Refresh: resourceRefreshFunc(ctx, requestParams, connV2),`
`168`		`- Timeout: d.Timeout(schema.TimeoutCreate) - time.Minute,`
`169`		`- MinTimeout: oneMinute,`
`170`		`- Delay: oneMinute,`
	`168`	`+ Timeout: d.Timeout(schema.TimeoutCreate),`
	`169`	`+ MinTimeout: timeout,`
	`170`	`+ Delay: timeout,`
`171`	`171`	`}`
`172`	`172`	`_, errWait := stateConf.WaitForStateContext(ctx)`
`173`	`173`	`deleteOnCreateTimeout := true // default value when not set`
Original file line number	Diff line number	Diff line change
`@@ -14,13 +14,12 @@ import (`
`14`	`14`
`15`	`15`	`const (`
`16`	`16`	`resourceInvitationName = "mongodbatlas_project_invitation.mig_test"`
`17`		`- resourceProjectName = "mongodbatlas_project.mig_test"`
`18`	`17`	`resourceUserProjectAssignmentName = "mongodbatlas_cloud_user_project_assignment.user_mig_test"`
`19`	`18`	`)`
`20`	`19`
`21`	`20`	`func TestMigCloudUserProjectAssignmentRS_basic(t *testing.T) {`
`22`	`21`	`mig.SkipIfVersionBelow(t, "2.0.0") // when resource 1st released`
`23`		`- mig.CreateAndRunTest(t, basicTestCase(t))`
	`22`	`+ mig.CreateAndRunTestNonParallel(t, basicTestCase(t))`
`24`	`23`	`}`
`25`	`24`
`26`	`25`	`func TestMigCloudUserProjectAssignmentRS_migrationJourney(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,7 @@ func resourceCreate(ctx context.Context, d *schema.ResourceData, meta any) diag.`
`261`	`261`	`Pending: []string{"INITIATING", "FINALIZING", "ADDING_PEER", "WAITING_FOR_USER"},`
`262`	`262`	`Target: []string{"FAILED", "AVAILABLE", "PENDING_ACCEPTANCE"},`
`263`	`263`	`Refresh: resourceRefreshFunc(ctx, peerID, projectID, peerRequest.GetContainerId(), conn.NetworkPeeringApi),`
`264`		`- Timeout: d.Timeout(schema.TimeoutCreate) - time.Minute, // When using a CRUD function with a timeout, any StateChangeConf timeouts must be configured below that duration to avoid returning the SDK context: deadline exceeded error instead of the retry logic error.`
	`264`	`+ Timeout: d.Timeout(schema.TimeoutCreate),`
`265`	`265`	`MinTimeout: minTimeout,`
`266`	`266`	`Delay: minTimeout,`
`267`	`267`	`}`