Merge branch 'main' into feat/appsync-grant-on-import

.github/workflows/issue-label-assign.yml

@@ -265,7 +265,6 @@ env:
             {"area":"@aws-cdk/aws-wafv2","keywords":["wafv2","aws-wafv2"],"labels":["@aws-cdk/aws-wafv2"]},
             {"area":"@aws-cdk/aws-workspaces","keywords":["aws-workspaces","workspaces"],"labels":["@aws-cdk/aws-workspaces"]},
             {"area":"@aws-cdk/aws-xray","keywords":["aws-xray","xray"],"labels":["@aws-cdk/aws-xray"]},
-            {"area":"@aws-cdk/cfnspec","keywords":["cfnspec"],"labels":["@aws-cdk/cfnspec"]},
             {"area":"@aws-cdk/cloud-assembly-schema","keywords":["cloud-assembly-schema","manifest"],"labels":["@aws-cdk/cloud-assembly-schema"]},
             {"area":"@aws-cdk/cloudformation-diff","keywords":["cloudformation-diff","cfn-diff"],"labels":["@aws-cdk/cloudformation-diff"]},
             {"area":"@aws-cdk/cloudformation-include","keywords":["cloudformation-include","cfn-include"],"labels":["@aws-cdk/cloudformation-include"]},

.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@af292f1e845a0377b596972698a8598734eb2796
+        uses: tj-actions/changed-files@18c8a4ecebe93d32ed8a88e1d0c098f5f68c221b
         with:
           base_sha: ${{ github.event.pull_request.base.sha }}
           files_yaml: |

.github/workflows/spec-update.yml

@@ -30,11 +30,11 @@ jobs:
       - name: Install ncu tool
         run: npm -g install lerna npm-check-updates
       - name: Run "ncu" for service spec packages
-        run: lerna exec --parallel ncu -- --upgrade --filter='@aws-cdk/aws-service-spec,@aws-cdk/service-spec-types' --target=latest
+        run: lerna exec --parallel ncu -- --upgrade --filter='@aws-cdk/aws-service-spec,@aws-cdk/service-spec-importers,@aws-cdk/service-spec-types' --target=latest
 
       # This will ensure the current lockfile is up-to-date with the dependency specifications
       - name: Install latest version & update lockfile
-        run: yarn upgrade @aws-cdk/aws-service-spec @aws-cdk/service-spec-types
+        run: yarn upgrade @aws-cdk/aws-service-spec @aws-cdk/service-spec-importers @aws-cdk/service-spec-types
 
       # Build @aws-cdk/spec2cdk and run L1 gen script to generate base files for new modules
       - name: Build @aws-cdk/spec2cdk

CONTRIBUTING.md

@@ -28,7 +28,6 @@ let us know if it's not up-to-date (even better, submit a PR with your  correcti
   - [Rosetta](#rosetta)
 - [Tools](#tools-advanced)
   - [Linters](#linters)
-  - [cfn2ts](#cfn2ts)
   - [scripts/foreach.sh](#scriptsforeachsh)
   - [Jetbrains support (WebStorm/IntelliJ)](#jetbrains-support-webstormintellij)
   - [Linking against this repository](#linking-against-this-repository)
@@ -1055,22 +1054,6 @@ Here are a few useful commands:
    evaluate only the rule specified [awslint README](./packages/awslint/README.md)
    for details on include/exclude rule patterns.
 
-### cfn2ts
-
-This tool is used to generate our low-level CloudFormation resources
-(L1/`CfnFoo`). It is executed as part of the build step of all modules in the
-AWS Construct Library.
-
-The tool consults the `cdk-build.cloudformation` key in `package.json` to
-determine which CloudFormation namespace this library represents (e.g.
-`AWS::EC2` is the namespace for `aws-ec2`). We maintain strict 1:1 relationship
-between those.
-
-Each module also has an npm script called `cfn2ts`:
-
-* `yarn cfn2ts`: generates L1 for a specific module
-* `lerna run cfn2ts`: generates L1 for the entire repo
-
 ### Jetbrains support (WebStorm/IntelliJ)
 
 This project uses lerna and utilizes symlinks inside nested `node_modules` directories. You may encounter an issue during

README.md

@@ -22,7 +22,7 @@ infrastructure definition and share it without worrying about boilerplate logic.
 The CDK is available in the following languages:
 
 * JavaScript, TypeScript ([Node.js ≥ 14.15.0](https://nodejs.org/download/release/latest-v14.x/))
-  * We recommend using a version in [Active LTS](https://nodejs.org/en/about/releases/)
+  * We recommend using a version in [Active LTS](https://nodejs.org/en/about/previous-releases)
 * Python ([Python ≥ 3.6](https://www.python.org/downloads/))
 * Java ([Java ≥ 8](https://www.oracle.com/technetwork/java/javase/downloads/index.html) and [Maven ≥ 3.5.4](https://maven.apache.org/download.cgi))
 * .NET ([.NET ≥ 6.0](https://dotnet.microsoft.com/download))
@@ -79,7 +79,7 @@ For a detailed walkthrough, see the [tutorial](https://docs.aws.amazon.com/cdk/l
 
 ### At a glance
 
-Install or update the [AWS CDK CLI] from npm (requires [Node.js ≥ 14.15.0](https://nodejs.org/download/release/latest-v14.x/)). We recommend using a version in [Active LTS](https://nodejs.org/en/about/releases/)
+Install or update the [AWS CDK CLI] from npm (requires [Node.js ≥ 14.15.0](https://nodejs.org/download/release/latest-v14.x/)). We recommend using a version in [Active LTS](https://nodejs.org/en/about/previous-releases)
 
 ```sh
 npm i -g aws-cdk

aws-cdk.code-workspace

@@ -10,6 +10,10 @@
         "name": "cli-lib-alpha",
         "rootPath": "packages/@aws-cdk/cli-lib-alpha"
       },
+      {
+        "name": "cloudformation-diff",
+        "rootPath": "packages/@aws-cdk/cloudformation-diff"
+      },
       {
         "name": "custom-resource-handlers",
         "rootPath": "packages/@aws-cdk/custom-resource-handlers"

lerna.json

@@ -12,7 +12,6 @@
     "packages/@aws-cdk/*/lambda-packages/*",
     "tools/@aws-cdk/cdk-build-tools",
     "tools/@aws-cdk/cdk-release",
-    "tools/@aws-cdk/cfn2ts",
     "tools/@aws-cdk/eslint-plugin",
     "tools/@aws-cdk/node-bundle",
     "tools/@aws-cdk/pkglint",

package.json

@@ -80,7 +80,6 @@
       "packages/@aws-cdk/*/lambda-packages/*",
       "tools/@aws-cdk/cdk-build-tools",
       "tools/@aws-cdk/cdk-release",
-      "tools/@aws-cdk/cfn2ts",
       "tools/@aws-cdk/eslint-plugin",
       "tools/@aws-cdk/node-bundle",
       "tools/@aws-cdk/pkglint",