Merge branch 'main' into merge-back/2.97.0

aws · Sep 22, 2023 · 78a0106 · 78a0106
2 parents d7cf3be + 5ae9099
commit 78a0106
Show file tree

Hide file tree

Showing 132 changed files with 4,702 additions and 643 deletions.
diff --git a/lerna.json b/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,

diff --git a/package.json b/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": [

diff --git a/packages/@aws-cdk-testing/cli-integ/tests/init-javascript/init-javascript.integtest.ts b/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-entrypoing.mjs';
+  await fs.writeJson(path.join(context.integTestDir, 'cdk.json'), cdkJson);
+
+  await shell.shell(['cdk', 'synth']);
+
+})));
diff --git a/packages/@aws-cdk/app-staging-synthesizer-alpha/awslint.json b/packages/@aws-cdk/app-staging-synthesizer-alpha/awslint.json
@@ -0,0 +1,6 @@
+{
+    "exclude": [
+        "construct-ctor:@aws-cdk/app-staging-synthesizer-alpha.DefaultStagingStack.<initializer>.params[0]",
+        "props-no-arn-refs:@aws-cdk/app-staging-synthesizer-alpha.DefaultStagingStackProps.deployRoleArn"
+    ]
+}
diff --git a/packages/@aws-cdk/aws-amplify-alpha/awslint.json b/packages/@aws-cdk/aws-amplify-alpha/awslint.json
@@ -0,0 +1,5 @@
+{
+    "exclude": [
+        "*:*"
+    ]
+}
diff --git a/packages/@aws-cdk/aws-amplify-alpha/package.json b/packages/@aws-cdk/aws-amplify-alpha/package.json
@@ -104,11 +104,6 @@
   },
   "stability": "experimental",
   "maturity": "experimental",
-  "awslint": {
-    "exclude": [
-      "*:*"
-    ]
-  },
   "awscdkio": {
     "announce": false
   },

diff --git a/packages/@aws-cdk/aws-apigatewayv2-alpha/awslint.json b/packages/@aws-cdk/aws-apigatewayv2-alpha/awslint.json
@@ -0,0 +1,5 @@
+{
+    "exclude": [
+        "*:*"
+    ]
+}
diff --git a/packages/@aws-cdk/aws-apigatewayv2-alpha/package.json b/packages/@aws-cdk/aws-apigatewayv2-alpha/package.json
@@ -101,11 +101,6 @@
   "engines": {
     "node": ">= 14.15.0"
   },
-  "awslint": {
-    "exclude": [
-      "*:*"
-    ]
-  },
   "stability": "experimental",
   "maturity": "experimental",
   "features": [

diff --git a/packages/@aws-cdk/aws-apigatewayv2-authorizers-alpha/awslint.json b/packages/@aws-cdk/aws-apigatewayv2-authorizers-alpha/awslint.json
@@ -0,0 +1,5 @@
+{
+    "exclude": [
+        "*:*"
+    ]
+}
diff --git a/packages/@aws-cdk/aws-apigatewayv2-authorizers-alpha/package.json b/packages/@aws-cdk/aws-apigatewayv2-authorizers-alpha/package.json
@@ -112,11 +112,6 @@
     "tag": "latest"
   },
   "private": false,
-  "awslint": {
-    "exclude": [
-      "*:*"
-    ]
-  },
   "pkglint": {
     "exclude": [
       "naming/package-matches-directory",

diff --git a/packages/@aws-cdk/aws-apigatewayv2-integrations-alpha/awslint.json b/packages/@aws-cdk/aws-apigatewayv2-integrations-alpha/awslint.json
@@ -0,0 +1,5 @@
+{
+    "exclude": [
+        "*:*"
+    ]
+}
diff --git a/packages/@aws-cdk/aws-apigatewayv2-integrations-alpha/package.json b/packages/@aws-cdk/aws-apigatewayv2-integrations-alpha/package.json
@@ -108,11 +108,6 @@
   "publishConfig": {
     "tag": "latest"
   },
-  "awslint": {
-    "exclude": [
-      "*:*"
-    ]
-  },
   "pkglint": {
     "exclude": [
       "naming/package-matches-directory",

diff --git a/packages/@aws-cdk/aws-appconfig-alpha/awslint.json b/packages/@aws-cdk/aws-appconfig-alpha/awslint.json
@@ -0,0 +1,5 @@
+{
+    "exclude": [
+        "*:*"
+    ]
+}
diff --git a/packages/@aws-cdk/aws-appconfig-alpha/package.json b/packages/@aws-cdk/aws-appconfig-alpha/package.json
@@ -102,11 +102,6 @@
   },
   "stability": "experimental",
   "maturity": "experimental",
-  "awslint": {
-    "exclude": [
-      "*:*"
-    ]
-  },
   "awscdkio": {
     "announce": false
   },

diff --git a/packages/@aws-cdk/aws-apprunner-alpha/awslint.json b/packages/@aws-cdk/aws-apprunner-alpha/awslint.json
@@ -0,0 +1,5 @@
+{
+    "exclude": [
+        "*:*"
+    ]
+}
diff --git a/packages/@aws-cdk/aws-apprunner-alpha/package.json b/packages/@aws-cdk/aws-apprunner-alpha/package.json
@@ -109,11 +109,6 @@
     "tag": "latest"
   },
   "private": false,
-  "awslint": {
-    "exclude": [
-      "*:*"
-    ]
-  },
   "pkglint": {
     "exclude": [
       "naming/package-matches-directory",

diff --git a/packages/@aws-cdk/aws-cloud9-alpha/awslint.json b/packages/@aws-cdk/aws-cloud9-alpha/awslint.json
@@ -0,0 +1,5 @@
+{
+    "exclude": [
+        "*:*"
+    ]
+}
diff --git a/packages/@aws-cdk/aws-cloud9-alpha/package.json b/packages/@aws-cdk/aws-cloud9-alpha/package.json
@@ -98,11 +98,6 @@
   "engines": {
     "node": ">= 14.15.0"
   },
-  "awslint": {
-    "exclude": [
-      "*:*"
-    ]
-  },
   "stability": "experimental",
   "maturity": "experimental",
   "awscdkio": {

diff --git a/packages/@aws-cdk/aws-codestar-alpha/awslint.json b/packages/@aws-cdk/aws-codestar-alpha/awslint.json
@@ -0,0 +1,5 @@
+{
+    "exclude": [
+        "*:*"
+    ]
+}
diff --git a/packages/@aws-cdk/aws-codestar-alpha/package.json b/packages/@aws-cdk/aws-codestar-alpha/package.json
@@ -98,11 +98,6 @@
   "engines": {
     "node": ">= 14.15.0"
   },
-  "awslint": {
-    "exclude": [
-      "*:*"
-    ]
-  },
   "stability": "experimental",
   "maturity": "experimental",
   "awscdkio": {

diff --git a/packages/@aws-cdk/aws-cognito-identitypool-alpha/awslint.json b/packages/@aws-cdk/aws-cognito-identitypool-alpha/awslint.json
@@ -0,0 +1,5 @@
+{
+    "exclude": [
+        "*:*"
+    ]
+}
diff --git a/packages/@aws-cdk/aws-cognito-identitypool-alpha/package.json b/packages/@aws-cdk/aws-cognito-identitypool-alpha/package.json
@@ -98,11 +98,6 @@
   "engines": {
     "node": ">= 14.15.0"
   },
-  "awslint": {
-    "exclude": [
-      "*:*"
-    ]
-  },
   "stability": "experimental",
   "maturity": "experimental",
   "awscdkio": {

diff --git a/packages/@aws-cdk/aws-gamelift-alpha/awslint.json b/packages/@aws-cdk/aws-gamelift-alpha/awslint.json
@@ -0,0 +1,5 @@
+{
+    "exclude": [
+        "*:*"
+    ]
+}
diff --git a/packages/@aws-cdk/aws-gamelift-alpha/package.json b/packages/@aws-cdk/aws-gamelift-alpha/package.json
@@ -99,11 +99,6 @@
   "engines": {
     "node": ">= 14.15.0"
   },
-  "awslint": {
-    "exclude": [
-      "*:*"
-    ]
-  },
   "stability": "experimental",
   "maturity": "experimental",
   "awscdkio": {

diff --git a/packages/@aws-cdk/aws-glue-alpha/awslint.json b/packages/@aws-cdk/aws-glue-alpha/awslint.json
@@ -0,0 +1,5 @@
+{
+    "exclude": [
+        "*:*"
+    ]
+}
diff --git a/packages/@aws-cdk/aws-glue-alpha/lib/external-table.ts b/packages/@aws-cdk/aws-glue-alpha/lib/external-table.ts
@@ -25,6 +25,7 @@ export interface ExternalTableProps extends TableBaseProps {
 
 /**
  * A Glue table that targets an external data location (e.g. A table in a Redshift Cluster).
+ * @resource AWS::Glue::Table
  */
 export class ExternalTable extends TableBase {
   /**

diff --git a/packages/@aws-cdk/aws-glue-alpha/lib/s3-table.ts b/packages/@aws-cdk/aws-glue-alpha/lib/s3-table.ts
@@ -78,6 +78,7 @@ export interface S3TableProps extends TableBaseProps {
 
 /**
  * A Glue table that targets a S3 dataset.
+ * @resource AWS::Glue::Table
  */
 export class S3Table extends TableBase {
   /**

diff --git a/packages/@aws-cdk/aws-glue-alpha/package.json b/packages/@aws-cdk/aws-glue-alpha/package.json
@@ -101,11 +101,6 @@
   },
   "stability": "experimental",
   "maturity": "experimental",
-  "awslint": {
-    "exclude": [
-      "*:*"
-    ]
-  },
   "awscdkio": {
     "announce": false
   },

diff --git a/packages/@aws-cdk/aws-iot-actions-alpha/awslint.json b/packages/@aws-cdk/aws-iot-actions-alpha/awslint.json
@@ -0,0 +1,5 @@
+{
+    "exclude": [
+        "*:*"
+    ]
+}
diff --git a/packages/@aws-cdk/aws-iot-actions-alpha/package.json b/packages/@aws-cdk/aws-iot-actions-alpha/package.json
@@ -121,11 +121,6 @@
     "tag": "latest"
   },
   "private": false,
-  "awslint": {
-    "exclude": [
-      "*:*"
-    ]
-  },
   "pkglint": {
     "exclude": [
       "naming/package-matches-directory",

diff --git a/packages/@aws-cdk/aws-iot-alpha/awslint.json b/packages/@aws-cdk/aws-iot-alpha/awslint.json
@@ -0,0 +1,5 @@
+{
+    "exclude": [
+        "*:*"
+    ]
+}
diff --git a/packages/@aws-cdk/aws-iot-alpha/package.json b/packages/@aws-cdk/aws-iot-alpha/package.json
@@ -99,11 +99,6 @@
   "engines": {
     "node": ">= 14.15.0"
   },
-  "awslint": {
-    "exclude": [
-      "*:*"
-    ]
-  },
   "stability": "experimental",
   "maturity": "experimental",
   "awscdkio": {

diff --git a/packages/@aws-cdk/aws-iotevents-actions-alpha/awslint.json b/packages/@aws-cdk/aws-iotevents-actions-alpha/awslint.json
@@ -0,0 +1,5 @@
+{
+    "exclude": [
+        "*:*"
+    ]
+}
diff --git a/packages/@aws-cdk/aws-iotevents-actions-alpha/package.json b/packages/@aws-cdk/aws-iotevents-actions-alpha/package.json
@@ -103,11 +103,6 @@
     "tag": "latest"
   },
   "private": false,
-  "awslint": {
-    "exclude": [
-      "*:*"
-    ]
-  },
   "pkglint": {
     "exclude": [
       "naming/package-matches-directory",

diff --git a/packages/@aws-cdk/aws-iotevents-alpha/awslint.json b/packages/@aws-cdk/aws-iotevents-alpha/awslint.json
@@ -0,0 +1,5 @@
+{
+    "exclude": [
+        "*:*"
+    ]
+}
diff --git a/packages/@aws-cdk/aws-iotevents-alpha/package.json b/packages/@aws-cdk/aws-iotevents-alpha/package.json
@@ -100,11 +100,6 @@
   "engines": {
     "node": ">= 14.15.0"
   },
-  "awslint": {
-    "exclude": [
-      "*:*"
-    ]
-  },
   "stability": "experimental",
   "maturity": "experimental",
   "awscdkio": {

diff --git a/packages/@aws-cdk/aws-ivs-alpha/awslint.json b/packages/@aws-cdk/aws-ivs-alpha/awslint.json
@@ -0,0 +1,5 @@
+{
+    "exclude": [
+        "*:*"
+    ]
+}
diff --git a/packages/@aws-cdk/aws-ivs-alpha/package.json b/packages/@aws-cdk/aws-ivs-alpha/package.json
@@ -42,11 +42,6 @@
       }
     }
   },
-  "awslint": {
-    "exclude": [
-      "*:*"
-    ]
-  },
   "repository": {
     "type": "git",
     "url": "https://github.com/aws/aws-cdk.git",

diff --git a/packages/@aws-cdk/aws-kinesisanalytics-flink-alpha/awslint.json b/packages/@aws-cdk/aws-kinesisanalytics-flink-alpha/awslint.json
@@ -0,0 +1,5 @@
+{
+    "exclude": [
+        "*:*"
+    ]
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,6 +25,7 @@ export interface ExternalTableProps extends TableBaseProps { @@
     /**
      * A Glue table that targets an external data location (e.g. A table in a Redshift Cluster).
+     * @resource AWS::Glue::Table
      */
     export class ExternalTable extends TableBase {
       /**
@@ Expand Down @@