chore(release): 1.26.0

.github/actions/prlinter/package.json

@@ -1,7 +1,7 @@
 {
   "name": "prlinter",
   "private": true,
-  "version": "0.0.1",
+  "version": "999.0.0",
   "description": "",
   "main": "index.js",
   "keywords": [],

.github/workflows/auto-approve-dependabot.yml

@@ -0,0 +1,27 @@
+# Automatically approve PRs made by Dependabot
+#
+# Written to look at the original author of the PR (instead of the current
+# actor) in order to be able to backresolve existing PRs using this action (by
+# mass labeling them). Leads to slightly unnecessary spammage of aprovals in a
+# PR...
+#
+# Only does approvals! A different GitHub Action takes care of merging.
+name: Auto-approve Dependabot
+on:
+  pull_request:
+    types:
+      - labeled
+      - opened
+      - ready_for_review
+      - reopened
+      - synchronize
+      - unlabeled
+      - unlocked
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: hmarr/auto-approve-action@7782c7e2bdf62b4d79bdcded8332808fd2f179cd
+      if: github.event.pull_request.user.login == 'dependabot[bot]' || github.event.pull_request.user.login == 'dependabot-preview[bot]'
+      with:
+        github-token: "${{ secrets.GITHUB_TOKEN }}"

.gitignore

@@ -16,6 +16,7 @@ pack/
 .tools/
 coverage/
 .nyc_output
+.nycrc
 .LAST_BUILD
 *.sw[a-z]
 *~

.mergify.yml

@@ -90,3 +90,25 @@ pull_request_rules:
       - status-failure=Semantic Pull Request
       - -merged
       - -closed
+  - name: automatic merge of Dependabot PRs
+    actions:
+      comment:
+        message: Thanks Dependabot!
+      merge:
+        # 'strict: false' disables Mergify keeping the branch up-to-date from master.
+        # It's not necessary: Dependabot will do that itself.
+        # It's not dangerous: GitHub branch protection settings prevent merging stale branches.
+        strict: false
+        method: squash
+      delete_head_branch: {}
+    conditions:
+      - -title~=(WIP|wip)
+      - -label~=(blocked|do-not-merge)
+      - -merged
+      - -closed
+      - author~=dependabot
+      - "#approved-reviews-by>=1"
+      - "#changes-requested-reviews-by=0"
+      - status-success~=AWS CodeBuild us-east-1
+      - status-success=Semantic Pull Request
+      - status-success=mandatory-changes

CHANGELOG.md

@@ -2,6 +2,40 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [1.26.0](https://github.com/aws/aws-cdk/compare/v1.25.0...v1.26.0) (2020-02-25)
+
+
+### ⚠ BREAKING CHANGES
+
+* **apigateway:** the interface now accepts endpointconfiguration property instead of endpoint type as defined by cfn
+* **lambda-nodejs:** `parcel-bundler` v1.x is now a peer dependency of `@aws-cdk/aws-lambda-nodejs`. Please add it to your `package.json`.
+
+### Features
+
+* **apigateway:** expose endpointconfiguration to include vpcEndpointIds ([#6078](https://github.com/aws/aws-cdk/issues/6078)) ([99de6ca](https://github.com/aws/aws-cdk/commit/99de6ca6940f8e7e66e44d1cc68f0e1f1cb80b94)), closes [#6038](https://github.com/aws/aws-cdk/issues/6038)
+* **apigateway:** lambda request authorizer ([#5642](https://github.com/aws/aws-cdk/issues/5642)) ([031932d](https://github.com/aws/aws-cdk/commit/031932d79511c3750f3f4177d74ead4609cab541))
+* **appsync:** mapping template for lambda proxy ([#6288](https://github.com/aws/aws-cdk/pull/6288)) ([f865d5e](https://github.com/aws/aws-cdk/commit/f865d5ec25df9b3232a66d8e3e9aa32e23cb8aa5))
+* **batch:** add JobQueue, ComputeEnvironment and JobDefinition constructs ([c8a22b1](https://github.com/aws/aws-cdk/commit/c8a22b176cdee7da2cde15c38a6fc107686cf2d0))
+* **cdk-assets:** asset uploading tool ([c505348](https://github.com/aws/aws-cdk/commit/c5053480b057b307c4ebf33d2792839f07a09bb6))
+* **cli:** faster "no-op" deployments ([#6346](https://github.com/aws/aws-cdk/issues/6346)) ([d4a132b](https://github.com/aws/aws-cdk/commit/d4a132bff91ab8e78ed38dc5ee41842554347ecf)), closes [#6046](https://github.com/aws/aws-cdk/issues/6046) [#2553](https://github.com/aws/aws-cdk/issues/2553) [#6216](https://github.com/aws/aws-cdk/issues/6216)
+* **cfn:** CloudFormation Resource Specification 11.1.0 ([#6424](https://github.com/aws/aws-cdk/issues/6424)) ([ab9b77c](https://github.com/aws/aws-cdk/commit/ab9b77cc9857b5ea34952d4efb3f67c1d8a51311))
+* **cognito:** user pool verification and invitation messages ([#6282](https://github.com/aws/aws-cdk/issues/6282)) ([faf6693](https://github.com/aws/aws-cdk/commit/faf6693e2590fbe7332be8737afd35874f6719f1))
+* **ecs-patterns:** create dlq when queue is not provided for QueueProcessingService ([#6356](https://github.com/aws/aws-cdk/issues/6356)) ([e307d7f](https://github.com/aws/aws-cdk/commit/e307d7fa721a54ee54d8ad8e4b3f13e6c45c342a))
+* **kms:** `trustAccountIdentities` avoids cyclic stack dependencies ([03f4ef2](https://github.com/aws/aws-cdk/commit/03f4ef27408822d288c75790c8d1270e007a0842))
+* **rds:** attach description to database secret ([d5a4854](https://github.com/aws/aws-cdk/commit/d5a48545f83efe7ca39cab75579b2cd91f55800b))
+* **sns:** support multiple tokens as url and email subscriptions ([#6357](https://github.com/aws/aws-cdk/issues/6357)) ([e5493bd](https://github.com/aws/aws-cdk/commit/e5493bd2cea897a2d4e1576d3084e9fb2e9f6b7f)), closes [#3996](https://github.com/aws/aws-cdk/issues/3996)
+* **ssm:** add ability to specify SSM Parameter tier ([#6326](https://github.com/aws/aws-cdk/issues/6326)) ([9209ef6](https://github.com/aws/aws-cdk/commit/9209ef6e4879c64a9b374a14e2fb7b09b5c51052))
+
+
+### Bug Fixes
+
+* **aws-ecs:** propagate dnsTtl property part of cloudMapOptions ([#6370](https://github.com/aws/aws-cdk/issues/6370)) ([747bdb2](https://github.com/aws/aws-cdk/commit/747bdb240296c69430dbd8970f809aa1540da11d)), closes [#6223](https://github.com/aws/aws-cdk/issues/6223)
+* **cli:** `cdk deploy` hangs when stack deployment fails ([#6433](https://github.com/aws/aws-cdk/issues/6433)) ([4b11d99](https://github.com/aws/aws-cdk/commit/4b11d998a09b2ecdff720dea0cd3ace718cb5b1d))
+* **cli:** Python init templates are missing .gitignore file ([#6350](https://github.com/aws/aws-cdk/issues/6350)) ([cd6cd42](https://github.com/aws/aws-cdk/commit/cd6cd42e4d0debbd9161bcf4d4bf22ef1a92f128)), closes [#5566](https://github.com/aws/aws-cdk/issues/5566)
+* **core:** top-level resources cannot use long logical ids ([#6419](https://github.com/aws/aws-cdk/issues/6419)) ([2a418b9](https://github.com/aws/aws-cdk/commit/2a418b9490f65ddcc34d96afb64c0d49041ae049)), closes [#6190](https://github.com/aws/aws-cdk/issues/6190) [#6190](https://github.com/aws/aws-cdk/issues/6190)
+* **ecs:** support file as firelens config type ([#6322](https://github.com/aws/aws-cdk/issues/6322)) ([f9996f3](https://github.com/aws/aws-cdk/commit/f9996f3e72460068f53d2cb551f00fb32386e9c9))
+* **lambda:** erroneous inline code support for ruby ([#6365](https://github.com/aws/aws-cdk/issues/6365)) ([8e21e78](https://github.com/aws/aws-cdk/commit/8e21e783d50bf75550298d7c111ad3ddb97f5343)), closes [#6302](https://github.com/aws/aws-cdk/issues/6302)
+* **lambda-nodejs:** parcel is too big to bundle ([a93e4d5](https://github.com/aws/aws-cdk/commit/a93e4d5418af1409f1b3278bffb8ace360d28a19)), closes [#6340](https://github.com/aws/aws-cdk/issues/6340)
 
 ## [1.25.0](https://github.com/aws/aws-cdk/compare/v1.24.0...v1.25.0) (2020-02-18)
 

buildspec.yaml

@@ -13,6 +13,7 @@ phases:
       - /bin/bash ./fetch-dotnet-snk.sh
   build:
     commands:
+      - /bin/bash ./scripts/align-version.sh
       - /bin/bash ./build.sh
   post_build:
     commands:

bump.sh

@@ -17,18 +17,14 @@ version=${1:-minor}
 
 echo "Starting ${version} version bump"
 
-export NODE_OPTIONS="--max-old-space-size=4096 ${NODE_OPTIONS:-}"
-
-/bin/bash ./install.sh
-
-npx lerna version ${version} --yes --exact --force-publish=* --no-git-tag-version --no-push
-
-# Another round of install to fix package-lock.jsons
-/bin/bash ./install.sh
-
-# align "peerDependencies" to actual dependencies after bump
-# this is technically only required for major version bumps, but in the meantime we shall do it in every bump
-/bin/bash scripts/fix-peer-deps.sh
+# /bin/bash ./install.sh
 
 # Generate CHANGELOG and create a commit
-npx standard-version --release --skip.tag=true --commit-all
+# --skip.tag because we create the tag as part of creating the github release
+npx standard-version \
+  --bumpFiles package.json \
+  --release-as ${version} \
+  --skip.tag=true \
+  --releaseCommitMessageFormat="chore(release): v{{currentTag}}" \
+  --commit-all
+

lerna.json

@@ -5,9 +5,10 @@
   "packages": [
     "packages/*",
     "packages/@aws-cdk/*",
+    "packages/@monocdk-experiment/*",
     "packages/@aws-cdk/*/lambda-packages/*",
     "tools/*"
   ],
   "rejectCycles": "true",
-  "version": "1.25.0"
+  "version": "999.0.0"
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "aws-cdk",
-  "version": "1.25.0",
+  "version": "1.26.0",
   "private": true,
   "pkglint": {
     "include": "dependencies/node-version"
@@ -10,28 +10,23 @@
     "build": "./build.sh",
     "pack": "./pack.sh",
     "compat": "./scripts/check-api-compatibility.sh",
+    "bump": "./bump.sh",
     "build-all": "tsc -b"
   },
   "devDependencies": {
     "conventional-changelog-cli": "^2.0.31",
     "fs-extra": "^8.1.0",
-    "jsii-diff": "^0.22.0",
+    "jsii-diff": "^1.0.0",
     "jsii-pacmak": "^0.22.0",
     "jsii-rosetta": "^0.22.0",
     "lerna": "^3.20.2",
-    "typescript": "~3.7.5"
+    "standard-version": "^7.1.0",
+    "typescript": "~3.8.2"
   },
   "repository": {
     "type": "git",
     "url": "git://github.com/aws/aws-cdk"
   },
-  "standard-version": {
-    "releaseCommitMessageFormat": "v{{currentTag}}",
-    "scripts": {
-      "prebump": "echo $(node -pe \"require('./lerna.json').version\")",
-      "precommit": "git add ."
-    }
-  },
   "license": "Apache-2.0",
   "author": {
     "name": "Amazon Web Services",
@@ -41,23 +36,26 @@
     "packages": [
       "packages/*",
       "packages/@aws-cdk/*",
+      "packages/@monocdk-experiment/*",
       "packages/@aws-cdk/*/lambda-packages/*",
       "tools/*"
     ],
     "nohoist": [
       "**/jszip",
       "**/jszip/**",
+      "@aws-cdk/cdk-assets-schema/semver",
+      "@aws-cdk/cdk-assets-schema/semver/**",
       "@aws-cdk/assets/minimatch",
       "@aws-cdk/assets/minimatch/**",
       "@aws-cdk/aws-codepipeline-actions/case",
       "@aws-cdk/aws-codepipeline-actions/case/**",
       "@aws-cdk/aws-ecr-assets/minimatch",
       "@aws-cdk/aws-ecr-assets/minimatch/**",
+      "@aws-cdk/aws-lambda-nodejs/parcel-bundler",
+      "@aws-cdk/aws-lambda-nodejs/parcel-bundler/**",
       "@aws-cdk/cx-api/semver",
       "@aws-cdk/cx-api/semver/**",
-      "@aws-cdk/cx-api/semver/**",
-      "@aws-cdk/aws-lambda-nodejs/parcel-bundler",
-      "@aws-cdk/aws-lambda-nodejs/parcel-bundler/**"
+      "@aws-cdk/cx-api/semver/**"
     ]
   }
 }

packages/@aws-cdk/alexa-ask/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-cdk/alexa-ask",
-  "version": "1.25.0",
+  "version": "999.0.0",
   "description": "The CDK Construct Library for Alexa::ASK",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -80,16 +80,16 @@
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "@aws-cdk/assert": "1.25.0",
-    "cdk-build-tools": "1.25.0",
-    "cfn2ts": "1.25.0",
-    "pkglint": "1.25.0"
+    "@aws-cdk/assert": "999.0.0",
+    "cdk-build-tools": "999.0.0",
+    "cfn2ts": "999.0.0",
+    "pkglint": "999.0.0"
   },
   "dependencies": {
-    "@aws-cdk/core": "1.25.0"
+    "@aws-cdk/core": "999.0.0"
   },
   "peerDependencies": {
-    "@aws-cdk/core": "1.25.0"
+    "@aws-cdk/core": "999.0.0"
   },
   "engines": {
     "node": ">= 10.3.0"

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

@@ -1,7 +1,7 @@
 {
   "name": "@aws-cdk/app-delivery",
   "description": "Continuous Integration / Continuous Delivery for CDK Applications",
-  "version": "1.25.0",
+  "version": "999.0.0",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "jsii": {
@@ -40,24 +40,24 @@
     "compat": "cdk-compat"
   },
   "dependencies": {
-    "@aws-cdk/aws-cloudformation": "1.25.0",
-    "@aws-cdk/aws-codebuild": "1.25.0",
-    "@aws-cdk/aws-codepipeline": "1.25.0",
-    "@aws-cdk/aws-codepipeline-actions": "1.25.0",
-    "@aws-cdk/aws-events": "1.25.0",
-    "@aws-cdk/aws-iam": "1.25.0",
-    "@aws-cdk/core": "1.25.0",
-    "@aws-cdk/cx-api": "1.25.0"
+    "@aws-cdk/aws-cloudformation": "999.0.0",
+    "@aws-cdk/aws-codebuild": "999.0.0",
+    "@aws-cdk/aws-codepipeline": "999.0.0",
+    "@aws-cdk/aws-codepipeline-actions": "999.0.0",
+    "@aws-cdk/aws-events": "999.0.0",
+    "@aws-cdk/aws-iam": "999.0.0",
+    "@aws-cdk/core": "999.0.0",
+    "@aws-cdk/cx-api": "999.0.0"
   },
   "devDependencies": {
-    "@aws-cdk/assert": "1.25.0",
-    "@aws-cdk/aws-s3": "1.25.0",
+    "@aws-cdk/assert": "999.0.0",
+    "@aws-cdk/aws-s3": "999.0.0",
     "@types/nodeunit": "^0.0.30",
-    "cdk-build-tools": "1.25.0",
-    "cdk-integ-tools": "1.25.0",
+    "cdk-build-tools": "999.0.0",
+    "cdk-integ-tools": "999.0.0",
     "fast-check": "^1.22.2",
     "nodeunit": "^0.11.3",
-    "pkglint": "1.25.0"
+    "pkglint": "999.0.0"
   },
   "repository": {
     "type": "git",
@@ -76,14 +76,14 @@
     "cdk"
   ],
   "peerDependencies": {
-    "@aws-cdk/aws-cloudformation": "1.25.0",
-    "@aws-cdk/aws-codebuild": "1.25.0",
-    "@aws-cdk/aws-codepipeline": "1.25.0",
-    "@aws-cdk/aws-codepipeline-actions": "1.25.0",
-    "@aws-cdk/aws-events": "1.25.0",
-    "@aws-cdk/aws-iam": "1.25.0",
-    "@aws-cdk/core": "1.25.0",
-    "@aws-cdk/cx-api": "1.25.0"
+    "@aws-cdk/aws-cloudformation": "999.0.0",
+    "@aws-cdk/aws-codebuild": "999.0.0",
+    "@aws-cdk/aws-codepipeline": "999.0.0",
+    "@aws-cdk/aws-codepipeline-actions": "999.0.0",
+    "@aws-cdk/aws-events": "999.0.0",
+    "@aws-cdk/aws-iam": "999.0.0",
+    "@aws-cdk/core": "999.0.0",
+    "@aws-cdk/cx-api": "999.0.0"
   },
   "engines": {
     "node": ">= 10.3.0"

packages/@aws-cdk/assert/jest.ts

@@ -1,4 +1,4 @@
-import { Stack } from '@aws-cdk/core';
+import * as core from '@aws-cdk/core';
 import * as cxapi from '@aws-cdk/cx-api';
 import { JestFriendlyAssertion } from './lib/assertion';
 import { haveOutput, HaveOutputProperties } from './lib/assertions/have-output';
@@ -28,7 +28,7 @@ declare global {
 
 expect.extend({
   toMatchTemplate(
-    actual: cxapi.CloudFormationStackArtifact | Stack,
+    actual: cxapi.CloudFormationStackArtifact | core.Stack,
     template: any,
     matchStyle?: MatchStyle) {
 
@@ -49,7 +49,7 @@ expect.extend({
   },
 
   toHaveResource(
-      actual: cxapi.CloudFormationStackArtifact | Stack,
+      actual: cxapi.CloudFormationStackArtifact | core.Stack,
       resourceType: string,
       properties?: any,
       comparison?: ResourcePart) {
@@ -59,7 +59,7 @@ expect.extend({
   },
 
   toHaveResourceLike(
-      actual: cxapi.CloudFormationStackArtifact | Stack,
+      actual: cxapi.CloudFormationStackArtifact | core.Stack,
       resourceType: string,
       properties?: any,
       comparison?: ResourcePart) {
@@ -69,14 +69,14 @@ expect.extend({
   },
 
   toHaveOutput(
-    actual: cxapi.CloudFormationStackArtifact | Stack,
+    actual: cxapi.CloudFormationStackArtifact | core.Stack,
     props: HaveOutputProperties) {
 
     return applyAssertion(haveOutput(props), actual);
   }
 });
 
-function applyAssertion(assertion: JestFriendlyAssertion<StackInspector>, actual: cxapi.CloudFormationStackArtifact | Stack) {
+function applyAssertion(assertion: JestFriendlyAssertion<StackInspector>, actual: cxapi.CloudFormationStackArtifact | core.Stack) {
   const inspector = ourExpect(actual);
   const pass = assertion.assertUsing(inspector);
   if (pass) {