feat(cdk): aspect framework and tag implementation

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,7 @@ 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));
 
  this.role = new iam.Role(this, 'InstanceRole', {
  assumedBy: new iam.ServicePrincipal('ec2.amazonaws.com')
@@ -255,7 +244,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 +604,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 +726,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', {
@@ -365,7 +365,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 +379,27 @@ 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', { applyToLaunchedInstances: false }));
 
  // 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 +422,7 @@ function mockSecurityGroup(stack: cdk.Stack) {
  securityGroupId: 'most-secure',
  });
 }
+
+function getTestStack(): cdk.Stack {
+ return new cdk.Stack(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, } from '@aws-cdk/assert';
 import ec2 = require('@aws-cdk/aws-ec2');
 import cdk = require('@aws-cdk/cdk');
 import { Test } from 'nodeunit';
@@ -111,4 +111,4 @@ function makeAutoScalingGroup(scope: cdk.Construct) {
  machineImage: new ec2.AmazonLinuxImage(),
  updateType: autoscaling.UpdateType.RollingUpdate,
  });
-}
+}

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({