feat: Adds support for skip_default_alerts_settings in mongodbatlas_organization resource & data sources (#2933)

Author: maastha

.changelog/2933.txt

@@ -0,0 +1,11 @@
+```release-note:enhancement
+resource/mongodbatlas_organization: Adds support for `skip_default_alerts_settings` setting
+```
+
+```release-note:enhancement
+data-source/mongodbatlas_organization: Adds support for `skip_default_alerts_settings` setting
+```
+
+```release-note:enhancement
+data-source/mongodbatlas_organizations: Adds support for `skip_default_alerts_settings` setting
+```

docs/data-sources/organization.md

@@ -27,6 +27,10 @@ In addition to all arguments above, the following attributes are exported:
 * `multi_factor_auth_required` - (Optional) Flag that indicates whether to require users to set up Multi-Factor Authentication (MFA) before accessing the specified organization. To learn more, see: https://www.mongodb.com/docs/atlas/security-multi-factor-authentication/.
 * `restrict_employee_access` - (Optional) Flag that indicates whether to block MongoDB Support from accessing Atlas infrastructure for any deployment in the specified organization without explicit permission. Once this setting is turned on, you can grant MongoDB Support a 24-hour bypass access to the Atlas deployment to resolve support issues. To learn more, see: https://www.mongodb.com/docs/atlas/security-restrict-support-access/.
 * `gen_ai_features_enabled` - (Optional) Flag that indicates whether this organization has access to generative AI features. This setting only applies to Atlas Commercial and defaults to `true`. With this setting on, Project Owners may be able to enable or disable individual AI features at the project level. To learn more, see https://www.mongodb.com/docs/generative-ai-faq/.
+* `skip_default_alerts_settings` - (Optional) Flag that indicates whether to prevent Atlas from automatically creating organization-level alerts not explicitly managed through Terraform. Defaults to `true`.
 
+    ~> **NOTE:** 
+    - *If you created an organization with our Terraform provider version >=1.30.0, this field will be set to `true` by default.*
+    - *If you have an existing organization created with our Terraform provider version <1.30.0, this field might be `false`, which is the [API default value](https://www.mongodb.com/docs/atlas/reference/api-resources-spec/v2/#tag/Organizations/operation/createOrganization). To prevent creation of future default alerts, you can explicitly set this to `true` using the [`mongodbatlas_organization`](../resources/organization.md) resource.*
 
 See [MongoDB Atlas API - Organization](https://www.mongodb.com/docs/atlas/reference/api-resources-spec/#tag/Organizations/operation/getOrganization) Documentation for more information.

docs/data-sources/organizations.md

@@ -32,5 +32,10 @@ data "mongodbatlas_organizations" "test" {
 * `multi_factor_auth_required` - (Optional) Flag that indicates whether to require users to set up Multi-Factor Authentication (MFA) before accessing the specified organization. To learn more, see: https://www.mongodb.com/docs/atlas/security-multi-factor-authentication/.
 * `restrict_employee_access` - (Optional) Flag that indicates whether to block MongoDB Support from accessing Atlas infrastructure for any deployment in the specified organization without explicit permission. Once this setting is turned on, you can grant MongoDB Support a 24-hour bypass access to the Atlas deployment to resolve support issues. To learn more, see: https://www.mongodb.com/docs/atlas/security-restrict-support-access/.
 * `gen_ai_features_enabled` - (Optional) Flag that indicates whether this organization has access to generative AI features. This setting only applies to Atlas Commercial and defaults to `true`. With this setting on, Project Owners may be able to enable or disable individual AI features at the project level. To learn more, see https://www.mongodb.com/docs/generative-ai-faq/.
-  
+* `skip_default_alerts_settings` - (Optional) Flag that indicates whether to prevent Atlas from automatically creating organization-level alerts not explicitly managed through Terraform. Defaults to `true`. 
+
+    ~> **NOTE:** 
+    - *If you created an organization with our Terraform provider version >=1.30.0, this field will be set to `true` by default.*
+    - *If you have an existing organization created with our Terraform provider version <1.30.0, this field might be `false`, which is the [API default value](https://www.mongodb.com/docs/atlas/reference/api-resources-spec/v2/#tag/Organizations/operation/createOrganization). To prevent creation of future default alerts, you can explicitly set this to `true` using the [`mongodbatlas_organization`](../resources/organization.md) resource.*
+
 See [MongoDB Atlas API - Organizations](https://www.mongodb.com/docs/atlas/reference/api-resources-spec/#tag/Organizations/operation/listOrganizations)  Documentation for more information.

docs/resources/organization.md

@@ -33,6 +33,12 @@ resource "mongodbatlas_organization" "test" {
 * `multi_factor_auth_required` - (Optional) Flag that indicates whether to require users to set up Multi-Factor Authentication (MFA) before accessing the specified organization. To learn more, see: https://www.mongodb.com/docs/atlas/security-multi-factor-authentication/.
 * `restrict_employee_access` - (Optional) Flag that indicates whether to block MongoDB Support from accessing Atlas infrastructure for any deployment in the specified organization without explicit permission. Once this setting is turned on, you can grant MongoDB Support a 24-hour bypass access to the Atlas deployment to resolve support issues. To learn more, see: https://www.mongodb.com/docs/atlas/security-restrict-support-access/.
 * `gen_ai_features_enabled` - (Optional) Flag that indicates whether this organization has access to generative AI features. This setting only applies to Atlas Commercial and defaults to `true`. With this setting on, Project Owners may be able to enable or disable individual AI features at the project level. To learn more, see https://www.mongodb.com/docs/generative-ai-faq/.
+* `skip_default_alerts_settings` - (Optional) Flag that indicates whether to prevent Atlas from automatically creating organization-level alerts not explicitly managed through Terraform. Defaults to `true`. 
+
+   ~> **NOTE:** 
+    - *If you are creating an organization with our Terraform provider version >=1.30.0, this field will be set to `true` by default.*
+    - *If you have an existing organization created with our Terraform provider version <1.30.0, this field might be `false`, which is the [API default value](https://www.mongodb.com/docs/atlas/reference/api-resources-spec/v2/#tag/Organizations/operation/createOrganization). To prevent creation of future default alerts, you can explicitly set this to `true`.*
+
 
 ## Attributes Reference
 

internal/service/organization/data_source_organization.go

@@ -59,6 +59,10 @@ func DataSource() *schema.Resource {
 				Type:     schema.TypeBool,
 				Computed: true,
 			},
+			"skip_default_alerts_settings": {
+				Type:     schema.TypeBool,
+				Computed: true,
+			},
 		},
 	}
 }
@@ -77,6 +81,10 @@ func dataSourceRead(ctx context.Context, d *schema.ResourceData, meta any) diag.
 		return diag.FromErr(fmt.Errorf("error setting `name`: %s", err))
 	}
 
+	if err := d.Set("skip_default_alerts_settings", organization.GetSkipDefaultAlertsSettings()); err != nil {
+		return diag.Errorf("error setting `skip_default_alerts_settings`: %s", err)
+	}
+
 	if err := d.Set("is_deleted", organization.GetIsDeleted()); err != nil {
 		return diag.FromErr(fmt.Errorf("error setting `is_deleted`: %s", err))
 	}

internal/service/organization/data_source_organizations.go

@@ -79,6 +79,10 @@ func PluralDataSource() *schema.Resource {
 							Type:     schema.TypeBool,
 							Computed: true,
 						},
+						"skip_default_alerts_settings": {
+							Type:     schema.TypeBool,
+							Computed: true,
+						},
 					},
 				},
 			},
@@ -135,14 +139,15 @@ func flattenOrganizations(ctx context.Context, conn *admin.APIClient, organizati
 			return nil, fmt.Errorf("error getting organization settings (orgID: %s, org Name: %s): %s", organization.GetId(), organization.GetName(), err)
 		}
 		results[k] = map[string]any{
-			"id":                         organization.Id,
-			"name":                       organization.Name,
-			"is_deleted":                 organization.IsDeleted,
-			"links":                      conversion.FlattenLinks(organization.GetLinks()),
-			"api_access_list_required":   settings.ApiAccessListRequired,
-			"multi_factor_auth_required": settings.MultiFactorAuthRequired,
-			"restrict_employee_access":   settings.RestrictEmployeeAccess,
-			"gen_ai_features_enabled":    settings.GenAIFeaturesEnabled,
+			"id":                           organization.Id,
+			"name":                         organization.Name,
+			"skip_default_alerts_settings": organization.SkipDefaultAlertsSettings,
+			"is_deleted":                   organization.IsDeleted,
+			"links":                        conversion.FlattenLinks(organization.GetLinks()),
+			"api_access_list_required":     settings.ApiAccessListRequired,
+			"multi_factor_auth_required":   settings.MultiFactorAuthRequired,
+			"restrict_employee_access":     settings.RestrictEmployeeAccess,
+			"gen_ai_features_enabled":      settings.GenAIFeaturesEnabled,
 		}
 	}
 	return results, nil

internal/service/organization/resource_organization.go

@@ -82,6 +82,13 @@ func Resource() *schema.Resource {
 				Optional: true,
 				Default:  true,
 			},
+			// skip_default_alerts_settings defaults to `true` to prevent Atlas from automatically creating organization-level alerts not explicitly managed through Terraform.
+			// Note that this deviates from the API default of `false` for this attribute.
+			"skip_default_alerts_settings": {
+				Type:     schema.TypeBool,
+				Optional: true,
+				Computed: true,
+			},
 		},
 	}
 }
@@ -173,6 +180,9 @@ func resourceRead(ctx context.Context, d *schema.ResourceData, meta any) diag.Di
 	if err := d.Set("name", organization.Name); err != nil {
 		return diag.Errorf("error setting `name` for organization (%s): %s", *organization.Id, err)
 	}
+	if err := d.Set("skip_default_alerts_settings", organization.SkipDefaultAlertsSettings); err != nil {
+		return diag.Errorf("error setting `skip_default_alerts_settings` for organization (%s): %s", orgID, err)
+	}
 
 	settings, _, err := conn.OrganizationsApi.GetOrganizationSettings(ctx, orgID).Execute()
 	if err != nil {
@@ -213,8 +223,12 @@ func resourceUpdate(ctx context.Context, d *schema.ResourceData, meta any) diag.
 	orgID := ids["org_id"]
 
 	updateRequest := new(admin.AtlasOrganization)
-	if d.HasChange("name") {
+
+	if d.HasChange("name") ||
+		d.HasChange("skip_default_alerts_settings") {
 		updateRequest.Name = d.Get("name").(string)
+		updateRequest.SkipDefaultAlertsSettings = conversion.Pointer(d.Get("skip_default_alerts_settings").(bool))
+
 		_, _, err := conn.OrganizationsApi.UpdateOrganization(ctx, orgID, updateRequest).Execute()
 		if err != nil {
 			return diag.FromErr(fmt.Errorf("error updating Organization name: %s", err))
@@ -254,9 +268,18 @@ func resourceDelete(ctx context.Context, d *schema.ResourceData, meta any) diag.
 }
 
 func newCreateOrganizationRequest(d *schema.ResourceData) *admin.CreateOrganizationRequest {
+	// skip_default_alerts_settings defaults to `true` to prevent Atlas from automatically creating organization-level alerts not explicitly managed through Terraform.
+	// Note that this deviates from the API default of `false` for this attribute.
+	skipDefaultAlertsSettings := true
+
+	if v, ok := d.GetOkExists("skip_default_alerts_settings"); ok {
+		skipDefaultAlertsSettings = v.(bool)
+	}
+
 	createRequest := &admin.CreateOrganizationRequest{
-		Name:       d.Get("name").(string),
-		OrgOwnerId: conversion.Pointer(d.Get("org_owner_id").(string)),
+		Name:                      d.Get("name").(string),
+		OrgOwnerId:                conversion.Pointer(d.Get("org_owner_id").(string)),
+		SkipDefaultAlertsSettings: conversion.Pointer(skipDefaultAlertsSettings),
 
 		ApiKey: &admin.CreateAtlasOrganizationApiKey{
 			Roles: conversion.ExpandStringList(d.Get("role_names").(*schema.Set).List()),

internal/service/organization/resource_organization_migration_test.go

@@ -19,7 +19,7 @@ func TestMigConfigRSOrganization_Basic(t *testing.T) {
 		name         = acc.RandomName()
 		description  = "test Key for Acceptance tests"
 		roleName     = "ORG_OWNER"
-		config       = configBasic(orgOwnerID, name, description, roleName)
+		config       = configBasic(orgOwnerID, name, description, roleName, false, nil)
 	)
 
 	resource.Test(t, resource.TestCase{
@@ -29,7 +29,6 @@ func TestMigConfigRSOrganization_Basic(t *testing.T) {
 				Config:            config,
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttrSet(resourceName, "org_id"),
-					resource.TestCheckResourceAttrSet(resourceName, "description"),
 					resource.TestCheckResourceAttr(resourceName, "description", description),
 				),
 			},