Merge pull request #7560 from aws/bump/1.35.0

chore(release): 1.35.0

CHANGELOG.md

@@ -2,6 +2,33 @@
 
 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.35.0](https://github.com/aws/aws-cdk/compare/v1.34.1...v1.35.0) (2020-04-23)
+
+
+### ⚠ BREAKING CHANGES
+
+* **assets:** `cdk deploy` now needs `s3:ListBucket` instead of `s3:HeadObject`.
+* **efs:** Exported types no longer have the `Efs` prefix.
+* **efs:** `provisionedThroughputInMibps` property is renamed to `provisionedThroughputPerSecond` and has the type `Size`.
+* **efs:** The property `fileSystemID` is now renamed to `fileSystemId` in the now named `FileSystemAttributes` (previously, `EfsFileSystemAttributes`).
+* **efs:** `LifecyclePolicyProperty` is now renamed to `LifecyclePolicy`.
+
+### Features
+
+* **cfnspec:** cloudformation spec v13.0.0 ([#7504](https://github.com/aws/aws-cdk/issues/7504)) ([6903869](https://github.com/aws/aws-cdk/commit/6903869def944f8100c8eef51dd7145c181984e2))
+* **cloudtrail:** Lambda Function data events ([4a70138](https://github.com/aws/aws-cdk/commit/4a70138faf2e863be37a66bec23ed29a784b486a))
+* **cognito:** user pool domain ([#7224](https://github.com/aws/aws-cdk/issues/7224)) ([feadd6c](https://github.com/aws/aws-cdk/commit/feadd6cb643b415ae002191ba2cb4622221a5af6)), closes [#6787](https://github.com/aws/aws-cdk/issues/6787)
+* **stepfunctions:** retrieve all reachable states from a given state in a state machine definition ([#7324](https://github.com/aws/aws-cdk/issues/7324)) ([ac3b330](https://github.com/aws/aws-cdk/commit/ac3b330c71ef258afd145b86fd90a06db5d1c990)), closes [#7256](https://github.com/aws/aws-cdk/issues/7256)
+
+
+### Bug Fixes
+
+* **assets:** infrequent "ValidationError: S3 error: Access Denied" ([#7556](https://github.com/aws/aws-cdk/issues/7556)) ([00c9deb](https://github.com/aws/aws-cdk/commit/00c9deb975fe794eef9003cd26a6453abc514928)), closes [#6430](https://github.com/aws/aws-cdk/issues/6430) [#7553](https://github.com/aws/aws-cdk/issues/7553)
+* **route53:** cannot add tags to `HostedZone` ([#7531](https://github.com/aws/aws-cdk/issues/7531)) ([2729804](https://github.com/aws/aws-cdk/commit/272980492dc6b98d71ce9c3b23cab38f656dc632)), closes [#7445](https://github.com/aws/aws-cdk/issues/7445)
+
+
+* **efs:** drop Efs prefix from all exported types ([#7481](https://github.com/aws/aws-cdk/issues/7481)) ([ddd47cd](https://github.com/aws/aws-cdk/commit/ddd47cd7e0735424d2e47891c32e4b7813035067))
+
 ## [1.34.1](https://github.com/aws/aws-cdk/compare/v1.34.0...v1.34.1) (2020-04-22)
 
 

lerna.json

@@ -10,5 +10,5 @@
     "tools/*"
   ],
   "rejectCycles": "true",
-  "version": "1.34.1"
+  "version": "1.35.0"
 }

pack.sh

@@ -15,7 +15,8 @@ rm -fr ${distdir}
 mkdir -p ${distdir}
 
 # Split out jsii and non-jsii packages. Jsii packages will be built all at once.
-# Non-jsii packages will be run individually.
+# Non-jsii packages will be run individually. Note that currently the monoCDK
+# package is handled as non-jsii because of the way it is packaged.
 echo "Collecting package list..." >&2
 scripts/list-packages $TMPDIR/jsii.txt $TMPDIR/nonjsii.txt
 

package.json

@@ -16,9 +16,9 @@
   "devDependencies": {
     "conventional-changelog-cli": "^2.0.31",
     "fs-extra": "^8.1.0",
-    "jsii-diff": "^1.3.2",
-    "jsii-pacmak": "^1.3.2",
-    "jsii-rosetta": "^1.3.2",
+    "jsii-diff": "^1.4.1",
+    "jsii-pacmak": "^1.4.1",
+    "jsii-rosetta": "^1.4.1",
     "lerna": "^3.20.2",
     "standard-version": "^7.1.0",
     "typescript": "~3.8.3"

packages/@aws-cdk/aws-apigateway/lib/deployment.ts

@@ -1,6 +1,6 @@
 import { CfnResource, Construct, Lazy, RemovalPolicy, Resource, Stack } from '@aws-cdk/core';
 import * as crypto from 'crypto';
-import { CfnDeployment, CfnDeploymentProps } from './apigateway.generated';
+import { CfnDeployment } from './apigateway.generated';
 import { IRestApi, RestApi } from './restapi';
 
 export interface DeploymentProps  {
@@ -68,7 +68,7 @@ export class Deployment extends Resource {
 
     this.resource = new LatestDeploymentResource(this, 'Resource', {
       description: props.description,
-      restApiId: props.api.restApiId,
+      restApi: props.api,
     });
 
     if (props.retainDeployments) {
@@ -116,13 +116,23 @@ export class Deployment extends Resource {
   }
 }
 
+interface LatestDeploymentResourceProps {
+  readonly description?: string;
+  readonly restApi: IRestApi;
+}
+
 class LatestDeploymentResource extends CfnDeployment {
   private hashComponents = new Array<any>();
   private originalLogicalId: string;
+  private api: IRestApi;
 
-  constructor(scope: Construct, id: string, props: CfnDeploymentProps) {
-    super(scope, id, props);
+  constructor(scope: Construct, id: string, props: LatestDeploymentResourceProps) {
+    super(scope, id, {
+      description: props.description,
+      restApiId: props.restApi.restApiId,
+    });
 
+    this.api = props.restApi;
     this.originalLogicalId = Stack.of(this).getLogicalId(this);
   }
 
@@ -145,6 +155,13 @@ class LatestDeploymentResource extends CfnDeployment {
    * add via `addToLogicalId`.
    */
   protected prepare() {
+    if (this.api instanceof RestApi) { // Ignore IRestApi that are imported
+
+      // Add CfnRestApi to the logical id so a new deployment is triggered when any of its properties change.
+      const cfnRestApiCF = (this.api.node.defaultChild as any)._toCloudFormation();
+      this.addToLogicalId(Stack.of(this).resolve(cfnRestApiCF));
+    }
+
     const stack = Stack.of(this);
 
     // if hash components were added to the deployment, we use them to calculate

packages/@aws-cdk/aws-apigateway/test/authorizers/integ.request-authorizer.expected.json

@@ -131,7 +131,7 @@
         "Name": "MyRestApi"
       }
     },
-    "MyRestApiDeploymentB555B5828fad37a0e56bbac79ae37ae990881dca": {
+    "MyRestApiDeploymentB555B582dcff966d69deeda8d47e3bf409ce29cb": {
       "Type": "AWS::ApiGateway::Deployment",
       "Properties": {
         "RestApiId": {
@@ -150,7 +150,7 @@
           "Ref": "MyRestApi2D1F47A9"
         },
         "DeploymentId": {
-          "Ref": "MyRestApiDeploymentB555B5828fad37a0e56bbac79ae37ae990881dca"
+          "Ref": "MyRestApiDeploymentB555B582dcff966d69deeda8d47e3bf409ce29cb"
         },
         "StageName": "prod"
       }

packages/@aws-cdk/aws-apigateway/test/authorizers/integ.token-authorizer-iam-role.expected.json

@@ -170,7 +170,7 @@
         "Name": "MyRestApi"
       }
     },
-    "MyRestApiDeploymentB555B5828fad37a0e56bbac79ae37ae990881dca": {
+    "MyRestApiDeploymentB555B582dcff966d69deeda8d47e3bf409ce29cb": {
       "Type": "AWS::ApiGateway::Deployment",
       "Properties": {
         "RestApiId": {
@@ -189,7 +189,7 @@
           "Ref": "MyRestApi2D1F47A9"
         },
         "DeploymentId": {
-          "Ref": "MyRestApiDeploymentB555B5828fad37a0e56bbac79ae37ae990881dca"
+          "Ref": "MyRestApiDeploymentB555B582dcff966d69deeda8d47e3bf409ce29cb"
         },
         "StageName": "prod"
       }

packages/@aws-cdk/aws-apigateway/test/authorizers/integ.token-authorizer.expected.json

@@ -131,7 +131,7 @@
         "Name": "MyRestApi"
       }
     },
-    "MyRestApiDeploymentB555B5828fad37a0e56bbac79ae37ae990881dca": {
+    "MyRestApiDeploymentB555B582dcff966d69deeda8d47e3bf409ce29cb": {
       "Type": "AWS::ApiGateway::Deployment",
       "Properties": {
         "RestApiId": {
@@ -150,7 +150,7 @@
           "Ref": "MyRestApi2D1F47A9"
         },
         "DeploymentId": {
-          "Ref": "MyRestApiDeploymentB555B5828fad37a0e56bbac79ae37ae990881dca"
+          "Ref": "MyRestApiDeploymentB555B582dcff966d69deeda8d47e3bf409ce29cb"
         },
         "StageName": "prod"
       }

packages/@aws-cdk/aws-apigateway/test/integ.cors.expected.json

@@ -6,7 +6,7 @@
         "Name": "cors-api-test"
       }
     },
-    "corsapitestDeployment2BF1633A197b7a426736ab40a59d8a41c2d3d50d": {
+    "corsapitestDeployment2BF1633A228079ea05e5799220dd4ca13512b92d": {
       "Type": "AWS::ApiGateway::Deployment",
       "Properties": {
         "RestApiId": {
@@ -29,7 +29,7 @@
           "Ref": "corsapitest8682546E"
         },
         "DeploymentId": {
-          "Ref": "corsapitestDeployment2BF1633A197b7a426736ab40a59d8a41c2d3d50d"
+          "Ref": "corsapitestDeployment2BF1633A228079ea05e5799220dd4ca13512b92d"
         },
         "StageName": "prod"
       }

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

@@ -355,7 +355,7 @@
         }
       }
     },
-    "deployment33381975": {
+    "deployment3338197541aef5f15bf9a60b10e06fdbe72854f4": {
       "Type": "AWS::ApiGateway::Deployment",
       "Properties": {
         "RestApiId": {
@@ -374,7 +374,7 @@
           "Ref": "lambdarestapiF559E4F2"
         },
         "DeploymentId": {
-          "Ref": "deployment33381975"
+          "Ref": "deployment3338197541aef5f15bf9a60b10e06fdbe72854f4"
         },
         "StageName": "prod"
       }

packages/@aws-cdk/aws-apigateway/test/integ.restapi.books.expected.json

@@ -156,7 +156,7 @@
         "Name": "books-api"
       }
     },
-    "booksapiDeployment308B08F1c828b08824c062376eba921738884f85": {
+    "booksapiDeployment308B08F132cc25cf8168bd5e99b9e6d4915866b5": {
       "Type": "AWS::ApiGateway::Deployment",
       "Properties": {
         "RestApiId": {
@@ -181,7 +181,7 @@
           "Ref": "booksapiE1885304"
         },
         "DeploymentId": {
-          "Ref": "booksapiDeployment308B08F1c828b08824c062376eba921738884f85"
+          "Ref": "booksapiDeployment308B08F132cc25cf8168bd5e99b9e6d4915866b5"
         },
         "StageName": "prod"
       }

packages/@aws-cdk/aws-apigateway/test/integ.restapi.defaults.expected.json

@@ -6,7 +6,7 @@
         "Name": "my-api"
       }
     },
-    "myapiDeployment92F2CB49916eaecf87f818f1e175215b8d086029": {
+    "myapiDeployment92F2CB4972a890db5063ec679071ba7eefc76f2a": {
       "Type": "AWS::ApiGateway::Deployment",
       "Properties": {
         "RestApiId": {
@@ -25,7 +25,7 @@
           "Ref": "myapi4C7BF186"
         },
         "DeploymentId": {
-          "Ref": "myapiDeployment92F2CB49916eaecf87f818f1e175215b8d086029"
+          "Ref": "myapiDeployment92F2CB4972a890db5063ec679071ba7eefc76f2a"
         },
         "StageName": "prod"
       }

packages/@aws-cdk/aws-apigateway/test/integ.restapi.expected.json

@@ -6,7 +6,7 @@
         "Name": "my-api"
       }
     },
-    "myapiDeployment92F2CB4919460d935da8177bcfbc418506e514ff": {
+    "myapiDeployment92F2CB4963d40685c54c6f8da21d80a83f16d3d5": {
       "Type": "AWS::ApiGateway::Deployment",
       "Properties": {
         "RestApiId": {
@@ -38,7 +38,7 @@
         "CacheClusterEnabled": true,
         "CacheClusterSize": "0.5",
         "DeploymentId": {
-          "Ref": "myapiDeployment92F2CB4919460d935da8177bcfbc418506e514ff"
+          "Ref": "myapiDeployment92F2CB4963d40685c54c6f8da21d80a83f16d3d5"
         },
         "Description": "beta stage",
         "MethodSettings": [

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

@@ -75,7 +75,7 @@
           "Name": "SecondRestAPI"
         }
       },
-      "BooksApiDeployment86CA39AFc929a0f95f673e230c62e2c9754726f6": {
+      "BooksApiDeployment86CA39AF7e6c771d47a1a3777eba99bffc037822": {
         "Type": "AWS::ApiGateway::Deployment",
         "Properties": {
           "RestApiId": {
@@ -96,7 +96,7 @@
             "Ref": "BooksApi60AC975F"
           },
           "DeploymentId": {
-            "Ref": "BooksApiDeployment86CA39AFc929a0f95f673e230c62e2c9754726f6"
+            "Ref": "BooksApiDeployment86CA39AF7e6c771d47a1a3777eba99bffc037822"
           },
           "StageName": "prod"
         }

packages/@aws-cdk/aws-apigateway/test/integ.restapi.multiuse.expected.json

@@ -56,7 +56,7 @@
         "Name": "hello-api"
       }
     },
-    "helloapiDeploymentFA89AEEC086c88c5044fbc117bd88fffcee53ab2": {
+    "helloapiDeploymentFA89AEEC3622d8c965f356a33fd95586d24bf138": {
       "Type": "AWS::ApiGateway::Deployment",
       "Properties": {
         "RestApiId": {
@@ -76,7 +76,7 @@
           "Ref": "helloapi4446A35B"
         },
         "DeploymentId": {
-          "Ref": "helloapiDeploymentFA89AEEC086c88c5044fbc117bd88fffcee53ab2"
+          "Ref": "helloapiDeploymentFA89AEEC3622d8c965f356a33fd95586d24bf138"
         },
         "StageName": "prod"
       }
@@ -265,7 +265,7 @@
         "Name": "second-api"
       }
     },
-    "secondapiDeployment20F2C7001932445454ace403a6bfe89c1430ff70": {
+    "secondapiDeployment20F2C70088fa5a027620045bea3e5043c6d31f5a": {
       "Type": "AWS::ApiGateway::Deployment",
       "Properties": {
         "RestApiId": {
@@ -285,7 +285,7 @@
           "Ref": "secondapi730EF3C7"
         },
         "DeploymentId": {
-          "Ref": "secondapiDeployment20F2C7001932445454ace403a6bfe89c1430ff70"
+          "Ref": "secondapiDeployment20F2C70088fa5a027620045bea3e5043c6d31f5a"
         },
         "StageName": "prod"
       }

packages/@aws-cdk/aws-apigateway/test/integ.restapi.vpc-endpoint.expected.json

@@ -631,7 +631,7 @@
         }
       }
     },
-    "MyApiDeploymentECB0D05E4316cb89aa1d468052daa78055609f5a": {
+    "MyApiDeploymentECB0D05E7a475a505b0c925e193030293593b6dc": {
       "Type": "AWS::ApiGateway::Deployment",
       "Properties": {
         "RestApiId": {
@@ -650,7 +650,7 @@
           "Ref": "MyApi49610EDF"
         },
         "DeploymentId": {
-          "Ref": "MyApiDeploymentECB0D05E4316cb89aa1d468052daa78055609f5a"
+          "Ref": "MyApiDeploymentECB0D05E7a475a505b0c925e193030293593b6dc"
         },
         "StageName": "prod"
       }