Merge branch 'main' into merge-back/2.97.1

Author: mergify[bot]

.gitattributes

@@ -11,3 +11,8 @@
 *.jpg binary
 *.tgz binary
 *.tar.gz binary
+
+# Hide snapshots from GitHub UI, except for the actual templates
+**/*.snapshot/** linguist-generated
+**/*.snapshot/**/*.template.json -linguist-generated
+**/*.snapshot/**/*DeployAssert*.template.json linguist-generated

.github/workflows/request-cli-integ-test.yml

@@ -19,7 +19,7 @@ jobs:
           persist-credentials: false
       - name: Find changed cli files
         id: changed-cli-files
-        uses: tj-actions/changed-files@76c4d81a6acd339b55bd7407a016981c853eb702
+        uses: tj-actions/changed-files@8238a4103220c636f2dad328ead8a7c8dbe316a3
         with:
           base_sha: ${{ github.event.pull_request.base.sha }}
           files_yaml: |

lerna.json

@@ -20,6 +20,7 @@
     "tools/@aws-cdk/prlint",
     "tools/@aws-cdk/spec2cdk",
     "tools/@aws-cdk/yarn-cling",
+    "tools/@aws-cdk/lazify",
     "scripts/@aws-cdk/script-tests"
   ],
   "rejectCycles": true,

package.json

@@ -88,6 +88,7 @@
       "tools/@aws-cdk/prlint",
       "tools/@aws-cdk/spec2cdk",
       "tools/@aws-cdk/yarn-cling",
+      "tools/@aws-cdk/lazify",
       "scripts/@aws-cdk/script-tests"
     ],
     "nohoist": [

packages/@aws-cdk-testing/cli-integ/tests/init-javascript/init-javascript.integtest.ts

@@ -1,3 +1,5 @@
+import * as path from 'path';
+import * as fs from 'fs-extra';
 import { integTest, withTemporaryDirectory, ShellHelper, withPackages } from '../../lib';
 
 ['app', 'sample-app'].forEach(template => {
@@ -13,3 +15,43 @@ import { integTest, withTemporaryDirectory, ShellHelper, withPackages } from '..
     await shell.shell(['cdk', 'synth']);
   })));
 });
+
+integTest('Test importing CDK from ESM', withTemporaryDirectory(withPackages(async (context) => {
+  // Use 'cdk init -l=javascript' to get set up, but use a different file
+  const shell = ShellHelper.fromContext(context);
+  await context.packages.makeCliAvailable();
+
+  await shell.shell(['cdk', 'init', '-l', 'javascript', 'app']);
+
+  // Rewrite some files
+  await fs.writeFile(path.join(context.integTestDir, 'new-entrypoint.mjs'), `
+// Test two styles of imports
+import { Stack, aws_sns as sns, aws_sns_subscriptions as subs, aws_sqs as sqs } from 'aws-cdk-lib';
+import * as cdk from 'aws-cdk-lib';
+
+class TestjsStack extends Stack {
+  constructor(scope, id, props) {
+    super(scope, id, props);
+
+    const queue = new sqs.Queue(this, 'TestjsQueue', {
+      visibilityTimeout: cdk.Duration.seconds(300)
+    });
+
+    const topic = new sns.Topic(this, 'TestjsTopic');
+
+    topic.addSubscription(new subs.SqsSubscription(queue));
+  }
+}
+
+const app = new cdk.App();
+new TestjsStack(app, 'TestjsStack');
+`, { encoding: 'utf-8' });
+
+  // Rewrite 'cdk.json' to use new entrypoint
+  const cdkJson = await fs.readJson(path.join(context.integTestDir, 'cdk.json'));
+  cdkJson.app = 'node new-entrypoint.mjs';
+  await fs.writeJson(path.join(context.integTestDir, 'cdk.json'), cdkJson);
+
+  await shell.shell(['cdk', 'synth']);
+
+})));

packages/@aws-cdk-testing/framework-integ/test/aws-rds/test/integ.cluster-snapshot.js.snapshot/cdk-integ-cluster-snapshot.assets.json

@@ -426,12 +426,12 @@
    "Type": "AWS::RDS::DBCluster",
    "Properties": {
     "CopyTagsToSnapshot": true,
-    "DBClusterParameterGroupName": "default.aurora-mysql5.7",
+    "DBClusterParameterGroupName": "default.aurora-mysql8.0",
     "DBSubnetGroupName": {
      "Ref": "ClusterSubnetsDCFA5CB7"
     },
     "Engine": "aurora-mysql",
-    "EngineVersion": "5.7.mysql_aurora.2.10.2",
+    "EngineVersion": "8.0.mysql_aurora.3.04.0",
     "MasterUserPassword": {
      "Fn::Join": [
       "",
@@ -474,7 +474,7 @@
     "DBClusterIdentifier": {
      "Ref": "ClusterEB0386A7"
     },
-    "DBInstanceClass": "db.t3.small",
+    "DBInstanceClass": "db.t3.medium",
     "DBSubnetGroupName": {
      "Ref": "ClusterSubnetsDCFA5CB7"
     },
@@ -495,7 +495,7 @@
     "DBClusterIdentifier": {
      "Ref": "ClusterEB0386A7"
     },
-    "DBInstanceClass": "db.t3.small",
+    "DBInstanceClass": "db.t3.medium",
     "DBSubnetGroupName": {
      "Ref": "ClusterSubnetsDCFA5CB7"
     },
@@ -1357,42 +1357,6 @@
     }
    }
   },
-  "FromSnapshotSecret9100F61C": {
-   "Type": "AWS::SecretsManager::Secret",
-   "Properties": {
-    "Description": {
-     "Fn::Join": [
-      "",
-      [
-       "Generated by the CDK for stack: ",
-       {
-        "Ref": "AWS::StackName"
-       }
-      ]
-     ]
-    },
-    "GenerateSecretString": {
-     "ExcludeCharacters": " %+~`#$&*()|[]{}:;<>?!'/@\"\\",
-     "GenerateStringKey": "password",
-     "PasswordLength": 30,
-     "SecretStringTemplate": "{\"username\":\"admin\"}"
-    }
-   },
-   "UpdateReplacePolicy": "Delete",
-   "DeletionPolicy": "Delete"
-  },
-  "FromSnapshotSecretAttachmentB62DA1C6": {
-   "Type": "AWS::SecretsManager::SecretTargetAttachment",
-   "Properties": {
-    "SecretId": {
-     "Ref": "FromSnapshotSecret9100F61C"
-    },
-    "TargetId": {
-     "Ref": "FromSnapshotEE0682C5"
-    },
-    "TargetType": "AWS::RDS::DBCluster"
-   }
-  },
   "cdkintegclustersnapshotFromSnapshotSnapshotSecretD93327943fdaad7efa858a3daf9490cf0a702aeb": {
    "Type": "AWS::SecretsManager::Secret",
    "Properties": {
@@ -1486,12 +1450,12 @@
    "Type": "AWS::RDS::DBCluster",
    "Properties": {
     "CopyTagsToSnapshot": true,
-    "DBClusterParameterGroupName": "default.aurora-mysql5.7",
+    "DBClusterParameterGroupName": "default.aurora-mysql8.0",
     "DBSubnetGroupName": {
      "Ref": "FromSnapshotSubnets9ED4B8EE"
     },
     "Engine": "aurora-mysql",
-    "EngineVersion": "5.7.mysql_aurora.2.10.2",
+    "EngineVersion": "8.0.mysql_aurora.3.04.0",
     "MasterUserPassword": {
      "Fn::Join": [
       "",
@@ -1528,7 +1492,7 @@
     "DBClusterIdentifier": {
      "Ref": "FromSnapshotEE0682C5"
     },
-    "DBInstanceClass": "db.t3.small",
+    "DBInstanceClass": "db.t3.medium",
     "DBSubnetGroupName": {
      "Ref": "FromSnapshotSubnets9ED4B8EE"
     },
@@ -1549,7 +1513,7 @@
     "DBClusterIdentifier": {
      "Ref": "FromSnapshotEE0682C5"
     },
-    "DBInstanceClass": "db.t3.small",
+    "DBInstanceClass": "db.t3.medium",
     "DBSubnetGroupName": {
      "Ref": "FromSnapshotSubnets9ED4B8EE"
     },