fix(apigateway): Token resolution should occur within the prepare context

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

@@ -1,4 +1,4 @@
-import { Construct, Lazy, RemovalPolicy, Resource, Stack } from '@aws-cdk/core';
+import { Construct, DefaultTokenResolver, Lazy, RemovalPolicy, Resource, Stack, StringConcat, Tokenization } from '@aws-cdk/core';
 import crypto = require('crypto');
 import { CfnDeployment, CfnDeploymentProps } from './apigateway.generated';
 import { IRestApi } from './restapi';
@@ -128,12 +128,23 @@ class LatestDeploymentResource extends CfnDeployment {
     if (this.hashComponents.length > 0) {
       const md5 = crypto.createHash('md5');
       this.hashComponents
-        .map(c => stack.resolve(c))
+        .map(c => {
+          try {
+            // TODO: Remove the code in the try block with next major version release of CDK.
+            // It's here to be backwards compatible, i.e., prevent LogicalIds to change.
+            return stack.resolve(c);
+          } catch (e) {
+            return Tokenization.resolve(c, {
+              scope: this,
+              resolver: new DefaultTokenResolver(new StringConcat()),
+              preparing: true,
+            });
+          }
+        })
         .forEach(c => md5.update(JSON.stringify(c)));
 
       this.overrideLogicalId(this.originalLogicalId + md5.digest("hex"));
     }
-
     super.prepare();
   }
 }

packages/@aws-cdk/core/lib/token.ts

@@ -112,8 +112,9 @@ export class Tokenization {
    */
   public static resolve(obj: any, options: ResolveOptions): any {
     return resolve(obj, {
-      ...options,
-      preparing: false
+      scope: options.scope,
+      resolver: options.resolver,
+      preparing: options.preparing || false
     });
   }
 
@@ -150,6 +151,11 @@ export interface ResolveOptions {
    * The resolver to apply to any resolvable tokens found
    */
   readonly resolver: ITokenResolver;
+
+  /**
+   * Whether the resolution is being executed during the prepare phase or not.
+   */
+  readonly preparing?: boolean;
 }
 
 /**