Update example and add support for GenAIFeaturesEnabled

Author: maastha

cfn-resources/organization/cmd/resource/model.go

@@ -88,6 +88,7 @@ func Create(req handler.Request, prevModel *Model, currentModel *Model) (handler
 	}
 
 	apikeyInputs := setAPIkeyInputs(currentModel)
+	setDefaultsIfNotDefined(currentModel)
 
 	// Set the roles from model
 	orgInput := &admin.CreateOrganizationRequest{
@@ -171,7 +172,9 @@ func Update(req handler.Request, prevModel *Model, currentModel *Model) (handler
 	conn := newOrgClient.AtlasSDK
 	ctx := context.Background()
 
+	setDefaultsIfNotDefined(currentModel)
 	atlasOrg := admin.AtlasOrganization{Id: currentModel.OrgId, Name: *currentModel.Name, SkipDefaultAlertsSettings: currentModel.SkipDefaultAlertsSettings}
+
 	if _, response, err := conn.OrganizationsApi.UpdateOrganization(ctx, *currentModel.OrgId, &atlasOrg).Execute(); err != nil {
 		return handleError(response, constants.UPDATE, err)
 	}
@@ -311,6 +314,7 @@ func (model *Model) getOrgDetails(ctx context.Context, conn *admin.APIClient, cu
 	model.ApiAccessListRequired = settings.ApiAccessListRequired
 	model.MultiFactorAuthRequired = settings.MultiFactorAuthRequired
 	model.RestrictEmployeeAccess = settings.RestrictEmployeeAccess
+	model.GenAIFeaturesEnabled = settings.GenAIFeaturesEnabled
 
 	return model, response, nil
 }
@@ -354,5 +358,19 @@ func newOrganizationSettings(model *Model) *admin.OrganizationSettings {
 		ApiAccessListRequired:   model.ApiAccessListRequired,
 		MultiFactorAuthRequired: model.MultiFactorAuthRequired,
 		RestrictEmployeeAccess:  model.RestrictEmployeeAccess,
+		GenAIFeaturesEnabled:    model.GenAIFeaturesEnabled,
+	}
+}
+
+func setDefaultsIfNotDefined(m *Model) {
+	if m == nil {
+		return
 	}
+	if m.SkipDefaultAlertsSettings == nil {
+		m.SkipDefaultAlertsSettings = util.Pointer(true)
+	}
+	if m.GenAIFeaturesEnabled == nil {
+		m.GenAIFeaturesEnabled = util.Pointer(true)
+	}
+
 }

cfn-resources/organization/cmd/resource/resource.go

@@ -19,6 +19,7 @@ To declare this entity in your AWS CloudFormation template, use the following sy
         "<a href="#profile" title="Profile">Profile</a>" : <i>String</i>,
         "<a href="#awssecretname" title="AwsSecretName">AwsSecretName</a>" : <i>String</i>,
         "<a href="#skipdefaultalertssettings" title="SkipDefaultAlertsSettings">SkipDefaultAlertsSettings</a>" : <i>Boolean</i>,
+        "<a href="#genaifeaturesenabled" title="GenAIFeaturesEnabled">GenAIFeaturesEnabled</a>" : <i>Boolean</i>,
         "<a href="#isdeleted" title="IsDeleted">IsDeleted</a>" : <i>Boolean</i>,
         "<a href="#apiaccesslistrequired" title="ApiAccessListRequired">ApiAccessListRequired</a>" : <i>Boolean</i>,
         "<a href="#multifactorauthrequired" title="MultiFactorAuthRequired">MultiFactorAuthRequired</a>" : <i>Boolean</i>,
@@ -39,6 +40,7 @@ Properties:
     <a href="#profile" title="Profile">Profile</a>: <i>String</i>
     <a href="#awssecretname" title="AwsSecretName">AwsSecretName</a>: <i>String</i>
     <a href="#skipdefaultalertssettings" title="SkipDefaultAlertsSettings">SkipDefaultAlertsSettings</a>: <i>Boolean</i>
+    <a href="#genaifeaturesenabled" title="GenAIFeaturesEnabled">GenAIFeaturesEnabled</a>: <i>Boolean</i>
     <a href="#isdeleted" title="IsDeleted">IsDeleted</a>: <i>Boolean</i>
     <a href="#apiaccesslistrequired" title="ApiAccessListRequired">ApiAccessListRequired</a>: <i>Boolean</i>
     <a href="#multifactorauthrequired" title="MultiFactorAuthRequired">MultiFactorAuthRequired</a>: <i>Boolean</i>
@@ -121,6 +123,16 @@ _Type_: Boolean
 
 _Update requires_: [No interruption](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-cfn-updating-stacks-update-behaviors.html#update-no-interrupt)
 
+#### GenAIFeaturesEnabled
+
+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/
+
+_Required_: No
+
+_Type_: Boolean
+
+_Update requires_: [No interruption](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-cfn-updating-stacks-update-behaviors.html#update-no-interrupt)
+
 #### IsDeleted
 
 Flag that indicates whether this organization has been deleted.

cfn-resources/organization/docs/README.md

@@ -54,7 +54,12 @@
     "SkipDefaultAlertsSettings": {
       "type": "boolean",
       "description": "Disables automatic alert creation. When set to `true`, Atlas doesn't automatically create organization-level alerts. Defaults to `true` for new Atlas Organizations created with the provider to prevent infrastructure drift caused by creation of new alerts.",
-      "default": "true"
+      "default": true
+    },
+    "GenAIFeaturesEnabled": {
+      "type": "boolean",
+      "description": "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/",
+      "default": true
     },
     "OrgId": {
       "type": "string",

cfn-resources/organization/mongodb-atlas-organization.json

@@ -12,5 +12,7 @@
   },
   "MultiFactorAuthRequired": "true",
   "RestrictEmployeeAccess": "false",
-  "ApiAccessListRequired": "false"
+  "ApiAccessListRequired": "false",
+  "SkipDefaultAlertsSettings": "true",
+  "GenAIFeaturesEnabled": "true"
 }

cfn-resources/organization/test/inputs_1_create.json

@@ -13,5 +13,6 @@
   "MultiFactorAuthRequired": "true",
   "RestrictEmployeeAccess": "true",
   "ApiAccessListRequired": "false",
-  "SkipDefaultAlertsSettings": "false"
+  "SkipDefaultAlertsSettings": "false",
+  "GenAIFeaturesEnabled": "false"
 }

cfn-resources/organization/test/inputs_1_update.json

@@ -61,6 +61,26 @@
         "false"
       ],
       "Default": "false"
+    },
+    "SkipDefaultAlertsSettings": {
+      "Type": "String",
+      "ConstraintDescription": "boolean",
+      "AllowedValues": [
+        "true",
+        "false"
+      ],
+      "Default": "true",
+      "Description": "SkipDefaultAlertsSettings"
+    },
+    "GenAIFeaturesEnabled": {
+      "Type": "String",
+      "ConstraintDescription": "boolean",
+      "AllowedValues": [
+        "true",
+        "false"
+      ],
+      "Default": "true",
+      "Description": "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/"
     }
   },
   "Mappings": {},
@@ -113,6 +133,12 @@
         },
         "RestrictEmployeeAccess": {
           "Ref": "RestrictEmployeeAccess"
+        },
+        "SkipDefaultAlertsSettings": {
+          "Ref": "SkipDefaultAlertsSettings"
+        },
+        "GenAIFeaturesEnabled": {
+          "Ref": "GenAIFeaturesEnabled"
         }
       }
     }