aws · eladb · Feb 6, 2019 · Feb 4, 2019 · Feb 4, 2019 · Feb 4, 2019
diff --git a/packages/@aws-cdk/assets/test/test.asset.ts b/packages/@aws-cdk/assets/test/test.asset.ts
@@ -18,7 +18,10 @@ export = {
     // the correct information
     const entry = asset.node.metadata.find(m => m.type === 'aws:cdk:asset');
     test.ok(entry, 'found metadata entry');
-    test.deepEqual(entry!.data, {
+
+    // console.error(JSON.stringify(stack.node.resolve(entry!.data)));
+
+    test.deepEqual(stack.node.resolve(entry!.data), {
       path: dirPath,
       id: 'MyAsset',
       packaging: 'zip',
@@ -34,13 +37,35 @@ export = {
     test.done();
   },
 
+  'verify that the app resolves tokens in metadata'(test: Test) {
+    const app = new cdk.App();
+    const stack = new cdk.Stack(app, 'my-stack');
+    const dirPath = path.resolve(__dirname, 'sample-asset-directory');
+
+    new ZipDirectoryAsset(stack, 'MyAsset', {
+      path: dirPath
+    });
+
+    const synth = app.synthesizeStack(stack.name);
+
+    test.deepEqual(synth.metadata['/my-stack/MyAsset'][0].data, {
+      path: dirPath,
+      id: "mystackMyAssetD6B1B593",
+      packaging: "zip",
+      s3BucketParameter: "MyAssetS3Bucket68C9B344",
+      s3KeyParameter: "MyAssetS3VersionKey68E1A45D"
+    });
+
+    test.done();
+  },
+
   '"file" assets'(test: Test) {
     const stack = new cdk.Stack();
     const filePath = path.join(__dirname, 'file-asset.txt');
     const asset = new FileAsset(stack, 'MyAsset', { path: filePath });
     const entry = asset.node.metadata.find(m => m.type === 'aws:cdk:asset');
     test.ok(entry, 'found metadata entry');
-    test.deepEqual(entry!.data, {
+    test.deepEqual(stack.node.resolve(entry!.data), {
       path: filePath,
       packaging: 'file',
       id: 'MyAsset',

diff --git a/packages/@aws-cdk/aws-apigateway/test/integ.restapi.books.expected.json b/packages/@aws-cdk/aws-apigateway/test/integ.restapi.books.expected.json
@@ -526,12 +526,12 @@
       },
       "DependsOn": [
         "booksapiANYF4F0CDEB",
-        "booksapibooks97D84727",
+        "booksapibooksbookidDELETE214F4059",
+        "booksapibooksbookidGETCCE21986",
+        "booksapibooksbookid5264BCA2",
         "booksapibooksGETA776447A",
         "booksapibooksPOSTF6C6559D",
-        "booksapibooksbookid5264BCA2",
-        "booksapibooksbookidDELETE214F4059",
-        "booksapibooksbookidGETCCE21986"
+        "booksapibooks97D84727"
       ]
     },
     "booksapiDeploymentStageprod55D8E03E": {

diff --git a/packages/@aws-cdk/aws-apigateway/test/integ.restapi.expected.json b/packages/@aws-cdk/aws-apigateway/test/integ.restapi.expected.json
@@ -15,16 +15,16 @@
         "Description": "Automatically created by the RestApi construct"
       },
       "DependsOn": [
-        "myapiv113487378",
-        "myapiv1appliances507FEFF4",
         "myapiv1appliancesGET8FE872EC",
-        "myapiv1books1D4BE6C1",
+        "myapiv1appliances507FEFF4",
         "myapiv1booksGETC6B996D0",
         "myapiv1booksPOST53E2832E",
-        "myapiv1toysA55FCBC4",
+        "myapiv1books1D4BE6C1",
+        "myapiv113487378",
         "myapiv1toysGET7348114D",
         "myapiv1toysPOST55128058",
-        "myapiv1toysPUT59AFBBC2"
+        "myapiv1toysPUT59AFBBC2",
+        "myapiv1toysA55FCBC4"
       ],
       "DeletionPolicy": "Retain"
     },

diff --git a/packages/@aws-cdk/aws-apigateway/test/test.restapi.ts b/packages/@aws-cdk/aws-apigateway/test/test.restapi.ts
@@ -526,12 +526,12 @@ export = {
     // THEN
     expect(stack).to(haveResource('My::Resource', {
       DependsOn: [
-        "myapiDeploymentB7EF8EB75c091a668064a3f3a1f6d68a3fb22cf9",
-        "myapi162F20B8",
         "myapiAccountC3A4750C",
         "myapiCloudWatchRoleEB425128",
+        "myapiDeploymentB7EF8EB75c091a668064a3f3a1f6d68a3fb22cf9",
         "myapiDeploymentStageprod329F21FF",
-        "myapiGET9B7CD29E"
+        "myapiGET9B7CD29E",
+        "myapi162F20B8"
       ]
     }, ResourcePart.CompleteDefinition));
 

diff --git a/packages/@aws-cdk/aws-autoscaling/test/test.lifecyclehooks.ts b/packages/@aws-cdk/aws-autoscaling/test/test.lifecyclehooks.ts
@@ -34,8 +34,8 @@ export = {
     // Lifecycle Hook has a dependency on the policy object
     expect(stack).to(haveResource('AWS::AutoScaling::LifecycleHook', {
       DependsOn: [
+        "ASGLifecycleHookTransitionRoleDefaultPolicy2E50C7DB",
         "ASGLifecycleHookTransitionRole3AAA6BB7",
-        "ASGLifecycleHookTransitionRoleDefaultPolicy2E50C7DB"
       ]
     }, ResourcePart.CompleteDefinition));
 

diff --git a/packages/@aws-cdk/aws-codedeploy/test/lambda/integ.deployment-group.expected.json b/packages/@aws-cdk/aws-codedeploy/test/lambda/integ.deployment-group.expected.json
@@ -253,8 +253,8 @@
         "Runtime": "nodejs8.10"
       },
       "DependsOn": [
-        "PreHookServiceRoleC724B9BA",
-        "PreHookServiceRoleDefaultPolicy65358F76"
+        "PreHookServiceRoleDefaultPolicy65358F76",
+        "PreHookServiceRoleC724B9BA"
       ]
     },
     "PostHookServiceRoleE8A6AAC2": {

diff --git a/packages/@aws-cdk/aws-elasticloadbalancingv2/test/nlb/test.listener.ts b/packages/@aws-cdk/aws-elasticloadbalancingv2/test/nlb/test.listener.ts
@@ -133,10 +133,10 @@ export = {
         MyResource: {
           Type: "Test::Resource",
           DependsOn: [
-            "LBListener49E825B4",
             // 2nd dependency is there because of the structure of the construct tree.
             // It does not harm.
-            "LBListenerGroupGroup79B304FF"
+            "LBListenerGroupGroup79B304FF",
+            "LBListener49E825B4",
           ]
         }
       }

diff --git a/packages/@aws-cdk/aws-lambda-event-sources/test/integ.dynamodb.expected.json b/packages/@aws-cdk/aws-lambda-event-sources/test/integ.dynamodb.expected.json
@@ -82,8 +82,8 @@
         "Runtime": "nodejs8.10"
       },
       "DependsOn": [
-        "FServiceRole3AC82EE1",
-        "FServiceRoleDefaultPolicy17A19BFA"
+        "FServiceRoleDefaultPolicy17A19BFA",
+        "FServiceRole3AC82EE1"
       ]
     },
     "FDynamoDBEventSourcelambdaeventsourcedynamodbT7967476AE652DA48": {

diff --git a/packages/@aws-cdk/aws-lambda-event-sources/test/integ.kinesis.expected.json b/packages/@aws-cdk/aws-lambda-event-sources/test/integ.kinesis.expected.json
@@ -77,8 +77,8 @@
         "Runtime": "nodejs8.10"
       },
       "DependsOn": [
-        "FServiceRole3AC82EE1",
-        "FServiceRoleDefaultPolicy17A19BFA"
+        "FServiceRoleDefaultPolicy17A19BFA",
+        "FServiceRole3AC82EE1"
       ]
     },
     "FKinesisEventSourcelambdaeventsourcekinesisQ645CE7DB2D6BCCF5": {

diff --git a/packages/@aws-cdk/aws-lambda-event-sources/test/integ.sqs.expected.json b/packages/@aws-cdk/aws-lambda-event-sources/test/integ.sqs.expected.json
@@ -81,8 +81,8 @@
         "Runtime": "nodejs8.10"
       },
       "DependsOn": [
-        "FServiceRole3AC82EE1",
-        "FServiceRoleDefaultPolicy17A19BFA"
+        "FServiceRoleDefaultPolicy17A19BFA",
+        "FServiceRole3AC82EE1"
       ]
     },
     "FSqsEventSourcelambdaeventsourcesqsQ67DE9201754EC819": {

diff --git a/packages/@aws-cdk/aws-lambda/test/integ.lambda.expected.json b/packages/@aws-cdk/aws-lambda/test/integ.lambda.expected.json
@@ -68,8 +68,8 @@
         "Runtime": "nodejs6.10"
       },
       "DependsOn": [
-        "MyLambdaServiceRole4539ECB6",
-        "MyLambdaServiceRoleDefaultPolicy5BBC6F68"
+        "MyLambdaServiceRoleDefaultPolicy5BBC6F68",
+        "MyLambdaServiceRole4539ECB6"
       ]
     },
     "MyLambdaVersion16CDE3C40": {
@@ -96,4 +96,4 @@
       }
     }
   }
-}
+}
diff --git a/packages/@aws-cdk/aws-lambda/test/test.lambda.ts b/packages/@aws-cdk/aws-lambda/test/test.lambda.ts
@@ -95,7 +95,7 @@ export = {
           Handler: 'index.handler',
           Role: { 'Fn::GetAtt': [ 'MyLambdaServiceRole4539ECB6', 'Arn' ] },
           Runtime: 'nodejs6.10' },
-         DependsOn: [ 'MyLambdaServiceRole4539ECB6', 'MyLambdaServiceRoleDefaultPolicy5BBC6F68' ] } } } );
+         DependsOn: [ 'MyLambdaServiceRoleDefaultPolicy5BBC6F68', 'MyLambdaServiceRole4539ECB6' ] } } } );
     test.done();
 
   },
@@ -429,8 +429,8 @@ export = {
             "FunctionName": "OneFunctionToRuleThemAll"
           },
           "DependsOn": [
-            "MyLambdaServiceRole4539ECB6",
-            "MyLambdaServiceRoleDefaultPolicy5BBC6F68"
+            "MyLambdaServiceRoleDefaultPolicy5BBC6F68",
+            "MyLambdaServiceRole4539ECB6"
           ]
           }
         }
@@ -539,8 +539,8 @@ export = {
             }
           },
           "DependsOn": [
-            "MyLambdaServiceRole4539ECB6",
-            "MyLambdaServiceRoleDefaultPolicy5BBC6F68"
+            "MyLambdaServiceRoleDefaultPolicy5BBC6F68",
+            "MyLambdaServiceRole4539ECB6"
           ]
           }
         }
@@ -717,8 +717,8 @@ export = {
             }
           },
           "DependsOn": [
-            "MyLambdaServiceRole4539ECB6",
-            "MyLambdaServiceRoleDefaultPolicy5BBC6F68"
+            "MyLambdaServiceRoleDefaultPolicy5BBC6F68",
+            "MyLambdaServiceRole4539ECB6"
           ]
           }
         }
@@ -827,8 +827,8 @@ export = {
           }
           },
           "DependsOn": [
-          "MyLambdaServiceRole4539ECB6",
-          "MyLambdaServiceRoleDefaultPolicy5BBC6F68"
+            "MyLambdaServiceRoleDefaultPolicy5BBC6F68",
+            "MyLambdaServiceRole4539ECB6",
           ]
         }
         }
@@ -906,8 +906,8 @@ export = {
       }
     },
     "DependsOn": [
+      "MyLambdaServiceRoleDefaultPolicy5BBC6F68",
       "MyLambdaServiceRole4539ECB6",
-      "MyLambdaServiceRoleDefaultPolicy5BBC6F68"
     ]
     }, ResourcePart.CompleteDefinition));
 
@@ -964,8 +964,8 @@ export = {
       }
     },
     "DependsOn": [
+      "MyLambdaServiceRoleDefaultPolicy5BBC6F68",
       "MyLambdaServiceRole4539ECB6",
-      "MyLambdaServiceRoleDefaultPolicy5BBC6F68"
     ]
     }, ResourcePart.CompleteDefinition));
 

diff --git a/packages/@aws-cdk/aws-sns/test/test.sns.ts b/packages/@aws-cdk/aws-sns/test/test.sns.ts
@@ -718,7 +718,8 @@ export = {
     test.deepEqual(dest1.type, s3n.BucketNotificationDestinationType.Topic);
 
     const dep: cdk.Construct = dest1.dependencies![0] as any;
-    test.deepEqual((dep.node.children[0] as any).logicalId, 'MyTopicPolicy12A5EC17', 'verify topic policy is added as dependency');
+    test.deepEqual(stack.node.resolve((dep.node.children[0] as any).logicalId),
+      'MyTopicPolicy12A5EC17', 'verify topic policy is added as dependency');
 
     // calling again on the same bucket yields is idempotent
     const dest2 = topic.asBucketNotificationDestination(bucketArn, bucketId);

diff --git a/packages/@aws-cdk/cdk/lib/cloudformation/cfn-tokens.ts b/packages/@aws-cdk/cdk/lib/cloudformation/cfn-tokens.ts
@@ -38,6 +38,10 @@ export class CfnReference extends Token {
     if (typeof(value) === 'function') {
         throw new Error('CfnReference can only hold CloudFormation intrinsics (not a function)');
     }
+    // prepend scope path to display name
+    if (displayName && scope) {
+      displayName = `${scope.node.path}.${displayName}`;
+    }
     super(value, displayName);
     this.replacementTokens = new Map<Stack, Token>();
     this.isReference = true;

diff --git a/packages/@aws-cdk/cdk/lib/cloudformation/resource.ts b/packages/@aws-cdk/cdk/lib/cloudformation/resource.ts
@@ -84,7 +84,7 @@ export class Resource extends Referenceable {
    *
    * Is filled during prepare().
    */
-  private readonly dependsOn = new Set<string>();
+  private readonly dependsOn = new Set<Resource>();
 
   /**
    * Creates a resource construct.
@@ -117,7 +117,7 @@ export class Resource extends Referenceable {
    * @param attributeName The name of the attribute.
    */
   public getAtt(attributeName: string) {
-    return new CfnReference({ 'Fn::GetAtt': [this.logicalId, attributeName] }, `${this.logicalId}.${attributeName}`, this);
+    return new CfnReference({ 'Fn::GetAtt': [this.logicalId, attributeName] }, attributeName, this);
   }
 
   /**
@@ -179,8 +179,12 @@ export class Resource extends Referenceable {
     this.addPropertyOverride(propertyPath, undefined);
   }
 
+  /**
+   * Indicates that this resource depends on another resource and cannot be provisioned
+   * unless the other resource has been successfully provisioned.
+   */
   public addDependsOn(resource: Resource) {
-    this.dependsOn.add(resource.logicalId);
+    this.dependsOn.add(resource);
   }
 
   /**
@@ -197,7 +201,7 @@ export class Resource extends Referenceable {
             Type: this.resourceType,
             Properties: ignoreEmpty(this, properties),
             // Return a sorted set of dependencies to be consistent across tests
-            DependsOn: ignoreEmpty(this, sortedSet(this.dependsOn)),
+            DependsOn: ignoreEmpty(this, renderDependsOn(this.dependsOn)),
             CreationPolicy:  capitalizePropertyNames(this, this.options.creationPolicy),
             UpdatePolicy: capitalizePropertyNames(this, this.options.updatePolicy),
             UpdateReplacePolicy: capitalizePropertyNames(this, this.options.updateReplacePolicy),
@@ -217,6 +221,15 @@ export class Resource extends Referenceable {
       // Re-throw
       throw e;
     }
+
+    // returns the set of logical ID (tokens) this resource depends on
+    // sorted by construct paths to ensure test determinism
+    function renderDependsOn(dependsOn: Set<Resource>) {
+      return Array
+        .from(dependsOn)
+        .sort((x, y) => x.node.path.localeCompare(y.node.path))
+        .map(r => r.logicalId);
+    }
   }
 
   protected renderProperties(properties: any): { [key: string]: any } {
@@ -305,8 +318,3 @@ export function deepMerge(target: any, source: any) {
 
   return target;
 }
-function sortedSet<T>(xs: Set<T>): T[] {
-  const ret = Array.from(xs);
-  ret.sort();
-  return ret;
-}