refactor(core): refactor API of Tokens

packages/@aws-cdk/assets-docker/lib/image-asset.ts

@@ -95,7 +95,7 @@ export class DockerImageAsset extends cdk.Construct implements assets.IAsset {
 
     // Parse repository name and tag from the parameter (<REPO_NAME>@sha256:<TAG>)
     // Example: cdk/cdkexampleimageb2d7f504@sha256:72c4f956379a43b5623d529ddd969f6826dde944d6221f445ff3e7add9875500
-    const components = cdk.Fn.split('@sha256:', imageNameParameter.stringValue);
+    const components = cdk.Fn.split('@sha256:', imageNameParameter.valueAsString);
     const repositoryName = cdk.Fn.select(0, components).toString();
     const imageSha = cdk.Fn.select(1, components).toString();
 

packages/@aws-cdk/assets/lib/asset.ts

@@ -148,11 +148,11 @@ export class Asset extends cdk.Construct implements IAsset {
       type: 'String',
     });
 
-    this.s3BucketName = bucketParam.stringValue;
-    this.s3Prefix = cdk.Fn.select(0, cdk.Fn.split(cxapi.ASSET_PREFIX_SEPARATOR, keyParam.stringValue)).toString();
-    const s3Filename = cdk.Fn.select(1, cdk.Fn.split(cxapi.ASSET_PREFIX_SEPARATOR, keyParam.stringValue)).toString();
+    this.s3BucketName = bucketParam.valueAsString;
+    this.s3Prefix = cdk.Fn.select(0, cdk.Fn.split(cxapi.ASSET_PREFIX_SEPARATOR, keyParam.valueAsString)).toString();
+    const s3Filename = cdk.Fn.select(1, cdk.Fn.split(cxapi.ASSET_PREFIX_SEPARATOR, keyParam.valueAsString)).toString();
     this.s3ObjectKey = `${this.s3Prefix}${s3Filename}`;
-    this.artifactHash = hashParam.stringValue;
+    this.artifactHash = hashParam.valueAsString;
 
     this.bucket = s3.Bucket.fromBucketName(this, 'AssetBucket', this.s3BucketName);
 

packages/@aws-cdk/aws-apigateway/lib/api-key.ts

@@ -94,7 +94,7 @@ export class ApiKey extends Resource implements IApiKey {
       stageKeys: this.renderStageKeys(props.resources)
     });
 
-    this.keyId = resource.ref;
+    this.keyId = resource.refAsString;
   }
 
   private renderStageKeys(resources: RestApi[] | undefined): CfnApiKey.StageKeyProperty[] | undefined {

packages/@aws-cdk/aws-apigateway/lib/deployment.ts

@@ -1,4 +1,4 @@
-import { Construct, DeletionPolicy, Resource, Token } from '@aws-cdk/cdk';
+import { Construct, DeletionPolicy, Lazy, Resource } from '@aws-cdk/cdk';
 import crypto = require('crypto');
 import { CfnDeployment, CfnDeploymentProps } from './apigateway.generated';
 import { IRestApi } from './restapi';
@@ -76,7 +76,7 @@ export class Deployment extends Resource {
     }
 
     this.api = props.api;
-    this.deploymentId = new Token(() => this.resource.deploymentId).toString();
+    this.deploymentId = Lazy.stringValue({ produce: () => this.resource.deploymentId });
   }
 
   /**

packages/@aws-cdk/aws-apigateway/lib/integrations/aws.ts

@@ -78,7 +78,7 @@ export class AwsIntegration extends Integration {
     super({
       type,
       integrationHttpMethod: props.integrationHttpMethod || 'POST',
-      uri: new cdk.Token(() => {
+      uri: cdk.Lazy.stringValue({ produce: () => {
         if (!this.scope) { throw new Error('AwsIntegration must be used in API'); }
         return this.scope.node.stack.formatArn({
           service: 'apigateway',
@@ -87,7 +87,7 @@ export class AwsIntegration extends Integration {
           sep: '/',
           resourceName: apiValue,
         });
-      }),
+      }}),
       options: props.options,
     });
   }

packages/@aws-cdk/aws-apigateway/lib/method.ts

@@ -124,7 +124,7 @@ export class Method extends Resource {
 
     const resource = new CfnMethod(this, 'Resource', methodProps);
 
-    this.methodId = resource.ref;
+    this.methodId = resource.refAsString;
 
     props.resource.restApi._attachMethod(this);
 

packages/@aws-cdk/aws-apigateway/lib/restapi.ts

@@ -219,7 +219,7 @@ export class RestApi extends Resource implements IRestApi {
       parameters: props.parameters,
     });
 
-    this.restApiId = resource.ref;
+    this.restApiId = resource.refAsString;
 
     this.configureDeployment(props);
 

packages/@aws-cdk/aws-apigateway/lib/stage.ts

@@ -197,7 +197,7 @@ export class Stage extends Resource {
       methodSettings,
     });
 
-    this.stageName = resource.ref;
+    this.stageName = resource.refAsString;
     this.restApi = props.deployment.api;
   }
 

packages/@aws-cdk/aws-apigateway/lib/usage-plan.ts

@@ -1,4 +1,4 @@
-import { Token } from '@aws-cdk/cdk';
+import { Lazy, Token } from '@aws-cdk/cdk';
 import { Construct, Resource } from '@aws-cdk/cdk';
 import { IApiKey } from './api-key';
 import { CfnUsagePlan, CfnUsagePlanKey } from './apigateway.generated';
@@ -156,7 +156,7 @@ export class UsagePlan extends Resource {
     let resource: CfnUsagePlan;
 
     resource = new CfnUsagePlan(this, 'Resource', {
-      apiStages: new Token(() => this.renderApiStages(this.apiStages)),
+      apiStages: Lazy.anyValue({ produce: () => this.renderApiStages(this.apiStages) }),
       description: props.description,
       quota: this.renderQuota(props),
       throttle: this.renderThrottle(props.throttle),
@@ -165,7 +165,7 @@ export class UsagePlan extends Resource {
 
     this.apiStages.push(...(props.apiStages || []));
 
-    this.usagePlanId = resource.ref;
+    this.usagePlanId = resource.refAsString;
 
     // Add ApiKey when
     if (props.apiKey) {

packages/@aws-cdk/aws-apigateway/test/test.deployment.ts

@@ -144,7 +144,7 @@ export = {
 
     // tokens supported, and are resolved upon synthesis
     const value = 'hello hello';
-    deployment.addToLogicalId({ foo: new cdk.Token(() => value) });
+    deployment.addToLogicalId({ foo: cdk.Lazy.stringValue({ produce: () => value }) });
 
     const template2 = synthesize();
     test.ok(template2.Resources.deployment33381975a12dfe81474913364dc31c06e37f9449);

packages/@aws-cdk/aws-applicationautoscaling/lib/step-scaling-action.ts

@@ -89,7 +89,7 @@ export class StepScalingAction extends cdk.Construct {
         cooldown: props.cooldownSec,
         minAdjustmentMagnitude: props.minAdjustmentMagnitude,
         metricAggregationType: props.metricAggregationType,
-        stepAdjustments: new cdk.Token(() => this.adjustments),
+        stepAdjustments: cdk.Lazy.anyValue({ produce: () => this.adjustments }),
       } as CfnScalingPolicy.StepScalingPolicyConfigurationProperty
     });
 

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

@@ -5,7 +5,7 @@ import elbv2 = require('@aws-cdk/aws-elasticloadbalancingv2');
 import iam = require('@aws-cdk/aws-iam');
 import sns = require('@aws-cdk/aws-sns');
 
-import { AutoScalingRollingUpdate, Construct, Fn, IResource, Resource, Tag, Token } from '@aws-cdk/cdk';
+import { AutoScalingRollingUpdate, Construct, Fn, IResource, Lazy, Resource, Tag } from '@aws-cdk/cdk';
 import { CfnAutoScalingGroup, CfnAutoScalingGroupProps, CfnLaunchConfiguration } from './autoscaling.generated';
 import { BasicLifecycleHookProps, LifecycleHook } from './lifecycle-hook';
 import { BasicScheduledActionProps, ScheduledAction } from './scheduled-action';
@@ -375,15 +375,15 @@ export class AutoScalingGroup extends AutoScalingGroupBase implements
 
     // use delayed evaluation
     const machineImage = props.machineImage.getImage(this);
-    const userDataToken = new Token(() => Fn.base64((machineImage.os.createUserData(this.userDataLines)))).toString();
-    const securityGroupsToken = new Token(() => this.securityGroups.map(sg => sg.securityGroupId));
+    const userDataToken = Lazy.stringValue({ produce: () => Fn.base64((machineImage.os.createUserData(this.userDataLines))) });
+    const securityGroupsToken = Lazy.listValue({ produce: () => this.securityGroups.map(sg => sg.securityGroupId) });
 
     const launchConfig = new CfnLaunchConfiguration(this, 'LaunchConfig', {
       imageId: machineImage.imageId,
       keyName: props.keyName,
       instanceType: props.instanceType.toString(),
-      securityGroups: securityGroupsToken.toList(),
-      iamInstanceProfile: iamProfile.ref,
+      securityGroups: securityGroupsToken,
+      iamInstanceProfile: iamProfile.refAsString,
       userData: userDataToken,
       associatePublicIpAddress: props.associatePublicIpAddress,
       spotPrice: props.spotPrice,
@@ -408,9 +408,9 @@ export class AutoScalingGroup extends AutoScalingGroupBase implements
       minSize: minCapacity.toString(),
       maxSize: maxCapacity.toString(),
       desiredCapacity: desiredCapacity.toString(),
-      launchConfigurationName: launchConfig.ref,
-      loadBalancerNames: new Token(() => this.loadBalancerNames.length > 0 ? this.loadBalancerNames : undefined).toList(),
-      targetGroupArns: new Token(() => this.targetGroupArns.length > 0 ? this.targetGroupArns : undefined).toList(),
+      launchConfigurationName: launchConfig.refAsString,
+      loadBalancerNames: Lazy.listValue({ produce: () => this.loadBalancerNames }, { omitEmpty: true }),
+      targetGroupArns: Lazy.listValue({ produce: () => this.targetGroupArns }, { omitEmpty: true }),
       notificationConfigurations: !props.notificationsTopic ? undefined : [
         {
           topicArn: props.notificationsTopic.topicArn,

packages/@aws-cdk/aws-autoscaling/lib/step-scaling-action.ts

@@ -78,7 +78,7 @@ export class StepScalingAction extends cdk.Construct {
       adjustmentType: props.adjustmentType,
       minAdjustmentMagnitude: props.minAdjustmentMagnitude,
       metricAggregationType: props.metricAggregationType,
-      stepAdjustments: new cdk.Token(() => this.adjustments),
+      stepAdjustments: cdk.Lazy.anyValue({ produce: () => this.adjustments }),
     });
 
     this.scalingPolicyArn = resource.scalingPolicyArn;

packages/@aws-cdk/aws-cloudwatch/lib/alarm.ts

@@ -1,4 +1,4 @@
-import { Construct, IResource, Resource, Token } from '@aws-cdk/cdk';
+import { Construct, IResource, Lazy, Resource } from '@aws-cdk/cdk';
 import { IAlarmAction } from './alarm-action';
 import { CfnAlarm } from './cloudwatch.generated';
 import { HorizontalAnnotation } from './graph';
@@ -133,9 +133,9 @@ export class Alarm extends Resource implements IAlarm {
 
       // Actions
       actionsEnabled: props.actionsEnabled,
-      alarmActions: new Token(() => this.alarmActionArns).toList(),
-      insufficientDataActions: new Token(() => this.insufficientDataActionArns).toList(),
-      okActions: new Token(() => this.okActionArns).toList(),
+      alarmActions: Lazy.listValue({ produce: () => this.alarmActionArns }),
+      insufficientDataActions: Lazy.listValue({ produce: (() => this.insufficientDataActionArns) }),
+      okActions: Lazy.listValue({ produce: () => this.okActionArns }),
 
       // Metric
       ...metricJson(props.metric)

packages/@aws-cdk/aws-cloudwatch/lib/dashboard.ts

@@ -1,4 +1,4 @@
-import { Construct, Resource, Token } from "@aws-cdk/cdk";
+import { Construct, Lazy, Resource } from "@aws-cdk/cdk";
 import { CfnDashboard } from './cloudwatch.generated';
 import { Column, Row } from "./layout";
 import { IWidget } from "./widget";
@@ -58,7 +58,7 @@ export class Dashboard extends Resource {
 
     new CfnDashboard(this, 'Resource', {
       dashboardName: (props && props.dashboardName) || undefined,
-      dashboardBody: new Token(() => {
+      dashboardBody: Lazy.stringValue({ produce: () => {
         const column = new Column(...this.rows);
         column.position(0, 0);
         return this.node.stringifyJson({
@@ -67,7 +67,7 @@ export class Dashboard extends Resource {
           periodOverride: props ? props.periodOverride : undefined,
           widgets: column.toJson(),
         });
-      }).toString()
+      }})
     });
   }
 

packages/@aws-cdk/aws-codebuild/lib/project.ts

@@ -6,7 +6,7 @@ import ecr = require('@aws-cdk/aws-ecr');
 import events = require('@aws-cdk/aws-events');
 import iam = require('@aws-cdk/aws-iam');
 import kms = require('@aws-cdk/aws-kms');
-import { Aws, Construct, IResource, Resource, Token } from '@aws-cdk/cdk';
+import { Aws, Construct, IResource, Lazy, Resource } from '@aws-cdk/cdk';
 import { BuildArtifacts, CodePipelineBuildArtifacts, NoBuildArtifacts } from './artifacts';
 import { Cache } from './cache';
 import { CfnProject } from './codebuild.generated';
@@ -702,8 +702,8 @@ export class Project extends ProjectBase {
       cache: cache._toCloudFormation(),
       name: props.projectName,
       timeoutInMinutes: props.timeout,
-      secondarySources: new Token(() => this.renderSecondarySources()),
-      secondaryArtifacts: new Token(() => this.renderSecondaryArtifacts()),
+      secondarySources: Lazy.anyValue({ produce: () => this.renderSecondarySources() }),
+      secondaryArtifacts: Lazy.anyValue({ produce: () => this.renderSecondaryArtifacts() }),
       triggers: this.source._buildTriggers(),
       vpcConfig: this.configureVpc(props),
     });

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

@@ -1135,7 +1135,7 @@ export = {
       environment: {
         environmentVariables: {
           FOO: { value: '1234' },
-          BAR: { value: `111${new cdk.Token({ twotwotwo: '222' })}`, type: codebuild.BuildEnvironmentVariableType.ParameterStore }
+          BAR: { value: `111${new cdk.Intrinsic({ twotwotwo: '222' })}`, type: codebuild.BuildEnvironmentVariableType.ParameterStore }
         }
       },
       environmentVariables: {

packages/@aws-cdk/aws-codedeploy/lib/lambda/application.ts

@@ -67,7 +67,7 @@ export class LambdaApplication extends Resource implements ILambdaApplication {
       computePlatform: 'Lambda'
     });
 
-    this.applicationName = resource.ref;
+    this.applicationName = resource.refAsString;
     this.applicationArn = arnForApplication(this.applicationName);
   }
 }

packages/@aws-cdk/aws-codedeploy/lib/lambda/deployment-group.ts

@@ -162,8 +162,8 @@ export class LambdaDeploymentGroup extends cdk.Resource implements ILambdaDeploy
         deploymentType: 'BLUE_GREEN',
         deploymentOption: 'WITH_TRAFFIC_CONTROL'
       },
-      alarmConfiguration: new cdk.Token(() => renderAlarmConfiguration(this.alarms, props.ignorePollAlarmsFailure)),
-      autoRollbackConfiguration: new cdk.Token(() => renderAutoRollbackConfiguration(this.alarms, props.autoRollback)),
+      alarmConfiguration: cdk.Lazy.anyValue({ produce: () => renderAlarmConfiguration(this.alarms, props.ignorePollAlarmsFailure) }),
+      autoRollbackConfiguration: cdk.Lazy.anyValue({ produce: () => renderAutoRollbackConfiguration(this.alarms, props.autoRollback) }),
     });
 
     this.deploymentGroupName = resource.deploymentGroupName;
@@ -180,8 +180,8 @@ export class LambdaDeploymentGroup extends cdk.Resource implements ILambdaDeploy
       codeDeployLambdaAliasUpdate: {
         applicationName: this.application.applicationName,
         deploymentGroupName: resource.deploymentGroupName,
-        beforeAllowTrafficHook: new cdk.Token(() => this.preHook === undefined ? undefined : this.preHook.functionName).toString(),
-        afterAllowTrafficHook: new cdk.Token(() => this.postHook === undefined ? undefined : this.postHook.functionName).toString()
+        beforeAllowTrafficHook: cdk.Lazy.stringValue({ produce: () => this.preHook && this.preHook.functionName }),
+        afterAllowTrafficHook: cdk.Lazy.stringValue({ produce: () => this.postHook && this.postHook.functionName }),
       }
     };
   }

packages/@aws-cdk/aws-codedeploy/lib/server/application.ts

@@ -68,7 +68,7 @@ export class ServerApplication extends Resource implements IServerApplication {
       computePlatform: 'Server',
     });
 
-    this.applicationName = resource.ref;
+    this.applicationName = resource.refAsString;
     this.applicationArn = arnForApplication(this.applicationName);
   }
 }

packages/@aws-cdk/aws-codedeploy/lib/server/deployment-config.ts

@@ -113,7 +113,7 @@ export class ServerDeploymentConfig extends cdk.Resource implements IServerDeplo
       minimumHealthyHosts: props.minimumHealthyHosts._json,
     });
 
-    this.deploymentConfigName = resource.ref.toString();
+    this.deploymentConfigName = resource.refAsString;
     this.deploymentConfigArn = arnForDeploymentConfig(this.deploymentConfigName);
   }
 }
@@ -125,4 +125,4 @@ function deploymentConfig(name: string): IServerDeploymentConfig {
   };
 }
 
-function ignore(_x: any) { return; }
+function ignore(_x: any) { return; }

packages/@aws-cdk/aws-codedeploy/lib/server/deployment-group.ts

@@ -289,10 +289,7 @@ export class ServerDeploymentGroup extends ServerDeploymentGroupBase {
       serviceRoleArn: this.role.roleArn,
       deploymentConfigName: props.deploymentConfig &&
         props.deploymentConfig.deploymentConfigName,
-      autoScalingGroups: new cdk.Token(() =>
-        this._autoScalingGroups.length === 0
-          ? undefined
-          : this._autoScalingGroups.map(asg => asg.autoScalingGroupName)).toList(),
+      autoScalingGroups: cdk.Lazy.listValue({ produce: () => this._autoScalingGroups.map(asg => asg.autoScalingGroupName) }, { omitEmpty: true }),
       loadBalancerInfo: this.loadBalancerInfo(props.loadBalancer),
       deploymentStyle: props.loadBalancer === undefined
         ? undefined
@@ -301,8 +298,8 @@ export class ServerDeploymentGroup extends ServerDeploymentGroupBase {
         },
       ec2TagSet: this.ec2TagSet(props.ec2InstanceTags),
       onPremisesTagSet: this.onPremiseTagSet(props.onPremiseInstanceTags),
-      alarmConfiguration: new cdk.Token(() => renderAlarmConfiguration(this.alarms, props.ignorePollAlarmsFailure)),
-      autoRollbackConfiguration: new cdk.Token(() => renderAutoRollbackConfiguration(this.alarms, props.autoRollback)),
+      alarmConfiguration: cdk.Lazy.anyValue({ produce: () => renderAlarmConfiguration(this.alarms, props.ignorePollAlarmsFailure) }),
+      autoRollbackConfiguration: cdk.Lazy.anyValue({ produce: () => renderAutoRollbackConfiguration(this.alarms, props.autoRollback) }),
     });
 
     this.deploymentGroupName = resource.deploymentGroupName;

packages/@aws-cdk/aws-codepipeline-actions/lib/cloudformation/pipeline-actions.ts

@@ -226,8 +226,8 @@ export abstract class CloudFormationDeployAction extends CloudFormationAction {
       ...configuration,
       // None evaluates to empty string which is falsey and results in undefined
       Capabilities: (capabilities && capabilities.toString()) || undefined,
-      RoleArn: new cdk.Token(() => this.deploymentRole.roleArn),
-      ParameterOverrides: new cdk.Token(() => this.scope.node.stringifyJson(props.parameterOverrides)),
+      RoleArn: cdk.Lazy.stringValue({ produce: () => this.deploymentRole.roleArn }),
+      ParameterOverrides: cdk.Lazy.stringValue({ produce: () => this.scope.node.stringifyJson(props.parameterOverrides) }),
       TemplateConfiguration: props.templateConfiguration ? props.templateConfiguration.location : undefined,
       StackName: props.stackName,
     });

packages/@aws-cdk/aws-codepipeline-actions/lib/codebuild/build-action.ts

@@ -83,7 +83,7 @@ export class CodeBuildAction extends codepipeline.Action {
     this.props = props;
 
     if (this.inputs.length > 1) {
-      this.configuration.PrimarySource = new cdk.Token(() => this.inputs[0].artifactName);
+      this.configuration.PrimarySource = cdk.Lazy.stringValue({ produce: () => this.inputs[0].artifactName });
     }
   }
 

packages/@aws-cdk/aws-codepipeline-actions/lib/manual-approval-action.ts

@@ -42,7 +42,7 @@ export class ManualApprovalAction extends codepipeline.Action {
       category: codepipeline.ActionCategory.Approval,
       provider: 'Manual',
       artifactBounds: { minInputs: 0, maxInputs: 0, minOutputs: 0, maxOutputs: 0 },
-      configuration: new cdk.Token(() => this.actionConfiguration()),
+      configuration: cdk.Lazy.anyValue({ produce: () => this.actionConfiguration() }),
     });
 
     this.props = props;

packages/@aws-cdk/aws-codepipeline-actions/test/lambda/test.lambda-invoke-action.ts

@@ -1,7 +1,7 @@
 import { expect, haveResourceLike } from "@aws-cdk/assert";
 import codepipeline = require('@aws-cdk/aws-codepipeline');
 import lambda = require('@aws-cdk/aws-lambda');
-import { Aws, SecretValue, Stack, Token } from "@aws-cdk/cdk";
+import { Aws, Intrinsic, Lazy, SecretValue, Stack } from "@aws-cdk/cdk";
 import { Test } from 'nodeunit';
 import cpactions = require('../../lib');
 
@@ -34,7 +34,7 @@ export = {
 
     'properly resolves any Tokens passed in userParameters'(test: Test) {
       const stack = stackIncludingLambdaInvokeCodePipeline({
-        key: new Token(() => Aws.region),
+        key: Lazy.stringValue({ produce: () => Aws.region }),
       });
 
       expect(stack).to(haveResourceLike('AWS::CodePipeline::Pipeline', {
@@ -68,7 +68,7 @@ export = {
 
     'properly resolves any stringified Tokens passed in userParameters'(test: Test) {
       const stack = stackIncludingLambdaInvokeCodePipeline({
-        key: new Token(() => null).toString(),
+        key: new Intrinsic(null).toString(),
       });
 
       expect(stack).to(haveResourceLike('AWS::CodePipeline::Pipeline', {