INTMDB-270: Added 'with_default_alerts_settings' to project resource (#595)

* added  'with_default_alerts_settings' to project resource

* change project documentation

Author: abner-dou

go.mod

@@ -12,6 +12,6 @@ require (
 	github.com/mwielbut/pointy v1.1.0
 	github.com/spf13/cast v1.4.1
 	github.com/terraform-providers/terraform-provider-aws v1.60.1-0.20210625132053-af2d5c0ad54f
-	go.mongodb.org/atlas v0.13.1-0.20211015211338-c17a67cbe2bf
+	go.mongodb.org/atlas v0.13.1-0.20211103172854-77290cf48e1e
 	go.mongodb.org/realm v0.1.0
 )

go.sum

@@ -1199,6 +1199,8 @@ go.mongodb.org/atlas v0.13.0 h1:JkJOWsKm9k2mcFaivaaMNDpKDsxJJj1O0eUsDtnNvuE=
 go.mongodb.org/atlas v0.13.0/go.mod h1:wVCnHcm/7/IfTjEB6K8K35PLG70yGz8BdkRwX0oK9/M=
 go.mongodb.org/atlas v0.13.1-0.20211015211338-c17a67cbe2bf h1:AczRmIosmEvyLpHNnvykZlUpDv90oZ0FEf1zs+CNYH0=
 go.mongodb.org/atlas v0.13.1-0.20211015211338-c17a67cbe2bf/go.mod h1:wVCnHcm/7/IfTjEB6K8K35PLG70yGz8BdkRwX0oK9/M=
+go.mongodb.org/atlas v0.13.1-0.20211103172854-77290cf48e1e h1:Fcx4rdJT5074x9TIENhX59vaaxgkkpMPhbJKql+FqxA=
+go.mongodb.org/atlas v0.13.1-0.20211103172854-77290cf48e1e/go.mod h1:lQhRHIxc6jQHEK3/q9WLu/SdBkPj2fQYhjLGUF6Z3U8=
 go.mongodb.org/realm v0.1.0 h1:zJiXyLaZrznQ+Pz947ziSrDKUep39DO4SfA0Fzx8M4M=
 go.mongodb.org/realm v0.1.0/go.mod h1:4Vj6iy+Puo1TDERcoh4XZ+pjtwbOzPpzqy3Cwe8ZmDM=
 go.mozilla.org/mozlog v0.0.0-20170222151521-4bb13139d403/go.mod h1:jHoPAGnDrCy6kaI2tAze5Prf0Nr0w/oNkROt2lw3n3o=

mongodbatlas/resource_mongodbatlas_project.go

@@ -2,11 +2,11 @@ package mongodbatlas
 
 import (
 	"context"
-	"fmt"
 	"net/http"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/mwielbut/pointy"
 	matlas "go.mongodb.org/atlas/mongodbatlas"
 )
 
@@ -68,6 +68,11 @@ func resourceMongoDBAtlasProject() *schema.Resource {
 				Type:     schema.TypeString,
 				Optional: true,
 			},
+			"with_default_alerts_settings": {
+				Type:     schema.TypeBool,
+				Optional: true,
+				Default:  true,
+			},
 		},
 	}
 }
@@ -77,8 +82,9 @@ func resourceMongoDBAtlasProjectCreate(ctx context.Context, d *schema.ResourceDa
 	conn := meta.(*MongoDBClient).Atlas
 
 	projectReq := &matlas.Project{
-		OrgID: d.Get("org_id").(string),
-		Name:  d.Get("name").(string),
+		OrgID:                     d.Get("org_id").(string),
+		Name:                      d.Get("name").(string),
+		WithDefaultAlertsSettings: pointy.Bool(d.Get("with_default_alerts_settings").(bool)),
 	}
 
 	var createProjectOptions *matlas.CreateProjectOptions
@@ -91,15 +97,15 @@ func resourceMongoDBAtlasProjectCreate(ctx context.Context, d *schema.ResourceDa
 
 	project, _, err := conn.Projects.Create(ctx, projectReq, createProjectOptions)
 	if err != nil {
-		return diag.FromErr(fmt.Errorf(errorProjectCreate, err))
+		return diag.Errorf(errorProjectCreate, err)
 	}
 
 	// Check if teams were set, if so we need to add the teams into the project
 	if teams, ok := d.GetOk("teams"); ok {
 		// adding the teams into the project
 		_, _, err := conn.Projects.AddTeamsToProject(ctx, project.ID, expandTeamsSet(teams.(*schema.Set)))
 		if err != nil {
-			return diag.FromErr(fmt.Errorf("error adding teams into the project: %s", err))
+			return diag.Errorf("error adding teams into the project: %s", err)
 		}
 	}
 
@@ -119,32 +125,32 @@ func resourceMongoDBAtlasProjectRead(ctx context.Context, d *schema.ResourceData
 			return nil
 		}
 
-		return diag.FromErr(fmt.Errorf(errorProjectRead, projectID, err))
+		return diag.Errorf(errorProjectRead, projectID, err)
 	}
 
 	teams, _, err := conn.Projects.GetProjectTeamsAssigned(ctx, projectID)
 	if err != nil {
-		return diag.FromErr(fmt.Errorf("error getting project's teams assigned (%s): %s", projectID, err))
+		return diag.Errorf("error getting project's teams assigned (%s): %s", projectID, err)
 	}
 
 	if err := d.Set("name", projectRes.Name); err != nil {
-		return diag.FromErr(fmt.Errorf(errorProjectSetting, `name`, projectID, err))
+		return diag.Errorf(errorProjectSetting, `name`, projectID, err)
 	}
 
 	if err := d.Set("org_id", projectRes.OrgID); err != nil {
-		return diag.FromErr(fmt.Errorf(errorProjectSetting, `org_id`, projectID, err))
+		return diag.Errorf(errorProjectSetting, `org_id`, projectID, err)
 	}
 
 	if err := d.Set("cluster_count", projectRes.ClusterCount); err != nil {
-		return diag.FromErr(fmt.Errorf(errorProjectSetting, `clusterCount`, projectID, err))
+		return diag.Errorf(errorProjectSetting, `clusterCount`, projectID, err)
 	}
 
 	if err := d.Set("created", projectRes.Created); err != nil {
-		return diag.FromErr(fmt.Errorf(errorProjectSetting, `created`, projectID, err))
+		return diag.Errorf(errorProjectSetting, `created`, projectID, err)
 	}
 
 	if err := d.Set("teams", flattenTeams(teams)); err != nil {
-		return diag.FromErr(fmt.Errorf(errorProjectSetting, `created`, projectID, err))
+		return diag.Errorf(errorProjectSetting, `created`, projectID, err)
 	}
 
 	return nil
@@ -162,7 +168,7 @@ func resourceMongoDBAtlasProjectUpdate(ctx context.Context, d *schema.ResourceDa
 		if len(newTeams) > 0 {
 			_, _, err := conn.Projects.AddTeamsToProject(ctx, projectID, expandTeamsList(newTeams))
 			if err != nil {
-				return diag.FromErr(fmt.Errorf("error adding teams into the project(%s): %s", projectID, err))
+				return diag.Errorf("error adding teams into the project(%s): %s", projectID, err)
 			}
 		}
 
@@ -172,7 +178,7 @@ func resourceMongoDBAtlasProjectUpdate(ctx context.Context, d *schema.ResourceDa
 
 			_, err := conn.Teams.RemoveTeamFromProject(ctx, projectID, teamID)
 			if err != nil {
-				return diag.FromErr(fmt.Errorf("error removing team(%s) from the project(%s): %s", teamID, projectID, err))
+				return diag.Errorf("error removing team(%s) from the project(%s): %s", teamID, projectID, err)
 			}
 		}
 
@@ -186,7 +192,7 @@ func resourceMongoDBAtlasProjectUpdate(ctx context.Context, d *schema.ResourceDa
 				},
 			)
 			if err != nil {
-				return diag.FromErr(fmt.Errorf("error updating role names for the team(%s): %s", team["team_id"], err))
+				return diag.Errorf("error updating role names for the team(%s): %s", team["team_id"], err)
 			}
 		}
 	}
@@ -200,7 +206,7 @@ func resourceMongoDBAtlasProjectDelete(ctx context.Context, d *schema.ResourceDa
 
 	_, err := conn.Projects.Delete(ctx, projectID)
 	if err != nil {
-		return diag.FromErr(fmt.Errorf(errorProjectDelete, projectID, err))
+		return diag.Errorf(errorProjectDelete, projectID, err)
 	}
 
 	return nil

mongodbatlas/resource_mongodbatlas_project_test.go

@@ -142,6 +142,33 @@ func TestAccResourceMongoDBAtlasProject_CreateWithProjectOwner(t *testing.T) {
 	})
 }
 
+func TestAccResourceMongoDBAtlasProject_CreateWithFalseDefaultSettings(t *testing.T) {
+	var (
+		project        matlas.Project
+		resourceName   = "mongodbatlas_project.test"
+		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: testAccMongoDBAtlasProjectConfigWithFalseDefaultSettings(projectName, orgID, projectOwnerID),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckMongoDBAtlasProjectExists(resourceName, &project),
+					testAccCheckMongoDBAtlasProjectAttributes(&project, projectName),
+					resource.TestCheckResourceAttr(resourceName, "name", projectName),
+					resource.TestCheckResourceAttr(resourceName, "org_id", orgID),
+				),
+			},
+		},
+	})
+}
+
 func TestAccResourceMongoDBAtlasProject_withUpdatedRole(t *testing.T) {
 	var (
 		resourceName    = "mongodbatlas_project.test"
@@ -312,3 +339,14 @@ func testAccMongoDBAtlasProjectConfigWithProjectOwner(projectName, orgID, projec
 		}
 	`, projectName, orgID, projectOwnerID)
 }
+
+func testAccMongoDBAtlasProjectConfigWithFalseDefaultSettings(projectName, orgID, projectOwnerID string) string {
+	return fmt.Sprintf(`
+		resource "mongodbatlas_project" "test" {
+			name   			 = "%[1]s"
+			org_id 			 = "%[2]s"
+		    project_owner_id = "%[3]s"
+			with_default_alerts_settings = false
+		}
+	`, projectName, orgID, projectOwnerID)
+}

website/docs/r/project.html.markdown

@@ -37,6 +37,7 @@ resource "mongodbatlas_project" "test" {
 * `name` - (Required) The name of the project you want to create. (Cannot be changed via this Provider after creation.)
 * `org_id` - (Required) The ID of the organization you want to create the project within.
 * `project_owner_id` - (Optional) Unique 24-hexadecimal digit string that identifies the Atlas user account to be granted the [Project Owner](https://docs.atlas.mongodb.com/reference/user-roles/#mongodb-authrole-Project-Owner) role on the specified project. If you set this parameter, it overrides the default value of the oldest [Organization Owner](https://docs.atlas.mongodb.com/reference/user-roles/#mongodb-authrole-Organization-Owner).
+* `with_default_alerts_settings` - (Optional) It allows users to disable the creation of the default alert settings. By default, this flag is set to true.
 
 ### Teams
 Teams attribute is optional