Skip to content

feat: Adds SkipDefaultAlertsSettings and GenAIFeaturesEnabled to Organization, maximumThroughput to Trigger and deprecates ServerlessInstance, ServerlessPrivateEndpoint and Serverless type in CloudBackupRestoreJobs and #415

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Mar 26, 2025
Merged

feat: Adds SkipDefaultAlertsSettings and GenAIFeaturesEnabled to Organization, maximumThroughput to Trigger and deprecates ServerlessInstance, ServerlessPrivateEndpoint and Serverless type in CloudBackupRestoreJobs and #415

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
63c8634
deprecations
oarbusi Mar 13, 2025
56ca430
api.md change
oarbusi Mar 13, 2025
e0b3e5e
organization update
oarbusi Mar 13, 2025
9dda81c
build
oarbusi Mar 25, 2025
9ee2b4d
trigger changes
oarbusi Mar 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 40 additions & 3 deletions API.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/l1-resources/cloud-backup-restore-jobs/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export interface CfnCloudBackUpRestoreJobsProps {
readonly projectId: string;

/**
* Type of instance specified on the Instance Name serverless or cluster
* Type of instance specified on the Instance Name serverless or cluster. **WARNING:** `serverless` instance type is deprecated and will be removed in January 2026. For more details, see [Migrate your programmatic tools from M2, M5, or Serverless Instances to Flex Clusters](https://www.mongodb.com/docs/atlas/flex-migration/).
*
* @schema CfnCloudBackUpRestoreJobsProps#InstanceType
*/
Expand Down Expand Up @@ -144,7 +144,7 @@ export function toJson_CfnCloudBackUpRestoreJobsProps(
/* eslint-enable max-len, quote-props */

/**
* Type of instance specified on the Instance Name serverless or cluster
* Type of instance specified on the Instance Name serverless or cluster. **WARNING:** `serverless` instance type is deprecated and will be removed in January 2026. For more details, see [Migrate your programmatic tools from M2, M5, or Serverless Instances to Flex Clusters](https://www.mongodb.com/docs/atlas/flex-migration/).
*
* @schema CfnCloudBackUpRestoreJobsPropsInstanceType
*/
Expand Down
17 changes: 17 additions & 0 deletions src/l1-resources/organization/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,21 @@ export interface CfnOrganizationProps {
*/
readonly awsSecretName: string;

/**
* 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` for new Atlas Organizations created with the provider to prevent infrastructure drift caused by creation of new alerts.
* @schema CfnOrganizationProps#SkipDefaultAlertsSettings
*/
readonly skipDefaultAlertsSettings?: boolean;
Copy link
Member

@AgustinBettati AgustinBettati Mar 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would confirm with @maastha, not sure if this change has been released yet

Copy link
Collaborator Author

@oarbusi oarbusi Mar 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is being picked up in the CI (see failure), that's why I included it. If it can't be included in this I will work around this

Copy link
Collaborator Author

@oarbusi oarbusi Mar 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

talked with @maastha, I'll wait to merge and release a CDK version with these changes until next week.

Copy link
Collaborator

@marcosuma marcosuma Mar 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@oarbusi in any case I think it's best practice you separate this. First you do a PR with these changes if they are blocking and then you do a PR for deprecation.

When I open the PR and see the title I don't expect these changes to be here.

Copy link
Collaborator Author

@oarbusi oarbusi Mar 13, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@marcosuma Because both changes are now in CFN repo master branch, and how this repo works, CI checks detect both changes, and separate PRs would have failing CI checks, which is not ideal IMO. That is why I prefer to not split it if possible and to just wait. I can change this PR title to accomodate both changes


/**
* 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/
*
* @schema CfnOrganizationProps#GenAIFeaturesEnabled
*/
readonly genAiFeaturesEnabled?: boolean;

/**
* Flag that indicates whether this organization has been deleted.
*
Expand Down Expand Up @@ -94,6 +109,8 @@ export function toJson_CfnOrganizationProps(
OrgOwnerId: obj.orgOwnerId,
Profile: obj.profile,
AwsSecretName: obj.awsSecretName,
SkipDefaultAlertsSettings: obj.skipDefaultAlertsSettings,
GenAIFeaturesEnabled: obj.genAiFeaturesEnabled,
IsDeleted: obj.isDeleted,
ApiAccessListRequired: obj.apiAccessListRequired,
MultiFactorAuthRequired: obj.multiFactorAuthRequired,
Expand Down
2 changes: 1 addition & 1 deletion src/l1-resources/serverless-instance/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import * as cdk from "aws-cdk-lib";
import * as constructs from "constructs";

/**
* Returns, adds, edits, and removes serverless instances.
* **WARNING:** This resource is deprecated and will be removed in January 2026. For more details, see [Migrate your programmatic tools from M2, M5, or Serverless Instances to Flex Clusters](https://www.mongodb.com/docs/atlas/flex-migration/). Returns, adds, edits, and removes serverless instances.
*
* @schema CfnServerlessInstanceProps
*/
Expand Down
2 changes: 1 addition & 1 deletion src/l1-resources/serverless-private-endpoint/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import * as cdk from "aws-cdk-lib";
import * as constructs from "constructs";

/**
* Returns, adds, edits, and removes private endpoints for serverless instances. To learn more, see the Atlas Administration API tab on the following tutorial.
* **WARNING:** This resource is deprecated and will be removed in May 2025. If you try to create a new ServerlessInstance, you will create a Flex cluster. As a result, you can't create ServerlessPrivateEndpoints for these new instances. For more details, see [Migrate your programmatic tools from M2, M5, or Serverless Instances to Flex Clusters](https://www.mongodb.com/docs/atlas/flex-migration/). Returns, adds, edits, and removes private endpoints for serverless instances. To learn more, see the Atlas Administration API tab on the following tutorial.
*
* @schema CfnServerlessPrivateEndpointProps
*/
Expand Down
Loading