feat(cdk): adding tags parameter option to cdk deploy command

packages/aws-cdk/bin/cdk.ts

@@ -63,6 +63,7 @@ async function parseCommandLineArguments() {
       .option('exclusively', { type: 'boolean', alias: 'e', desc: 'only deploy requested stacks, don\'t include dependencies' })
       .option('require-approval', { type: 'string', choices: [RequireApproval.Never, RequireApproval.AnyChange, RequireApproval.Broadening], desc: 'what security-sensitive changes need manual approval' }))
       .option('ci', { type: 'boolean', desc: 'Force CI detection. Use --no-ci to disable CI autodetection.', default: process.env.CI !== undefined })
+      .option('tags', { type: 'array', alias: 't', desc: 'tags to add to the stack', nargs: 1, requiresArg: 'KEY=VALUE'})
     .command('destroy [STACKS..]', 'Destroy the stack(s) named STACKS', yargs => yargs
       .option('exclusively', { type: 'boolean', alias: 'x', desc: 'only deploy requested stacks, don\'t include dependees' })
       .option('force', { type: 'boolean', alias: 'f', desc: 'Do not ask for confirmation before destroying the stacks' }))
@@ -105,7 +106,6 @@ async function initCommandLine() {
     proxyAddress: argv.proxy,
     ec2creds: argv.ec2creds,
   });
-
   const configuration = new Configuration(argv);
   await configuration.load();
 
@@ -198,7 +198,8 @@ async function initCommandLine() {
           roleArn: args.roleArn,
           requireApproval: configuration.settings.get(['requireApproval']),
           ci: args.ci,
-          reuseAssets: args['build-exclude']
+          reuseAssets: args['build-exclude'],
+          tags: configuration.settings.get(['tags'])
         });
 
       case 'destroy':

packages/aws-cdk/lib/api/cxapp/stacks.ts

@@ -61,6 +61,7 @@ export interface AppStacksProps {
  * In a class because it shares some global state
  */
 export class AppStacks {
+
   /**
    * Since app execution basically always synthesizes all the stacks,
    * we can invoke it once and cache the response for subsequent calls.
@@ -225,6 +226,22 @@ export class AppStacks {
     }
   }
 
+  public getTagsFromStackMetadata(stack: SelectedStack): Tags {
+    const tags = [];
+    for (const id of Object.keys(stack.metadata)) {
+      const metadata = stack.metadata[id];
+      for (const entry of metadata) {
+        switch (entry.type) {
+          case "Tags":
+            for (const tag of entry.data) {
+              tags.push(new Tag(tag.key, tag.value));
+            }
+        }
+      }
+    }
+    return tags;
+  }
+
   /**
    * Extracts 'aws:cdk:warning|info|error' metadata entries from the stack synthesis
    */
@@ -373,3 +390,13 @@ export interface SelectedStack extends cxapi.SynthesizedStack {
    */
   originalName: string;
 }
+
+export type Tags = Tag[];
+export class Tag {
+  public readonly Key: string;
+  public Value: string;
+  constructor(key: string, value: string) {
+    this.Key = key;
+    this.Value = value;
+  }
+}

packages/aws-cdk/lib/api/deploy-stack.ts

@@ -2,6 +2,7 @@ import cxapi = require('@aws-cdk/cx-api');
 import aws = require('aws-sdk');
 import colors = require('colors/safe');
 import uuid = require('uuid');
+import { Tags } from "../api/cxapp/stacks";
 import { prepareAssets } from '../assets';
 import { debug, error, print } from '../logging';
 import { toYAML } from '../serialize';
@@ -32,6 +33,7 @@ export interface DeployStackOptions {
   quiet?: boolean;
   ci?: boolean;
   reuseAssets?: string[];
+  tags?: Tags;
 }
 
 const LARGE_TEMPLATE_SIZE_KB = 50;
@@ -73,7 +75,8 @@ export async function deployStack(options: DeployStackOptions): Promise<DeploySt
     TemplateURL: bodyParameter.TemplateURL,
     Parameters: params,
     RoleARN: options.roleArn,
-    Capabilities: [ 'CAPABILITY_IAM', 'CAPABILITY_NAMED_IAM', 'CAPABILITY_AUTO_EXPAND' ]
+    Capabilities: [ 'CAPABILITY_IAM', 'CAPABILITY_NAMED_IAM', 'CAPABILITY_AUTO_EXPAND' ],
+    Tags: options.tags
   }).promise();
   debug('Initiated creation of changeset: %s; waiting for it to finish creating...', changeSet.Id);
   const changeSetDescription = await waitForChangeSet(cfn, deployName, changeSetName);

packages/aws-cdk/lib/api/deployment-target.ts

@@ -1,4 +1,5 @@
 import cxapi = require('@aws-cdk/cx-api');
+import { Tags } from "../api/cxapp/stacks";
 import { debug } from '../logging';
 import { deserializeStructure } from '../serialize';
 import { Mode } from './aws-auth/credentials';
@@ -28,6 +29,7 @@ export interface DeployStackOptions {
   ci?: boolean;
   toolkitStackName?: string;
   reuseAssets?: string[];
+  tags?: Tags;
 }
 
 export interface ProvisionerProps {
@@ -71,6 +73,7 @@ export class CloudFormationDeploymentTarget implements IDeploymentTarget {
       ci: options.ci,
       reuseAssets: options.reuseAssets,
       toolkitInfo,
+      tags: options.tags
     });
   }
 }

packages/aws-cdk/lib/cdk-toolkit.ts

@@ -1,7 +1,7 @@
 import colors = require('colors/safe');
 import fs = require('fs-extra');
 import { format, promisify } from 'util';
-import { AppStacks, ExtendedStackSelection } from "./api/cxapp/stacks";
+import { AppStacks, ExtendedStackSelection, Tags } from "./api/cxapp/stacks";
 import { IDeploymentTarget } from './api/deployment-target';
 import { printSecurityDiff, printStackDiff, RequireApproval } from './diff';
 import { data, error, highlight, print, success } from './logging';
@@ -109,6 +109,10 @@ export class CdkToolkit {
         print('%s: deploying...', colors.bold(stack.name));
       }
 
+      if (!options.tags || options.tags.length === 0) {
+        options.tags = this.appStacks.getTagsFromStackMetadata(stack);
+      }
+
       try {
         const result = await this.provisioner.deployStack({
           stack,
@@ -117,6 +121,7 @@ export class CdkToolkit {
           ci: options.ci,
           toolkitStackName: options.toolkitStackName,
           reuseAssets: options.reuseAssets,
+          tags: options.tags
         });
 
         const message = result.noOp
@@ -230,4 +235,9 @@ export interface DeployOptions {
    * Reuse the assets with the given asset IDs
    */
   reuseAssets?: string[];
-}
+
+  /**
+   * Tags to pass to CloudFormation for deployment
+   */
+  tags?: Tags;
+}

packages/aws-cdk/lib/settings.ts

@@ -2,6 +2,7 @@ import fs = require('fs-extra');
 import os = require('os');
 import fs_path = require('path');
 import yargs = require('yargs');
+import { Tag, Tags } from './api/cxapp/stacks';
 import { debug, warning } from './logging';
 import util = require('./util');
 
@@ -177,32 +178,21 @@ export class Context {
  * A single bag of settings
  */
 export class Settings {
+
   /**
    * Parse Settings out of CLI arguments.
    * @param argv the received CLI arguments.
    * @returns a new Settings object.
    */
   public static fromCommandLineArguments(argv: yargs.Arguments): Settings {
-    const context: any = {};
-
-    // Turn list of KEY=VALUE strings into an object
-    for (const assignment of ((argv as any).context || [])) {
-      const parts = assignment.split('=', 2);
-      if (parts.length === 2) {
-        debug('CLI argument context: %s=%s', parts[0], parts[1]);
-        if (parts[0].match(/^aws:.+/)) {
-          throw new Error(`User-provided context cannot use keys prefixed with 'aws:', but ${parts[0]} was provided.`);
-        }
-        context[parts[0]] = parts[1];
-      } else {
-        warning('Context argument is not an assignment (key=value): %s', assignment);
-      }
-    }
+    const context = this.parseStringContextListToObject(argv);
+    const tags = this.parseStringTagsListToObject(argv);
 
     return new Settings({
       app: argv.app,
       browser: argv.browser,
       context,
+      tags,
       language: argv.language,
       pathMetadata: argv.pathMetadata,
       assetMetadata: argv.assetMetadata,
@@ -221,6 +211,39 @@ export class Settings {
     return ret;
   }
 
+  private static parseStringContextListToObject(argv: yargs.Arguments) {
+    const context: any = {};
+
+    for (const assignment of ((argv as any).context || [])) {
+      const parts = assignment.split('=', 2);
+      if (parts.length === 2) {
+        debug('CLI argument context: %s=%s', parts[0], parts[1]);
+        if (parts[0].match(/^aws:.+/)) {
+          throw new Error(`User-provided context cannot use keys prefixed with 'aws:', but ${parts[0]} was provided.`);
+        }
+        context[parts[0]] = parts[1];
+      } else {
+        warning('Context argument is not an assignment (key=value): %s', assignment);
+      }
+    }
+    return context;
+  }
+
+  private static parseStringTagsListToObject(argv: yargs.Arguments) {
+    const tags: Tags = [];
+
+    for (const assignment of ((argv as any).tags || [])) {
+      const parts = assignment.split('=', 2);
+      if (parts.length === 2) {
+        debug('CLI argument tags: %s=%s', parts[0], parts[1]);
+        tags.push(new Tag(parts[0], parts[1]));
+      } else {
+        warning('Tags argument is not an assignment (key=value): %s', assignment);
+      }
+    }
+    return tags;
+  }
+
   constructor(private settings: SettingsMap = {}, public readonly readOnly = false) {}
 
   public async load(fileName: string): Promise<this> {