Merge remote-tracking branch 'origin/master' into huijbers/pipelines-…

…env-constr

.github/ISSUE_TEMPLATE.md

@@ -31,4 +31,4 @@ falling prey to the [X/Y problem][2]!
 
 
 ### Other information
-<!-- e.g. detailed explanation, stacktraces, related issues, suggestions how to fix, links for us to have context, eg. associated pull-request, stackoverflow, gitter, etc -->
+<!-- e.g. detailed explanation, stacktraces, related issues, suggestions how to fix, links for us to have context, eg. associated pull-request, stackoverflow, slack, etc -->

.github/ISSUE_TEMPLATE/bug.md

@@ -41,7 +41,7 @@ What is the unexpected behavior you were seeing? If you got an error, paste it h
 
 ### Other
 
-<!-- e.g. detailed explanation, stacktraces, related issues, suggestions on how to fix, links for us to have context, eg. associated pull-request, stackoverflow, gitter, etc -->
+<!-- e.g. detailed explanation, stacktraces, related issues, suggestions on how to fix, links for us to have context, eg. associated pull-request, stackoverflow, slack, etc -->
 
 
 

.github/ISSUE_TEMPLATE/feature-request.md

@@ -31,7 +31,7 @@ labels: feature-request, needs-triage
 
 <!-- 
 e.g. detailed explanation, stacktraces, related issues, suggestions on how to fix, 
-links for us to have context, eg. associated pull-request, stackoverflow, gitter, etc
+links for us to have context, eg. associated pull-request, stackoverflow, slack, etc
 -->
 
 

.github/ISSUE_TEMPLATE/general-issues.md

@@ -32,4 +32,4 @@ falling prey to the [X/Y problem][2]!
 
 
 ### Other information
-<!-- e.g. detailed explanation, stacktraces, related issues, suggestions on how to fix, links for us to have context, eg. associated pull-request, stackoverflow, gitter, etc -->
+<!-- e.g. detailed explanation, stacktraces, related issues, suggestions on how to fix, links for us to have context, eg. associated pull-request, stackoverflow, slack, etc -->

CHANGELOG.md

@@ -2,6 +2,21 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [1.66.0](https://github.com/aws/aws-cdk/compare/v1.65.0...v1.66.0) (2020-10-02)
+
+### Features
+
+* **cfnspec:** cloudformation spec v18.4.0 ([#10493](https://github.com/aws/aws-cdk/issues/10493)) ([fa50369](https://github.com/aws/aws-cdk/commit/fa503692c14a45c130103415114f6818b3d79426))
+* **cfnspec:** cloudformation spec v18.5.0 ([#10636](https://github.com/aws/aws-cdk/issues/10636)) ([e99cf63](https://github.com/aws/aws-cdk/commit/e99cf631430ceca0b4fe9920f7189bc8b664acbf))
+* **events-targets:** option to provide an existing role to use with the StepFunctions State Machine target ([#10551](https://github.com/aws/aws-cdk/issues/10551)) ([b96efd8](https://github.com/aws/aws-cdk/commit/b96efd8aaa143845b9fe315a9ee1e8398c4d83c2)), closes [#8255](https://github.com/aws/aws-cdk/issues/8255)
+
+
+### Bug Fixes
+
+* **codebuild:** permissions for Project in VPC used incorrect AWS partition ([#10637](https://github.com/aws/aws-cdk/issues/10637)) ([b207888](https://github.com/aws/aws-cdk/commit/b2078881445850acf4877ffd2cf657cfdfa78e0f)), closes [#10634](https://github.com/aws/aws-cdk/issues/10634)
+* **codecommit:** use region given in fromRepositoryArn when creating clone urls ([#10639](https://github.com/aws/aws-cdk/issues/10639)) ([934553c](https://github.com/aws/aws-cdk/commit/934553cae4a9110f9109a978ab92a493f27dbfca)), closes [#10630](https://github.com/aws/aws-cdk/issues/10630)
+* **core,cx-api:** docker bundling fails during tests on macOS ([#10620](https://github.com/aws/aws-cdk/issues/10620)) ([0331508](https://github.com/aws/aws-cdk/commit/033150840a4f5bc21f85f0126b125e4f2a31a9bf)), closes [#10262](https://github.com/aws/aws-cdk/issues/10262)
+
 ## [1.65.0](https://github.com/aws/aws-cdk/compare/v1.64.1...v1.65.0) (2020-09-30)
 
 

README.md

@@ -1,7 +1,6 @@
 # AWS Cloud Development Kit (AWS CDK)
 
 ![Build Status](https://codebuild.us-east-1.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiSy9rWmVENzRDbXBoVlhYaHBsNks4OGJDRXFtV1IySmhCVjJoaytDU2dtVWhhVys3NS9Odk5DbC9lR2JUTkRvSWlHSXZrNVhYQ3ZsaUJFY3o4OERQY1pnPSIsIml2UGFyYW1ldGVyU3BlYyI6IlB3ODEyRW9KdU0yaEp6NDkiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=master)
-[![Gitter chat](https://badges.gitter.im/gitterHQ/gitter.svg)](https://gitter.im/awslabs/aws-cdk)
 [![Gitpod Ready-to-Code](https://img.shields.io/badge/Gitpod-ready--to--code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/aws/aws-cdk)
 [![NPM version](https://badge.fury.io/js/aws-cdk.svg)](https://badge.fury.io/js/aws-cdk)
 [![PyPI version](https://badge.fury.io/py/aws-cdk.core.svg)](https://badge.fury.io/py/aws-cdk.core)
@@ -130,11 +129,9 @@ If you have a support plan with AWS Support, you can also create a new [support
 
 You may also find help on these community resources:
 * Look through the [API Reference](https://docs.aws.amazon.com/cdk/api/latest/docs/aws-construct-library.html) or [Developer Guide](https://docs.aws.amazon.com/cdk/latest/guide)
+* The #aws-cdk Slack channel in [cdk.dev](https://cdk.dev)
 * Ask a question on [Stack Overflow](https://stackoverflow.com/questions/tagged/aws-cdk)
   and tag it with `aws-cdk`
-* Come join the AWS CDK community on [Gitter](https://gitter.im/awslabs/aws-cdk)
-* Talk in the CDK channel of the [AWS Developers Slack workspace](https://awsdevelopers.slack.com) (invite required)
-* A community-driven Slack channel is also available, invite at [cdk.dev](https://cdk.dev)
 
 ### Roadmap
 

lerna.json

@@ -11,5 +11,5 @@
     "tools/*"
   ],
   "rejectCycles": "true",
-  "version": "1.65.0"
-}
+  "version": "1.66.0"
+}

package.json

@@ -18,9 +18,9 @@
     "fs-extra": "^9.0.1",
     "graceful-fs": "^4.2.4",
     "jest-junit": "^11.1.0",
-    "jsii-diff": "^1.12.0",
-    "jsii-pacmak": "^1.12.0",
-    "jsii-rosetta": "^1.12.0",
+    "jsii-diff": "^1.13.0",
+    "jsii-pacmak": "^1.13.0",
+    "jsii-rosetta": "^1.13.0",
     "lerna": "^3.22.1",
     "standard-version": "^9.0.0",
     "typescript": "~3.9.7"
@@ -96,4 +96,4 @@
       "monocdk-experiment/yaml/**"
     ]
   }
-}
+}

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

@@ -38,6 +38,7 @@
     "pkglint": "pkglint -f",
     "test": "cdk-test",
     "watch": "cdk-watch",
+    "lint": "cdk-lint",
     "integ": "cdk-integ",
     "awslint": "cdk-awslint",
     "build+test+package": "npm run build+test && npm run package",
@@ -62,7 +63,7 @@
     "@types/nodeunit": "^0.0.31",
     "cdk-build-tools": "0.0.0",
     "cdk-integ-tools": "0.0.0",
-    "fast-check": "^2.3.0",
+    "fast-check": "^2.4.0",
     "nodeunit": "^0.11.3",
     "pkglint": "0.0.0"
   },

packages/@aws-cdk/app-delivery/test/test.pipeline-deploy-stack-action.ts

@@ -8,6 +8,7 @@ import * as iam from '@aws-cdk/aws-iam';
 import * as s3 from '@aws-cdk/aws-s3';
 import * as cxschema from '@aws-cdk/cloud-assembly-schema';
 import * as cdk from '@aws-cdk/core';
+import * as constructs from 'constructs';
 import * as fc from 'fast-check';
 import * as nodeunit from 'nodeunit';
 import { PipelineDeployStackAction } from '../lib/pipeline-deploy-stack-action';
@@ -459,7 +460,7 @@ class FakeAction implements codepipeline.IAction {
     this.outputArtifact = new codepipeline.Artifact('OutputArtifact');
   }
 
-  public bind(_scope: cdk.Construct, _stage: codepipeline.IStage, _options: codepipeline.ActionBindOptions):
+  public bind(_scope: constructs.Construct, _stage: codepipeline.IStage, _options: codepipeline.ActionBindOptions):
   codepipeline.ActionConfig {
     return {};
   }

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

@@ -25,7 +25,7 @@
     "cdk-build-tools": "0.0.0",
     "jest": "^26.4.2",
     "pkglint": "0.0.0",
-    "ts-jest": "^26.3.0"
+    "ts-jest": "^26.4.1"
   },
   "dependencies": {
     "@aws-cdk/cloud-assembly-schema": "0.0.0",

packages/@aws-cdk/assert/test/assertions.test.ts

@@ -1,5 +1,6 @@
 import * as cdk from '@aws-cdk/core';
 import * as cx from '@aws-cdk/cx-api';
+import * as constructs from 'constructs';
 
 import { countResources, countResourcesLike, exist, expect as cdkExpect, haveType, MatchStyle, matchTemplate } from '../lib/index';
 
@@ -332,7 +333,7 @@ interface TestResourceProps extends cdk.CfnResourceProps {
 }
 
 class TestResource extends cdk.CfnResource {
-  constructor(scope: cdk.Construct, id: string, props: TestResourceProps) {
+  constructor(scope: constructs.Construct, id: string, props: TestResourceProps) {
     super(scope, id, props);
   }
 }
@@ -342,7 +343,7 @@ interface TestParameterProps extends cdk.CfnParameterProps {
 }
 
 class TestParameter extends cdk.CfnParameter {
-  constructor(scope: cdk.Construct, id: string, props: TestParameterProps) {
+  constructor(scope: constructs.Construct, id: string, props: TestParameterProps) {
     super(scope, id, props);
   }
 }

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

@@ -70,13 +70,13 @@
   "devDependencies": {
     "@aws-cdk/assert": "0.0.0",
     "@types/nodeunit": "^0.0.31",
-    "@types/sinon": "^9.0.5",
+    "@types/sinon": "^9.0.7",
     "aws-cdk": "0.0.0",
     "cdk-build-tools": "0.0.0",
     "cdk-integ-tools": "0.0.0",
     "nodeunit": "^0.11.3",
     "pkglint": "0.0.0",
-    "sinon": "^9.0.3",
+    "sinon": "^9.1.0",
     "ts-mock-imports": "^1.3.0"
   },
   "dependencies": {

packages/@aws-cdk/aws-amplify/test/integ.app-codecommit.ts

@@ -1,5 +1,6 @@
 import * as codecommit from '@aws-cdk/aws-codecommit';
-import { App, Construct, Stack, StackProps } from '@aws-cdk/core';
+import { App, Stack, StackProps } from '@aws-cdk/core';
+import { Construct } from 'constructs';
 import * as amplify from '../lib';
 
 class TestStack extends Stack {

packages/@aws-cdk/aws-amplify/test/integ.app.ts

@@ -1,4 +1,5 @@
-import { App, Construct, Stack, StackProps } from '@aws-cdk/core';
+import { App, Stack, StackProps } from '@aws-cdk/core';
+import { Construct } from 'constructs';
 import * as amplify from '../lib';
 
 class TestStack extends Stack {

packages/@aws-cdk/aws-apigateway/test/integ.cors.ts

@@ -1,7 +1,8 @@
 /// !cdk-integ pragma:ignore-assets
 import * as path from 'path';
 import * as lambda from '@aws-cdk/aws-lambda';
-import { App, Construct, Stack, StackProps } from '@aws-cdk/core';
+import { App, Stack, StackProps } from '@aws-cdk/core';
+import { Construct } from 'constructs';
 import * as apigw from '../lib';
 
 class TestStack extends Stack {

packages/@aws-cdk/aws-apigateway/test/integ.lambda-api.latebound-deploymentstage.ts

@@ -1,5 +1,6 @@
 import { Code, Function, Runtime } from '@aws-cdk/aws-lambda';
-import { App, Construct, Stack } from '@aws-cdk/core';
+import { App, Stack } from '@aws-cdk/core';
+import { Construct } from 'constructs';
 import { Deployment, LambdaRestApi, Stage } from '../lib';
 
 class LateBoundDeploymentStageStack extends Stack {

packages/@aws-cdk/aws-apigateway/test/integ.restapi-import.lit.ts

@@ -1,4 +1,5 @@
-import { App, CfnOutput, Construct, NestedStack, NestedStackProps, Stack } from '@aws-cdk/core';
+import { App, CfnOutput, NestedStack, NestedStackProps, Stack } from '@aws-cdk/core';
+import { Construct } from 'constructs';
 import { Deployment, Method, MockIntegration, PassthroughBehavior, RestApi, Stage } from '../lib';
 
 /**

packages/@aws-cdk/aws-apigateway/test/integ.restapi.multistack.ts

@@ -2,12 +2,13 @@
 
 import * as lambda from '@aws-cdk/aws-lambda';
 import * as cdk from '@aws-cdk/core';
+import * as constructs from 'constructs';
 import * as apig from '../lib';
 
 class FirstStack extends cdk.Stack {
   public readonly firstLambda: lambda.Function;
 
-  constructor(scope: cdk.Construct, id: string, props?: cdk.StackProps) {
+  constructor(scope: constructs.Construct, id: string, props?: cdk.StackProps) {
     super(scope, id, props);
 
     this.firstLambda = new lambda.Function(this, 'firstLambda', {
@@ -29,7 +30,7 @@ interface SecondStackProps extends cdk.StackProps {
 }
 
 class SecondStack extends cdk.Stack {
-  constructor(scope: cdk.Construct, id: string, props: SecondStackProps) {
+  constructor(scope: constructs.Construct, id: string, props: SecondStackProps) {
     super(scope, id, props);
 
     const api = new apig.RestApi(this, 'BooksApi', {

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

@@ -74,7 +74,7 @@
     "@types/nodeunit": "^0.0.31",
     "cdk-build-tools": "0.0.0",
     "cfn2ts": "0.0.0",
-    "fast-check": "^2.3.0",
+    "fast-check": "^2.4.0",
     "nodeunit": "^0.11.3",
     "pkglint": "0.0.0"
   },

packages/@aws-cdk/aws-applicationautoscaling/test/util.ts

@@ -1,9 +1,9 @@
 import * as scalingcommon from '@aws-cdk/aws-autoscaling-common';
-import * as cdk from '@aws-cdk/core';
+import * as constructs from 'constructs';
 import * as fc from 'fast-check';
 import * as appscaling from '../lib';
 
-export function createScalableTarget(scope: cdk.Construct) {
+export function createScalableTarget(scope: constructs.Construct) {
   return new appscaling.ScalableTarget(scope, 'Target', {
     serviceNamespace: appscaling.ServiceNamespace.DYNAMODB,
     scalableDimension: 'test:TestCount',

packages/@aws-cdk/aws-appsync/test/appsync-directives.test.ts

@@ -1,6 +1,6 @@
 import '@aws-cdk/assert/jest';
-import * as cdk from '@aws-cdk/core';
 import * as cognito from '@aws-cdk/aws-cognito';
+import * as cdk from '@aws-cdk/core';
 import * as appsync from '../lib';
 import * as t from './scalar-type-defintions';
 

packages/@aws-cdk/aws-autoscaling-common/package.json

@@ -67,7 +67,7 @@
     "@types/nodeunit": "^0.0.31",
     "cdk-build-tools": "0.0.0",
     "cdk-integ-tools": "0.0.0",
-    "fast-check": "^2.3.0",
+    "fast-check": "^2.4.0",
     "nodeunit": "^0.11.3",
     "pkglint": "0.0.0"
   },

packages/@aws-cdk/aws-autoscaling/test/lifecyclehooks.test.ts

@@ -2,6 +2,7 @@ import { expect, haveResource, ResourcePart } from '@aws-cdk/assert';
 import * as ec2 from '@aws-cdk/aws-ec2';
 import * as iam from '@aws-cdk/aws-iam';
 import * as cdk from '@aws-cdk/core';
+import * as constructs from 'constructs';
 import { nodeunitShim, Test } from 'nodeunit-shim';
 import * as autoscaling from '../lib';
 
@@ -71,7 +72,7 @@ nodeunitShim({
 });
 
 class FakeNotificationTarget implements autoscaling.ILifecycleHookTarget {
-  public bind(_scope: cdk.Construct, lifecycleHook: autoscaling.ILifecycleHook): autoscaling.LifecycleHookTargetConfig {
+  public bind(_scope: constructs.Construct, lifecycleHook: autoscaling.ILifecycleHook): autoscaling.LifecycleHookTargetConfig {
     lifecycleHook.role.addToPolicy(new iam.PolicyStatement({
       actions: ['action:Work'],
       resources: ['*'],

packages/@aws-cdk/aws-autoscaling/test/scaling.test.ts

@@ -3,6 +3,7 @@ import * as cloudwatch from '@aws-cdk/aws-cloudwatch';
 import * as ec2 from '@aws-cdk/aws-ec2';
 import * as elbv2 from '@aws-cdk/aws-elasticloadbalancingv2';
 import * as cdk from '@aws-cdk/core';
+import * as constructs from 'constructs';
 import { nodeunitShim, Test } from 'nodeunit-shim';
 import * as autoscaling from '../lib';
 
@@ -228,7 +229,7 @@ class ASGFixture extends cdk.Construct {
   public readonly vpc: ec2.Vpc;
   public readonly asg: autoscaling.AutoScalingGroup;
 
-  constructor(scope: cdk.Construct, id: string) {
+  constructor(scope: constructs.Construct, id: string) {
     super(scope, id);
 
     this.vpc = new ec2.Vpc(this, 'VPC');

packages/@aws-cdk/aws-autoscaling/test/scheduled-action.test.ts

@@ -1,6 +1,7 @@
 import { expect, haveResource, MatchStyle } from '@aws-cdk/assert';
 import * as ec2 from '@aws-cdk/aws-ec2';
 import * as cdk from '@aws-cdk/core';
+import * as constructs from 'constructs';
 import { nodeunitShim, Test } from 'nodeunit-shim';
 import * as autoscaling from '../lib';
 
@@ -107,7 +108,7 @@ nodeunitShim({
   },
 });
 
-function makeAutoScalingGroup(scope: cdk.Construct) {
+function makeAutoScalingGroup(scope: constructs.Construct) {
   const vpc = new ec2.Vpc(scope, 'VPC');
   return new autoscaling.AutoScalingGroup(scope, 'ASG', {
     vpc,

packages/@aws-cdk/aws-backup/test/integ.backup.ts

@@ -1,6 +1,7 @@
 import * as dynamodb from '@aws-cdk/aws-dynamodb';
 import * as efs from '@aws-cdk/aws-efs';
-import { App, Construct, RemovalPolicy, Stack, StackProps } from '@aws-cdk/core';
+import { App, RemovalPolicy, Stack, StackProps } from '@aws-cdk/core';
+import { Construct } from 'constructs';
 import * as backup from '../lib';
 
 class TestStack extends Stack {

packages/@aws-cdk/aws-backup/test/selection.test.ts

@@ -2,9 +2,14 @@ import '@aws-cdk/assert/jest';
 import * as dynamodb from '@aws-cdk/aws-dynamodb';
 import * as ec2 from '@aws-cdk/aws-ec2';
 import * as efs from '@aws-cdk/aws-efs';
-import { Construct, Stack } from '@aws-cdk/core';
+import { Stack } from '@aws-cdk/core';
+import { Construct } from 'constructs';
 import { BackupPlan, BackupResource, BackupSelection } from '../lib';
 
+// v2 - keep this import as a separate section to reduce merge conflict when forward merging with the v2 branch.
+// eslint-disable-next-line
+import { Construct as CoreConstruct } from '@aws-cdk/core';
+
 let stack: Stack;
 let plan: BackupPlan;
 beforeEach(() => {
@@ -120,13 +125,13 @@ test('allow restores', () => {
 
 test('fromConstruct', () => {
   // GIVEN
-  class EfsConstruct extends Construct {
+  class EfsConstruct extends CoreConstruct {
     constructor(scope: Construct, id: string) {
       super(scope, id);
       new efs.CfnFileSystem(this, 'FileSystem');
     }
   }
-  class MyConstruct extends Construct {
+  class MyConstruct extends CoreConstruct {
     constructor(scope: Construct, id: string) {
       super(scope, id);
 

packages/@aws-cdk/aws-certificatemanager/lambda-packages/dns_validated_certificate_handler/package.json

@@ -29,15 +29,15 @@
   "devDependencies": {
     "aws-sdk": "^2.596.0",
     "aws-sdk-mock": "^5.1.0",
-    "eslint": "^7.9.0",
+    "eslint": "^7.10.0",
     "eslint-config-standard": "^14.1.1",
-    "eslint-plugin-import": "^2.22.0",
+    "eslint-plugin-import": "^2.22.1",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^4.2.1",
     "eslint-plugin-standard": "^4.0.1",
     "jest": "^26.4.2",
     "lambda-tester": "^3.6.0",
     "nock": "^13.0.4",
-    "ts-jest": "^26.3.0"
+    "ts-jest": "^26.4.1"
   }
 }