Merge branch 'master' into replace-iservice

.github/ISSUE_TEMPLATE.md

@@ -1,7 +1,7 @@
 ---
 name: "\U00002753 General Issue"
 about: Create a new issue
-labels: status/needs-triage
+labels: needs-triage
 ---
 
 <!-- NOTE:📕 If issue regarding developer guide, please create issue [here](https://github.com/awsdocs/aws-cdk-guide/issues) -->

.github/ISSUE_TEMPLATE/bug.md

@@ -1,7 +1,7 @@
 ---
 name: "\U0001F41B Bug Report"
 about: Report a bug
-labels: bug, status/needs-triage
+labels: bug, needs-triage
 ---
 
 <!--

.github/ISSUE_TEMPLATE/doc.md

@@ -1,7 +1,7 @@
 ---
 name: "📕 Documentation issue"
 about: Issue in the reference documentation or developer guide
-labels: feature-request, status/needs-triage
+labels: feature-request, needs-triage
 ---
 
 <!-- 

.github/ISSUE_TEMPLATE/feature-request.md

@@ -1,7 +1,7 @@
 ---
 name: "\U0001F680 Feature Request"
 about: Request a new feature
-labels: feature-request, status/needs-triage
+labels: feature-request, needs-triage
 ---
 
 <!-- short description of the feature you are proposing: -->

.github/ISSUE_TEMPLATE/general-issues.md

@@ -1,7 +1,7 @@
 ---
 name: "\U00002753 General Issue"
 about: Create a new issue
-labels: status/needs-triage
+labels: needs-triage
 ---
 
 <!-- NOTE:📕 If there is an issue regarding developer guide, please create an issue [here](https://github.com/awsdocs/aws-cdk-guide/issues) -->

.github/ISSUE_TEMPLATE/tracking.md

@@ -0,0 +1,61 @@
+---
+name: "📊 Tracking Issue"
+title: "📊Tracking: [service]"
+about: Add a module tracking issue (internal use only)
+labels: management/tracking
+---
+
+Add your +1 👍  to help us prioritize high-level constructs for this service
+--- 
+
+### Overview:
+<!-- 
+Summary of the service (leverage the service’s product page for the text) and a link to the relevant AWS Docs. 
+This should be the same text that we put at the top of the package’s README.md. Also include a link to the 
+service’s CDK Construct Library API reference page.
+-->
+
+
+
+
+
+
+[AWS Docs](url)  <!-- replace `url` with link to the relevant AWS Docs -->
+[CDK API Reference](url) <!-- replace `url` with link to the service's CDK API reference -->
+
+
+### Implementation:
+<!-- 
+Checklist of use cases, constructs, features (such as grant methods) that will ship in this package 
+(not required until the issue is added to the public roadmap)
+- [ ] 
+- [ ]
+-->
+
+
+
+
+
+
+### Issue list:
+<!-- 
+e.g. checklist of links to feature requests, bugs, and PRs that are in scope for GA release of this module 
+(not required until the issues is added to the public roadmap)
+- [ ] 
+- [ ]
+-->
+
+
+
+
+
+
+<!-- 
+Labels to add:
+    - package/[name] (create new labels if they don’t already exist)
+    - needs-design (if cfn-only)
+    - management/roadmap (when added to the roadmap)
+    - in-progress (when added to “working on it” column of the roadmap)
+-->
+--- 
+This is a  📊Tracking Issue

.github/actions/prlinter/package.json

@@ -1,11 +1,11 @@
 {
   "name": "prlinter",
   "private": true,
-  "version": "0.0.1",
+  "version": "0.0.0",
   "description": "",
   "main": "index.js",
   "keywords": [],
-  "license": "Apache-2.0",  
+  "license": "Apache-2.0",
   "author": {
     "name": "Amazon Web Services",
     "url": "https://aws.amazon.com",
@@ -16,4 +16,4 @@
     "@actions/github": "^2.1.0",
     "prlint": "file:../../../tools/prlint"
   }
-}
+}

.mergify.yml

@@ -11,7 +11,7 @@ pull_request_rules:
   - name: automatic merge
     actions:
       comment:
-        message: Thank you for contributing! Your pull request is now being automatically merged.
+        message: Thank you for contributing! Your pull request will be updated from master and then merged automatically (do not update manually, and be sure to [allow changes to be pushed to your fork](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/allowing-changes-to-a-pull-request-branch-created-from-a-fork)).
       merge:
         strict: smart
         method: squash
@@ -34,15 +34,14 @@ pull_request_rules:
   - name: automatic merge
     actions:
       comment:
-        message: Thank you for contributing! Your pull request is now being automatically merged without squashing.
+        message: Thank you for contributing! Your pull request will be updated from master and then merged automatically without squashing (do not update manually, and be sure to [allow changes to be pushed to your fork](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/allowing-changes-to-a-pull-request-branch-created-from-a-fork)).
       merge:
         strict: smart
         # Merge instead of squash
         method: merge
         strict_method: merge
       delete_head_branch: {}
     conditions:
-      - base!=release
       - -title~=(WIP|wip)
       - -label~=(blocked|do-not-merge)
       # Only if no-squash is set

.versionrc.json

@@ -0,0 +1,5 @@
+{
+  "skip": { "tag": true },
+  "packageFiles": [ {  "filename": "lerna.json",  "type": "json" } ],
+  "bumpFiles": [ { "filename": "lerna.json", "type": "json" }  ]
+}

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)
 

CONTRIBUTING.md

@@ -38,6 +38,7 @@ and let us know if it's not up-to-date (even better, submit a PR with your  corr
   - [API Compatibility Checks](#api-compatibility-checks)
   - [Examples](#examples)
   - [Feature Flags](#feature-flags)
+  - [Versioning](#versioning)
 - [Troubleshooting](#troubleshooting)
 - [Debugging](#debugging)
   - [Connecting the VS Code Debugger](#connecting-the-vs-code-debugger)
@@ -381,6 +382,12 @@ If you also wish to package to all languages, make sure you have all the [toolch
 $ ./pack.sh
 ```
 
+> NOTE: in local builds, pack.sh will finish but will fail with an error
+> indicating the build artifacts use the marker version (`0.0.0`). This is
+> normal, and you can trust the output in `dist/` despite the failure. This is a
+> protection we have to make sure we don't accidentally release artifacts with
+> the marker version.
+
 ### Full Docker build
 
 Clone the repo:
@@ -659,6 +666,25 @@ CDK](https://github.com/aws/aws-cdk/issues/3398) we will either remove the
 legacy behavior or flip the logic for all these features and then
 reset the `FEATURE_FLAGS` map for the next cycle.
 
+### Versioning
+
+All `package.json` files in this repo use a stable marker version of `0.0.0`.
+This means that when you declare dependencies, you should always use `0.0.0`.
+This makes it easier for us to bump a new version (the `bump.sh` script will
+just update the central version and create a CHANGELOG entry) and also reduces
+the chance of merge conflicts after a new version is released.
+
+Additional scripts that take part in the versioning mechanism:
+
+- `scripts/get-version.js` can be used to obtain the actual version of the repo.
+  You can use either from JavaScript code by `require('./scripts/get-version')`
+  or from a shell script `node -p "require('./scripts/get-version')"`.
+- `scripts/get-version-marker.js` returns `0.0.0` and used to DRY the version
+  marker.
+- `scripts/align-version.sh` and `scripts/align-version.js` are used to align
+  all package.json files in the repo to the official version. This script is
+  invoked in CI builds and should not be used inside a development environment.
+
 ## Troubleshooting
 
 Most build issues can be solved by doing a full clean rebuild:

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,7 @@ version=${1:-minor}
 
 echo "Starting ${version} version bump"
 
-export NODE_OPTIONS="--max-old-space-size=4096 ${NODE_OPTIONS:-}"
+# /bin/bash ./install.sh
 
-/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
-
-# Generate CHANGELOG and create a commit
-npx standard-version --release --skip.tag=true --commit-all
+# Generate CHANGELOG and create a commit (see .versionrc.json)
+npx standard-version --release-as ${version}

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": "1.26.0"
 }

pack.sh

@@ -57,8 +57,14 @@ done
 # Remove a JSII aggregate POM that may have snuk past
 rm -rf dist/java/software/amazon/jsii
 
-# Get version from lerna
-version="$(cat ${root}/lerna.json | grep version | cut -d '"' -f4)"
+# Get version
+version="$(node -p "require('./scripts/get-version')")"
+
+# Ensure we don't publish anything beyond 1.x for now
+if [[ ! "${version}" == "1."* ]]; then
+  echo "ERROR: accidentally releasing a major version? Expecting repo version to start with '1.' but got '${version}'"
+  exit 1
+fi
 
 # Get commit from CodePipeline (or git, if we are in CodeBuild)
 # If CODEBUILD_RESOLVED_SOURCE_VERSION is not defined (i.e. local
@@ -79,6 +85,16 @@ HERE
 # copy CHANGELOG.md to dist/ for github releases
 cp CHANGELOG.md ${distdir}/
 
+# defensive: make sure our artifacts don't use the version marker (this means
+# that "pack" will always fails when building in a dev environment)
+# when we get to 10.0.0, we can fix this...
+marker=$(node -p "require('./scripts/get-version-marker')")
+if find dist/ | grep "${marker}"; then
+  echo "ERROR: build artifacts use the version marker '${marker}' instead of a real version."
+  echo "This is expected for builds in a development environment but should not happen in CI builds!"
+  exit 1
+fi
+
 # for posterity, print all files in dist
 echo "=============================================================================================="
 echo " dist contents"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "aws-cdk",
-  "version": "1.25.0",
+  "version": "0.0.0",
   "private": true,
   "pkglint": {
     "include": "dependencies/node-version"
@@ -10,6 +10,7 @@
     "build": "./build.sh",
     "pack": "./pack.sh",
     "compat": "./scripts/check-api-compatibility.sh",
+    "bump": "./bump.sh",
     "build-all": "tsc -b"
   },
   "devDependencies": {
@@ -19,19 +20,13 @@
     "jsii-pacmak": "^0.22.0",
     "jsii-rosetta": "^0.22.0",
     "lerna": "^3.20.2",
-    "typescript": "~3.8.2"
+    "standard-version": "^7.1.0",
+    "typescript": "~3.8.3"
   },
   "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,6 +36,7 @@
     "packages": [
       "packages/*",
       "packages/@aws-cdk/*",
+      "packages/@monocdk-experiment/*",
       "packages/@aws-cdk/*/lambda-packages/*",
       "tools/*"
     ],
@@ -62,4 +58,4 @@
       "@aws-cdk/cx-api/semver/**"
     ]
   }
-}
+}