Merge branch 'master' into core-cfn-mapping

.gitallowed

@@ -23,6 +23,8 @@ account: '856666278305'
 account: '840364872350'
 account: '422531588944'
 account: '924023996002'
+account: '919366029133' #cn-north-1
+account: '919830735681' #cn-northwest-1
 
 # The account IDs of password rotation applications of Serverless Application Repository
 # https://docs.aws.amazon.com/secretsmanager/latest/userguide/enable-rotation-rds.html

.github/workflows/README.md

@@ -0,0 +1,47 @@
+# AWS CDK GitHub Actions
+
+These workflows and actions are configured in the AWS CDK GitHub repository.
+
+## Pull Request Triggered
+
+### Auto Approve
+[auto-approve.yml](auto-approve.yml): Approves merging PRs with the
+`pr/auto-approve` label.
+Owner: Core CDK team
+
+### PR Linter
+[pr-linter.yml](pr-linter.yml): Runs `tools/@aws-cdk-prlint` on each PR to
+check for correctness.
+Owner: Core CDK team
+
+### v2-main PR automation
+[v2-pull-request.yml](v2-pull-request.yml): Runs `pkglint` on merge forward PRs
+and commits the results.
+Owner: Core CDK team
+
+### Label Assigner
+[issue-label-assign.yml](issue-label-assign.yml): Github action for automatically adding labels and/or setting assignees when an Issue or PR is opened or edited based on user-defined Area
+Owner: CDK support team
+
+## Issue Triggered
+
+### Closed Issue Message
+[closed-issue-message.yml](closed-issue-message.yml): Adds a reminder message
+to issues that are closed.
+Owner: CDK support team
+
+### Label Assigner
+[issue-label-assign.yml](issue-label-assign.yml): Github action for automatically adding labels and/or setting assignees when an Issue or PR is opened or edited based on user-defined Area
+Owner: CDK support team
+
+## Scheduled Actions
+
+### Issue Lifecycle Handling
+[close-stale-issues.yml](close-stale-issues.yml): Handles labeling issues and
+PRs with `closing-soon`, `response-requested`, etc.
+Owner: CDK support team
+
+### Yarn Upgrader
+[yarn-upgrade.yml](yarn-upgrade.yml): Upgrades yarn dependencies and creates a
+patch file for downloading.
+Owner: Core CDK team

.github/workflows/auto-approve.yml

@@ -8,10 +8,10 @@ on:
 jobs:
   auto-approve:
     if: >
-       contains(github.event.pull_request.labels.*.name, 'pr/auto-approve') &&
-       (github.event.pull_request.user.login == 'aws-cdk-automation'
-        || github.event.pull_request.user.login == 'dependabot[bot]'
-        || github.event.pull_request.user.login == 'dependabot-preview[bot]')
+       github.event.pull_request.user.login == 'dependabot[bot]'
+        || github.event.pull_request.user.login == 'dependabot-preview[bot]'
+        || (contains(github.event.pull_request.labels.*.name, 'pr/auto-approve')
+            && github.event.pull_request.user.login == 'aws-cdk-automation')
     runs-on: ubuntu-latest
     permissions:
       pull-requests: write

.github/workflows/close-stale-issues.yml

@@ -4,7 +4,7 @@ name: "Close Stale Issues"
 on:
   workflow_dispatch:
   schedule:
-  - cron: "0 6 * * *"
+  - cron: "0 */4 * * *"
 
 jobs:
   cleanup:

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

@@ -11,6 +11,7 @@ jobs:
   test:
     permissions:
       issues: write
+      pull-requests: write
     runs-on: ubuntu-latest
     steps:
       - uses: peterwoodworth/issue-action@main

.gitignore

@@ -45,3 +45,4 @@ yarn-error.log
 .nzm-*
 
 /.versionrc.json
+RELEASE_NOTES.md

.mergify.yml

@@ -1,21 +1,24 @@
 # See https://doc.mergify.io
+queue_rules:
+  - name: default
+    conditions:
+      - status-success~=AWS CodeBuild us-east-1
 
 pull_request_rules:
   - name: label core
     actions:
       label:
         add: [ contribution/core ]
     conditions:
-      - author~=^(eladb|RomainMuller|garnaat|nija-at|skinny85|rix0rrr|NGL321|Jerry-AWS|MrArnoldPalmer|NetaNir|iliapolo|njlynch|ericzbeard|ccfife|fulghum|pkandasamy91|SoManyHs|uttarasridhar|otaviomacedo|BenChaimberg|madeline-k|BryanPan342|kaizen3031593|comcalvi)$
+      - author~=^(eladb|RomainMuller|garnaat|nija-at|skinny85|rix0rrr|NGL321|Jerry-AWS|MrArnoldPalmer|NetaNir|iliapolo|njlynch|ericzbeard|ccfife|fulghum|pkandasamy91|SoManyHs|uttarasridhar|otaviomacedo|BenChaimberg|madeline-k|BryanPan342|kaizen3031593|comcalvi|Chriscbr)$
       - -label~="contribution/core"
   - name: automatic merge
     actions:
       comment:
         message: Thank you for contributing! Your pull request will be updated from master and then merged automatically (do not update manually, and be sure to [allow changes to be pushed to your fork](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/allowing-changes-to-a-pull-request-branch-created-from-a-fork)).
-      merge:
-        strict: smart
+      queue:
+        name: default
         method: squash
-        strict_method: merge
         commit_message: title+body
     conditions:
       - base!=release

.yarnrc

@@ -1 +1,10 @@
 --install.check-files     true      # install will verify file tree of packages for consistency
+
+# Use the npm registry instead of yarns mirror.
+# npm treats registry.npmjs.org as a special value that means 'the current
+# configured package' in package-lock and npm-shrinkwrap.  if we use
+# registry.yarnpkg.com in our shrinkwrap then users with a custom registry will
+# be forced to registry.yarnpkg.com.
+# https://github.com/npm/cli/issues/3783
+registry "https://registry.npmjs.org"
+ignore-engines            true      # the 'engines' key for 'aws-cdk-lib' has specifies node14 as min while v1 will remain at node10

CHANGELOG.md

@@ -2,6 +2,40 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [1.128.0](https://github.com/aws/aws-cdk/compare/v1.127.0...v1.128.0) (2021-10-14)
+
+
+### ⚠ BREAKING CHANGES TO EXPERIMENTAL FEATURES
+
+* **assertions:** Starting this release, the `assertions` module will be
+published to Maven with the name 'assertions' instead of
+'cdk-assertions'.
+
+### Features
+
+* **apigatewayv2-integrations:** http api - support for request parameter mapping ([#15630](https://github.com/aws/aws-cdk/issues/15630)) ([0452aed](https://github.com/aws/aws-cdk/commit/0452aed2f00198e05bd65b1d20246f7de0b24e20))
+* **cli:** hotswap deployments for ECS Services ([#16864](https://github.com/aws/aws-cdk/issues/16864)) ([ad7288f](https://github.com/aws/aws-cdk/commit/ad7288f35a17fcfbecd7080e99ece4873fa99ad2))
+* **codepipeline:** add support for string user parameters to the Lambda invoke action ([#16946](https://github.com/aws/aws-cdk/issues/16946)) ([e19ea31](https://github.com/aws/aws-cdk/commit/e19ea31dbf62446edaf5131c75246098ab05da6e)), closes [#16776](https://github.com/aws/aws-cdk/issues/16776)
+* **lambda:** docker platform for architecture ([#16858](https://github.com/aws/aws-cdk/issues/16858)) ([5c258a3](https://github.com/aws/aws-cdk/commit/5c258a30367a4922e404eb26e5aa076720846fbe))
+* **lambda-event-sources:** self managed kafka: support sasl/plain authentication ([#16712](https://github.com/aws/aws-cdk/issues/16712)) ([d4ad93f](https://github.com/aws/aws-cdk/commit/d4ad93f30877b26b851caa81d3a4a1d80df55164))
+* **stepfunctions-tasks:** AWS SDK service integrations ([#16746](https://github.com/aws/aws-cdk/issues/16746)) ([ae840ff](https://github.com/aws/aws-cdk/commit/ae840ff1abb8283a1290dae5859f5729a9cf72b1)), closes [#16780](https://github.com/aws/aws-cdk/issues/16780)
+
+
+### Bug Fixes
+
+* **ecs:** add ASG capacity via Capacity Provider by not specifying machineImageType ([#16361](https://github.com/aws/aws-cdk/issues/16361)) ([93b3fdc](https://github.com/aws/aws-cdk/commit/93b3fdce80f0997d7b809f9ef7e3edd1e75e1f42)), closes [#16360](https://github.com/aws/aws-cdk/issues/16360)
+* **servicecatalog:** Allow users to create multiple product versions from assets.  ([#16914](https://github.com/aws/aws-cdk/issues/16914)) ([958d755](https://github.com/aws/aws-cdk/commit/958d755ff7acaf016e3f8969bf5ab07d4dc2977b))
+* **codebuild:** add build image AMAZON_LINUX_2_ARM_2 ([#16931](https://github.com/aws/aws-cdk/issues/16931)) ([370cb31](https://github.com/aws/aws-cdk/commit/370cb310cce3fccc5381d8d53130e21b266de868)), closes [#16930](https://github.com/aws/aws-cdk/issues/16930)
+* **core:** asset hash is different between linux and windows ([#16945](https://github.com/aws/aws-cdk/issues/16945)) ([59950dd](https://github.com/aws/aws-cdk/commit/59950dd331635fb707aac819529614c0f3e47ee5)), closes [#14555](https://github.com/aws/aws-cdk/issues/14555) [#16928](https://github.com/aws/aws-cdk/issues/16928)
+* **ecs-patterns:** minScalingCapacity cannot be set to 0 ([#16961](https://github.com/aws/aws-cdk/issues/16961)) ([589f284](https://github.com/aws/aws-cdk/commit/589f284acec8530aa9824b75a5daef4632e98985)), closes [#15632](https://github.com/aws/aws-cdk/issues/15632) [#14336](https://github.com/aws/aws-cdk/issues/14336)
+* **ssm:**  StringParameter accepts ParameterType.AWS_EC2_IMAGE_ID as type ([#16884](https://github.com/aws/aws-cdk/issues/16884)) ([2b353be](https://github.com/aws/aws-cdk/commit/2b353be5291cbcdc56a8863038eed4a5f2adc65f)), closes [#16806](https://github.com/aws/aws-cdk/issues/16806)
+* use registry.npmjs.com to fix shinkwrap resolves ([#16607](https://github.com/aws/aws-cdk/issues/16607)) ([8f91531](https://github.com/aws/aws-cdk/commit/8f91531c3c25900316d40d5564450566a03e27ee))
+
+
+### Miscellaneous Chores
+
+* **assertions:** consistent naming in maven ([#16921](https://github.com/aws/aws-cdk/issues/16921)) ([0dcd9ec](https://github.com/aws/aws-cdk/commit/0dcd9eca3a1014c39f92d9e052b67974fc751af0))
+
 ## [1.127.0](https://github.com/aws/aws-cdk/compare/v1.126.0...v1.127.0) (2021-10-08)
 
 

build.sh

@@ -93,4 +93,11 @@ if [ "$check_compat" == "true" ]; then
   /bin/bash scripts/check-api-compatibility.sh
 fi
 
+# Create the release notes for the current version. These are ephemeral and not saved in source.
+# Skip this step for a "bump candidate" build, where a new, fake version number has been created
+# without any corresponding changelog entries.
+if ! ${BUMP_CANDIDATE:-false}; then
+    node ./scripts/create-release-notes.js
+fi
+
 touch $BUILD_INDICATOR

package.json

@@ -20,10 +20,10 @@
     "fs-extra": "^9.1.0",
     "graceful-fs": "^4.2.8",
     "jest-junit": "^12.3.0",
-    "jsii-diff": "^1.38.0",
-    "jsii-pacmak": "^1.38.0",
-    "jsii-reflect": "^1.38.0",
-    "jsii-rosetta": "^1.38.0",
+    "jsii-diff": "^1.40.0",
+    "jsii-pacmak": "^1.40.0",
+    "jsii-reflect": "^1.40.0",
+    "jsii-rosetta": "^1.40.0",
     "lerna": "^4.0.0",
     "patch-package": "^6.4.7",
     "standard-version": "^9.3.1",

packages/@aws-cdk-containers/ecs-service-extensions/lib/extensions/appmesh.ts

@@ -138,6 +138,7 @@ export class AppMeshExtension extends ServiceExtension {
 
   public useTaskDefinition(taskDefinition: ecs.TaskDefinition) {
     var region = cdk.Stack.of(this.scope).region;
+    var partition = cdk.Stack.of(this.scope).partition;
     var appMeshRepo;
 
     // This is currently necessary because App Mesh has different images in each region,
@@ -151,6 +152,8 @@ export class AppMeshExtension extends ServiceExtension {
         'ap-southeast-1': this.accountIdForRegion('ap-southeast-1'),
         'ap-southeast-2': this.accountIdForRegion('ap-southeast-1'),
         'ca-central-1': this.accountIdForRegion('ca-central-1'),
+        'cn-north-1': this.accountIdForRegion('cn-north-1'),
+        'cn-northwest-1': this.accountIdForRegion('cn-northwest-1'),
         'eu-central-1': this.accountIdForRegion('eu-central-1'),
         'eu-north-1': this.accountIdForRegion('eu-north-1'),
         'eu-south-1': this.accountIdForRegion('eu-south-1'),
@@ -177,7 +180,7 @@ export class AppMeshExtension extends ServiceExtension {
       `${this.parentService.id}-envoy-repo`,
       {
         repositoryName: 'aws-appmesh-envoy',
-        repositoryArn: `arn:aws:ecr:${region}:${ownerAccount}:repository/aws-appmesh-envoy`,
+        repositoryArn: `arn:${partition}:ecr:${region}:${ownerAccount}:repository/aws-appmesh-envoy`,
       },
     );
 

packages/@aws-cdk-containers/ecs-service-extensions/test/integ.all-service-addons.expected.json

@@ -949,7 +949,11 @@
                 "Fn::Join": [
                   "",
                   [
-                    "arn:aws:ecr:",
+                    "arn:",
+                    {
+                      "Ref": "AWS::Partition"
+                    },
+                    ":ecr:",
                     {
                       "Ref": "AWS::Region"
                     },
@@ -1818,7 +1822,11 @@
                 "Fn::Join": [
                   "",
                   [
-                    "arn:aws:ecr:",
+                    "arn:",
+                    {
+                      "Ref": "AWS::Partition"
+                    },
+                    ":ecr:",
                     {
                       "Ref": "AWS::Region"
                     },
@@ -2806,7 +2814,11 @@
                 "Fn::Join": [
                   "",
                   [
-                    "arn:aws:ecr:",
+                    "arn:",
+                    {
+                      "Ref": "AWS::Partition"
+                    },
+                    ":ecr:",
                     {
                       "Ref": "AWS::Region"
                     },
@@ -3316,6 +3328,12 @@
       "ca-central-1": {
         "ecrRepo": "840364872350"
       },
+      "cn-north-1": {
+        "ecrRepo": "919366029133"
+      },
+      "cn-northwest-1": {
+        "ecrRepo": "919830735681"
+      },
       "eu-central-1": {
         "ecrRepo": "840364872350"
       },
@@ -3378,6 +3396,12 @@
       "ca-central-1": {
         "ecrRepo": "840364872350"
       },
+      "cn-north-1": {
+        "ecrRepo": "919366029133"
+      },
+      "cn-northwest-1": {
+        "ecrRepo": "919830735681"
+      },
       "eu-central-1": {
         "ecrRepo": "840364872350"
       },
@@ -3440,6 +3464,12 @@
       "ca-central-1": {
         "ecrRepo": "840364872350"
       },
+      "cn-north-1": {
+        "ecrRepo": "919366029133"
+      },
+      "cn-northwest-1": {
+        "ecrRepo": "919830735681"
+      },
       "eu-central-1": {
         "ecrRepo": "840364872350"
       },

packages/@aws-cdk-containers/ecs-service-extensions/test/integ.multiple-environments.expected.json

@@ -1304,7 +1304,11 @@
                 "Fn::Join": [
                   "",
                   [
-                    "arn:aws:ecr:",
+                    "arn:",
+                    {
+                      "Ref": "AWS::Partition"
+                    },
+                    ":ecr:",
                     {
                       "Ref": "AWS::Region"
                     },
@@ -1828,7 +1832,11 @@
                 "Fn::Join": [
                   "",
                   [
-                    "arn:aws:ecr:",
+                    "arn:",
+                    {
+                      "Ref": "AWS::Partition"
+                    },
+                    ":ecr:",
                     {
                       "Ref": "AWS::Region"
                     },
@@ -2135,6 +2143,12 @@
       "ca-central-1": {
         "ecrRepo": "840364872350"
       },
+      "cn-north-1": {
+        "ecrRepo": "919366029133"
+      },
+      "cn-northwest-1": {
+        "ecrRepo": "919830735681"
+      },
       "eu-central-1": {
         "ecrRepo": "840364872350"
       },
@@ -2197,6 +2211,12 @@
       "ca-central-1": {
         "ecrRepo": "840364872350"
       },
+      "cn-north-1": {
+        "ecrRepo": "919366029133"
+      },
+      "cn-northwest-1": {
+        "ecrRepo": "919830735681"
+      },
       "eu-central-1": {
         "ecrRepo": "840364872350"
       },

packages/@aws-cdk/app-delivery/package.json

@@ -66,7 +66,7 @@
     "@aws-cdk/cdk-integ-tools": "0.0.0",
     "@aws-cdk/pkglint": "0.0.0",
     "@types/jest": "^26.0.24",
-    "fast-check": "^2.17.0",
+    "fast-check": "^2.18.0",
     "jest": "^26.6.3"
   },
   "repository": {

packages/@aws-cdk/assertions/package.json

@@ -29,7 +29,7 @@
         "package": "software.amazon.awscdk.assertions",
         "maven": {
           "groupId": "software.amazon.awscdk",
-          "artifactId": "cdk-assertions"
+          "artifactId": "assertions"
         }
       },
       "dotnet": {
@@ -55,11 +55,6 @@
       }
     }
   },
-  "cdk-build": {
-    "post": [
-      "yarn rosetta:extract"
-    ]
-  },
   "author": {
     "name": "Amazon Web Services",
     "url": "https://aws.amazon.com",

packages/@aws-cdk/aws-apigatewayv2-authorizers/package.json

@@ -78,7 +78,7 @@
     "@aws-cdk/cdk-build-tools": "0.0.0",
     "@aws-cdk/cdk-integ-tools": "0.0.0",
     "@aws-cdk/pkglint": "0.0.0",
-    "@types/aws-lambda": "^8.10.83",
+    "@types/aws-lambda": "^8.10.84",
     "@types/jest": "^26.0.24"
   },
   "dependencies": {