Merge pull request #10964 from aws/bump/1.69.0

chore(release): 1.69.0

Author: NetaNir

.github/workflows/auto-approve-v2-merge-forward.yml

@@ -0,0 +1,26 @@
+# Automatically approve PRs that merge master forward to v2-main
+#
+# Only does approvals! mergify takes care of the actual merge.
+name: Auto-approve forward merges onto v2-main
+on:
+  pull_request:
+    types:
+      - labeled
+      - opened
+      - ready_for_review
+      - reopened
+      - synchronize
+      - unlabeled
+      - unlocked
+
+jobs:
+  approve:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: hmarr/[email protected]
+      if: >
+        github.event.pull_request.user.login == 'aws-cdk-automation'
+        && github.event.pull_request.base.ref == 'v2-main'
+        && contains(github.event.pull_request.labels.*.name, 'pr/forward-merge')
+      with:
+        github-token: "${{ secrets.GITHUB_TOKEN }}"

.mergify.yml

@@ -119,3 +119,20 @@ pull_request_rules:
       - "#changes-requested-reviews-by=0"
       - status-success~=AWS CodeBuild us-east-1
       - status-success=validate-pr
+  - name: automatic merge of v2 forward merges
+    actions:
+      comment:
+        message: Forward merge successful!
+      merge:
+        method: merge
+        strict: smart+fasttrack
+        strict_method: merge
+        commit_message: title+body
+    conditions:
+      - label~=forward-merge
+      - -label~=(blocked|do-not-merge)
+      - -merged
+      - -closed
+      - author~=aws-cdk-automation
+      - "#approved-reviews-by>=1"
+      - status-success~=AWS CodeBuild us-east-1

CHANGELOG.md

@@ -2,6 +2,23 @@
 
 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.69.0](https://github.com/aws/aws-cdk/compare/v1.68.0...v1.69.0) (2020-10-19)
+
+
+### Features
+
+* **apigatewayv2:** configure description for HttpApi ([#10863](https://github.com/aws/aws-cdk/issues/10863)) ([895372f](https://github.com/aws/aws-cdk/commit/895372fc8b027bd12d64450c429c04d8efdd27f4))
+* **pipelines:** temporarily disable self-mutation ([#10466](https://github.com/aws/aws-cdk/issues/10466)) ([8ffabb4](https://github.com/aws/aws-cdk/commit/8ffabb4325d2853f8650f991706eccfe233b2c74))
+
+
+### Bug Fixes
+
+* **apigateway:** cannot configure stage for SpecRestApi ([#10749](https://github.com/aws/aws-cdk/issues/10749)) ([62a2286](https://github.com/aws/aws-cdk/commit/62a2286f6dc46059160daa3c7466e712dad9f136)), closes [#10300](https://github.com/aws/aws-cdk/issues/10300)
+* **apigateway:** lambda integration does not recognize allowTestInvoke ([#10828](https://github.com/aws/aws-cdk/issues/10828)) ([650c23f](https://github.com/aws/aws-cdk/commit/650c23f1fe9e87a7b1eb521faf57c7ed341d0eb6)), closes [#7605](https://github.com/aws/aws-cdk/issues/7605) [#7604](https://github.com/aws/aws-cdk/issues/7604)
+* **cli:** `cdk context --reset <number>` does not work ([#10753](https://github.com/aws/aws-cdk/issues/10753)) ([2f3a167](https://github.com/aws/aws-cdk/commit/2f3a167797e60fd2df6c83bc2f3906ddc8eb8966)), closes [#3033](https://github.com/aws/aws-cdk/issues/3033) [#10619](https://github.com/aws/aws-cdk/issues/10619)
+* **cli:** failure if account cache is malformed ([#10887](https://github.com/aws/aws-cdk/issues/10887)) ([9b2438a](https://github.com/aws/aws-cdk/commit/9b2438a6e78fc7a9622e79b1435ea6f8b76d98f7))
+* **lambda-python:** asset hashes changed ([#10959](https://github.com/aws/aws-cdk/issues/10959)) ([b8de264](https://github.com/aws/aws-cdk/commit/b8de264af75aed11e14fb715f40d6d2e41d5233e)), closes [#10958](https://github.com/aws/aws-cdk/issues/10958) [#10957](https://github.com/aws/aws-cdk/issues/10957)
+
 ## [1.68.0](https://github.com/aws/aws-cdk/compare/v1.67.0...v1.68.0) (2020-10-15)
 
 

build.sh

@@ -37,6 +37,11 @@ done
 export PATH=$(npm bin):$PATH
 export NODE_OPTIONS="--max-old-space-size=4096 ${NODE_OPTIONS:-}"
 
+if ! [ -x "$(command -v yarn)" ]; then
+  echo "yarn is not installed. Install it from here- https://yarnpkg.com/en/docs/install."
+  exit 1
+fi
+
 echo "============================================================================================="
 echo "installing..."
 yarn install --frozen-lockfile --network-timeout 1000000
@@ -65,11 +70,6 @@ rm -rf $BUILD_INDICATOR
 export MERKLE_BUILD_CACHE=$(mktemp -d)
 trap "rm -rf $MERKLE_BUILD_CACHE" EXIT
 
-if ! [ -x "$(command -v yarn)" ]; then
-  echo "yarn is not installed. Install it from here- https://yarnpkg.com/en/docs/install."
-  exit 1
-fi
-
 echo "============================================================================================="
 echo "building..."
 time lerna run $bail --stream $runtarget || fail

lerna.json

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

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

@@ -50,7 +50,8 @@
     "cfn2ts": "cfn2ts",
     "build+test+package": "npm run build+test && npm run package",
     "build+test": "npm run build && npm test",
-    "compat": "cdk-compat"
+    "compat": "cdk-compat",
+    "gen": "cfn2ts"
   },
   "cdk-build": {
     "cloudformation": "Alexa::ASK",

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

@@ -50,7 +50,8 @@
     "cfn2ts": "cfn2ts",
     "compat": "cdk-compat",
     "build+test": "npm run build && npm test",
-    "build+test+package": "npm run build+test && npm run package"
+    "build+test+package": "npm run build+test && npm run package",
+    "gen": "cfn2ts"
   },
   "cdk-build": {
     "cloudformation": "AWS::AccessAnalyzer",

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

@@ -50,7 +50,8 @@
     "cfn2ts": "cfn2ts",
     "build+test+package": "npm run build+test && npm run package",
     "build+test": "npm run build && npm test",
-    "compat": "cdk-compat"
+    "compat": "cdk-compat",
+    "gen": "cfn2ts"
   },
   "cdk-build": {
     "cloudformation": "AWS::ACMPCA",

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

@@ -50,7 +50,8 @@
     "cfn2ts": "cfn2ts",
     "build+test+package": "npm run build+test && npm run package",
     "build+test": "npm run build && npm test",
-    "compat": "cdk-compat"
+    "compat": "cdk-compat",
+    "gen": "cfn2ts"
   },
   "cdk-build": {
     "cloudformation": "AWS::AmazonMQ",

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

@@ -50,7 +50,8 @@
     "cfn2ts": "cfn2ts",
     "build+test": "npm run build && npm test",
     "build+test+package": "npm run build+test && npm run package",
-    "compat": "cdk-compat"
+    "compat": "cdk-compat",
+    "gen": "cfn2ts"
   },
   "cdk-build": {
     "cloudformation": "AWS::Amplify",