feat(cdk): aspect framework and tag implementation

packages/@aws-cdk/app-delivery/test/test.pipeline-deploy-stack-action.ts

@@ -9,7 +9,7 @@ import cxapi = require('@aws-cdk/cx-api');
 import fc = require('fast-check');
 import nodeunit = require('nodeunit');
 
-import { countResources, expect, haveResource, isSuperObject } from '@aws-cdk/assert';
+import { countResources, expect, haveResource, isSuperObject, TestStack } from '@aws-cdk/assert';
 import { PipelineDeployStackAction } from '../lib/pipeline-deploy-stack-action';
 
 interface SelfUpdatingPipeline {
@@ -299,7 +299,7 @@ class FakeAction extends api.Action {
 }
 
 function getTestStack(): cdk.Stack {
-  return new cdk.Stack(undefined, 'TestStack', { env: { account: '123456789012', region: 'us-east-1' } });
+  return new TestStack(undefined, 'TestStack', { env: { account: '123456789012', region: 'us-east-1' } });
 }
 
 function createSelfUpdatingStack(pipelineStack: cdk.Stack): SelfUpdatingPipeline {

packages/@aws-cdk/assert/lib/expect.ts

@@ -1,6 +1,7 @@
 import cdk = require('@aws-cdk/cdk');
 import api = require('@aws-cdk/cx-api');
 import { StackInspector } from './inspector';
+import { TestStack } from './test-stack';
 
 export function expect(stack: api.SynthesizedStack | cdk.Stack, skipValidation = false): StackInspector {
   // Can't use 'instanceof' here, that breaks if we have multiple copies
@@ -18,6 +19,10 @@ export function expect(stack: api.SynthesizedStack | cdk.Stack, skipValidation =
       }
     }
 
+    if (isTestStack(stack)) {
+      stack.testInvokeAspects();
+    }
+
     sstack = {
       name: stack.name,
       template: stack.toCloudFormation(),
@@ -50,3 +55,7 @@ function collectStackMetadata(root: cdk.ConstructNode): api.StackMetadata {
   }
   return result;
 }
+
+function isTestStack(t: any): t is TestStack {
+  return t.testInvokeAspects !== undefined;
+}

packages/@aws-cdk/assert/lib/index.ts

@@ -1,6 +1,7 @@
 export * from './assertion';
 export * from './expect';
 export * from './inspector';
+export * from './test-stack';
 
 export * from './assertions/exist';
 export * from './assertions/have-resource';

packages/@aws-cdk/assert/lib/test-stack.ts

@@ -0,0 +1,7 @@
+import cdk = require('@aws-cdk/cdk');
+
+export class TestStack extends cdk.Stack {
+  public testInvokeAspects() {
+    this.invokeAspects();
+  }
+}

packages/@aws-cdk/aws-autoscaling/lib/auto-scaling-group.ts

@@ -137,11 +137,6 @@ export interface AutoScalingGroupProps {
    */
   resourceSignalTimeoutSec?: number;
 
-  /**
-   * The AWS resource tags to associate with the ASG.
-   */
-  tags?: cdk.Tags;
-
   /**
    * Default scaling cooldown for this AutoScalingGroup
    *
@@ -161,7 +156,7 @@ export interface AutoScalingGroupProps {
  *
  * The ASG spans all availability zones.
  */
-export class AutoScalingGroup extends cdk.Construct implements IAutoScalingGroup, cdk.ITaggable, elb.ILoadBalancerTarget, ec2.IConnectable,
+export class AutoScalingGroup extends cdk.Construct implements IAutoScalingGroup, elb.ILoadBalancerTarget, ec2.IConnectable,
   elbv2.IApplicationLoadBalancerTarget, elbv2.INetworkLoadBalancerTarget {
   /**
    * The type of OS instances of this fleet are running.
@@ -178,11 +173,6 @@ export class AutoScalingGroup extends cdk.Construct implements IAutoScalingGroup
    */
   public readonly role: iam.Role;
 
-  /**
-   * Manage tags for this construct and children
-   */
-  public readonly tags: cdk.TagManager;
-
   /**
    * Name of the AutoScalingGroup
    */
@@ -209,8 +199,9 @@ export class AutoScalingGroup extends cdk.Construct implements IAutoScalingGroup
     });
     this.connections = new ec2.Connections({ securityGroups: [this.securityGroup] });
     this.securityGroups.push(this.securityGroup);
-    this.tags = new TagManager(this, {initialTags: props.tags});
-    this.tags.setTag(NAME_TAG, this.node.path, { overwrite: false });
+    this.apply(new cdk.Tag(NAME_TAG, this.node.path, {
+      applyToLaunchInstances: true,
+    }));
 
     this.role = new iam.Role(this, 'InstanceRole', {
       assumedBy: new iam.ServicePrincipal('ec2.amazonaws.com')
@@ -255,7 +246,6 @@ export class AutoScalingGroup extends cdk.Construct implements IAutoScalingGroup
       launchConfigurationName: launchConfig.ref,
       loadBalancerNames: new cdk.Token(() => this.loadBalancerNames.length > 0 ? this.loadBalancerNames : undefined),
       targetGroupArns: new cdk.Token(() => this.targetGroupArns.length > 0 ? this.targetGroupArns : undefined),
-      tags: this.tags,
     };
 
     if (props.notificationsTopic) {
@@ -616,16 +606,6 @@ function renderRollingUpdateConfig(config: RollingUpdateConfiguration = {}): cdk
   };
 }
 
-class TagManager extends cdk.TagManager {
-  protected tagFormatResolve(tagGroups: cdk.TagGroups): any {
-    const tags = {...tagGroups.nonStickyTags, ...tagGroups.ancestorTags, ...tagGroups.stickyTags};
-    return Object.keys(tags).map( (key) => {
-      const propagateAtLaunch = !!tagGroups.propagateTags[key] || !!tagGroups.ancestorTags[key];
-      return {key, value: tags[key], propagateAtLaunch};
-    });
-  }
-}
-
 /**
  * Render a number of seconds to a PTnX string.
  */
@@ -748,4 +728,4 @@ export interface MetricTargetTrackingProps extends BaseTargetTrackingProps {
    * Value to keep the metric around
    */
   targetValue: number;
-}
+}

packages/@aws-cdk/aws-autoscaling/test/test.auto-scaling-group.ts

@@ -9,7 +9,7 @@ import autoscaling = require('../lib');
 
 export = {
   'default fleet'(test: Test) {
-    const stack = new cdk.Stack(undefined, 'MyStack', { env: { region: 'us-east-1', account: '1234' }});
+    const stack = getTestStack();
     const vpc = mockVpc(stack);
 
     new autoscaling.AutoScalingGroup(stack, 'MyFleet', {
@@ -18,6 +18,8 @@ export = {
       vpc
     });
 
+    stack.testInvokeAspects();
+
     expect(stack).toMatch({
       "Resources": {
         "MyFleetInstanceSecurityGroup774E8234": {
@@ -365,7 +367,8 @@ export = {
   },
   'can set tags'(test: Test) {
     // GIVEN
-    const stack = new cdk.Stack(undefined, 'MyStack', { env: { region: 'us-east-1', account: '1234' }});
+    const stack = getTestStack();
+      // new cdk.Stack(undefined, 'MyStack', { env: { region: 'us-east-1', account: '1234' }});
     const vpc = mockVpc(stack);
 
     // WHEN
@@ -378,27 +381,28 @@ export = {
         minSuccessfulInstancesPercent: 50,
         pauseTimeSec: 345
       },
-      tags: {superfood: 'acai'},
     });
-    asg.tags.setTag('notsuper', 'caramel', {propagate: false});
+    asg.apply( new cdk.Tag('superfood', 'acai'));
+    asg.apply( new cdk.Tag('notsuper', 'caramel', { applyToLaunchInstances: false }));
 
+    stack.testInvokeAspects();
     // THEN
     expect(stack).to(haveResource("AWS::AutoScaling::AutoScalingGroup", {
       Tags: [
         {
-          Key: 'superfood',
-          Value: 'acai',
+          Key: 'Name',
           PropagateAtLaunch: true,
+          Value: 'MyFleet',
         },
         {
-          Key: 'Name',
-          Value: 'MyFleet',
+          Key: 'superfood',
           PropagateAtLaunch: true,
+          Value: 'acai',
         },
         {
           Key: 'notsuper',
-          Value: 'caramel',
           PropagateAtLaunch: false,
+          Value: 'caramel',
         },
       ]
     }));
@@ -421,3 +425,12 @@ function mockSecurityGroup(stack: cdk.Stack) {
     securityGroupId: 'most-secure',
   });
 }
+
+class TestStack extends cdk.Stack {
+  public testInvokeAspects(): void {
+    this.invokeAspects();
+  }
+}
+function getTestStack(): TestStack {
+  return new TestStack(undefined, 'TestStack', { env: { account: '1234', region: 'us-east-1' } });
+}

packages/@aws-cdk/aws-autoscaling/test/test.scheduled-action.ts

@@ -1,4 +1,4 @@
-import { expect, haveResource, MatchStyle } from '@aws-cdk/assert';
+import { expect, haveResource, MatchStyle, TestStack } from '@aws-cdk/assert';
 import ec2 = require('@aws-cdk/aws-ec2');
 import cdk = require('@aws-cdk/cdk');
 import { Test } from 'nodeunit';
@@ -7,7 +7,7 @@ import autoscaling = require('../lib');
 export = {
   'can schedule an action'(test: Test) {
     // GIVEN
-    const stack = new cdk.Stack();
+    const stack = new TestStack();
     const asg = makeAutoScalingGroup(stack);
 
     // WHEN
@@ -27,7 +27,7 @@ export = {
 
   'correctly formats date objects'(test: Test) {
     // GIVEN
-    const stack = new cdk.Stack();
+    const stack = new TestStack();
     const asg = makeAutoScalingGroup(stack);
 
     // WHEN
@@ -47,7 +47,7 @@ export = {
 
   'autoscaling group has recommended updatepolicy for scheduled actions'(test: Test) {
     // GIVEN
-    const stack = new cdk.Stack();
+    const stack = getTestStack();
     const asg = makeAutoScalingGroup(stack);
 
     // WHEN
@@ -56,6 +56,7 @@ export = {
       minCapacity: 10,
     });
 
+    stack.testInvokeAspects();
     // THEN
     expect(stack).toMatch({
       Resources: {
@@ -111,4 +112,8 @@ function makeAutoScalingGroup(scope: cdk.Construct) {
     machineImage: new ec2.AmazonLinuxImage(),
     updateType: autoscaling.UpdateType.RollingUpdate,
   });
-}
+}
+
+function getTestStack(): TestStack {
+  return new TestStack(undefined, 'TestStack', { env: { account: '1234', region: 'us-east-1' } });
+}

packages/@aws-cdk/aws-cloudtrail/test/test.cloudtrail.ts

@@ -1,4 +1,4 @@
-import { expect, haveResource, not } from '@aws-cdk/assert';
+import { expect, haveResource, not, TestStack } from '@aws-cdk/assert';
 import { Stack } from '@aws-cdk/cdk';
 import { Test } from 'nodeunit';
 import { CloudTrail, LogRetention, ReadWriteType } from '../lib';
@@ -147,5 +147,5 @@ export = {
 };
 
 function getTestStack(): Stack {
-  return new Stack(undefined, 'TestStack', { env: { account: '123456789012', region: 'us-east-1' } });
+  return new TestStack(undefined, 'TestStack', { env: { account: '123456789012', region: 'us-east-1' } });
 }

packages/@aws-cdk/aws-dynamodb/lib/table.ts

@@ -1,7 +1,7 @@
 import appscaling = require('@aws-cdk/aws-applicationautoscaling');
 import iam = require('@aws-cdk/aws-iam');
 import cdk = require('@aws-cdk/cdk');
-import { Construct, TagManager, Tags, Token } from '@aws-cdk/cdk';
+import { Construct, Token } from '@aws-cdk/cdk';
 import { CfnTable } from './dynamodb.generated';
 import { EnableScalingProps, IScalableTableAttribute } from './scalable-attribute-api';
 import { ScalableTableAttribute } from './scalable-table-attribute';
@@ -88,12 +88,6 @@ export interface TableProps {
    */
   streamSpecification?: StreamViewType;
 
-  /**
-   * The AWS resource tags to associate with the table.
-   * @default undefined
-   */
-  tags?: Tags;
-
   /**
    * The name of TTL attribute.
    * @default undefined, TTL is disabled
@@ -216,7 +210,6 @@ export class Table extends Construct {
       },
       sseSpecification: props.sseEnabled ? { sseEnabled: props.sseEnabled } : undefined,
       streamSpecification: props.streamSpecification ? { streamViewType: props.streamSpecification } : undefined,
-      tags: new TagManager(this, { initialTags: props.tags }),
       timeToLiveSpecification: props.ttlAttributeName ? { attributeName: props.ttlAttributeName, enabled: true } : undefined
     });
 

packages/@aws-cdk/aws-dynamodb/test/integ.dynamodb.ondemand.ts

@@ -1,4 +1,4 @@
-import { App, Stack } from '@aws-cdk/cdk';
+import { App, Stack, Tag } from '@aws-cdk/cdk';
 import { Attribute, AttributeType, BillingMode, ProjectionType, StreamViewType, Table } from '../lib';
 
 // CDK parameters
@@ -48,11 +48,12 @@ const tableWithGlobalAndLocalSecondaryIndex = new Table(stack, TABLE_WITH_GLOBAL
   pitrEnabled: true,
   sseEnabled: true,
   streamSpecification: StreamViewType.KeysOnly,
-  tags: { Environment: 'Production' },
   billingMode: BillingMode.PayPerRequest,
   ttlAttributeName: 'timeToLive'
 });
 
+tableWithGlobalAndLocalSecondaryIndex.apply(new Tag('Environment', 'Production'));
+
 tableWithGlobalAndLocalSecondaryIndex.addPartitionKey(TABLE_PARTITION_KEY);
 tableWithGlobalAndLocalSecondaryIndex.addSortKey(TABLE_SORT_KEY);
 tableWithGlobalAndLocalSecondaryIndex.addGlobalSecondaryIndex({

packages/@aws-cdk/aws-dynamodb/test/integ.dynamodb.ts

@@ -1,4 +1,4 @@
-import { App, Stack } from '@aws-cdk/cdk';
+import { App, Stack, Tag } from '@aws-cdk/cdk';
 import { Attribute, AttributeType, ProjectionType, StreamViewType, Table } from '../lib';
 
 // CDK parameters
@@ -47,10 +47,10 @@ const tableWithGlobalAndLocalSecondaryIndex = new Table(stack, TABLE_WITH_GLOBAL
   pitrEnabled: true,
   sseEnabled: true,
   streamSpecification: StreamViewType.KeysOnly,
-  tags: { Environment: 'Production' },
   ttlAttributeName: 'timeToLive'
 });
 
+tableWithGlobalAndLocalSecondaryIndex.apply(new Tag('Environment', 'Production'));
 tableWithGlobalAndLocalSecondaryIndex.addPartitionKey(TABLE_PARTITION_KEY);
 tableWithGlobalAndLocalSecondaryIndex.addSortKey(TABLE_SORT_KEY);
 tableWithGlobalAndLocalSecondaryIndex.addGlobalSecondaryIndex({