Merge branch 'main' into dependabot/npm_and_yarn/examples/mern-cdk-ci-cd/mern/client/http-proxy-middleware-2.0.9

Author: maastha

.github/workflows/release.yml

@@ -1,4 +1,4 @@
-name: Release
+name: Release (Requires manual steps to take)
 on: workflow_dispatch
 jobs:
   release:
@@ -23,10 +23,29 @@ jobs:
         uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e
         with:
           node-version: 18.x
+      - uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b
+        name: Setup Java
+        with:
+          distribution: temurin
+          java-version: 11.x
+      - uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55
+        name: Setup Python
+        with:
+          python-version: 3.x
+      - uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9
+        name: Setup .NET
+        with:
+          dotnet-version: 9.0.x
+      - uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b
+        name: Setup Go
+        with:
+          go-version: ^1.16.0
       - name: Install dependencies
         run: yarn install --check-files --frozen-lockfile
       - name: release
-        run: npx projen release
+        run: |
+          unset CI # enable full package-all https://github.com/mongodb/awscdk-resources-mongodbatlas/blob/main/.projen/tasks.json#L157-L170
+          npx projen release
       - name: Backup artifact permissions
         run: cd dist && getfacl -R . > permissions-backup.acl
         continue-on-error: true
@@ -55,16 +74,6 @@ jobs:
       - name: Restore build artifact permissions
         run: cd dist && setfacl --restore=permissions-backup.acl
         continue-on-error: true
-      - name: Checkout
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-        with:
-          path: .repo
-      - name: Install Dependencies
-        run: cd .repo && yarn install --check-files --frozen-lockfile
-      - name: Create js artifact
-        run: cd .repo && npx projen compile && npx projen package:js
-      - name: Collect js Artifact
-        run: mv .repo/dist/js dist/js
       - name: Release
         env:
           NPM_DIST_TAG: latest
@@ -105,16 +114,6 @@ jobs:
       - name: Restore build artifact permissions
         run: cd dist && setfacl --restore=permissions-backup.acl
         continue-on-error: true
-      - name: Checkout
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-        with:
-          path: .repo
-      - name: Install Dependencies
-        run: cd .repo && yarn install --check-files --frozen-lockfile
-      - name: Create java artifact
-        run: cd .repo && npx projen compile && npx projen package:java
-      - name: Collect java Artifact
-        run: mv .repo/dist/java dist/java
       - name: Release
         env:
           MAVEN_GPG_PRIVATE_KEY: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
@@ -156,16 +155,6 @@ jobs:
       - name: Restore build artifact permissions
         run: cd dist && setfacl --restore=permissions-backup.acl
         continue-on-error: true
-      - name: Checkout
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-        with:
-          path: .repo
-      - name: Install Dependencies
-        run: cd .repo && yarn install --check-files --frozen-lockfile
-      - name: Create python artifact
-        run: cd .repo && npx projen compile && npx projen package:python
-      - name: Collect python Artifact
-        run: mv .repo/dist/python dist/python
       - name: Release
         env:
           TWINE_USERNAME: ${{ secrets.TWINE_USERNAME }}
@@ -204,21 +193,6 @@ jobs:
       - name: Restore build artifact permissions
         run: cd dist && setfacl --restore=permissions-backup.acl
         continue-on-error: true
-      - name: Checkout
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-        with:
-          path: .repo
-          fetch-depth: 0
-      - name: Install Dependencies
-        run: cd .repo && yarn install --check-files --frozen-lockfile
-      - name: Create dotnet artifact
-        run: |
-          cd .repo
-          npx projen bump
-          npx projen compile
-          npx projen package:dotnet
-      - name: Collect dotnet Artifact
-        run: mv .repo/dist/dotnet dist/dotnet
       - name: Extract Version
         id: extract-version
         run: echo "VERSION=$(cat dist/version.txt)" >> "${GITHUB_OUTPUT}"
@@ -270,16 +244,6 @@ jobs:
       - name: Restore build artifact permissions
         run: cd dist && setfacl --restore=permissions-backup.acl
         continue-on-error: true
-      - name: Checkout
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-        with:
-          path: .repo
-      - name: Install Dependencies
-        run: cd .repo && yarn install --check-files --frozen-lockfile
-      - name: Create go artifact
-        run: cd .repo && npx projen compile && npx projen package:go
-      - name: Collect go Artifact
-        run: mv .repo/dist/go dist/go
       - name: Release
         env:
           GITHUB_TOKEN: ${{ secrets.GO_GITHUB_TOKEN }}

API.md

@@ -3,19 +3,26 @@
 
 ## Stable release
 
-Stable releases are managed by the [Release GitHub Action](https://github.com/mongodb/awscdk-resources-mongodbatlas/actions/workflows/release.yml). You can release a new CDK version by manually trigger the action.
+Stable releases are managed by the [Release GitHub Action](https://github.com/mongodb/awscdk-resources-mongodbatlas/actions/workflows/release.yml). You can release a new CDK version by manually triggering the action ([*MAKE SURE TO FOLLOW MANUAL STEPS BELOW*](#manual-steps)).
 
 ![Screenshot 2023-04-20 at 10 35 11](https://user-images.githubusercontent.com/5663078/233325734-0f469045-f91b-436c-8dd5-19d1e8f24c57.png)
 
+### Manual Steps
 After the action finishes successfully you have to manually release the Go package:
 - Go to the [Go repo](https://github.com/mongodb/awscdk-resources-mongodbatlas-go) and check that the latest commit happened now with the same release as in this repo, e.g. `chore(release): v3.0.0`.
 - Go to the [Go Repo release page](https://github.com/mongodb/awscdk-resources-mongodbatlas-go/releases).
 - Select the latest release that has to be the same as the one in this repo, e.g. `awscdkresourcemongodbatlas/v3.0.0`, name will be like `v3.0.0`, click "Generate release notes" and make sure "Set as latest release" is checked.
 
+Also, to ensure no silent errors, look for the specific `vX.Y.Z` language releases:
+- [Javascript](https://www.npmjs.com/package/awscdk-resources-mongodbatlas?activeTab=versions)
+- [Java](https://central.sonatype.com/artifact/org.mongodb/awscdk-resources-mongodbatlas/versions)
+- [Python](https://pypi.org/project/awscdk-resources-mongodbatlas/#history)
+- [Golang (after the manual release above)](https://github.com/mongodb/awscdk-resources-mongodbatlas-go/releases)
+- [Nuget](https://www.nuget.org/packages/MongoDB.AWSCDKResourcesMongoDBAtlas#versions-body-tab)
+
 ## Versioning
 The release version is determinated based on the [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/#summary) in that release.
 
-
 ## Release troubleshooting
 If the Release Gitub Action fails, it can happen that the new version is published only to some repositories, 
 but the failing ones are still in the current version.

RELEASING.md

@@ -21,14 +21,12 @@ export class CdkTestingStack extends cdk.Stack {
       profile: atlasProps.profile,
       actions:[
         {
-          action: "GROUP_READ",
+          action: "FIND",
           resources: [
             {
               collection: atlasProps.collectionName,
-            },
-            {
               db: atlasProps.dbName,
-            }
+            },
           ]
         }
       ],

examples/l1-resources/custom-db-role.ts

@@ -10,6 +10,7 @@ interface AtlasStackProps {
   readonly dbName: string;
   readonly username: string;
   readonly password: string;
+  readonly description: string;
 }
 
 export class CdkTestingStack extends cdk.Stack {
@@ -23,6 +24,7 @@ export class CdkTestingStack extends cdk.Stack {
       username: atlasProps.username,
       password: atlasProps.password,
       databaseName: atlasProps.dbName,
+      description: atlasProps.description,
       roles: [ 
         {
           roleName: atlasProps.roleName,
@@ -43,6 +45,7 @@ export class CdkTestingStack extends cdk.Stack {
     const dbName = this.node.tryGetContext('dbName');
     const username = this.node.tryGetContext('username');
     const password = this.node.tryGetContext('password');
+    const description = this.node.tryGetContext('userDescription');
 
 
     return {
@@ -51,7 +54,8 @@ export class CdkTestingStack extends cdk.Stack {
       roleName,
       dbName,
       username,
-      password
+      password,
+      description
     }
   }
 }

examples/l1-resources/database-user.ts

@@ -60,5 +60,8 @@ sed -e 's/UNDERSCORE_//g' -e 's/HYPHEN_//g' -e 's/PERIOD_//g' -e 's/VALUE_//g' "
 # Fix @typescript-eslint/no-shadow es-linter error in file federated-database-instance/index.ts
 sed -e 's/map(y => toJson_TagSet(y))/map(x => toJson_TagSet(x))/g' "${dest}" > "${dest}.tmp" && mv "${dest}.tmp" "${dest}"
 
+# Fix errors like `Definition for rule '@stylistic/max-len' was not found      @stylistic/max-len` until eslint 9 is supported by projen: https://github.com/projen/projen/issues/3240
+sed -e 's|@stylistic/max-len, ||g' -e 's|, @stylistic/quote-props||g' "${dest}" > "${dest}.tmp" && mv "${dest}.tmp" "${dest}"
+
 echo
 echo "L1 CDK resource generated succesfully: ${resource}, CFN type: ${resourceType}"

scripts/cdk.sh

@@ -230,6 +230,20 @@ export interface ProcessArgs {
    */
   readonly minimumEnabledTlsProtocol?: string;
 
+  /**
+   * The TLS cipher suite configuration mode. Valid values include `CUSTOM` or `DEFAULT`. The `DEFAULT` mode uses the default cipher suites. The `CUSTOM` mode allows you to specify custom cipher suites for both TLS 1.2 and TLS 1.3. To unset, this should be set back to `DEFAULT`.
+   *
+   * @schema processArgs#TlsCipherConfigMode
+   */
+  readonly tlsCipherConfigMode?: string;
+
+  /**
+   * The custom OpenSSL cipher suite list for TLS 1.2. This field is only valid when `tls_cipher_config_mode` is set to `CUSTOM`.
+   *
+   * @schema processArgs#CustomOpensslCipherConfigTls12
+   */
+  readonly customOpensslCipherConfigTls12?: string[];
+
   /**
    * Flag that indicates whether the cluster disables executing any query that requires a collection scan to return results.
    *
@@ -289,6 +303,10 @@ export function toJson_ProcessArgs(
     FailIndexKeyTooLong: obj.failIndexKeyTooLong,
     JavascriptEnabled: obj.javascriptEnabled,
     MinimumEnabledTLSProtocol: obj.minimumEnabledTlsProtocol,
+    TlsCipherConfigMode: obj.tlsCipherConfigMode,
+    CustomOpensslCipherConfigTls12: obj.customOpensslCipherConfigTls12?.map(
+      (y) => y
+    ),
     NoTableScan: obj.noTableScan,
     OplogSizeMB: obj.oplogSizeMb,
     SampleSizeBIConnector: obj.sampleSizeBiConnector,

src/l1-resources/cluster/index.ts

@@ -154,14 +154,14 @@ export function toJson_InheritedRole(
  */
 export interface Resource {
   /**
-   * Human-readable label that identifies the collection on which you grant the action to one MongoDB user. If you don't set this parameter, you grant the action to all collections in the database specified in the actions.resources.db parameter. If you set "actions.resources.cluster" : true, MongoDB Cloud ignores this parameter.
+   * Human-readable label that identifies the collection on which you grant the action to one MongoDB user. If you don't set this parameter, you grant the action to all collections in the database specified in the actions.resources.db parameter. If you set "actions.resources.cluster" : true, MongoDB Cloud ignores this parameter. Use the empty string ("") to allow an action on all collections.
    *
    * @schema Resource#Collection
    */
   readonly collection?: string;
 
   /**
-   * Human-readable label that identifies the database on which you grant the action to one MongoDB user. If you set "actions.resources.cluster" : true, MongoDB Cloud ignores this parameter.
+   * Human-readable label that identifies the database on which you grant the action to one MongoDB user. If you set "actions.resources.cluster" : true, MongoDB Cloud ignores this parameter. Use the empty string ("") to allow an action on all databases.
    *
    * @schema Resource#DB
    */

src/l1-resources/custom-db-role/index.ts

@@ -29,6 +29,13 @@ export interface CfnDatabaseUserProps {
    */
   readonly databaseName: string;
 
+  /**
+   * Description of this database user.
+   *
+   * @schema CfnDatabaseUserProps#Description
+   */
+  readonly description?: string;
+
   /**
    * List that contains the key-value pairs for tagging and categorizing the MongoDB database user. The labels that you define do not appear in the console.
    *
@@ -107,6 +114,7 @@ export function toJson_CfnDatabaseUserProps(
     DeleteAfterDate: obj.deleteAfterDate,
     AWSIAMType: obj.awsiamType,
     DatabaseName: obj.databaseName,
+    Description: obj.description,
     Labels: obj.labels?.map((y) => toJson_LabelDefinition(y)),
     LdapAuthType: obj.ldapAuthType,
     X509Type: obj.x509Type,