fix(apigateway): deployment not invalidated when integration is chang…

…ed (#4552)

* fix(apigateway): deployment not invalidated when integration is changed

The calculation of the deployment logical id is based on a hash of the apigateway model, which includes components such as the resource and method configurations. method integrations, which are part of the method configuration are also included, and could possible include references to other resources such as lambda functions.

When the hash was calculated, tokens have been resolved using `StringConcat` which basically converted all tokens to `[Object object]`. This means, for example, that if we changed the reference of an integration lambda to a different handler, the hash would remain the same.

There is no apparent reason why we can't simply resolve tokens using the CloudFormation concatenation function during "prepare", which means that if we now reference a different resource, the token will resolve to a different value and deployment will be invalidated.

Fixes #4551
Fixes aws-samples/aws-cdk-intro-workshop#83

* fix lint errors

* update expectations

* add lambda asset

* update expectation

* update expectations

* update decdk tests

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

@@ -1,4 +1,4 @@
-import { Construct, DefaultTokenResolver, Lazy, RemovalPolicy, Resource, Stack, StringConcat, Tokenization } from '@aws-cdk/core';
+import { Construct, Lazy, RemovalPolicy, Resource, Stack } from '@aws-cdk/core';
 import crypto = require('crypto');
 import { CfnDeployment, CfnDeploymentProps } from './apigateway.generated';
 import { IRestApi } from './restapi';
@@ -121,20 +121,13 @@ class LatestDeploymentResource extends CfnDeployment {
    * add via `addToLogicalId`.
    */
   protected prepare() {
+    const stack = Stack.of(this);
+
     // if hash components were added to the deployment, we use them to calculate
     // a logical ID for the deployment resource.
     if (this.hashComponents.length > 0) {
       const md5 = crypto.createHash('md5');
-      this.hashComponents
-        .map(c => {
-          return Tokenization.resolve(c, {
-            scope: this,
-            resolver: new DefaultTokenResolver(new StringConcat()),
-            preparing: true,
-          });
-        })
-        .forEach(c => md5.update(JSON.stringify(c)));
-
+      this.hashComponents.map(x => stack.resolve(x)).forEach(c => md5.update(JSON.stringify(c)));
       this.overrideLogicalId(this.originalLogicalId + md5.digest("hex"));
     }
     super.prepare();

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

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