Merge branch 'main' into DOCSP-53434

xargom · web-flow · commit caf86e0c543a · 2025-09-11T15:36:07.000-06:00
diff --git a/.github/workflows/code-health.yml b/.github/workflows/code-health.yml
@@ -18,7 +18,7 @@ jobs:
           ref: ${{ github.event.pull_request.head.ref }}
           repository: ${{ github.event.pull_request.head.repo.full_name }}
       - name: Setup Node.js
-        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
+        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444
         with:
           node-version: 18.x
       - name: Install dependencies
@@ -36,7 +36,7 @@ jobs:
           ./actionlint -color
         shell: bash
       - name: Setup Node.js
-        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
+        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444
         with:
           node-version: 18.x
       - name: Install dependencies
@@ -56,7 +56,7 @@ jobs:
       contents: write
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
-      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
+      - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444
         with:
           node-version: 18.x
       - run: yarn install --check-files
@@ -85,7 +85,7 @@ jobs:
     permissions: {}
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
-      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
+      - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444
         with:
           node-version: 18.x
       - run: yarn install --check-files
diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml
@@ -12,4 +12,4 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
       - name: Dependency Review
-        uses: actions/dependency-review-action@bc41886e18ea39df68b1b1245f4184881938e050
+        uses: actions/dependency-review-action@595b5aeba73380359d98a5e087f648dbb0edce1b
diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
@@ -13,7 +13,7 @@ jobs:
           ref: ${{ github.event.pull_request.head.ref }}
           repository: ${{ github.event.pull_request.head.repo.full_name }}
       - name: Setup Node.js
-        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
+        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444
         with:
           node-version: 18.x
       - name: Install dependencies
@@ -25,7 +25,7 @@ jobs:
     runs-on: ubuntu-latest
     permissions: {}
     steps:
-      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
+      - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444
         with:
           node-version: 18.x
       - name: Checkout
@@ -46,7 +46,7 @@ jobs:
         with:
           distribution: temurin
           java-version: 11.x
-      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
+      - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444
         with:
           node-version: 18.x
       - name: Checkout
@@ -63,10 +63,10 @@ jobs:
     runs-on: ubuntu-latest
     permissions: {}
     steps:
-      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065
+      - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c
         with:
           python-version: 3.x
-      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
+      - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444
         with:
           node-version: 18.x
       - name: Checkout
@@ -86,7 +86,7 @@ jobs:
       - uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9
         with:
           dotnet-version: 9.0.x
-      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
+      - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444
         with:
           node-version: 18.x
       - name: Checkout
@@ -107,7 +107,7 @@ jobs:
       - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5
         with:
           go-version: ^1.16.0
-      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
+      - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444
         with:
           node-version: 18.x
       - name: Checkout
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -20,15 +20,15 @@ jobs:
           git config user.name "github-actions"
           git config user.email "github-actions@github.com"
       - name: Setup Node.js
-        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
+        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444
         with:
           node-version: 18.x
       - uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165
         name: Setup Java
         with:
           distribution: temurin
           java-version: 11.x
-      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065
+      - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c
         name: Setup Python
         with:
           python-version: 3.x
@@ -63,7 +63,7 @@ jobs:
       contents: read
       issues: write
     steps:
-      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
+      - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444
         with:
           node-version: 18.x
       - name: Download build artifacts
@@ -103,7 +103,7 @@ jobs:
         with:
           distribution: temurin
           java-version: 11.x
-      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
+      - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444
         with:
           node-version: 18.x
       - name: Download build artifacts
@@ -142,10 +142,10 @@ jobs:
       contents: read
       issues: write
     steps:
-      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
+      - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444
         with:
           node-version: 18.x
-      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065
+      - uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c
         with:
           python-version: 3.x
       - name: Download build artifacts
@@ -195,7 +195,7 @@ jobs:
       contents: read
       issues: write
     steps:
-      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
+      - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444
         with:
           node-version: 18.x
       - uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9
@@ -246,7 +246,7 @@ jobs:
       contents: read
       issues: write
     steps:
-      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
+      - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444
         with:
           node-version: 18.x
       - uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5
@@ -285,7 +285,7 @@ jobs:
       contents: write
       issues: write
     steps:
-      - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
+      - uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444
         with:
           node-version: 18.x
       - name: Download build artifacts
@@ -363,7 +363,7 @@ jobs:
             echo "No changes to commit."
           fi
       - name: Upload SBOM as release artifact
-        uses: softprops/action-gh-release@72f2c25fcb47643c292f7107632f7a47c1df5cd8
+        uses: softprops/action-gh-release@6cbd405e2c4e67a21c47fa9e383d020e4e28b836
         with:
           files: compliance/sbom.json
           tag_name: ${{ steps.extract-version.outputs.VERSION }}
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -9,7 +9,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639
+      - uses: actions/stale@3a9db7e6a41a89f618792c92c0e97cc736e1b13f
         id: stale
         with:
           stale-issue-message: 'This issue has gone 30 days without any activity and meets the project’s definition of "stale". This will be auto-closed if there is no new activity over the next 30 days. If the issue is still relevant and active, you can simply comment with a "bump" to keep it open, or add the label "not_stale". Thanks for keeping our repository healthy!'
diff --git a/.github/workflows/upgrade-main.yml b/.github/workflows/upgrade-main.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
       - name: Setup Node.js
-        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
+        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444
         with:
           node-version: 18.x
       - name: Install dependencies
diff --git a/API.md b/API.md
diff --git a/TESTING.md b/TESTING.md
@@ -38,7 +38,7 @@ npx projen test
 
 ## Testing the resource in a CFN stack:
 1. Build the construct by running `npx projen build`.
-2. Navigate inside `/dist/js` and copy the`.tgz` file. You will use this in the next steps.
+2. It will generate a `.tgz` file in `dist/js` that we will reference later.
 3. Create a CDK test app: We will be using a CDK app to test our construct by using the app to create, update and delete AWS CloudFormation stacks.
 Create the CDK app by running the following in a terminal: ([refer AWS walkthrough for details](https://docs.aws.amazon.com/cdk/v2/guide/hello_world.html#hello_world_tutorial_create_app)):
 ```
@@ -48,10 +48,12 @@ cdk init app --language typescript
 # build the app:
 npm run build
 ```
-4. Copy the .tgz file from step #2 inside the node_modules folder in your CDK test app.
+4. Add a reference to the previous file in the `dependencies` section in `package.json` instead of using a published version, for example:
+```
+"awscdk-resources-mongodbatlas": "file:../dist/js/awscdk-resources-mongodbatlas@0.0.0.jsii.tgz"
+```
 5. Import your CDK construct in a testing project.
 6. Use the construct in your app with appropriate parameters.
- - [Optional, not applicable for L2/L3 constructs] If you need help getting test parameters to use with the constructs you can use `./cfn-resources/cfn-testing-helper.sh`. Refer “Getting test parameters” for creating a stack here for details.
 7. Build your app again.
 
 #### Create a stack:
@@ -79,4 +81,4 @@ cdk deploy
 2. Stack **Outputs** should show required data correctly.
 3. **Create** - Stack should complete successfully and resource should be created and correctly configured in Atlas account.
 4. **Update** - Stack should complete successfully and resource should be updated and correctly configured in Atlas account.
-5. **Delete** - Stack should complete successfully and resource should be deleted from your Atlas account.
+5. **Delete** - Stack should complete successfully and resource should be deleted from your Atlas account.
diff --git a/src/l1-resources/cluster/README.md b/src/l1-resources/cluster/README.md
@@ -90,6 +90,7 @@ const clusterRes = new CfnCluster(this, 'ClusterResource', {
 
 ```
 
+
 ## Flex Clusters
 
 You can create a flex cluster using ``CfnCluster``, as the following example shows:
@@ -112,6 +113,7 @@ const flexClusterRes = new CfnCluster(this, 'FlexClusterResource', {
 });
 ```
 
+
 *Note:* Upgrades to or from flex clusters are currently unavailable. We expect to support upgrades to or from flex clusters in the forseeable future.
 
 *Important:* Use the `CfnCluster` resource instead of the [CfnFlexCluster](https://github.com/mongodb/awscdk-resources-mongodbatlas/blob/main/src/l1-resources/flex-cluster/README.md) resource to create and manage flex clusters. `CfnCluster` supports flex clusters and future upgrades will only be available through this resource.
@@ -128,4 +130,4 @@ This library is auto-generated and published to all supported programming langua
 
 ## License
 
-Distributed under the Apache-2.0 License.
+Distributed under the Apache-2.0 License.
diff --git a/src/l1-resources/cluster/index.ts b/src/l1-resources/cluster/index.ts
@@ -579,14 +579,14 @@ export interface Tag {
    *
    * @schema tag#Key
    */
-  readonly key?: string;
+  readonly key: string;
 
   /**
    * Variable that belongs to the set of the tag. For example, production in the environment : production tag.
    *
    * @schema tag#Value
    */
-  readonly value?: string;
+  readonly value: string;
 }
 
 /**
@@ -747,6 +747,8 @@ export enum AdvancedRegionConfigProviderName {
   AZURE = "AZURE",
   /** TENANT */
   TENANT = "TENANT",
+  /** FLEX */
+  FLEX = "FLEX",
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -579,14 +579,14 @@ export interface Tag {`
`579`	`579`	`*`
`580`	`580`	`* @schema tag#Key`
`581`	`581`	`*/`
`582`		`- readonly key?: string;`
	`582`	`+ readonly key: string;`
`583`	`583`
`584`	`584`	`/**`
`585`	`585`	`* Variable that belongs to the set of the tag. For example, production in the environment : production tag.`
`586`	`586`	`*`
`587`	`587`	`* @schema tag#Value`
`588`	`588`	`*/`
`589`		`- readonly value?: string;`
	`589`	`+ readonly value: string;`
`590`	`590`	`}`
`591`	`591`
`592`	`592`	`/**`
`@@ -747,6 +747,8 @@ export enum AdvancedRegionConfigProviderName {`
`747`	`747`	`AZURE = "AZURE",`
`748`	`748`	`/** TENANT */`
`749`	`749`	`TENANT = "TENANT",`
	`750`	`+ /** FLEX */`
	`751`	`+ FLEX = "FLEX",`
`750`	`752`	`}`
`751`	`753`
`752`	`754`	`/**`