From f7cfcee89997775192c15836e40445143133a66c Mon Sep 17 00:00:00 2001
From: sullis <github@seansullivan.com>
Date: Mon, 12 Oct 2020 01:50:51 -0700
Subject: [PATCH 1/8] chore(init/java): use latest exec-maven-plugin (#9219)

Changelog: https://github.com/mojohaus/exec-maven-plugin/releases/tag/exec-maven-plugin-3.0.0

----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
---
 packages/aws-cdk/lib/init-templates/app/java/pom.template.xml   | 2 +-
 .../aws-cdk/lib/init-templates/sample-app/java/pom.template.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/aws-cdk/lib/init-templates/app/java/pom.template.xml b/packages/aws-cdk/lib/init-templates/app/java/pom.template.xml
index 18a08d803562f..dcce5ea68a5ef 100644
--- a/packages/aws-cdk/lib/init-templates/app/java/pom.template.xml
+++ b/packages/aws-cdk/lib/init-templates/app/java/pom.template.xml
@@ -27,7 +27,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
-                <version>1.6.0</version>
+                <version>3.0.0</version>
                 <configuration>
                     <mainClass>com.myorg.%name.PascalCased%App</mainClass>
                 </configuration>
diff --git a/packages/aws-cdk/lib/init-templates/sample-app/java/pom.template.xml b/packages/aws-cdk/lib/init-templates/sample-app/java/pom.template.xml
index 7159e270096a4..98af8eb52d2ff 100644
--- a/packages/aws-cdk/lib/init-templates/sample-app/java/pom.template.xml
+++ b/packages/aws-cdk/lib/init-templates/sample-app/java/pom.template.xml
@@ -23,7 +23,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
-                <version>1.6.0</version>
+                <version>3.0.0</version>
                 <configuration>
                     <mainClass>com.myorg.%name.PascalCased%App</mainClass>
                 </configuration>

From 733d72dd9b5d5e2655fae6118290fc9d774f7525 Mon Sep 17 00:00:00 2001
From: John Crnjanin <john.crn@live.com>
Date: Mon, 12 Oct 2020 19:27:31 +1000
Subject: [PATCH 2/8] chore(dynamodb): fix nonKeyAttributes limit test
 description (#8096)

Relates to #8186, #8095

----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
---
 packages/@aws-cdk/aws-dynamodb/test/dynamodb.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@aws-cdk/aws-dynamodb/test/dynamodb.test.ts b/packages/@aws-cdk/aws-dynamodb/test/dynamodb.test.ts
index 990e9bcd42094..01fa03d83d1bd 100644
--- a/packages/@aws-cdk/aws-dynamodb/test/dynamodb.test.ts
+++ b/packages/@aws-cdk/aws-dynamodb/test/dynamodb.test.ts
@@ -1112,7 +1112,7 @@ test('error when adding a global secondary index with projection type KEYS_ONLY,
   })).toThrow(/non-key attributes should not be specified when not using INCLUDE projection type/);
 });
 
-test('error when adding a global secondary index with projection type INCLUDE, but with more than 20 non-key attributes', () => {
+test('error when adding a global secondary index with projection type INCLUDE, but with more than 100 non-key attributes', () => {
   const stack = new Stack();
   const table = new Table(stack, CONSTRUCT_NAME, { partitionKey: TABLE_PARTITION_KEY, sortKey: TABLE_SORT_KEY });
   const gsiNonKeyAttributeGenerator = NON_KEY_ATTRIBUTE_GENERATOR(GSI_NON_KEY);

From 3327b7faafbed98b2a8da2caf769206f5c004d56 Mon Sep 17 00:00:00 2001
From: Nick Lynch <nlynch@amazon.com>
Date: Mon, 12 Oct 2020 10:57:48 +0100
Subject: [PATCH 3/8] fix(cloudfront): compression disabled by default for
 Distribution (#10794)

Flip the default setting for compression from 'false' to 'true', as the
recommended setting.

Also updated the README to make it easier to understand Behaviors more up-front.

BREAKING CHANGE: `Distribution` behaviors now enable compression by default

----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
---
 .../test/integ.http-origin.expected.json                 | 1 +
 .../test/integ.load-balancer-origin.expected.json        | 1 +
 .../test/integ.origin-group.expected.json                | 2 ++
 .../test/integ.s3-origin-oai.expected.json               | 1 +
 .../test/integ.s3-origin.expected.json                   | 1 +
 packages/@aws-cdk/aws-cloudfront/README.md               | 9 ++++++---
 packages/@aws-cdk/aws-cloudfront/lib/distribution.ts     | 2 +-
 .../aws-cloudfront/lib/private/cache-behavior.ts         | 2 +-
 .../@aws-cdk/aws-cloudfront/test/distribution.test.ts    | 9 +++++++++
 .../test/integ.distribution-basic.expected.json          | 1 +
 .../test/integ.distribution-extensive.expected.json      | 3 ++-
 .../test/integ.distribution-lambda.expected.json         | 3 ++-
 .../test/integ.distribution-policies.expected.json       | 1 +
 .../aws-cloudfront/test/private/cache-behavior.test.ts   | 1 +
 14 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/packages/@aws-cdk/aws-cloudfront-origins/test/integ.http-origin.expected.json b/packages/@aws-cdk/aws-cloudfront-origins/test/integ.http-origin.expected.json
index 1b53322bce185..bf1cb5354e5d3 100644
--- a/packages/@aws-cdk/aws-cloudfront-origins/test/integ.http-origin.expected.json
+++ b/packages/@aws-cdk/aws-cloudfront-origins/test/integ.http-origin.expected.json
@@ -6,6 +6,7 @@
         "DistributionConfig": {
           "DefaultCacheBehavior": {
             "CachePolicyId": "658327ea-f89d-4fab-a63d-7e88639e58f6",
+            "Compress": true,
             "TargetOriginId": "cloudfronthttporiginDistributionOrigin162B02709",
             "ViewerProtocolPolicy": "allow-all"
           },
diff --git a/packages/@aws-cdk/aws-cloudfront-origins/test/integ.load-balancer-origin.expected.json b/packages/@aws-cdk/aws-cloudfront-origins/test/integ.load-balancer-origin.expected.json
index 0a4f25d7164f8..3e2d0d1a33572 100644
--- a/packages/@aws-cdk/aws-cloudfront-origins/test/integ.load-balancer-origin.expected.json
+++ b/packages/@aws-cdk/aws-cloudfront-origins/test/integ.load-balancer-origin.expected.json
@@ -412,6 +412,7 @@
         "DistributionConfig": {
           "DefaultCacheBehavior": {
             "CachePolicyId": "658327ea-f89d-4fab-a63d-7e88639e58f6",
+            "Compress": true,
             "TargetOriginId": "cloudfrontloadbalanceroriginDistributionOrigin1BCC75186",
             "ViewerProtocolPolicy": "allow-all"
           },
diff --git a/packages/@aws-cdk/aws-cloudfront-origins/test/integ.origin-group.expected.json b/packages/@aws-cdk/aws-cloudfront-origins/test/integ.origin-group.expected.json
index c4dfa53520caa..c65231c502f19 100644
--- a/packages/@aws-cdk/aws-cloudfront-origins/test/integ.origin-group.expected.json
+++ b/packages/@aws-cdk/aws-cloudfront-origins/test/integ.origin-group.expected.json
@@ -71,6 +71,7 @@
           "CacheBehaviors": [
             {
               "CachePolicyId": "658327ea-f89d-4fab-a63d-7e88639e58f6",
+              "Compress": true,
               "PathPattern": "/api",
               "TargetOriginId": "cloudfrontorigingroupDistributionOriginGroup10B57F1D1",
               "ViewerProtocolPolicy": "allow-all"
@@ -78,6 +79,7 @@
           ],
           "DefaultCacheBehavior": {
             "CachePolicyId": "658327ea-f89d-4fab-a63d-7e88639e58f6",
+            "Compress": true,
             "TargetOriginId": "cloudfrontorigingroupDistributionOriginGroup10B57F1D1",
             "ViewerProtocolPolicy": "allow-all"
           },
diff --git a/packages/@aws-cdk/aws-cloudfront-origins/test/integ.s3-origin-oai.expected.json b/packages/@aws-cdk/aws-cloudfront-origins/test/integ.s3-origin-oai.expected.json
index 7683122c7870a..3d17b0944873e 100644
--- a/packages/@aws-cdk/aws-cloudfront-origins/test/integ.s3-origin-oai.expected.json
+++ b/packages/@aws-cdk/aws-cloudfront-origins/test/integ.s3-origin-oai.expected.json
@@ -19,6 +19,7 @@
         "DistributionConfig": {
           "DefaultCacheBehavior": {
             "CachePolicyId": "658327ea-f89d-4fab-a63d-7e88639e58f6",
+            "Compress": true,
             "TargetOriginId": "cloudfronts3originoaiDistributionOrigin1516C5A91",
             "ViewerProtocolPolicy": "allow-all"
           },
diff --git a/packages/@aws-cdk/aws-cloudfront-origins/test/integ.s3-origin.expected.json b/packages/@aws-cdk/aws-cloudfront-origins/test/integ.s3-origin.expected.json
index d7451363a0101..5eb310b5b92d7 100644
--- a/packages/@aws-cdk/aws-cloudfront-origins/test/integ.s3-origin.expected.json
+++ b/packages/@aws-cdk/aws-cloudfront-origins/test/integ.s3-origin.expected.json
@@ -70,6 +70,7 @@
         "DistributionConfig": {
           "DefaultCacheBehavior": {
             "CachePolicyId": "658327ea-f89d-4fab-a63d-7e88639e58f6",
+            "Compress": true,
             "TargetOriginId": "cloudfronts3originDistributionOrigin1741C4E95",
             "ViewerProtocolPolicy": "allow-all"
           },
diff --git a/packages/@aws-cdk/aws-cloudfront/README.md b/packages/@aws-cdk/aws-cloudfront/README.md
index b973e44da5aa3..65c8c13010aab 100644
--- a/packages/@aws-cdk/aws-cloudfront/README.md
+++ b/packages/@aws-cdk/aws-cloudfront/README.md
@@ -35,9 +35,12 @@ for more complex use cases.
 ### Creating a distribution
 
 CloudFront distributions deliver your content from one or more origins; an origin is the location where you store the original version of your
-content. Origins can be created from S3 buckets or a custom origin (HTTP server). Each distribution has a default behavior which applies to all
-requests to that distribution, and routes requests to a primary origin. Constructs to define origins are in the `@aws-cdk/aws-cloudfront-origins`
-module.
+content. Origins can be created from S3 buckets or a custom origin (HTTP server). Constructs to define origins are in the `@aws-cdk/aws-cloudfront-origins` module.
+
+Each distribution has a default behavior which applies to all requests to that distribution, and routes requests to a primary origin.
+Additional behaviors may be specified for an origin with a given URL path pattern. Behaviors allow routing with multiple origins,
+controlling which HTTP methods to support, whether to require users to use HTTPS, and what query strings or cookies to forward to your origin,
+among other settings.
 
 #### From an S3 Bucket
 
diff --git a/packages/@aws-cdk/aws-cloudfront/lib/distribution.ts b/packages/@aws-cdk/aws-cloudfront/lib/distribution.ts
index 3cbf713f5cf6d..5d1d7cb720b94 100644
--- a/packages/@aws-cdk/aws-cloudfront/lib/distribution.ts
+++ b/packages/@aws-cdk/aws-cloudfront/lib/distribution.ts
@@ -673,7 +673,7 @@ export interface AddBehaviorOptions {
    * See https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/ServingCompressedFiles.html#compressed-content-cloudfront-file-types
    * for file types CloudFront will compress.
    *
-   * @default false
+   * @default true
    */
   readonly compress?: boolean;
 
diff --git a/packages/@aws-cdk/aws-cloudfront/lib/private/cache-behavior.ts b/packages/@aws-cdk/aws-cloudfront/lib/private/cache-behavior.ts
index a165d5e7219bd..4b700e166cecc 100644
--- a/packages/@aws-cdk/aws-cloudfront/lib/private/cache-behavior.ts
+++ b/packages/@aws-cdk/aws-cloudfront/lib/private/cache-behavior.ts
@@ -46,7 +46,7 @@ export class CacheBehavior {
       allowedMethods: this.props.allowedMethods?.methods,
       cachedMethods: this.props.cachedMethods?.methods,
       cachePolicyId: (this.props.cachePolicy ?? CachePolicy.CACHING_OPTIMIZED).cachePolicyId,
-      compress: this.props.compress,
+      compress: this.props.compress ?? true,
       originRequestPolicyId: this.props.originRequestPolicy?.originRequestPolicyId,
       smoothStreaming: this.props.smoothStreaming,
       viewerProtocolPolicy: this.props.viewerProtocolPolicy ?? ViewerProtocolPolicy.ALLOW_ALL,
diff --git a/packages/@aws-cdk/aws-cloudfront/test/distribution.test.ts b/packages/@aws-cdk/aws-cloudfront/test/distribution.test.ts
index 49a3cd4adb5b5..bbe6b34ebae3a 100644
--- a/packages/@aws-cdk/aws-cloudfront/test/distribution.test.ts
+++ b/packages/@aws-cdk/aws-cloudfront/test/distribution.test.ts
@@ -25,6 +25,7 @@ test('minimal example renders correctly', () => {
     DistributionConfig: {
       DefaultCacheBehavior: {
         CachePolicyId: '658327ea-f89d-4fab-a63d-7e88639e58f6',
+        Compress: true,
         TargetOriginId: 'StackMyDistOrigin1D6D5E535',
         ViewerProtocolPolicy: 'allow-all',
       },
@@ -68,6 +69,7 @@ test('exhaustive example of props renders correctly', () => {
       Aliases: ['example.com'],
       DefaultCacheBehavior: {
         CachePolicyId: '658327ea-f89d-4fab-a63d-7e88639e58f6',
+        Compress: true,
         TargetOriginId: 'StackMyDistOrigin1D6D5E535',
         ViewerProtocolPolicy: 'allow-all',
       },
@@ -133,11 +135,13 @@ describe('multiple behaviors', () => {
       DistributionConfig: {
         DefaultCacheBehavior: {
           CachePolicyId: '658327ea-f89d-4fab-a63d-7e88639e58f6',
+          Compress: true,
           TargetOriginId: 'StackMyDistOrigin1D6D5E535',
           ViewerProtocolPolicy: 'allow-all',
         },
         CacheBehaviors: [{
           CachePolicyId: '658327ea-f89d-4fab-a63d-7e88639e58f6',
+          Compress: true,
           PathPattern: 'api/*',
           TargetOriginId: 'StackMyDistOrigin1D6D5E535',
           ViewerProtocolPolicy: 'allow-all',
@@ -170,11 +174,13 @@ describe('multiple behaviors', () => {
       DistributionConfig: {
         DefaultCacheBehavior: {
           CachePolicyId: '658327ea-f89d-4fab-a63d-7e88639e58f6',
+          Compress: true,
           TargetOriginId: 'StackMyDistOrigin1D6D5E535',
           ViewerProtocolPolicy: 'allow-all',
         },
         CacheBehaviors: [{
           CachePolicyId: '658327ea-f89d-4fab-a63d-7e88639e58f6',
+          Compress: true,
           PathPattern: 'api/*',
           TargetOriginId: 'StackMyDistOrigin20B96F3AD',
           ViewerProtocolPolicy: 'allow-all',
@@ -215,17 +221,20 @@ describe('multiple behaviors', () => {
       DistributionConfig: {
         DefaultCacheBehavior: {
           CachePolicyId: '658327ea-f89d-4fab-a63d-7e88639e58f6',
+          Compress: true,
           TargetOriginId: 'StackMyDistOrigin1D6D5E535',
           ViewerProtocolPolicy: 'allow-all',
         },
         CacheBehaviors: [{
           CachePolicyId: '658327ea-f89d-4fab-a63d-7e88639e58f6',
+          Compress: true,
           PathPattern: 'api/1*',
           TargetOriginId: 'StackMyDistOrigin20B96F3AD',
           ViewerProtocolPolicy: 'allow-all',
         },
         {
           CachePolicyId: '658327ea-f89d-4fab-a63d-7e88639e58f6',
+          Compress: true,
           PathPattern: 'api/2*',
           TargetOriginId: 'StackMyDistOrigin1D6D5E535',
           ViewerProtocolPolicy: 'allow-all',
diff --git a/packages/@aws-cdk/aws-cloudfront/test/integ.distribution-basic.expected.json b/packages/@aws-cdk/aws-cloudfront/test/integ.distribution-basic.expected.json
index 9103815e60fd2..504433198d635 100644
--- a/packages/@aws-cdk/aws-cloudfront/test/integ.distribution-basic.expected.json
+++ b/packages/@aws-cdk/aws-cloudfront/test/integ.distribution-basic.expected.json
@@ -6,6 +6,7 @@
         "DistributionConfig": {
           "DefaultCacheBehavior": {
             "CachePolicyId": "658327ea-f89d-4fab-a63d-7e88639e58f6",
+            "Compress": true,
             "TargetOriginId": "integdistributionbasicDistOrigin151B53FF1",
             "ViewerProtocolPolicy": "allow-all"
           },
diff --git a/packages/@aws-cdk/aws-cloudfront/test/integ.distribution-extensive.expected.json b/packages/@aws-cdk/aws-cloudfront/test/integ.distribution-extensive.expected.json
index 5ad5427cdd5fd..9ec492a9c730a 100644
--- a/packages/@aws-cdk/aws-cloudfront/test/integ.distribution-extensive.expected.json
+++ b/packages/@aws-cdk/aws-cloudfront/test/integ.distribution-extensive.expected.json
@@ -12,6 +12,7 @@
           "Comment": "a test",
           "DefaultCacheBehavior": {
             "CachePolicyId": "658327ea-f89d-4fab-a63d-7e88639e58f6",
+            "Compress": true,
             "TargetOriginId": "integdistributionextensiveMyDistOrigin185F089B3",
             "ViewerProtocolPolicy": "allow-all"
           },
@@ -52,4 +53,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/packages/@aws-cdk/aws-cloudfront/test/integ.distribution-lambda.expected.json b/packages/@aws-cdk/aws-cloudfront/test/integ.distribution-lambda.expected.json
index dc186fbacab3e..fde47299f760e 100644
--- a/packages/@aws-cdk/aws-cloudfront/test/integ.distribution-lambda.expected.json
+++ b/packages/@aws-cdk/aws-cloudfront/test/integ.distribution-lambda.expected.json
@@ -71,6 +71,7 @@
         "DistributionConfig": {
           "DefaultCacheBehavior": {
             "CachePolicyId": "4135ea2d-6df8-44a3-9df3-4b5a84be39ad",
+            "Compress": true,
             "LambdaFunctionAssociations": [
               {
                 "EventType": "origin-request",
@@ -98,4 +99,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/packages/@aws-cdk/aws-cloudfront/test/integ.distribution-policies.expected.json b/packages/@aws-cdk/aws-cloudfront/test/integ.distribution-policies.expected.json
index e65e4fd8a0c36..a3fcd0084202a 100644
--- a/packages/@aws-cdk/aws-cloudfront/test/integ.distribution-policies.expected.json
+++ b/packages/@aws-cdk/aws-cloudfront/test/integ.distribution-policies.expected.json
@@ -51,6 +51,7 @@
             "CachePolicyId": {
               "Ref": "CachePolicy26D8A535"
             },
+            "Compress": true,
             "OriginRequestPolicyId": {
               "Ref": "OriginRequestPolicy3EFDB4FA"
             },
diff --git a/packages/@aws-cdk/aws-cloudfront/test/private/cache-behavior.test.ts b/packages/@aws-cdk/aws-cloudfront/test/private/cache-behavior.test.ts
index 4b201addd7e37..a1e315fdcdd96 100644
--- a/packages/@aws-cdk/aws-cloudfront/test/private/cache-behavior.test.ts
+++ b/packages/@aws-cdk/aws-cloudfront/test/private/cache-behavior.test.ts
@@ -22,6 +22,7 @@ test('renders the minimum template with an origin and path specified', () => {
   expect(behavior._renderBehavior()).toEqual({
     targetOriginId: 'origin_id',
     cachePolicyId: '658327ea-f89d-4fab-a63d-7e88639e58f6',
+    compress: true,
     pathPattern: '*',
     viewerProtocolPolicy: 'allow-all',
   });

From 46df4a7c51843542bc79d2c1b3f211548ac39ab5 Mon Sep 17 00:00:00 2001
From: Niranjan Jayakar <nija@amazon.com>
Date: Mon, 12 Oct 2020 11:54:12 +0100
Subject: [PATCH 4/8] feat(apigateway): autodetermine the private integration
 uri (#10730)

When VPC Link is configured as a private integration on a Method, the
'uri' field is required. Without this the CloudFormation deployment
fails with the error - 'Invalid integration URI specified'.

Instead of switching this to just a synth time error, use the NLB DNS
name when available.

closes #10435


----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
---
 packages/@aws-cdk/aws-apigateway/README.md    |   5 +
 .../aws-apigateway/lib/integration.ts         |  33 ++++-
 .../@aws-cdk/aws-apigateway/lib/vpc-link.ts   |  16 +-
 .../aws-apigateway/test/test.integration.ts   | 140 ++++++++++++++++++
 4 files changed, 186 insertions(+), 8 deletions(-)

diff --git a/packages/@aws-cdk/aws-apigateway/README.md b/packages/@aws-cdk/aws-apigateway/README.md
index 9c40aa83ae322..5b55d55f4c38a 100644
--- a/packages/@aws-cdk/aws-apigateway/README.md
+++ b/packages/@aws-cdk/aws-apigateway/README.md
@@ -941,6 +941,11 @@ const integration = new apigw.Integration({
 });
 ```
 
+The uri for the private integration, in the case of a VpcLink, will be set to the DNS name of
+the VPC Link's NLB. If the VPC Link has multiple NLBs or the VPC Link is imported or the DNS
+name cannot be determined for any other reason, the user is expected to specify the `uri`
+property.
+
 Any existing `VpcLink` resource can be imported into the CDK app via the `VpcLink.fromVpcLinkId()`.
 
 ```ts
diff --git a/packages/@aws-cdk/aws-apigateway/lib/integration.ts b/packages/@aws-cdk/aws-apigateway/lib/integration.ts
index 5b6a3040cb946..9d08a02b57bc2 100644
--- a/packages/@aws-cdk/aws-apigateway/lib/integration.ts
+++ b/packages/@aws-cdk/aws-apigateway/lib/integration.ts
@@ -1,6 +1,7 @@
 import * as iam from '@aws-cdk/aws-iam';
+import { Lazy } from '@aws-cdk/core';
 import { Method } from './method';
-import { IVpcLink } from './vpc-link';
+import { IVpcLink, VpcLink } from './vpc-link';
 
 export interface IntegrationOptions {
   /**
@@ -90,7 +91,7 @@ export interface IntegrationOptions {
 
   /**
    * The type of network connection to the integration endpoint.
-   * @default ConnectionType.Internet
+   * @default - ConnectionType.VPC_LINK if `vpcLink` property is configured; ConnectionType.Internet otherwise.
    */
   readonly connectionType?: ConnectionType;
 
@@ -199,10 +200,34 @@ export class Integration {
    * being integrated, access the REST API object, method ARNs, etc.
    */
   public bind(_method: Method): IntegrationConfig {
+    let uri = this.props.uri;
+    const options = this.props.options;
+
+    if (options?.connectionType === ConnectionType.VPC_LINK && uri === undefined) {
+      uri = Lazy.stringValue({
+        // needs to be a lazy since the targets can be added to the VpcLink construct after initialization.
+        produce: () => {
+          const vpcLink = options.vpcLink;
+          if (vpcLink instanceof VpcLink) {
+            const targets = vpcLink._targetDnsNames;
+            if (targets.length > 1) {
+              throw new Error("'uri' is required when there are more than one NLBs in the VPC Link");
+            } else {
+              return `http://${targets[0]}`;
+            }
+          } else {
+            throw new Error("'uri' is required when the 'connectionType' is VPC_LINK");
+          }
+        },
+      });
+    }
     return {
-      options: this.props.options,
+      options: {
+        ...options,
+        connectionType: options?.vpcLink ? ConnectionType.VPC_LINK : options?.connectionType,
+      },
       type: this.props.type,
-      uri: this.props.uri,
+      uri,
       integrationHttpMethod: this.props.integrationHttpMethod,
     };
   }
diff --git a/packages/@aws-cdk/aws-apigateway/lib/vpc-link.ts b/packages/@aws-cdk/aws-apigateway/lib/vpc-link.ts
index 85bdf63d0022c..700d22c137cc1 100644
--- a/packages/@aws-cdk/aws-apigateway/lib/vpc-link.ts
+++ b/packages/@aws-cdk/aws-apigateway/lib/vpc-link.ts
@@ -61,7 +61,7 @@ export class VpcLink extends Resource implements IVpcLink {
    */
   public readonly vpcLinkId: string;
 
-  private readonly targets = new Array<elbv2.INetworkLoadBalancer>();
+  private readonly _targets = new Array<elbv2.INetworkLoadBalancer>();
 
   constructor(scope: Construct, id: string, props: VpcLinkProps = {}) {
     super(scope, id, {
@@ -83,17 +83,25 @@ export class VpcLink extends Resource implements IVpcLink {
   }
 
   public addTargets(...targets: elbv2.INetworkLoadBalancer[]) {
-    this.targets.push(...targets);
+    this._targets.push(...targets);
+  }
+
+  /**
+   * Return the list of DNS names from the target NLBs.
+   * @internal
+   * */
+  public get _targetDnsNames(): string[] {
+    return this._targets.map(t => t.loadBalancerDnsName);
   }
 
   protected validate(): string[] {
-    if (this.targets.length === 0) {
+    if (this._targets.length === 0) {
       return ['No targets added to vpc link'];
     }
     return [];
   }
 
   private renderTargets() {
-    return this.targets.map(nlb => nlb.loadBalancerArn);
+    return this._targets.map(nlb => nlb.loadBalancerArn);
   }
 }
diff --git a/packages/@aws-cdk/aws-apigateway/test/test.integration.ts b/packages/@aws-cdk/aws-apigateway/test/test.integration.ts
index 40047b53df745..e946ded961b29 100644
--- a/packages/@aws-cdk/aws-apigateway/test/test.integration.ts
+++ b/packages/@aws-cdk/aws-apigateway/test/test.integration.ts
@@ -1,3 +1,4 @@
+import { ABSENT, expect, haveResourceLike } from '@aws-cdk/assert';
 import * as ec2 from '@aws-cdk/aws-ec2';
 import * as elbv2 from '@aws-cdk/aws-elasticloadbalancingv2';
 import * as iam from '@aws-cdk/aws-iam';
@@ -33,6 +34,89 @@ export = {
     test.done();
   },
 
+  'uri is self determined from the NLB'(test: Test) {
+    const stack = new cdk.Stack();
+    const vpc = new ec2.Vpc(stack, 'VPC');
+    const nlb = new elbv2.NetworkLoadBalancer(stack, 'NLB', { vpc });
+    const link = new apigw.VpcLink(stack, 'link', {
+      targets: [nlb],
+    });
+    const api = new apigw.RestApi(stack, 'restapi');
+    const integration = new apigw.Integration({
+      type: apigw.IntegrationType.HTTP_PROXY,
+      integrationHttpMethod: 'ANY',
+      options: {
+        connectionType: apigw.ConnectionType.VPC_LINK,
+        vpcLink: link,
+      },
+    });
+    api.root.addMethod('GET', integration);
+
+    expect(stack).to(haveResourceLike('AWS::ApiGateway::Method', {
+      Integration: {
+        Uri: {
+          'Fn::Join': [
+            '',
+            [
+              'http://',
+              {
+                'Fn::GetAtt': [
+                  'NLB55158F82',
+                  'DNSName',
+                ],
+              },
+            ],
+          ],
+        },
+      },
+    }));
+
+    test.done();
+  },
+
+  'uri must be set for VpcLink with multiple NLBs'(test: Test) {
+    const app = new cdk.App();
+    const stack = new cdk.Stack(app);
+    const vpc = new ec2.Vpc(stack, 'VPC');
+    const nlb1 = new elbv2.NetworkLoadBalancer(stack, 'NLB1', { vpc });
+    const nlb2 = new elbv2.NetworkLoadBalancer(stack, 'NLB2', { vpc });
+    const link = new apigw.VpcLink(stack, 'link', {
+      targets: [nlb1, nlb2],
+    });
+    const api = new apigw.RestApi(stack, 'restapi');
+    const integration = new apigw.Integration({
+      type: apigw.IntegrationType.HTTP_PROXY,
+      integrationHttpMethod: 'ANY',
+      options: {
+        connectionType: apigw.ConnectionType.VPC_LINK,
+        vpcLink: link,
+      },
+    });
+    api.root.addMethod('GET', integration);
+    test.throws(() => app.synth(), /'uri' is required when there are more than one NLBs in the VPC Link/);
+
+    test.done();
+  },
+
+  'uri must be set when using an imported VpcLink'(test: Test) {
+    const app = new cdk.App();
+    const stack = new cdk.Stack(app);
+    const link = apigw.VpcLink.fromVpcLinkId(stack, 'link', 'vpclinkid');
+    const api = new apigw.RestApi(stack, 'restapi');
+    const integration = new apigw.Integration({
+      type: apigw.IntegrationType.HTTP_PROXY,
+      integrationHttpMethod: 'ANY',
+      options: {
+        connectionType: apigw.ConnectionType.VPC_LINK,
+        vpcLink: link,
+      },
+    });
+    api.root.addMethod('GET', integration);
+    test.throws(() => app.synth(), /'uri' is required when the 'connectionType' is VPC_LINK/);
+
+    test.done();
+  },
+
   'connectionType of INTERNET and vpcLink are mutually exclusive'(test: Test) {
     // GIVEN
     const stack = new cdk.Stack();
@@ -55,4 +139,60 @@ export = {
     }), /cannot set 'vpcLink' where 'connectionType' is INTERNET/);
     test.done();
   },
+
+  'connectionType is ABSENT when vpcLink is not specified'(test: Test) {
+    // GIVEN
+    const stack = new cdk.Stack();
+    const api = new apigw.RestApi(stack, 'restapi');
+
+    // WHEN
+    const integration = new apigw.Integration({
+      type: apigw.IntegrationType.HTTP_PROXY,
+      integrationHttpMethod: 'ANY',
+    });
+    api.root.addMethod('ANY', integration);
+
+    // THEN
+    expect(stack).to(haveResourceLike('AWS::ApiGateway::Method', {
+      HttpMethod: 'ANY',
+      Integration: {
+        ConnectionType: ABSENT,
+      },
+    }));
+
+    test.done();
+  },
+
+  'connectionType defaults to VPC_LINK if vpcLink is configured'(test: Test) {
+    // GIVEN
+    const stack = new cdk.Stack();
+    const vpc = new ec2.Vpc(stack, 'VPC');
+    const nlb = new elbv2.NetworkLoadBalancer(stack, 'NLB', {
+      vpc,
+    });
+    const link = new apigw.VpcLink(stack, 'link', {
+      targets: [nlb],
+    });
+    const api = new apigw.RestApi(stack, 'restapi');
+
+    // WHEN
+    const integration = new apigw.Integration({
+      type: apigw.IntegrationType.HTTP_PROXY,
+      integrationHttpMethod: 'ANY',
+      options: {
+        vpcLink: link,
+      },
+    });
+    api.root.addMethod('ANY', integration);
+
+    // THEN
+    expect(stack).to(haveResourceLike('AWS::ApiGateway::Method', {
+      HttpMethod: 'ANY',
+      Integration: {
+        ConnectionType: 'VPC_LINK',
+      },
+    }));
+
+    test.done();
+  },
 };
\ No newline at end of file

From 99111f72adc210f48e269db50f2b8e8b78d21252 Mon Sep 17 00:00:00 2001
From: Nick Lynch <nlynch@amazon.com>
Date: Mon, 12 Oct 2020 12:51:44 +0100
Subject: [PATCH 5/8] fix(lambda): grantInvoke on imported function fails
 (#10622)

PR #8828 added the ability to add permissions on imported functions, if the
account on the stack and imported function matched. However, when this doesn't
match, attempting to call `grantInvoke` on the imported function results in a
`findChild` error.

This change guards against calling `addPermission` when `canCreatePermissions`
is false by checking if the `CfnPermission` was actually created, and adjusting
the return from `addInvoke` appropriately.

fixes #10607


----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
---
 .../@aws-cdk/aws-lambda/lib/function-base.ts  |  12 +-
 .../@aws-cdk/aws-lambda/test/test.lambda.ts   | 267 +++++++++++-------
 .../test/lambda/lambda.test.ts                |  16 ++
 3 files changed, 184 insertions(+), 111 deletions(-)

diff --git a/packages/@aws-cdk/aws-lambda/lib/function-base.ts b/packages/@aws-cdk/aws-lambda/lib/function-base.ts
index 7e6c309a3853e..ab1012b6015bc 100644
--- a/packages/@aws-cdk/aws-lambda/lib/function-base.ts
+++ b/packages/@aws-cdk/aws-lambda/lib/function-base.ts
@@ -210,7 +210,7 @@ export abstract class FunctionBase extends Resource implements IFunction {
    */
   public addPermission(id: string, permission: Permission) {
     if (!this.canCreatePermissions) {
-      // FIXME: Report metadata
+      // FIXME: @deprecated(v2) - throw an error if calling `addPermission` on a resource that doesn't support it.
       return;
     }
 
@@ -299,7 +299,11 @@ export abstract class FunctionBase extends Resource implements IFunction {
               action: 'lambda:InvokeFunction',
             });
 
-            return { statementAdded: true, policyDependable: this._functionNode().findChild(identifier) } as iam.AddToResourcePolicyResult;
+            const permissionNode = this._functionNode().tryFindChild(identifier);
+            if (!permissionNode) {
+              throw new Error('Cannot modify permission to lambda function. Function is either imported or $LATEST version.');
+            }
+            return { statementAdded: true, policyDependable: permissionNode };
           },
           node: this.node,
           stack: this.stack,
@@ -357,13 +361,13 @@ export abstract class FunctionBase extends Resource implements IFunction {
    * ..which means that in order to extract the `account-id` component from the ARN, we can
    * split the ARN using ":" and select the component in index 4.
    *
-   * @returns true if account id of function matches this account
+   * @returns true if account id of function matches this account, or the accounts are unresolved.
    *
    * @internal
    */
   protected _isStackAccount(): boolean {
     if (Token.isUnresolved(this.stack.account) || Token.isUnresolved(this.functionArn)) {
-      return false;
+      return true;
     }
     return this.stack.parseArn(this.functionArn).account === this.stack.account;
   }
diff --git a/packages/@aws-cdk/aws-lambda/test/test.lambda.ts b/packages/@aws-cdk/aws-lambda/test/test.lambda.ts
index 3678ba37069e0..cad80e9d38931 100644
--- a/packages/@aws-cdk/aws-lambda/test/test.lambda.ts
+++ b/packages/@aws-cdk/aws-lambda/test/test.lambda.ts
@@ -276,68 +276,71 @@ export = {
     // WHEN
     const imported = lambda.Function.fromFunctionArn(stack2, 'Imported', 'arn:aws:lambda:us-east-1:123456789012:function:ProcessKinesisRecords');
 
-    // Can call addPermission() but it won't do anything
-    imported.addPermission('Hello', {
-      principal: new iam.ServicePrincipal('harry'),
-    });
-
     // THEN
     test.deepEqual(imported.functionArn, 'arn:aws:lambda:us-east-1:123456789012:function:ProcessKinesisRecords');
     test.deepEqual(imported.functionName, 'ProcessKinesisRecords');
-    expect(stack2).notTo(haveResource('AWS::Lambda::Permission'));
+
     test.done();
   },
 
-  'imported Function w/ resolved account and function arn can addPermissions'(test: Test) {
-    // GIVEN
-    const app = new cdk.App();
-    const stack = new cdk.Stack(app, 'Imports', {
-      env: { account: '123456789012', region: 'us-east-1' },
-    });
-    const stack2 = new cdk.Stack(app, 'imported', {
-      env: { account: '123456789012', region: 'us-east-1' },
-    });
-    new lambda.Function(stack, 'BaseFunction', {
-      code: new lambda.InlineCode('foo'),
-      handler: 'index.handler',
-      runtime: lambda.Runtime.NODEJS_10_X,
-    });
+  'addPermissions()': {
+    'imported Function w/ resolved account and function arn'(test: Test) {
+      // GIVEN
+      const app = new cdk.App();
+      const stack = new cdk.Stack(app, 'Imports', {
+        env: { account: '123456789012', region: 'us-east-1' },
+      });
 
-    // WHEN
-    const iFunc = lambda.Function.fromFunctionAttributes(stack2, 'iFunc', {
-      functionArn: 'arn:aws:lambda:us-east-1:123456789012:function:BaseFunction',
-    });
-    iFunc.addPermission('iFunc', {
-      principal: new iam.ServicePrincipal('cloudformation.amazonaws.com'),
-    });
+      // WHEN
+      const iFunc = lambda.Function.fromFunctionAttributes(stack, 'iFunc', {
+        functionArn: 'arn:aws:lambda:us-east-1:123456789012:function:BaseFunction',
+      });
+      iFunc.addPermission('iFunc', {
+        principal: new iam.ServicePrincipal('cloudformation.amazonaws.com'),
+      });
 
-    // THEN
-    expect(stack2).to(haveResource('AWS::Lambda::Permission'));
-    test.done();
-  },
+      // THEN
+      expect(stack).to(haveResource('AWS::Lambda::Permission'));
+      test.done();
+    },
 
-  'imported Function w/o account cannot addPermissions'(test: Test) {
-    // GIVEN
-    const app = new cdk.App();
-    const stack = new cdk.Stack(app, 'Base');
-    const importedStack = new cdk.Stack(app, 'Imported');
-    new lambda.Function(stack, 'BaseFunction', {
-      code: new lambda.InlineCode('foo'),
-      handler: 'index.handler',
-      runtime: lambda.Runtime.NODEJS_10_X,
-    });
+    'imported Function w/ unresolved account'(test: Test) {
+      // GIVEN
+      const app = new cdk.App();
+      const stack = new cdk.Stack(app, 'Imports');
 
-    // WHEN
-    const iFunc = lambda.Function.fromFunctionAttributes(importedStack, 'iFunc', {
-      functionArn: 'arn:aws:lambda:us-east-1:123456789012:function:BaseFunction',
-    });
-    iFunc.addPermission('iFunc', {
-      principal: new iam.ServicePrincipal('cloudformation.amazonaws.com'),
-    });
+      // WHEN
+      const iFunc = lambda.Function.fromFunctionAttributes(stack, 'iFunc', {
+        functionArn: 'arn:aws:lambda:us-east-1:123456789012:function:BaseFunction',
+      });
+      iFunc.addPermission('iFunc', {
+        principal: new iam.ServicePrincipal('cloudformation.amazonaws.com'),
+      });
 
-    // THEN
-    expect(importedStack).notTo(haveResource('AWS::Lambda::Permission'));
-    test.done();
+      // THEN
+      expect(stack).to(haveResource('AWS::Lambda::Permission'));
+      test.done();
+    },
+
+    'imported Function w/different account'(test: Test) {
+      // GIVEN
+      const app = new cdk.App();
+      const stack = new cdk.Stack(app, 'Base', {
+        env: { account: '111111111111' },
+      });
+
+      // WHEN
+      const iFunc = lambda.Function.fromFunctionAttributes(stack, 'iFunc', {
+        functionArn: 'arn:aws:lambda:us-east-1:123456789012:function:BaseFunction',
+      });
+      iFunc.addPermission('iFunc', {
+        principal: new iam.ServicePrincipal('cloudformation.amazonaws.com'),
+      });
+
+      // THEN
+      expect(stack).notTo(haveResource('AWS::Lambda::Permission'));
+      test.done();
+    },
   },
 
   'Lambda code can be read from a local directory via an asset'(test: Test) {
@@ -1220,66 +1223,118 @@ export = {
 
       test.done();
     },
-  },
 
-  'grantInvoke with an imported role (in the same account)'(test: Test) {
-    // GIVEN
-    const stack = new cdk.Stack(undefined, undefined, {
-      env: { account: '123456789012' },
-    });
-    const fn = new lambda.Function(stack, 'Function', {
-      code: lambda.Code.fromInline('xxx'),
-      handler: 'index.handler',
-      runtime: lambda.Runtime.NODEJS_10_X,
-    });
+    'with an imported role (in the same account)'(test: Test) {
+      // GIVEN
+      const stack = new cdk.Stack(undefined, undefined, {
+        env: { account: '123456789012' },
+      });
+      const fn = new lambda.Function(stack, 'Function', {
+        code: lambda.Code.fromInline('xxx'),
+        handler: 'index.handler',
+        runtime: lambda.Runtime.NODEJS_10_X,
+      });
 
-    // WHEN
-    fn.grantInvoke(iam.Role.fromRoleArn(stack, 'ForeignRole', 'arn:aws:iam::123456789012:role/someRole'));
+      // WHEN
+      fn.grantInvoke(iam.Role.fromRoleArn(stack, 'ForeignRole', 'arn:aws:iam::123456789012:role/someRole'));
 
-    // THEN
-    expect(stack).to(haveResource('AWS::IAM::Policy', {
-      PolicyDocument: objectLike({
-        Statement: arrayWith(
-          {
-            Action: 'lambda:InvokeFunction',
-            Effect: 'Allow',
-            Resource: { 'Fn::GetAtt': ['Function76856677', 'Arn'] },
-          },
-        ),
-      }),
-      Roles: ['someRole'],
-    }));
+      // THEN
+      expect(stack).to(haveResource('AWS::IAM::Policy', {
+        PolicyDocument: objectLike({
+          Statement: arrayWith(
+            {
+              Action: 'lambda:InvokeFunction',
+              Effect: 'Allow',
+              Resource: { 'Fn::GetAtt': ['Function76856677', 'Arn'] },
+            },
+          ),
+        }),
+        Roles: ['someRole'],
+      }));
 
-    test.done();
-  },
+      test.done();
+    },
 
-  'grantInvoke with an imported role (from a different account)'(test: Test) {
-    // GIVEN
-    const stack = new cdk.Stack(undefined, undefined, {
-      env: { account: '3333' },
-    });
-    const fn = new lambda.Function(stack, 'Function', {
-      code: lambda.Code.fromInline('xxx'),
-      handler: 'index.handler',
-      runtime: lambda.Runtime.NODEJS_10_X,
-    });
+    'with an imported role (from a different account)'(test: Test) {
+      // GIVEN
+      const stack = new cdk.Stack(undefined, undefined, {
+        env: { account: '3333' },
+      });
+      const fn = new lambda.Function(stack, 'Function', {
+        code: lambda.Code.fromInline('xxx'),
+        handler: 'index.handler',
+        runtime: lambda.Runtime.NODEJS_10_X,
+      });
 
-    // WHEN
-    fn.grantInvoke(iam.Role.fromRoleArn(stack, 'ForeignRole', 'arn:aws:iam::123456789012:role/someRole'));
+      // WHEN
+      fn.grantInvoke(iam.Role.fromRoleArn(stack, 'ForeignRole', 'arn:aws:iam::123456789012:role/someRole'));
 
-    // THEN
-    expect(stack).to(haveResource('AWS::Lambda::Permission', {
-      Action: 'lambda:InvokeFunction',
-      FunctionName: {
-        'Fn::GetAtt': [
-          'Function76856677',
-          'Arn',
-        ],
-      },
-      Principal: 'arn:aws:iam::123456789012:role/someRole',
-    }));
+      // THEN
+      expect(stack).to(haveResource('AWS::Lambda::Permission', {
+        Action: 'lambda:InvokeFunction',
+        FunctionName: {
+          'Fn::GetAtt': [
+            'Function76856677',
+            'Arn',
+          ],
+        },
+        Principal: 'arn:aws:iam::123456789012:role/someRole',
+      }));
 
-    test.done();
+      test.done();
+    },
+
+    'on an imported function (same account)'(test: Test) {
+      // GIVEN
+      const stack = new cdk.Stack(undefined, undefined, {
+        env: { account: '123456789012' },
+      });
+      const fn = lambda.Function.fromFunctionArn(stack, 'Function', 'arn:aws:lambda:us-east-1:123456789012:function:MyFn');
+
+      // WHEN
+      fn.grantInvoke(new iam.ServicePrincipal('elasticloadbalancing.amazonaws.com'));
+
+      // THEN
+      expect(stack).to(haveResource('AWS::Lambda::Permission', {
+        Action: 'lambda:InvokeFunction',
+        FunctionName: 'arn:aws:lambda:us-east-1:123456789012:function:MyFn',
+        Principal: 'elasticloadbalancing.amazonaws.com',
+      }));
+
+      test.done();
+    },
+
+    'on an imported function (unresolved account)'(test: Test) {
+      // GIVEN
+      const stack = new cdk.Stack();
+      const fn = lambda.Function.fromFunctionArn(stack, 'Function', 'arn:aws:lambda:us-east-1:123456789012:function:MyFn');
+
+      // WHEN
+      fn.grantInvoke(new iam.ServicePrincipal('elasticloadbalancing.amazonaws.com'));
+
+      // THEN
+      expect(stack).to(haveResource('AWS::Lambda::Permission', {
+        Action: 'lambda:InvokeFunction',
+        FunctionName: 'arn:aws:lambda:us-east-1:123456789012:function:MyFn',
+        Principal: 'elasticloadbalancing.amazonaws.com',
+      }));
+
+      test.done();
+    },
+
+    'on an imported function (different account)'(test: Test) {
+      // GIVEN
+      const stack = new cdk.Stack(undefined, undefined, {
+        env: { account: '111111111111' }, // Different account
+      });
+      const fn = lambda.Function.fromFunctionArn(stack, 'Function', 'arn:aws:lambda:us-east-1:123456789012:function:MyFn');
+
+      // THEN
+      test.throws(() => { fn.grantInvoke(new iam.ServicePrincipal('elasticloadbalancing.amazonaws.com')); },
+        /Cannot modify permission to lambda function/);
+
+      test.done();
+    },
   },
 
   'Can use metricErrors on a lambda Function'(test: Test) {
@@ -1342,8 +1397,7 @@ export = {
       runtime: lambda.Runtime.NODEJS_10_X,
       code: lambda.Code.fromInline('exports.main = function() { console.log("DONE"); }'),
       handler: 'index.main',
-    }),
-    /nodejs10.x is not in \[nodejs12.x\]/);
+    }), /nodejs10.x is not in \[nodejs12.x\]/);
 
     test.done();
   },
@@ -1362,8 +1416,7 @@ export = {
       runtime: lambda.Runtime.NODEJS_10_X,
       code: lambda.Code.fromInline('exports.main = function() { console.log("DONE"); }'),
       handler: 'index.main',
-    }),
-    /Unable to add layer:/);
+    }), /Unable to add layer:/);
 
     test.done();
   },
diff --git a/packages/@aws-cdk/aws-s3-notifications/test/lambda/lambda.test.ts b/packages/@aws-cdk/aws-s3-notifications/test/lambda/lambda.test.ts
index 10de49b776d02..6bd225d17fd0c 100644
--- a/packages/@aws-cdk/aws-s3-notifications/test/lambda/lambda.test.ts
+++ b/packages/@aws-cdk/aws-s3-notifications/test/lambda/lambda.test.ts
@@ -102,6 +102,22 @@ test('lambda in a different stack as notification target', () => {
   });
 });
 
+test('imported lambda in a different account as notification target', () => {
+  const app = new App();
+  const stack = new Stack(app, 'stack', {
+    env: { account: '111111111111' },
+  });
+
+  // Lambda account and stack account differ; no permissions should be created.
+  const lambdaFunction = lambda.Function.fromFunctionArn(stack, 'lambdaFunction', 'arn:aws:lambda:us-east-1:123456789012:function:BaseFunction');
+  const bucket = new s3.Bucket(stack, 'bucket');
+
+  bucket.addObjectCreatedNotification(new s3n.LambdaDestination(lambdaFunction));
+
+  // no permissions created
+  expect(stack).not.toHaveResourceLike('AWS::Lambda::Permission');
+});
+
 test('lambda as notification target', () => {
   // GIVEN
   const stack = new Stack();

From c7e52ee850868f5b068ee8d2fda006668f83f899 Mon Sep 17 00:00:00 2001
From: Eli Polonsky <epolon@amazon.com>
Date: Mon, 12 Oct 2020 16:56:27 +0300
Subject: [PATCH 6/8] chore(cli): Use previous version for fetching regression
 tests (#10675)

This PR rectifies a long standing logical breakdown in our regression tests.

In order to run regression tests, we first need to fetch the tests themselves from the previous release, and run it against CLI code that is being built. Up until now, those tests were fetched from the **latest published** version, under the assumption that this version is always lower (or equal) than the version that is currently being built.

Normally, this assumption is correct. For example, let's say the latest published version is 1.65.0.
When the pipeline runs, the version in `lerna.json` is 1.65.0, which is indeed equal to the latest published version.

However, if the master pipeline is executed before the merge back PR is merged to master, the `lerna.json` version in that case will have `1.64.0`. This means that the latest published version number is actually bigger.

This effectively meant that the CLI we are testing has a lower version than the framework, which was not the intent.
This in turn caused "fake" failures when we introduced changes to assets schemas that validated version mismatches.

Another change this PR introduces is a "cognitive" simplification in how we use verdaccio to serve locally built tarballs.
Since our `lerna.json` in the repo has a version that is also the version of a publicly available module as well, we have to be very careful in how we launch verdaccio with the NPM uplink because of potential conflicts and overrides.

Instead of having to worry about that, we now perform a fake bump in our pipeline with a pre-release tag, making it so that local versions are never the same as public packages, avoiding the uplink problems.

More details here: https://github.com/aws/aws-cdk/pull/8150#issuecomment-634903897

----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
---
 .gitignore                                    |   3 +
 buildspec.yaml                                |   3 +
 bump-candidate.sh                             |  23 ++
 packages/aws-cdk/CONTRIBUTING.md              |  51 ++-
 packages/aws-cdk/package.json                 |   8 +-
 .../cli-regression-patches/v1.67.0/NOTES.md   |   2 +
 .../v1.67.0/cdk-helpers.js                    | 331 ++++++++++++++++++
 .../aws-cdk/test/integ/cli/cdk-helpers.ts     |  12 +-
 packages/aws-cdk/test/integ/cli/test.sh       |   6 -
 packages/aws-cdk/test/integ/github-helpers.ts |  30 ++
 packages/aws-cdk/test/integ/run-against-dist  |   3 +
 .../aws-cdk/test/integ/run-against-dist.bash  |  71 +---
 .../aws-cdk/test/integ/run-against-release    |   1 +
 packages/aws-cdk/test/integ/run-against-repo  |   1 +
 .../aws-cdk/test/integ/run-wrappers/repo/npm  |   8 +-
 ...est-cli-regression-against-current-code.sh |  88 +----
 ...t-cli-regression-against-latest-release.sh |  11 +-
 .../test/integ/test-cli-regression.bash       |  82 +++++
 yarn.lock                                     |  62 +++-
 19 files changed, 627 insertions(+), 169 deletions(-)
 create mode 100755 bump-candidate.sh
 create mode 100644 packages/aws-cdk/test/integ/cli-regression-patches/v1.67.0/NOTES.md
 create mode 100644 packages/aws-cdk/test/integ/cli-regression-patches/v1.67.0/cdk-helpers.js
 create mode 100644 packages/aws-cdk/test/integ/github-helpers.ts
 create mode 100644 packages/aws-cdk/test/integ/test-cli-regression.bash

diff --git a/.gitignore b/.gitignore
index 055b85911775d..28ed33d0064b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,5 +40,8 @@ yarn-error.log
 # Parcel default cache directory
 .parcel-cache
 
+# VSCode history plugin
+.vscode/.history/
+
 # Cloud9
 .c9
diff --git a/buildspec.yaml b/buildspec.yaml
index 8196752082e93..b3dac131ac590 100644
--- a/buildspec.yaml
+++ b/buildspec.yaml
@@ -18,6 +18,9 @@ phases:
       - /bin/bash ./fetch-dotnet-snk.sh
   build:
     commands:
+      # we bump here so that our master version won't be identical to the latest published version during tests.
+      # otherwise this causes problems with verdaccio mirroring.
+      - '[ ${GIT_BRANCH} = ${REGRESSION_TESTS_BRANCH} ] && /bin/bash ./bump-candidate.sh'
       - /bin/bash ./scripts/align-version.sh
       - /bin/bash ./build.sh
   post_build:
diff --git a/bump-candidate.sh b/bump-candidate.sh
new file mode 100755
index 0000000000000..5958a9a151230
--- /dev/null
+++ b/bump-candidate.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+# --------------------------------------------------------------------------------------------------
+#
+# This script is intended to be used in our master pipeline as a way of incrementing the version number
+# so that it doesnt colide with any published version. This is needed because our integration tests launch
+# a verdaccio instance that serves local tarballs, and if those tarballs have the same version as
+# already published modules, it messes things up.
+#
+# It does so by using a pre-release rc tag, making it so that locally packed versions will always be
+# suffixed with '-rc', distinguishing it from publisehd modules.
+#
+# If you need to run integration tests locally against the distribution tarballs, you should run this
+# script locally as well before building and packing the repository.
+#
+# This script only increments the version number in the version files, it does not generate a changelog.
+#
+# --------------------------------------------------------------------------------------------------
+set -euo pipefail
+version=${1:-minor}
+
+echo "Starting candidate ${version} version bump"
+
+npx standard-version --release-as ${version} --prerelease=rc --skip.commit --skip.changelog
\ No newline at end of file
diff --git a/packages/aws-cdk/CONTRIBUTING.md b/packages/aws-cdk/CONTRIBUTING.md
index b5416406b7136..cbf6933dff920 100644
--- a/packages/aws-cdk/CONTRIBUTING.md
+++ b/packages/aws-cdk/CONTRIBUTING.md
@@ -88,7 +88,7 @@ yarn integ-cli-no-regression
 
 #### Regression
 
-Validate that previously tested functionality still works in light of recent changes to the CLI. This is done by fetching the functional tests of the latest published release, and running them against the new CLI code.
+Validate that previously tested functionality still works in light of recent changes to the CLI. This is done by fetching the functional tests of the previous published release, and running them against the new CLI code.
 
 These tests run in two variations:
 
@@ -97,17 +97,62 @@ These tests run in two variations:
   Use your local framework code. This is important to make sure the new CLI version
   will work properly with the new framework version.
 
-- **against latest release code**
+  > See a concrete failure [example](https://github.com/aws/aws-cdk-rfcs/blob/master/text/00110-cli-framework-compatibility-strategy.md#remove---target-from-docker-build-command)
 
-  Fetches the framework code from the latest release. This is important to make sure
+- **against previously release code**
+
+  Fetches the framework code from the previous release. This is important to make sure
   the new CLI version does not rely on new framework features to provide the same functionality.
 
+  > See a concrete failure [example](https://github.com/aws/aws-cdk-rfcs/blob/master/text/00110-cli-framework-compatibility-strategy.md#change-artifact-metadata-type-value)
+
 You can also run just these tests by executing:
 
 ```console
 yarn integ-cli-regression
 ```
 
+Note that these tests can only be executed using the `run-against-dist` wrapper. Why? well, it doesn't really make sense to `run-against-repo` when testing the **previously released code**, since we obviously cannot use the repo. Granted, running **against local framework code** can somehow work, but it required a few too many hacks in the current codebase to make it seem worthwhile.
+
+##### Implementation
+
+The implemention of the regression suites is not trivial to reason about and follow. Even though the code includes inline comments, we break down the exact details to better serve us in maintaining it and regaining context.
+
+Before diving into it, we establish a few key concepts:
+
+- `CANDIDATE_VERSION` - This is the version of the code that is being built in the pipeline, and its value is stored in the `build.json` file of the packaged artifact of the repo.
+- `PREVIOUS_VERSION` - This is the version previous to the `CANDIDATE_VERSION`.
+- `CLI_VERSION` - This is the version of the CLI we are testing. It is **always** the same as the `CANDIDATE_VERSION` since we want to test the latest CLI code.
+- `FRAMEWORK_VERSION` - This is the version of the framework we are testing. It varries between the two variation of the regression suites.
+Its value can either be that of `CANDIDATE_VERSION` (for testing against the latest framework code), or `PREVIOUS_VERSION` (for testing against the previously published version of the framework code).
+
+Following are the steps invovled in running these tests:
+
+1. Run [`./bump-candidate.sh`](../../bump-candidate.sh) to differentiate between the local version and the published version. For example, if the version in `lerna.json` is `1.67.0`, this script will result in a version `1.67.0-rc.0`. This is needed so that we can launch a verdaccio instance serving local tarballs without worrying about conflicts with the public npm uplink. This will help us avoid version quirks that might happen during the *post-release-pre-merge-back* time window.
+
+2. Run [`./align-version.sh`](../../scripts/align-version.sh) to configure the above version in all our packages.
+
+3. Build and Pack the repository. The produced tarballs will be versioned with the above version.
+
+4. Run `test/integ/run-against-dist test/integ/test-cli-regression-against-latest-release.sh` (or `test/integ/test-cli-regression-against-latest-code.sh`)
+
+5. First, the `run-against-dist` wrapper will run and:
+
+    - Read the `CANDIDATE_VERSION` from `build.json` and export it.
+    - [Launch verdaccio](./test/integ/run-against-dist#L29) to serve all local tarballs (serves the `CANDIDATE_VERSION` now)
+    - [Install the CLI](./test/integ/run-against-dist#L30) using the `CANDIDATE_VERSION` version `CANDIDATE_VERSION` env variable.
+    - Execute the given script.
+
+6. Both cli regression test scripts run the same [`run_regression_against_framework_version`](./test/integ/test-cli-regression.bash#L22) function. This function accepts which framework version should the regression run against, it can be either `CANDIDATE_VERSION` or `PREVIOUS_VERSION`. Note that the argument is not the actual value of the versio, but instead is just an [indirection indentifier](./test/integ/test-cli-regression.bash#L81). The function will:
+
+    - Calculate the actual value of the previous version based on the candidate version. (fetches from github)
+    - Download the previous version tarball from npm and extract the integration tests.
+    - Export a `FRAMWORK_VERSION` env variable based on the caller, and execute the integration tests of the previous version.
+
+7. Our integration tests now run and have knowledge of which framework version they should [install](./test/integ/cli/cdk-helpers.ts#L74).
+
+That "basically" it, hope it makes sense...
+
 ### Init template integration tests
 
 Init template tests will initialize and compile the init templates that the
diff --git a/packages/aws-cdk/package.json b/packages/aws-cdk/package.json
index d72fac19cd2ab..030b3d2325504 100644
--- a/packages/aws-cdk/package.json
+++ b/packages/aws-cdk/package.json
@@ -19,8 +19,8 @@
     "build+test": "npm run build && npm test",
     "integ-cli": "npm run integ-cli-regression && npm run integ-cli-no-regression",
     "integ-cli-regression": "npm run integ-cli-regression-latest-release && npm run integ-cli-regression-latest-code",
-    "integ-cli-regression-latest-release": "test/integ/run-against-repo test/integ/test-cli-regression-against-latest-release.sh",
-    "integ-cli-regression-latest-code": "test/integ/run-against-repo test/integ/test-cli-regression-against-current-code.sh",
+    "integ-cli-regression-latest-release": "test/integ/run-against-dist test/integ/test-cli-regression-against-latest-release.sh",
+    "integ-cli-regression-latest-code": "test/integ/run-against-dist test/integ/test-cli-regression-against-current-code.sh",
     "integ-cli-no-regression": "test/integ/run-against-repo test/integ/cli/test.sh",
     "integ-init": "test/integ/run-against-dist test/integ/init/test-all.sh"
   },
@@ -62,7 +62,9 @@
     "pkglint": "0.0.0",
     "sinon": "^9.1.0",
     "ts-jest": "^26.4.1",
-    "ts-mock-imports": "^1.3.0"
+    "ts-mock-imports": "^1.3.0",
+    "@octokit/rest": "^18.0.6",
+    "make-runnable": "^1.3.8"
   },
   "dependencies": {
     "@aws-cdk/cloud-assembly-schema": "0.0.0",
diff --git a/packages/aws-cdk/test/integ/cli-regression-patches/v1.67.0/NOTES.md b/packages/aws-cdk/test/integ/cli-regression-patches/v1.67.0/NOTES.md
new file mode 100644
index 0000000000000..19bd85e22f5f2
--- /dev/null
+++ b/packages/aws-cdk/test/integ/cli-regression-patches/v1.67.0/NOTES.md
@@ -0,0 +1,2 @@
+Integration tests are now injected with environment variable that specifies which framework
+version they should install and use. This patch includes the cdk-helpers.js file that is responsible for that.
\ No newline at end of file
diff --git a/packages/aws-cdk/test/integ/cli-regression-patches/v1.67.0/cdk-helpers.js b/packages/aws-cdk/test/integ/cli-regression-patches/v1.67.0/cdk-helpers.js
new file mode 100644
index 0000000000000..7bb7790818e40
--- /dev/null
+++ b/packages/aws-cdk/test/integ/cli-regression-patches/v1.67.0/cdk-helpers.js
@@ -0,0 +1,331 @@
+"use strict";
+var _a, _b;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.randomString = exports.rimraf = exports.shell = exports.TestFixture = exports.cloneDirectory = exports.withDefaultFixture = exports.withCdkApp = exports.withAws = void 0;
+const child_process = require("child_process");
+const fs = require("fs");
+const os = require("os");
+const path = require("path");
+const aws_helpers_1 = require("./aws-helpers");
+const resource_pool_1 = require("./resource-pool");
+const REGIONS = process.env.AWS_REGIONS
+    ? process.env.AWS_REGIONS.split(',')
+    : [(_b = (_a = process.env.AWS_REGION) !== null && _a !== void 0 ? _a : process.env.AWS_DEFAULT_REGION) !== null && _b !== void 0 ? _b : 'us-east-1'];
+const FRAMEWORK_VERSION = process.env.FRAMEWORK_VERSION;
+process.stdout.write(`Using regions: ${REGIONS}\n`);
+process.stdout.write(`Using framework version: ${FRAMEWORK_VERSION}\n`);
+const REGION_POOL = new resource_pool_1.ResourcePool(REGIONS);
+/**
+ * Higher order function to execute a block with an AWS client setup
+ *
+ * Allocate the next region from the REGION pool and dispose it afterwards.
+ */
+function withAws(block) {
+    return (context) => REGION_POOL.using(async (region) => {
+        const aws = await aws_helpers_1.AwsClients.forRegion(region, context.output);
+        await sanityCheck(aws);
+        return block({ ...context, aws });
+    });
+}
+exports.withAws = withAws;
+/**
+ * Higher order function to execute a block with a CDK app fixture
+ *
+ * Requires an AWS client to be passed in.
+ *
+ * For backwards compatibility with existing tests (so we don't have to change
+ * too much) the inner block is expected to take a `TestFixture` object.
+ */
+function withCdkApp(block) {
+    return async (context) => {
+        const randy = randomString();
+        const stackNamePrefix = `cdktest-${randy}`;
+        const integTestDir = path.join(os.tmpdir(), `cdk-integ-${randy}`);
+        context.output.write(` Stack prefix:   ${stackNamePrefix}\n`);
+        context.output.write(` Test directory: ${integTestDir}\n`);
+        context.output.write(` Region:         ${context.aws.region}\n`);
+        await cloneDirectory(path.join(__dirname, 'app'), integTestDir, context.output);
+        const fixture = new TestFixture(integTestDir, stackNamePrefix, context.output, context.aws);
+        let success = true;
+        try {
+            let modules = [
+                '@aws-cdk/core',
+                '@aws-cdk/aws-sns',
+                '@aws-cdk/aws-iam',
+                '@aws-cdk/aws-lambda',
+                '@aws-cdk/aws-ssm',
+                '@aws-cdk/aws-ecr-assets',
+                '@aws-cdk/aws-cloudformation',
+                '@aws-cdk/aws-ec2',
+            ];
+            if (FRAMEWORK_VERSION) {
+                modules = modules.map(module => `${module}@${FRAMEWORK_VERSION}`);
+            }
+            await fixture.shell(['npm', 'install', ...modules]);
+            await ensureBootstrapped(fixture);
+            await block(fixture);
+        }
+        catch (e) {
+            success = false;
+            throw e;
+        }
+        finally {
+            await fixture.dispose(success);
+        }
+    };
+}
+exports.withCdkApp = withCdkApp;
+/**
+ * Default test fixture for most (all?) integ tests
+ *
+ * It's a composition of withAws/withCdkApp, expecting the test block to take a `TestFixture`
+ * object.
+ *
+ * We could have put `withAws(withCdkApp(fixture => { /... actual test here.../ }))` in every
+ * test declaration but centralizing it is going to make it convenient to modify in the future.
+ */
+function withDefaultFixture(block) {
+    return withAws(withCdkApp(block));
+    //              ^~~~~~ this is disappointing TypeScript! Feels like you should have been able to derive this.
+}
+exports.withDefaultFixture = withDefaultFixture;
+/**
+ * Prepare a target dir byreplicating a source directory
+ */
+async function cloneDirectory(source, target, output) {
+    await shell(['rm', '-rf', target], { output });
+    await shell(['mkdir', '-p', target], { output });
+    await shell(['cp', '-R', source + '/*', target], { output });
+}
+exports.cloneDirectory = cloneDirectory;
+class TestFixture {
+    constructor(integTestDir, stackNamePrefix, output, aws) {
+        this.integTestDir = integTestDir;
+        this.stackNamePrefix = stackNamePrefix;
+        this.output = output;
+        this.aws = aws;
+        this.qualifier = randomString().substr(0, 10);
+        this.bucketsToDelete = new Array();
+    }
+    log(s) {
+        this.output.write(`${s}\n`);
+    }
+    async shell(command, options = {}) {
+        return shell(command, {
+            output: this.output,
+            cwd: this.integTestDir,
+            ...options,
+        });
+    }
+    async cdkDeploy(stackNames, options = {}) {
+        var _a, _b;
+        stackNames = typeof stackNames === 'string' ? [stackNames] : stackNames;
+        const neverRequireApproval = (_a = options.neverRequireApproval) !== null && _a !== void 0 ? _a : true;
+        return this.cdk(['deploy',
+            ...(neverRequireApproval ? ['--require-approval=never'] : []), // Default to no approval in an unattended test
+            ...((_b = options.options) !== null && _b !== void 0 ? _b : []), ...this.fullStackName(stackNames)], options);
+    }
+    async cdkDestroy(stackNames, options = {}) {
+        var _a;
+        stackNames = typeof stackNames === 'string' ? [stackNames] : stackNames;
+        return this.cdk(['destroy',
+            '-f', // We never want a prompt in an unattended test
+            ...((_a = options.options) !== null && _a !== void 0 ? _a : []), ...this.fullStackName(stackNames)], options);
+    }
+    async cdk(args, options = {}) {
+        var _a;
+        const verbose = (_a = options.verbose) !== null && _a !== void 0 ? _a : true;
+        return this.shell(['cdk', ...(verbose ? ['-v'] : []), ...args], {
+            ...options,
+            modEnv: {
+                AWS_REGION: this.aws.region,
+                AWS_DEFAULT_REGION: this.aws.region,
+                STACK_NAME_PREFIX: this.stackNamePrefix,
+                ...options.modEnv,
+            },
+        });
+    }
+    fullStackName(stackNames) {
+        if (typeof stackNames === 'string') {
+            return `${this.stackNamePrefix}-${stackNames}`;
+        }
+        else {
+            return stackNames.map(s => `${this.stackNamePrefix}-${s}`);
+        }
+    }
+    /**
+     * Append this to the list of buckets to potentially delete
+     *
+     * At the end of a test, we clean up buckets that may not have gotten destroyed
+     * (for whatever reason).
+     */
+    rememberToDeleteBucket(bucketName) {
+        this.bucketsToDelete.push(bucketName);
+    }
+    /**
+     * Cleanup leftover stacks and buckets
+     */
+    async dispose(success) {
+        const stacksToDelete = await this.deleteableStacks(this.stackNamePrefix);
+        // Bootstrap stacks have buckets that need to be cleaned
+        const bucketNames = stacksToDelete.map(stack => aws_helpers_1.outputFromStack('BucketName', stack)).filter(defined);
+        await Promise.all(bucketNames.map(b => this.aws.emptyBucket(b)));
+        // Bootstrap stacks have ECR repositories with images which should be deleted
+        const imageRepositoryNames = stacksToDelete.map(stack => aws_helpers_1.outputFromStack('ImageRepositoryName', stack)).filter(defined);
+        await Promise.all(imageRepositoryNames.map(r => this.aws.deleteImageRepository(r)));
+        await this.aws.deleteStacks(...stacksToDelete.map(s => s.StackName));
+        // We might have leaked some buckets by upgrading the bootstrap stack. Be
+        // sure to clean everything.
+        for (const bucket of this.bucketsToDelete) {
+            await this.aws.deleteBucket(bucket);
+        }
+        // If the tests completed successfully, happily delete the fixture
+        // (otherwise leave it for humans to inspect)
+        if (success) {
+            rimraf(this.integTestDir);
+        }
+    }
+    /**
+     * Return the stacks starting with our testing prefix that should be deleted
+     */
+    async deleteableStacks(prefix) {
+        var _a;
+        const statusFilter = [
+            'CREATE_IN_PROGRESS', 'CREATE_FAILED', 'CREATE_COMPLETE',
+            'ROLLBACK_IN_PROGRESS', 'ROLLBACK_FAILED', 'ROLLBACK_COMPLETE',
+            'DELETE_FAILED',
+            'UPDATE_IN_PROGRESS', 'UPDATE_COMPLETE_CLEANUP_IN_PROGRESS',
+            'UPDATE_COMPLETE', 'UPDATE_ROLLBACK_IN_PROGRESS',
+            'UPDATE_ROLLBACK_FAILED',
+            'UPDATE_ROLLBACK_COMPLETE_CLEANUP_IN_PROGRESS',
+            'UPDATE_ROLLBACK_COMPLETE', 'REVIEW_IN_PROGRESS',
+            'IMPORT_IN_PROGRESS', 'IMPORT_COMPLETE',
+            'IMPORT_ROLLBACK_IN_PROGRESS', 'IMPORT_ROLLBACK_FAILED',
+            'IMPORT_ROLLBACK_COMPLETE',
+        ];
+        const response = await this.aws.cloudFormation('describeStacks', {});
+        return ((_a = response.Stacks) !== null && _a !== void 0 ? _a : [])
+            .filter(s => s.StackName.startsWith(prefix))
+            .filter(s => statusFilter.includes(s.StackStatus))
+            .filter(s => s.RootId === undefined); // Only delete parent stacks. Nested stacks are deleted in the process
+    }
+}
+exports.TestFixture = TestFixture;
+/**
+ * Perform a one-time quick sanity check that the AWS clients has properly configured credentials
+ *
+ * If we don't do this, calls are going to fail and they'll be retried and everything will take
+ * forever before the user notices a simple misconfiguration.
+ *
+ * We can't check for the presence of environment variables since credentials could come from
+ * anywhere, so do simple account retrieval.
+ *
+ * Only do it once per process.
+ */
+async function sanityCheck(aws) {
+    if (sanityChecked === undefined) {
+        try {
+            await aws.account();
+            sanityChecked = true;
+        }
+        catch (e) {
+            sanityChecked = false;
+            throw new Error(`AWS credentials probably not configured, got error: ${e.message}`);
+        }
+    }
+    if (!sanityChecked) {
+        throw new Error('AWS credentials probably not configured, see previous error');
+    }
+}
+let sanityChecked;
+/**
+ * Make sure that the given environment is bootstrapped
+ *
+ * Since we go striping across regions, it's going to suck doing this
+ * by hand so let's just mass-automate it.
+ */
+async function ensureBootstrapped(fixture) {
+    // Old-style bootstrap stack with default name
+    if (await fixture.aws.stackStatus('CDKToolkit') === undefined) {
+        await fixture.cdk(['bootstrap', `aws://${await fixture.aws.account()}/${fixture.aws.region}`]);
+    }
+}
+/**
+ * A shell command that does what you want
+ *
+ * Is platform-aware, handles errors nicely.
+ */
+async function shell(command, options = {}) {
+    var _a, _b;
+    if (options.modEnv && options.env) {
+        throw new Error('Use either env or modEnv but not both');
+    }
+    (_a = options.output) === null || _a === void 0 ? void 0 : _a.write(`💻 ${command.join(' ')}\n`);
+    const env = (_b = options.env) !== null && _b !== void 0 ? _b : (options.modEnv ? { ...process.env, ...options.modEnv } : undefined);
+    const child = child_process.spawn(command[0], command.slice(1), {
+        ...options,
+        env,
+        // Need this for Windows where we want .cmd and .bat to be found as well.
+        shell: true,
+        stdio: ['ignore', 'pipe', 'pipe'],
+    });
+    return new Promise((resolve, reject) => {
+        const stdout = new Array();
+        const stderr = new Array();
+        child.stdout.on('data', chunk => {
+            var _a;
+            (_a = options.output) === null || _a === void 0 ? void 0 : _a.write(chunk);
+            stdout.push(chunk);
+        });
+        child.stderr.on('data', chunk => {
+            var _a, _b;
+            (_a = options.output) === null || _a === void 0 ? void 0 : _a.write(chunk);
+            if ((_b = options.captureStderr) !== null && _b !== void 0 ? _b : true) {
+                stderr.push(chunk);
+            }
+        });
+        child.once('error', reject);
+        child.once('close', code => {
+            if (code === 0 || options.allowErrExit) {
+                resolve((Buffer.concat(stdout).toString('utf-8') + Buffer.concat(stderr).toString('utf-8')).trim());
+            }
+            else {
+                reject(new Error(`'${command.join(' ')}' exited with error code ${code}`));
+            }
+        });
+    });
+}
+exports.shell = shell;
+function defined(x) {
+    return x !== undefined;
+}
+/**
+ * rm -rf reimplementation, don't want to depend on an NPM package for this
+ */
+function rimraf(fsPath) {
+    try {
+        const isDir = fs.lstatSync(fsPath).isDirectory();
+        if (isDir) {
+            for (const file of fs.readdirSync(fsPath)) {
+                rimraf(path.join(fsPath, file));
+            }
+            fs.rmdirSync(fsPath);
+        }
+        else {
+            fs.unlinkSync(fsPath);
+        }
+    }
+    catch (e) {
+        // We will survive ENOENT
+        if (e.code !== 'ENOENT') {
+            throw e;
+        }
+    }
+}
+exports.rimraf = rimraf;
+function randomString() {
+    // Crazy
+    return Math.random().toString(36).replace(/[^a-z0-9]+/g, '');
+}
+exports.randomString = randomString;
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"cdk-helpers.js","sourceRoot":"","sources":["cdk-helpers.ts"],"names":[],"mappings":"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","sourcesContent":["import * as child_process from 'child_process';\nimport * as fs from 'fs';\nimport * as os from 'os';\nimport * as path from 'path';\nimport { outputFromStack, AwsClients } from './aws-helpers';\nimport { ResourcePool } from './resource-pool';\nimport { TestContext } from './test-helpers';\n\nconst REGIONS = process.env.AWS_REGIONS\n  ? process.env.AWS_REGIONS.split(',')\n  : [process.env.AWS_REGION ?? process.env.AWS_DEFAULT_REGION ?? 'us-east-1'];\n\nconst FRAMEWORK_VERSION = process.env.FRAMEWORK_VERSION;\n\nprocess.stdout.write(`Using regions: ${REGIONS}\\n`);\nprocess.stdout.write(`Using framework version: ${FRAMEWORK_VERSION}\\n`);\n\nconst REGION_POOL = new ResourcePool(REGIONS);\n\n\nexport type AwsContext = { readonly aws: AwsClients };\n\n/**\n * Higher order function to execute a block with an AWS client setup\n *\n * Allocate the next region from the REGION pool and dispose it afterwards.\n */\nexport function withAws<A extends TestContext>(block: (context: A & AwsContext) => Promise<void>) {\n  return (context: A) => REGION_POOL.using(async (region) => {\n    const aws = await AwsClients.forRegion(region, context.output);\n    await sanityCheck(aws);\n\n    return block({ ...context, aws });\n  });\n}\n\n/**\n * Higher order function to execute a block with a CDK app fixture\n *\n * Requires an AWS client to be passed in.\n *\n * For backwards compatibility with existing tests (so we don't have to change\n * too much) the inner block is expected to take a `TestFixture` object.\n */\nexport function withCdkApp<A extends TestContext & AwsContext>(block: (context: TestFixture) => Promise<void>) {\n  return async (context: A) => {\n    const randy = randomString();\n    const stackNamePrefix = `cdktest-${randy}`;\n    const integTestDir = path.join(os.tmpdir(), `cdk-integ-${randy}`);\n\n    context.output.write(` Stack prefix:   ${stackNamePrefix}\\n`);\n    context.output.write(` Test directory: ${integTestDir}\\n`);\n    context.output.write(` Region:         ${context.aws.region}\\n`);\n\n    await cloneDirectory(path.join(__dirname, 'app'), integTestDir, context.output);\n    const fixture = new TestFixture(\n      integTestDir,\n      stackNamePrefix,\n      context.output,\n      context.aws);\n\n    let success = true;\n    try {\n      let modules = [\n        '@aws-cdk/core',\n        '@aws-cdk/aws-sns',\n        '@aws-cdk/aws-iam',\n        '@aws-cdk/aws-lambda',\n        '@aws-cdk/aws-ssm',\n        '@aws-cdk/aws-ecr-assets',\n        '@aws-cdk/aws-cloudformation',\n        '@aws-cdk/aws-ec2',\n      ];\n      if (FRAMEWORK_VERSION) {\n        modules = modules.map(module => `${module}@${FRAMEWORK_VERSION}`);\n      }\n      await fixture.shell(['npm', 'install', ...modules]);\n\n      await ensureBootstrapped(fixture);\n\n      await block(fixture);\n    } catch (e) {\n      success = false;\n      throw e;\n    } finally {\n      await fixture.dispose(success);\n    }\n  };\n}\n\n/**\n * Default test fixture for most (all?) integ tests\n *\n * It's a composition of withAws/withCdkApp, expecting the test block to take a `TestFixture`\n * object.\n *\n * We could have put `withAws(withCdkApp(fixture => { /... actual test here.../ }))` in every\n * test declaration but centralizing it is going to make it convenient to modify in the future.\n */\nexport function withDefaultFixture(block: (context: TestFixture) => Promise<void>) {\n  return withAws<TestContext>(withCdkApp(block));\n  //              ^~~~~~ this is disappointing TypeScript! Feels like you should have been able to derive this.\n}\n\nexport interface ShellOptions extends child_process.SpawnOptions {\n  /**\n   * Properties to add to 'env'\n   */\n  modEnv?: Record<string, string>;\n\n  /**\n   * Don't fail when exiting with an error\n   *\n   * @default false\n   */\n  allowErrExit?: boolean;\n\n  /**\n   * Whether to capture stderr\n   *\n   * @default true\n   */\n  captureStderr?: boolean;\n\n  /**\n   * Pass output here\n   */\n  output?: NodeJS.WritableStream;\n}\n\nexport interface CdkCliOptions extends ShellOptions {\n  options?: string[];\n  neverRequireApproval?: boolean;\n  verbose?: boolean;\n}\n\n/**\n * Prepare a target dir byreplicating a source directory\n */\nexport async function cloneDirectory(source: string, target: string, output?: NodeJS.WritableStream) {\n  await shell(['rm', '-rf', target], { output });\n  await shell(['mkdir', '-p', target], { output });\n  await shell(['cp', '-R', source + '/*', target], { output });\n}\n\nexport class TestFixture {\n  public readonly qualifier = randomString().substr(0, 10);\n  private readonly bucketsToDelete = new Array<string>();\n\n  constructor(\n    public readonly integTestDir: string,\n    public readonly stackNamePrefix: string,\n    public readonly output: NodeJS.WritableStream,\n    public readonly aws: AwsClients) {\n  }\n\n  public log(s: string) {\n    this.output.write(`${s}\\n`);\n  }\n\n  public async shell(command: string[], options: Omit<ShellOptions, 'cwd'|'output'> = {}): Promise<string> {\n    return shell(command, {\n      output: this.output,\n      cwd: this.integTestDir,\n      ...options,\n    });\n  }\n\n  public async cdkDeploy(stackNames: string | string[], options: CdkCliOptions = {}) {\n    stackNames = typeof stackNames === 'string' ? [stackNames] : stackNames;\n\n    const neverRequireApproval = options.neverRequireApproval ?? true;\n\n    return this.cdk(['deploy',\n      ...(neverRequireApproval ? ['--require-approval=never'] : []), // Default to no approval in an unattended test\n      ...(options.options ?? []),\n      ...this.fullStackName(stackNames)], options);\n  }\n\n  public async cdkDestroy(stackNames: string | string[], options: CdkCliOptions = {}) {\n    stackNames = typeof stackNames === 'string' ? [stackNames] : stackNames;\n\n    return this.cdk(['destroy',\n      '-f', // We never want a prompt in an unattended test\n      ...(options.options ?? []),\n      ...this.fullStackName(stackNames)], options);\n  }\n\n  public async cdk(args: string[], options: CdkCliOptions = {}) {\n    const verbose = options.verbose ?? true;\n\n    return this.shell(['cdk', ...(verbose ? ['-v'] : []), ...args], {\n      ...options,\n      modEnv: {\n        AWS_REGION: this.aws.region,\n        AWS_DEFAULT_REGION: this.aws.region,\n        STACK_NAME_PREFIX: this.stackNamePrefix,\n        ...options.modEnv,\n      },\n    });\n  }\n\n  public fullStackName(stackName: string): string;\n  public fullStackName(stackNames: string[]): string[];\n  public fullStackName(stackNames: string | string[]): string | string[] {\n    if (typeof stackNames === 'string') {\n      return `${this.stackNamePrefix}-${stackNames}`;\n    } else {\n      return stackNames.map(s => `${this.stackNamePrefix}-${s}`);\n    }\n  }\n\n  /**\n   * Append this to the list of buckets to potentially delete\n   *\n   * At the end of a test, we clean up buckets that may not have gotten destroyed\n   * (for whatever reason).\n   */\n  public rememberToDeleteBucket(bucketName: string) {\n    this.bucketsToDelete.push(bucketName);\n  }\n\n  /**\n   * Cleanup leftover stacks and buckets\n   */\n  public async dispose(success: boolean) {\n    const stacksToDelete = await this.deleteableStacks(this.stackNamePrefix);\n\n    // Bootstrap stacks have buckets that need to be cleaned\n    const bucketNames = stacksToDelete.map(stack => outputFromStack('BucketName', stack)).filter(defined);\n    await Promise.all(bucketNames.map(b => this.aws.emptyBucket(b)));\n\n    // Bootstrap stacks have ECR repositories with images which should be deleted\n    const imageRepositoryNames = stacksToDelete.map(stack => outputFromStack('ImageRepositoryName', stack)).filter(defined);\n    await Promise.all(imageRepositoryNames.map(r => this.aws.deleteImageRepository(r)));\n\n    await this.aws.deleteStacks(...stacksToDelete.map(s => s.StackName));\n\n    // We might have leaked some buckets by upgrading the bootstrap stack. Be\n    // sure to clean everything.\n    for (const bucket of this.bucketsToDelete) {\n      await this.aws.deleteBucket(bucket);\n    }\n\n    // If the tests completed successfully, happily delete the fixture\n    // (otherwise leave it for humans to inspect)\n    if (success) {\n      rimraf(this.integTestDir);\n    }\n  }\n\n  /**\n   * Return the stacks starting with our testing prefix that should be deleted\n   */\n  private async deleteableStacks(prefix: string): Promise<AWS.CloudFormation.Stack[]> {\n    const statusFilter = [\n      'CREATE_IN_PROGRESS', 'CREATE_FAILED', 'CREATE_COMPLETE',\n      'ROLLBACK_IN_PROGRESS', 'ROLLBACK_FAILED', 'ROLLBACK_COMPLETE',\n      'DELETE_FAILED',\n      'UPDATE_IN_PROGRESS', 'UPDATE_COMPLETE_CLEANUP_IN_PROGRESS',\n      'UPDATE_COMPLETE', 'UPDATE_ROLLBACK_IN_PROGRESS',\n      'UPDATE_ROLLBACK_FAILED',\n      'UPDATE_ROLLBACK_COMPLETE_CLEANUP_IN_PROGRESS',\n      'UPDATE_ROLLBACK_COMPLETE', 'REVIEW_IN_PROGRESS',\n      'IMPORT_IN_PROGRESS', 'IMPORT_COMPLETE',\n      'IMPORT_ROLLBACK_IN_PROGRESS', 'IMPORT_ROLLBACK_FAILED',\n      'IMPORT_ROLLBACK_COMPLETE',\n    ];\n\n    const response = await this.aws.cloudFormation('describeStacks', {});\n\n    return (response.Stacks ?? [])\n      .filter(s => s.StackName.startsWith(prefix))\n      .filter(s => statusFilter.includes(s.StackStatus))\n      .filter(s => s.RootId === undefined); // Only delete parent stacks. Nested stacks are deleted in the process\n  }\n}\n\n/**\n * Perform a one-time quick sanity check that the AWS clients has properly configured credentials\n *\n * If we don't do this, calls are going to fail and they'll be retried and everything will take\n * forever before the user notices a simple misconfiguration.\n *\n * We can't check for the presence of environment variables since credentials could come from\n * anywhere, so do simple account retrieval.\n *\n * Only do it once per process.\n */\nasync function sanityCheck(aws: AwsClients) {\n  if (sanityChecked === undefined) {\n    try {\n      await aws.account();\n      sanityChecked = true;\n    } catch (e) {\n      sanityChecked = false;\n      throw new Error(`AWS credentials probably not configured, got error: ${e.message}`);\n    }\n  }\n  if (!sanityChecked) {\n    throw new Error('AWS credentials probably not configured, see previous error');\n  }\n}\nlet sanityChecked: boolean | undefined;\n\n/**\n * Make sure that the given environment is bootstrapped\n *\n * Since we go striping across regions, it's going to suck doing this\n * by hand so let's just mass-automate it.\n */\nasync function ensureBootstrapped(fixture: TestFixture) {\n  // Old-style bootstrap stack with default name\n  if (await fixture.aws.stackStatus('CDKToolkit') === undefined) {\n    await fixture.cdk(['bootstrap', `aws://${await fixture.aws.account()}/${fixture.aws.region}`]);\n  }\n}\n\n/**\n * A shell command that does what you want\n *\n * Is platform-aware, handles errors nicely.\n */\nexport async function shell(command: string[], options: ShellOptions = {}): Promise<string> {\n  if (options.modEnv && options.env) {\n    throw new Error('Use either env or modEnv but not both');\n  }\n\n  options.output?.write(`💻 ${command.join(' ')}\\n`);\n\n  const env = options.env ?? (options.modEnv ? { ...process.env, ...options.modEnv } : undefined);\n\n  const child = child_process.spawn(command[0], command.slice(1), {\n    ...options,\n    env,\n    // Need this for Windows where we want .cmd and .bat to be found as well.\n    shell: true,\n    stdio: ['ignore', 'pipe', 'pipe'],\n  });\n\n  return new Promise<string>((resolve, reject) => {\n    const stdout = new Array<Buffer>();\n    const stderr = new Array<Buffer>();\n\n    child.stdout!.on('data', chunk => {\n      options.output?.write(chunk);\n      stdout.push(chunk);\n    });\n\n    child.stderr!.on('data', chunk => {\n      options.output?.write(chunk);\n      if (options.captureStderr ?? true) {\n        stderr.push(chunk);\n      }\n    });\n\n    child.once('error', reject);\n\n    child.once('close', code => {\n      if (code === 0 || options.allowErrExit) {\n        resolve((Buffer.concat(stdout).toString('utf-8') + Buffer.concat(stderr).toString('utf-8')).trim());\n      } else {\n        reject(new Error(`'${command.join(' ')}' exited with error code ${code}`));\n      }\n    });\n  });\n}\n\nfunction defined<A>(x: A): x is NonNullable<A> {\n  return x !== undefined;\n}\n\n/**\n * rm -rf reimplementation, don't want to depend on an NPM package for this\n */\nexport function rimraf(fsPath: string) {\n  try {\n    const isDir = fs.lstatSync(fsPath).isDirectory();\n\n    if (isDir) {\n      for (const file of fs.readdirSync(fsPath)) {\n        rimraf(path.join(fsPath, file));\n      }\n      fs.rmdirSync(fsPath);\n    } else {\n      fs.unlinkSync(fsPath);\n    }\n  } catch (e) {\n    // We will survive ENOENT\n    if (e.code !== 'ENOENT') { throw e; }\n  }\n}\n\nexport function randomString() {\n  // Crazy\n  return Math.random().toString(36).replace(/[^a-z0-9]+/g, '');\n}"]}
\ No newline at end of file
diff --git a/packages/aws-cdk/test/integ/cli/cdk-helpers.ts b/packages/aws-cdk/test/integ/cli/cdk-helpers.ts
index 01829ebff413f..c1049e330d77e 100644
--- a/packages/aws-cdk/test/integ/cli/cdk-helpers.ts
+++ b/packages/aws-cdk/test/integ/cli/cdk-helpers.ts
@@ -10,7 +10,10 @@ const REGIONS = process.env.AWS_REGIONS
   ? process.env.AWS_REGIONS.split(',')
   : [process.env.AWS_REGION ?? process.env.AWS_DEFAULT_REGION ?? 'us-east-1'];
 
+const FRAMEWORK_VERSION = process.env.FRAMEWORK_VERSION;
+
 process.stdout.write(`Using regions: ${REGIONS}\n`);
+process.stdout.write(`Using framework version: ${FRAMEWORK_VERSION}\n`);
 
 const REGION_POOL = new ResourcePool(REGIONS);
 
@@ -58,7 +61,7 @@ export function withCdkApp<A extends TestContext & AwsContext>(block: (context:
 
     let success = true;
     try {
-      await fixture.shell(['npm', 'install',
+      let modules = [
         '@aws-cdk/core',
         '@aws-cdk/aws-sns',
         '@aws-cdk/aws-iam',
@@ -66,7 +69,12 @@ export function withCdkApp<A extends TestContext & AwsContext>(block: (context:
         '@aws-cdk/aws-ssm',
         '@aws-cdk/aws-ecr-assets',
         '@aws-cdk/aws-cloudformation',
-        '@aws-cdk/aws-ec2']);
+        '@aws-cdk/aws-ec2',
+      ];
+      if (FRAMEWORK_VERSION) {
+        modules = modules.map(module => `${module}@${FRAMEWORK_VERSION}`);
+      }
+      await fixture.shell(['npm', 'install', ...modules]);
 
       await ensureBootstrapped(fixture);
 
diff --git a/packages/aws-cdk/test/integ/cli/test.sh b/packages/aws-cdk/test/integ/cli/test.sh
index 42b4994b72ce9..05be97e5312c3 100755
--- a/packages/aws-cdk/test/integ/cli/test.sh
+++ b/packages/aws-cdk/test/integ/cli/test.sh
@@ -6,12 +6,6 @@ echo '~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~'
 echo 'CLI Integration Tests'
 echo '~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~'
 
-current_version=$(node -p "require('${scriptdir}/../../../package.json').version")
-
-# This allows injecting different versions, not just the current one.
-# Useful when testing.
-export VERSION_UNDER_TEST=${VERSION_UNDER_TEST:-${current_version}}
-
 cd $scriptdir
 
 # Install these dependencies that the tests (written in Jest) need.
diff --git a/packages/aws-cdk/test/integ/github-helpers.ts b/packages/aws-cdk/test/integ/github-helpers.ts
new file mode 100644
index 0000000000000..3a0bc1fb84195
--- /dev/null
+++ b/packages/aws-cdk/test/integ/github-helpers.ts
@@ -0,0 +1,30 @@
+import { Octokit } from '@octokit/rest';
+import * as semver from 'semver';
+
+module.exports.fetchPreviousVersion = async function(base: string) {
+  const token = process.env.GITHUB_TOKEN;
+  if (!token) {
+    throw new Error('GITHUB_TOKEN must be set');
+  }
+
+  const github = new Octokit({ auth: token });
+  const releases = await github.repos.listReleases({
+    owner: 'aws',
+    repo: 'aws-cdk',
+  });
+
+  // this returns a list in decsending order, newest releases first
+  for (const release of releases.data) {
+    const version = release.name.replace('v', '');
+    if (semver.lt(version, base)) {
+      return version;
+    }
+  }
+  throw new Error(`Unable to find previous version of ${base}`);
+
+};
+
+// eslint-disable-next-line @typescript-eslint/no-require-imports
+require('make-runnable/custom')({
+  printOutputFrame: false,
+});
\ No newline at end of file
diff --git a/packages/aws-cdk/test/integ/run-against-dist b/packages/aws-cdk/test/integ/run-against-dist
index 3b314abc0e2c4..ed17ddee88243 100755
--- a/packages/aws-cdk/test/integ/run-against-dist
+++ b/packages/aws-cdk/test/integ/run-against-dist
@@ -23,8 +23,11 @@ if [[ ! -f $dist_root/build.json ]]; then
   exit 1
 fi
 
+export CANDIDATE_VERSION=$(node -p "require('${dist_root}/build.json').version")
+export TEST_RUNNER=dist
 
 serve_npm_packages
+install_cli
 
 prepare_java_packages
 prepare_nuget_packages
diff --git a/packages/aws-cdk/test/integ/run-against-dist.bash b/packages/aws-cdk/test/integ/run-against-dist.bash
index a77f564f1895f..83c29e82a5620 100644
--- a/packages/aws-cdk/test/integ/run-against-dist.bash
+++ b/packages/aws-cdk/test/integ/run-against-dist.bash
@@ -4,7 +4,6 @@ npmws=/tmp/cdk-rundist
 rm -rf $npmws
 mkdir -p $npmws
 
-
 # This script must create 1 or 2 traps, and the 'trap' command will replace
 # the previous trap, so get some 'dynamic traps' mechanism in place
 TRAPS=()
@@ -35,66 +34,24 @@ function serve_npm_packages() {
     return 1
   fi
 
-  local_cli_version="$(node -e "console.log(require('${dist_root}/build.json').version)")"
+  #------------------------------------------------------------------------------
+  # Start a mock npm repository from the given tarballs
+  #------------------------------------------------------------------------------
+  header "Starting local NPM Repository (Serving version ${CANDIDATE_VERSION})"
 
   tarballs_glob="$dist_root/js/*.tgz"
 
-  if [ ! -z "${USE_PUBLISHED_FRAMEWORK_VERSION:-}" ]; then
-
-    echo "Testing against latest published versions of the framework"
-
-    header "Installing aws-cdk from local tarballs..."
-    # Need 'npm install --prefix' otherwise it goes to the wrong directory
-    (cd ${npmws} && npx serve-npm-tarballs --glob "${tarballs_glob}" -- npm install --prefix $npmws aws-cdk@${local_cli_version})
-    export PATH=$npmws/node_modules/.bin:$PATH
-
-  else
-
-    echo "Testing against local versions of the framework"
-
-    #------------------------------------------------------------------------------
-    # Start a mock npm repository from the given tarballs
-    #------------------------------------------------------------------------------
-    header "Starting local NPM Repository"
-
-    # When using '--daemon', 'npm install' first so the files are permanent, or
-    # 'npx' will remove them too soon.
-    npm install serve-npm-tarballs
-    eval $(npx serve-npm-tarballs --glob "${tarballs_glob}" --daemon)
-    TRAPS+=("kill $SERVE_NPM_TARBALLS_PID")
-
-    header "Installing aws-cdk from local tarballs..."
-    # Need 'npm install --prefix' otherwise it goes to the wrong directory
-    (cd ${npmws} && npm install --prefix $npmws aws-cdk@${local_cli_version})
-    export PATH=$npmws/node_modules/.bin:$PATH
-
-  fi
-
-  # a bit silly, but it verifies the PATH exports and just makes sure
-  # that we run 'cdk' commands we use the version we just installed.
-  verify_installed_cli_version ${local_cli_version}
-
+  # When using '--daemon', 'npm install' first so the files are permanent, or
+  # 'npx' will remove them too soon.
+  npm install serve-npm-tarballs
+  eval $(npx serve-npm-tarballs --glob "${tarballs_glob}" --daemon)
+  TRAPS+=("kill $SERVE_NPM_TARBALLS_PID")
 }
 
-# Make sure that installed CLI matches the build version
-function verify_installed_cli_version() {
-
-  expected_version=$1
-
-  header "Expected CDK version: ${expected_version}"
-
-  log "Found CDK: $(type -p cdk)"
-
-  # Execute "cdk --version" as a validation that the toolkit is installed
-  local actual_version="$(cdk --version | cut -d" " -f1)"
-
-  if [ "${expected_version}" != "${actual_version}" ]; then
-    log "Mismatched CDK version. Expected: ${expected_version}, actual: ${actual_version}"
-    cdk --version
-    exit 1
-  else
-    log "Verified CDK version is: ${expected_version}"
-  fi
+function install_cli() {
+  echo "Installing CLI aws-cdk@${CANDIDATE_VERSION}"
+  (cd ${npmws} && npm install --prefix $npmws aws-cdk@${CANDIDATE_VERSION})
+  export PATH=$npmws/node_modules/.bin:$PATH
 }
 
 function prepare_java_packages() {
@@ -180,4 +137,4 @@ function prepare_python_packages() {
 
 function pip() {
   pip_ "$@"
-}
+}
\ No newline at end of file
diff --git a/packages/aws-cdk/test/integ/run-against-release b/packages/aws-cdk/test/integ/run-against-release
index 5ea9bf34ff7d4..0865bd331a25d 100755
--- a/packages/aws-cdk/test/integ/run-against-release
+++ b/packages/aws-cdk/test/integ/run-against-release
@@ -14,6 +14,7 @@ mkdir -p $npmws
 # Install the CLI and put it on the PATH
 (cd $npmws && npm install aws-cdk)
 export PATH=$npmws/node_modules/.bin:$PATH
+export TEST_RUNNER=release
 
 # Run the inner script
 exec "$@"
diff --git a/packages/aws-cdk/test/integ/run-against-repo b/packages/aws-cdk/test/integ/run-against-repo
index 601097c880d18..420850f2cd951 100755
--- a/packages/aws-cdk/test/integ/run-against-repo
+++ b/packages/aws-cdk/test/integ/run-against-repo
@@ -15,6 +15,7 @@ fi
 
 export REPO_ROOT="$repo_root"
 export ORIGINAL_NPM="$(type -p npm)"
+export TEST_RUNNER=repo
 
 export PATH="$cli_dir/bin:$cli_dir/test/integ/run-wrappers/repo:$PATH"
 hash -r
diff --git a/packages/aws-cdk/test/integ/run-wrappers/repo/npm b/packages/aws-cdk/test/integ/run-wrappers/repo/npm
index e90e296bbef1d..4a49bd85621b5 100755
--- a/packages/aws-cdk/test/integ/run-wrappers/repo/npm
+++ b/packages/aws-cdk/test/integ/run-wrappers/repo/npm
@@ -5,11 +5,7 @@ command=$1
 
 lerna=$REPO_ROOT/node_modules/.bin/lerna
 
-if [ ! -z "${USE_PUBLISHED_FRAMEWORK_VERSION:-}" ]; then
-  # simply pass through to npm and install the published package.
-  echo "Running original NPM command since we are testing against published framework version"
-  exec $ORIGINAL_NPM "$@"
-elif [[ "$command" == "install" || "$command" == "i" ]]; then
+if [[ "$command" == "install" || "$command" == "i" ]]; then
   npmargs="install"
   shift
 
@@ -33,3 +29,5 @@ elif [[ "$command" == "install" || "$command" == "i" ]]; then
 
   exec $ORIGINAL_NPM $npmargs
 fi
+
+exec $ORIGINAL_NPM "$@"
\ No newline at end of file
diff --git a/packages/aws-cdk/test/integ/test-cli-regression-against-current-code.sh b/packages/aws-cdk/test/integ/test-cli-regression-against-current-code.sh
index dc62bab8f698c..ff50aa5f69a2b 100755
--- a/packages/aws-cdk/test/integ/test-cli-regression-against-current-code.sh
+++ b/packages/aws-cdk/test/integ/test-cli-regression-against-current-code.sh
@@ -1,93 +1,11 @@
 #!/bin/bash
 #
 # Run our integration tests in regression mode against the
-# local code of the framework and CLI.
-#
-#   1. Download the latest released version of the aws-cdk repo.
-#   2. Copy its integration tests directory ((test/integ/cli)) here.
-#   3. Run the integration tests from the copied directory.
+# candidate version of the framework, which is the one we just packed.
 #
 set -euo pipefail
 integdir=$(cd $(dirname $0) && pwd)
 
-temp_dir=$(mktemp -d)
-
-function cleanup {
-    # keep junit file to allow report creation
-    cp ${integ_under_test}/coverage/junit.xml .
-    rm -rf ${temp_dir}
-    rm -rf ${integ_under_test}
-}
-
-
-function get_latest_published_version {
-
-    # fetch the latest published version number.
-    # this is stored in the github releases under the 'latest' tag.
-
-    github_headers=""
-    if [[ "${GITHUB_TOKEN:-}" != "" ]]; then
-        github_headers="Authorization: token ${GITHUB_TOKEN}"
-    fi
-
-    out="${temp_dir}/aws-cdk-release.json"
-
-    curl -Ss --dump-header /dev/null -H "$github_headers" https://api.github.com/repos/aws/aws-cdk/releases/latest > ${out}
-    latest_version=$(node -p "require('${out}').name")
-    echo ${latest_version}
-}
-
-function download_repo {
-
-    # we need to download the repo code from GitHub in order to extract
-    # the integration tests that were present in that version of the repo.
-    #
-    # Download just the CLI tarball, which contains the tests. We can't
-    # use 'npm pack' here to obtain the tarball, as 'npm' commands may
-    # be redirected to a local Verdaccio.
-    #
-    # Rather than introducing another level of indirection to work around
-    # that, just go to npmjs.com directly.
-
-    # Strip off leading 'v'
-    version=${1#v}
-
-    out="${temp_dir}/.repo.tar.gz"
-
-    curl -Ssf -L -o ${out} "https://registry.npmjs.org/aws-cdk/-/aws-cdk-${version}.tgz"
-    tar -zxf ${out} -C ${temp_dir}
-}
-
-# this allows injecting different versions to be treated as the baseline
-# of the regression. usually this would just be the latest published version,
-# but this can even be a branch name during development and testing.
-VERSION_UNDER_TEST=${VERSION_UNDER_TEST:-$(get_latest_published_version)}
-
-trap cleanup INT EXIT
-
-echo "Downloading aws-cdk repo version ${VERSION_UNDER_TEST}"
-download_repo ${VERSION_UNDER_TEST}
-
-# remove '/' that is prevelant in our branch names but causes
-# bad behvaior when using it as directory names.
-sanitized_version=$(sed 's/\//-/g' <<< "${VERSION_UNDER_TEST}")
-
-# Test must be created in the same directory here because the script files liberally
-# include files from '..' and they have to exist.
-integ_under_test=${integdir}/cli-backwards-tests-${sanitized_version}
-rm -rf ${integ_under_test}
-echo "Copying integration tests of version ${VERSION_UNDER_TEST} to ${integ_under_test} (dont worry, its gitignored)"
-cp -r ${temp_dir}/package/test/integ/cli ${integ_under_test}
-
-patch_dir="${integdir}/cli-regression-patches/${VERSION_UNDER_TEST}"
-# delete possibly stale junit.xml file
-rm -f ${integ_under_test}/junit.xml
-if [[ -d "$patch_dir" ]]; then
-    echo "Hotpatching the tests with files from $patch_dir" >&2
-    cp -r "$patch_dir"/* ${integ_under_test}
-fi
-
-echo "Running integration tests of version ${VERSION_UNDER_TEST} from ${integ_under_test}"
-set -x
+source ${integdir}/test-cli-regression.bash
 
-VERSION_UNDER_TEST=${VERSION_UNDER_TEST} ${integ_under_test}/test.sh "$@"
+run_regression_against_framework_version CANDIDATE_VERSION
diff --git a/packages/aws-cdk/test/integ/test-cli-regression-against-latest-release.sh b/packages/aws-cdk/test/integ/test-cli-regression-against-latest-release.sh
index 6d0133ca06108..8b670eb7b793d 100755
--- a/packages/aws-cdk/test/integ/test-cli-regression-against-latest-release.sh
+++ b/packages/aws-cdk/test/integ/test-cli-regression-against-latest-release.sh
@@ -1,8 +1,11 @@
 #!/bin/bash
+#
+# Run our integration tests in regression mode against the
+# previous version of the framework, relative to the version being packed now.
+#
 set -euo pipefail
 integdir=$(cd $(dirname $0) && pwd)
 
-# run the regular regression test but pass the env variable that will
-# eventually instruct our runners and wrappers to install the framework
-# from npmjs.org rather then using the local code.
-USE_PUBLISHED_FRAMEWORK_VERSION=True ${integdir}/test-cli-regression-against-current-code.sh "$@"
+source ${integdir}/test-cli-regression.bash
+
+run_regression_against_framework_version PREVIOUS_VERSION
diff --git a/packages/aws-cdk/test/integ/test-cli-regression.bash b/packages/aws-cdk/test/integ/test-cli-regression.bash
new file mode 100644
index 0000000000000..70ac6645dd61c
--- /dev/null
+++ b/packages/aws-cdk/test/integ/test-cli-regression.bash
@@ -0,0 +1,82 @@
+#!/bin/bash
+#
+# Helper functions for CLI regression tests.
+#
+set -euo pipefail
+integdir=$(cd $(dirname $0) && pwd)
+
+# Run our integration tests in regression mode.
+#
+#   1. Figure out what was the previous (relative to the current candidate) version we published.
+#   2. Download the integration tests artifact from that version.
+#   2. Copy its integration tests directory ((test/integ/cli)) here.
+#   3. Run the integration tests from the copied directory.
+#
+# Positional Arugments:
+#
+#   1) Framework version identifier. Which version of the framework should the tests run against. Options are:
+#
+#       - CANDIDATE_VERSION: Use the candidate code, i.e the one being built right now.
+#       - PREVIOUS_VERSION: Use the previous version code, i.e the published version prior to CANDIDATE_VERSION.
+#
+function run_regression_against_framework_version() {
+
+  TEST_RUNNER=${TEST_RUNNER:-""}
+  CANDIDATE_VERSION=${CANDIDATE_VERSION:-""}
+
+  if [ "${TEST_RUNNER}" != "dist" ]; then
+    echo "Unsupported runner: ${TEST_RUNNER}. Regression tests can only run with the 'dist' runner"
+    exit 1
+  fi
+
+  if [[ ! "${CANDIDATE_VERSION}" =~ "rc" ]]; then
+    echo "Unexpected CANDIDATE_VERSION: ${CANDIDATE_VERSION}. Must be set to a pre-release version. Did you forget to run './bump-candiate.sh' before packing?"
+    exit 1
+  fi
+
+  SUPPORTED_FRAMEWORK_VERSION_IDENTIFIERS=("CANDIDATE_VERSION PREVIOUS_VERSION")
+  FRAMEWORK_VERSION_IDENTIFIER=$1
+  if [[ ! " ${SUPPORTED_FRAMEWORK_VERSION_IDENTIFIERS[@]} " =~ " ${FRAMEWORK_VERSION_IDENTIFIER} " ]]; then
+      echo "Unsupported framework version identifier. Should be one of ${SUPPORTED_FRAMEWORK_VERSION_IDENTIFIERS}"
+      exit 1
+  fi
+
+  echo "Fetching previous version for candidate: ${CANDIDATE_VERSION}"
+
+  # we need to explicitly install these deps because this script is executed
+  # int the test phase, which means the cwd is the packaged dist directory,
+  # so it doesn't have the dependencies installed from the installation of the package.json
+  # in the build phase. maybe we should just run npm install on the package.json again?
+  npm install @octokit/rest@^18.0.6 semver@^7.3.2 make-runnable@^1.3.8
+  PREVIOUS_VERSION=$(node ${integdir}/github-helpers.js fetchPreviousVersion ${CANDIDATE_VERSION})
+
+  echo "Previous version is: ${PREVIOUS_VERSION}"
+
+  temp_dir=$(mktemp -d)
+  integ_under_test=${integdir}/cli-backwards-tests-${PREVIOUS_VERSION}
+
+  pushd ${temp_dir}
+
+  echo "Downloading aws-cdk ${PREVIOUS_VERSION} tarball from npm"
+  npm pack aws-cdk@${PREVIOUS_VERSION}
+  tar -zxvf aws-cdk-${PREVIOUS_VERSION}.tgz
+
+  rm -rf ${integ_under_test}
+
+  echo "Copying integration tests of version ${PREVIOUS_VERSION} to ${integ_under_test} (dont worry, its gitignored)"
+  cp -r ${temp_dir}/package/test/integ/cli "${integ_under_test}"
+
+  patch_dir="${integdir}/cli-regression-patches/v${PREVIOUS_VERSION}"
+  # delete possibly stale junit.xml file
+  rm -f ${integ_under_test}/junit.xml
+  if [[ -d "$patch_dir" ]]; then
+      echo "Hotpatching the tests with files from $patch_dir" >&2
+      cp -r "$patch_dir"/* ${integ_under_test}
+  fi
+
+  popd
+
+  # the framework version to use is determined by the caller as the first argument.
+  # its a variable name indirection.
+  FRAMEWORK_VERSION=${!FRAMEWORK_VERSION_IDENTIFIER} ${integ_under_test}/test.sh
+}
diff --git a/yarn.lock b/yarn.lock
index affb10c957d4c..d6e7b9cf672d1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2156,6 +2156,18 @@
   dependencies:
     "@octokit/types" "^5.0.0"
 
+"@octokit/core@^3.0.0":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@octokit/core/-/core-3.1.2.tgz#c937d5f9621b764573068fcd2e5defcc872fd9cc"
+  integrity sha512-AInOFULmwOa7+NFi9F8DlDkm5qtZVmDQayi7TUgChE3yeIGPq0Y+6cAEXPexQ3Ea+uZy66hKEazR7DJyU+4wfw==
+  dependencies:
+    "@octokit/auth-token" "^2.4.0"
+    "@octokit/graphql" "^4.3.1"
+    "@octokit/request" "^5.4.0"
+    "@octokit/types" "^5.0.0"
+    before-after-hook "^2.1.0"
+    universal-user-agent "^6.0.0"
+
 "@octokit/endpoint@^6.0.1":
   version "6.0.6"
   resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-6.0.6.tgz#4f09f2b468976b444742a1d5069f6fa45826d999"
@@ -2165,6 +2177,15 @@
     is-plain-object "^5.0.0"
     universal-user-agent "^6.0.0"
 
+"@octokit/graphql@^4.3.1":
+  version "4.5.6"
+  resolved "https://registry.yarnpkg.com/@octokit/graphql/-/graphql-4.5.6.tgz#708143ba15cf7c1879ed6188266e7f270be805d4"
+  integrity sha512-Rry+unqKTa3svswT2ZAuqenpLrzJd+JTv89LTeVa5UM/5OX8o4KTkPL7/1ABq4f/ZkELb0XEK/2IEoYwykcLXg==
+  dependencies:
+    "@octokit/request" "^5.3.0"
+    "@octokit/types" "^5.0.0"
+    universal-user-agent "^6.0.0"
+
 "@octokit/plugin-enterprise-rest@^6.0.1":
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/@octokit/plugin-enterprise-rest/-/plugin-enterprise-rest-6.0.1.tgz#e07896739618dab8da7d4077c658003775f95437"
@@ -2177,6 +2198,13 @@
   dependencies:
     "@octokit/types" "^2.0.1"
 
+"@octokit/plugin-paginate-rest@^2.2.0":
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.4.0.tgz#92f951ddc8a1cd505353fa07650752ca25ed7e93"
+  integrity sha512-YT6Klz3LLH6/nNgi0pheJnUmTFW4kVnxGft+v8Itc41IIcjl7y1C8TatmKQBbCSuTSNFXO5pCENnqg6sjwpJhg==
+  dependencies:
+    "@octokit/types" "^5.5.0"
+
 "@octokit/plugin-request-log@^1.0.0":
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/@octokit/plugin-request-log/-/plugin-request-log-1.0.0.tgz#eef87a431300f6148c39a7f75f8cfeb218b2547e"
@@ -2190,6 +2218,14 @@
     "@octokit/types" "^2.0.1"
     deprecation "^2.3.1"
 
+"@octokit/plugin-rest-endpoint-methods@4.2.0":
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-4.2.0.tgz#c5a0691b3aba5d8b4ef5dffd6af3649608f167ba"
+  integrity sha512-1/qn1q1C1hGz6W/iEDm9DoyNoG/xdFDt78E3eZ5hHeUfJTLJgyAMdj9chL/cNBHjcjd+FH5aO1x0VCqR2RE0mw==
+  dependencies:
+    "@octokit/types" "^5.5.0"
+    deprecation "^2.3.1"
+
 "@octokit/request-error@^1.0.2":
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-1.2.1.tgz#ede0714c773f32347576c25649dc013ae6b31801"
@@ -2208,7 +2244,7 @@
     deprecation "^2.0.0"
     once "^1.4.0"
 
-"@octokit/request@^5.2.0":
+"@octokit/request@^5.2.0", "@octokit/request@^5.3.0", "@octokit/request@^5.4.0":
   version "5.4.9"
   resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.4.9.tgz#0a46f11b82351b3416d3157261ad9b1558c43365"
   integrity sha512-CzwVvRyimIM1h2n9pLVYfTDmX9m+KHSgCpqPsY8F1NdEK8IaWqXhSBXsdjOBFZSpEcxNEeg4p0UO9cQ8EnOCLA==
@@ -2244,6 +2280,16 @@
     once "^1.4.0"
     universal-user-agent "^4.0.0"
 
+"@octokit/rest@^18.0.6":
+  version "18.0.6"
+  resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-18.0.6.tgz#76c274f1a68f40741a131768ef483f041e7b98b6"
+  integrity sha512-ES4lZBKPJMX/yUoQjAZiyFjei9pJ4lTTfb9k7OtYoUzKPDLl/M8jiHqt6qeSauyU4eZGLw0sgP1WiQl9FYeM5w==
+  dependencies:
+    "@octokit/core" "^3.0.0"
+    "@octokit/plugin-paginate-rest" "^2.2.0"
+    "@octokit/plugin-request-log" "^1.0.0"
+    "@octokit/plugin-rest-endpoint-methods" "4.2.0"
+
 "@octokit/types@^2.0.0", "@octokit/types@^2.0.1":
   version "2.16.2"
   resolved "https://registry.yarnpkg.com/@octokit/types/-/types-2.16.2.tgz#4c5f8da3c6fecf3da1811aef678fda03edac35d2"
@@ -2251,7 +2297,7 @@
   dependencies:
     "@types/node" ">= 8"
 
-"@octokit/types@^5.0.0", "@octokit/types@^5.0.1":
+"@octokit/types@^5.0.0", "@octokit/types@^5.0.1", "@octokit/types@^5.5.0":
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/@octokit/types/-/types-5.5.0.tgz#e5f06e8db21246ca102aa28444cdb13ae17a139b"
   integrity sha512-UZ1pErDue6bZNjYOotCNveTXArOMZQFG6hKJfOnGnulVCMcVVi7YIIuuR4WfBhjo7zgpmzn/BkPDnUXtNx+PcQ==
@@ -4054,7 +4100,7 @@ bcrypt-pbkdf@^1.0.0:
   dependencies:
     tweetnacl "^0.14.3"
 
-before-after-hook@^2.0.0:
+before-after-hook@^2.0.0, before-after-hook@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-2.1.0.tgz#b6c03487f44e24200dd30ca5e6a1979c5d2fb635"
   integrity sha512-IWIbu7pMqyw3EAJHzzHbWa85b6oud/yfKYg5rqB5hNE8CeMi3nX+2C2sj0HswfblST86hpVEOAb9x34NZd6P7A==
@@ -4073,7 +4119,7 @@ bl@^4.0.3:
     inherits "^2.0.4"
     readable-stream "^3.4.0"
 
-bluebird@^3.5.1, bluebird@^3.5.3, bluebird@^3.5.5:
+bluebird@^3.5.0, bluebird@^3.5.1, bluebird@^3.5.3, bluebird@^3.5.5:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
@@ -9759,6 +9805,14 @@ make-fetch-happen@^5.0.0:
     socks-proxy-agent "^4.0.0"
     ssri "^6.0.0"
 
+make-runnable@^1.3.8:
+  version "1.3.8"
+  resolved "https://registry.yarnpkg.com/make-runnable/-/make-runnable-1.3.8.tgz#ce547757d776c1f369028dbd937731db9514fe6a"
+  integrity sha512-8lXEwzB1eLl1pGFx5JZxFbWac6v6bHfRrCn/xDO4Qk9H6DN0QqIsJOquGxz7NkZxedhh7uki1txsbgTci1W/Vw==
+  dependencies:
+    bluebird "^3.5.0"
+    yargs "^16.0.3"
+
 makeerror@1.0.x:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c"

From fa8d4ed06e56fe3a48adb256e5f463175b6289fb Mon Sep 17 00:00:00 2001
From: Niranjan Jayakar <nija@amazon.com>
Date: Mon, 12 Oct 2020 15:26:56 +0100
Subject: [PATCH 7/8] chore: enable gitpod prebuilds for PRs from forks
 (#10824)

This enables GitPod pre-builds to be created for PRs that are created
from forks.

Docs: https://www.gitpod.io/docs/prebuilds/#configure-the-github-app


----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
---
 .gitpod.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.gitpod.yml b/.gitpod.yml
index 61bf069e34517..2e63da1c1cb98 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -1,4 +1,10 @@
+github:
+  prebuilds:
+    pullRequestsFromForks: true
+    addComment: true
+
 image: jsii/superchain
+
 tasks:
   - init: yarn build --skip-test --no-bail --skip-prereqs --skip-compat
 

From e90a0a9065f48e09a3e4c8e39403c6beac7cd566 Mon Sep 17 00:00:00 2001
From: Pankaj Yadav <nirvanapankaj12@gmail.com>
Date: Mon, 12 Oct 2020 21:58:19 +0530
Subject: [PATCH 8/8] feat(aws-codepipeline-actions) allows custom role for
 code commit event role (#10807)

With this PR you  can use custom role that is assumed by "events.amazonaws.com" to start CodePipeline execution.

Fixes #10069

----
*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
---
 .../aws-codepipeline-actions/README.md        | 13 +++++
 .../lib/codecommit/source-action.ts           | 12 +++-
 .../test.codecommit-source-action.ts          | 57 +++++++++++++++++++
 3 files changed, 81 insertions(+), 1 deletion(-)

diff --git a/packages/@aws-cdk/aws-codepipeline-actions/README.md b/packages/@aws-cdk/aws-codepipeline-actions/README.md
index 39874e001cb4b..6578110867b33 100644
--- a/packages/@aws-cdk/aws-codepipeline-actions/README.md
+++ b/packages/@aws-cdk/aws-codepipeline-actions/README.md
@@ -42,6 +42,19 @@ pipeline.addStage({
 });
 ```
 
+If you want to use existing role which can be used by on commit event rule.
+You can specify the role object in eventRole property.
+
+```ts
+const eventRole = iam.Role.fromRoleArn(this, 'Event-role', 'roleArn');
+const sourceAction = new codepipeline_actions.CodeCommitSourceAction({
+  actionName: 'CodeCommit',
+  repository: repo,
+  output: new codepipeline.Artifact(),
+  eventRole,
+});
+```
+
 The CodeCommit source action emits variables:
 
 ```typescript
diff --git a/packages/@aws-cdk/aws-codepipeline-actions/lib/codecommit/source-action.ts b/packages/@aws-cdk/aws-codepipeline-actions/lib/codecommit/source-action.ts
index 62e8b83ba3424..8abca963a1943 100644
--- a/packages/@aws-cdk/aws-codepipeline-actions/lib/codecommit/source-action.ts
+++ b/packages/@aws-cdk/aws-codepipeline-actions/lib/codecommit/source-action.ts
@@ -77,6 +77,14 @@ export interface CodeCommitSourceActionProps extends codepipeline.CommonAwsActio
    * The CodeCommit repository.
    */
   readonly repository: codecommit.IRepository;
+
+  /**
+   * Role to be used by on commit event rule.
+   * Used only when trigger value is CodeCommitTrigger.EVENTS.
+   *
+   * @default a new role will be created.
+   */
+  readonly eventRole?: iam.IRole;
 }
 
 /**
@@ -124,7 +132,9 @@ export class CodeCommitSourceAction extends Action {
     if (createEvent) {
       const eventId = this.generateEventId(stage);
       this.props.repository.onCommit(eventId, {
-        target: new targets.CodePipeline(stage.pipeline),
+        target: new targets.CodePipeline(stage.pipeline, {
+          eventRole: this.props.eventRole,
+        }),
         branches: [this.branch],
       });
     }
diff --git a/packages/@aws-cdk/aws-codepipeline-actions/test/codecommit/test.codecommit-source-action.ts b/packages/@aws-cdk/aws-codepipeline-actions/test/codecommit/test.codecommit-source-action.ts
index fda7c79dc1800..520af74ba8af2 100644
--- a/packages/@aws-cdk/aws-codepipeline-actions/test/codecommit/test.codecommit-source-action.ts
+++ b/packages/@aws-cdk/aws-codepipeline-actions/test/codecommit/test.codecommit-source-action.ts
@@ -2,6 +2,7 @@ import { countResources, expect, haveResourceLike, not } from '@aws-cdk/assert';
 import * as codebuild from '@aws-cdk/aws-codebuild';
 import * as codecommit from '@aws-cdk/aws-codecommit';
 import * as codepipeline from '@aws-cdk/aws-codepipeline';
+import * as iam from '@aws-cdk/aws-iam';
 import { Stack, Lazy } from '@aws-cdk/core';
 import { Test } from 'nodeunit';
 import * as cpactions from '../../lib';
@@ -267,6 +268,62 @@ export = {
 
       test.done();
     },
+
+    'uses the role when passed'(test: Test) {
+      const stack = new Stack();
+
+      const pipeline = new codepipeline.Pipeline(stack, 'P', {
+        pipelineName: 'MyPipeline',
+      });
+
+      const triggerEventTestRole = new iam.Role(stack, 'Trigger-test-role', {
+        assumedBy: new iam.ServicePrincipal('events.amazonaws.com'),
+      });
+      triggerEventTestRole.addToPolicy(new iam.PolicyStatement({
+        actions: ['codepipeline:StartPipelineExecution'],
+        resources: [pipeline.pipelineArn],
+      }));
+
+      const sourceOutput = new codepipeline.Artifact();
+
+      const sourceAction = new cpactions.CodeCommitSourceAction({
+        actionName: 'CodeCommit',
+        repository: new codecommit.Repository(stack, 'R', {
+          repositoryName: 'repository',
+        }),
+        branch: Lazy.stringValue({ produce: () => 'my-branch' }),
+        output: sourceOutput,
+        eventRole: triggerEventTestRole,
+      });
+
+      pipeline.addStage({
+        stageName: 'Source',
+        actions: [sourceAction],
+      });
+
+      const buildAction = new cpactions.CodeBuildAction({
+        actionName: 'Build',
+        project: new codebuild.PipelineProject(stack, 'CodeBuild'),
+        input: sourceOutput,
+      });
+
+      pipeline.addStage({
+        stageName: 'build',
+        actions: [buildAction],
+      });
+
+      expect(stack).to(haveResourceLike('AWS::Events::Rule', {
+        Targets: [
+          {
+            Arn: stack.resolve(pipeline.pipelineArn),
+            Id: 'Target0',
+            RoleArn: stack.resolve(triggerEventTestRole.roleArn),
+          },
+        ],
+      }));
+
+      test.done();
+    },
   },
 };