Update error message, fix error where tokens are not properly finally…

… resolved
aws · Aug 7, 2019 · 17a5b02 · 17a5b02
1 parent 34b4e9a
commit 17a5b02
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/packages/@aws-cdk/core/lib/private/cfn-reference.ts b/packages/@aws-cdk/core/lib/private/cfn-reference.ts
@@ -104,7 +104,7 @@ export class CfnReference extends Reference {
     const consumingStack = Stack.of(context.scope);
     const token = this.replacementTokens.get(consumingStack);
     if (!token && this.isCrossStackReference(consumingStack) && !context.preparing) {
-      throw new Error('Should have hadd a cross-stack reference, but not found. prepare() the reference first.');
+      throw new Error('Cross-stack reference has not been assigned a value--call prepare() first');
     }
 
     if (token) {

diff --git a/packages/@aws-cdk/core/lib/private/cloudformation-lang.ts b/packages/@aws-cdk/core/lib/private/cloudformation-lang.ts
@@ -49,8 +49,9 @@ export class CloudFormationLang {
 
       public resolveToken(t: IResolvable, context: IResolveContext, postProcess: IPostProcessor) {
         // Return References directly, so their type is maintained and the references will
-        // continue to work.
-        if (Reference.isReference(t)) { return t; }
+        // continue to work. Only while preparing, because we do need the final value of the
+        // token while resolving.
+        if (Reference.isReference(t) && context.preparing) { return wrap(t); }
 
         // Deep-resolve and wrap. This is necessary for Lazy tokens so we can see "inside" them.
         return wrap(super.resolveToken(t, context, postProcess));