INTMDB-302: Ensure we handle new flow for project deletion well (#688)

* Before deleting a project, wait for any currently deleting clusters to finish deleting

* First pass at adding a test which ensures project is deleted properly when it has an advanced_cluster

* Removed clusterCount assertion and put in custom resource for advanced_cluster

* Fix naming on AdvancedClusters response value

Co-authored-by: Andrea Angiolillo <[email protected]>

* Added concept of project dependents and added comments, using ErrorResponse.As

* Fixed case where there are no dependencies

* Reduced timeout to 30 minutes

* Using else instead of otherwise in comment

* Fixed formatting in project_test

* Removed a state no longer in use

Co-authored-by: Andrea Angiolillo <[email protected]>

Author: evertsd

.gitignore

@@ -21,6 +21,7 @@ website/node_modules
 *~
 .*.swp
 .idea
+.vscode
 *.iml
 *.test
 *.iml

mongodbatlas/resource_mongodbatlas_project.go

@@ -5,8 +5,10 @@ import (
 	"errors"
 	"log"
 	"net/http"
+	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/mwielbut/pointy"
 	matlas "go.mongodb.org/atlas/mongodbatlas"
@@ -99,6 +101,11 @@ func resourceMongoDBAtlasProject() *schema.Resource {
 	}
 }
 
+// Resources that need to be cleaned up before a project can be deleted
+type AtlastProjectDependents struct {
+	AdvancedClusters *matlas.AdvancedClustersResponse
+}
+
 func resourceMongoDBAtlasProjectCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
 	// Get client connection.
 	conn := meta.(*MongoDBClient).Atlas
@@ -292,14 +299,67 @@ func resourceMongoDBAtlasProjectDelete(ctx context.Context, d *schema.ResourceDa
 	conn := meta.(*MongoDBClient).Atlas
 	projectID := d.Id()
 
-	_, err := conn.Projects.Delete(ctx, projectID)
+	stateConf := &resource.StateChangeConf{
+		Pending:    []string{"DELETING", "RETRY"},
+		Target:     []string{"IDLE"},
+		Refresh:    resourceProjectDependentsDeletingRefreshFunc(ctx, projectID, conn),
+		Timeout:    30 * time.Minute,
+		MinTimeout: 30 * time.Second,
+		Delay:      0,
+	}
+
+	_, err := stateConf.WaitForStateContext(ctx)
+
+	if err != nil {
+		log.Printf("[ERROR] could not determine MongoDB project %s dependents status: %s", projectID, err.Error())
+	}
+
+	_, err = conn.Projects.Delete(ctx, projectID)
+
 	if err != nil {
 		return diag.Errorf(errorProjectDelete, projectID, err)
 	}
 
 	return nil
 }
 
+/*
+	This assumes the project CRUD outcome will be the same for any non-zero number of dependents
+
+	If all dependents are deleting, wait to try and delete
+	Else consider the aggregate dependents idle.
+
+	If we get a defined error response, return that right away
+	Else retry
+*/
+func resourceProjectDependentsDeletingRefreshFunc(ctx context.Context, projectID string, client *matlas.Client) resource.StateRefreshFunc {
+	return func() (interface{}, string, error) {
+		var target *matlas.ErrorResponse
+		clusters, _, err := client.AdvancedClusters.List(ctx, projectID, nil)
+		dependents := AtlastProjectDependents{AdvancedClusters: clusters}
+
+		if errors.As(err, &target) {
+			return nil, "", err
+		} else if err != nil {
+			return nil, "RETRY", nil
+		}
+
+		if dependents.AdvancedClusters.TotalCount == 0 {
+			return dependents, "IDLE", nil
+		}
+
+		for _, v := range dependents.AdvancedClusters.Results {
+			if v.StateName != "DELETING" {
+				return dependents, "IDLE", nil
+			}
+		}
+
+		log.Printf("[DEBUG] status for MongoDB project %s dependents: %s", projectID, "DELETING")
+
+		return dependents, "DELETING", nil
+	}
+}
+
 func expandTeamsSet(teams *schema.Set) []*matlas.ProjectTeam {
 	res := make([]*matlas.ProjectTeam, teams.Len())
 

mongodbatlas/resource_mongodbatlas_project_test.go

@@ -293,6 +293,37 @@ func testAccCheckMongoDBAtlasProjectExists(resourceName string, project *matlas.
 	}
 }
 
+func TestAccResourceMongoDBAtlasProject_CreateWithAdvancedCluster(t *testing.T) {
+	var (
+		project             matlas.Project
+		cluster             matlas.AdvancedCluster
+		clusterResourceName = "mongodbatlas_advanced_cluster.test"
+		resourceName        = "mongodbatlas_project.test"
+		clusterName         = fmt.Sprintf("testacc-project-%s", acctest.RandString(10))
+		projectName         = fmt.Sprintf("testacc-project-%s", acctest.RandString(10))
+		orgID               = os.Getenv("MONGODB_ATLAS_ORG_ID")
+		projectOwnerID      = os.Getenv("MONGODB_ATLAS_PROJECT_OWNER_ID")
+	)
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:          func() { testAccPreCheck(t) },
+		ProviderFactories: testAccProviderFactories,
+		CheckDestroy:      testAccCheckMongoDBAtlasProjectDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccMongoDBAtlasProjectConfigWithAdvancedCluster(projectName, orgID, projectOwnerID, clusterName),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckMongoDBAtlasProjectExists(resourceName, &project),
+					testAccCheckMongoDBAtlasAdvancedClusterExists(clusterResourceName, &cluster),
+					testAccCheckMongoDBAtlasProjectAttributes(&project, projectName),
+					resource.TestCheckResourceAttr(resourceName, "name", projectName),
+					resource.TestCheckResourceAttr(resourceName, "org_id", orgID),
+				),
+			},
+		},
+	})
+}
+
 func testAccCheckMongoDBAtlasProjectAttributes(project *matlas.Project, projectName string) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		if project.Name != projectName {
@@ -391,8 +422,41 @@ func testAccMongoDBAtlasProjectConfigWithFalseDefaultSettings(projectName, orgID
 		resource "mongodbatlas_project" "test" {
 			name   			 = "%[1]s"
 			org_id 			 = "%[2]s"
-		    project_owner_id = "%[3]s"
+			project_owner_id = "%[3]s"
 			with_default_alerts_settings = false
 		}
 	`, projectName, orgID, projectOwnerID)
 }
+
+func testAccMongoDBAtlasProjectConfigWithAdvancedCluster(projectName, orgID, projectOwnerID, clusterName string) string {
+	return fmt.Sprintf(`
+		resource "mongodbatlas_project" "test" {
+			name                         = %[1]q
+			org_id                       = %[2]q
+			project_owner_id             = %[3]q
+			with_default_alerts_settings = false
+		}
+
+		resource "mongodbatlas_advanced_cluster" "test" {
+			project_id   = mongodbatlas_project.test.id
+			name         = %[4]q
+			cluster_type = "REPLICASET"
+
+			replication_specs {
+				region_configs {
+					electable_specs {
+						instance_size = "M10"
+						node_count    = 3
+					}
+					analytics_specs {
+						instance_size = "M10"
+						node_count    = 1
+					}
+					provider_name = "AWS"
+					priority      = 7
+					region_name   = "US_EAST_1"
+				}
+			}
+		}
+	`, projectName, orgID, projectOwnerID, clusterName)
+}