refactor: introduce SecretValue to represent secrets

packages/@aws-cdk/aws-codepipeline-actions/lib/alexa-ask/deploy-action.ts

@@ -1,5 +1,5 @@
 import codepipeline = require('@aws-cdk/aws-codepipeline');
-import cdk = require('@aws-cdk/cdk');
+import { SecretValue } from '@aws-cdk/cdk';
 
 /**
  * Construction properties of the {@link AlexaSkillDeployAction Alexa deploy Action}.
@@ -13,12 +13,12 @@ export interface AlexaSkillDeployActionProps extends codepipeline.CommonActionPr
   /**
    * The client secret of the developer console token
    */
-  readonly clientSecret: string;
+  readonly clientSecret: SecretValue;
 
   /**
    * The refresh token of the developer console token
    */
-  readonly refreshToken: string;
+  readonly refreshToken: SecretValue;
 
   /**
    * The Alexa skill id
@@ -41,9 +41,6 @@ export interface AlexaSkillDeployActionProps extends codepipeline.CommonActionPr
  */
 export class AlexaSkillDeployAction extends codepipeline.DeployAction {
   constructor(props: AlexaSkillDeployActionProps) {
-    cdk.Secret.assertSafeSecret(props.clientSecret, 'clientSecret');
-    cdk.Secret.assertSafeSecret(props.refreshToken, 'refreshToken');
-
     super({
       ...props,
       artifactBounds: {

packages/@aws-cdk/aws-codepipeline-actions/lib/github/source-action.ts

@@ -1,5 +1,5 @@
 import codepipeline = require('@aws-cdk/aws-codepipeline');
-import cdk = require('@aws-cdk/cdk');
+import { SecretValue } from '@aws-cdk/cdk';
 
 /**
  * Construction properties of the {@link GitHubSourceAction GitHub source action}.
@@ -36,7 +36,7 @@ export interface GitHubSourceActionProps extends codepipeline.CommonActionProps
    *   const oauth = new secretsmanager.SecretString(this, 'GitHubOAuthToken', { secretId: 'my-github-token' });
    *   new GitHubSource(this, 'GitHubAction', { oauthToken: oauth.value, ... });
    */
-  readonly oauthToken: string;
+  readonly oauthToken: SecretValue;
 
   /**
    * Whether AWS CodePipeline should poll for source changes.
@@ -54,8 +54,6 @@ export class GitHubSourceAction extends codepipeline.SourceAction {
   private readonly props: GitHubSourceActionProps;
 
   constructor(props: GitHubSourceActionProps) {
-    cdk.Secret.assertSafeSecret(props.oauthToken, 'oauthToken');
-
     super({
       ...props,
       owner: 'ThirdParty',
@@ -64,7 +62,7 @@ export class GitHubSourceAction extends codepipeline.SourceAction {
         Owner: props.owner,
         Repo: props.repo,
         Branch: props.branch || "master",
-        OAuthToken: props.oauthToken,
+        OAuthToken: props.oauthToken.toString(),
         PollForSourceChanges: props.pollForSourceChanges || false,
       },
       outputArtifactName: props.outputArtifactName
@@ -78,7 +76,7 @@ export class GitHubSourceAction extends codepipeline.SourceAction {
       new codepipeline.CfnWebhook(info.scope, 'WebhookResource', {
         authentication: 'GITHUB_HMAC',
         authenticationConfiguration: {
-          secretToken: this.props.oauthToken,
+          secretToken: this.props.oauthToken.toString(),
         },
         filters: [
           {

packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-alexa-deploy.ts

@@ -1,15 +1,15 @@
 import codepipeline = require('@aws-cdk/aws-codepipeline');
 import s3 = require('@aws-cdk/aws-s3');
-import cdk = require('@aws-cdk/cdk');
+import { App, RemovalPolicy, SecretValue, Stack } from '@aws-cdk/cdk';
 import cpactions = require('../lib');
 
-const app = new cdk.App();
+const app = new App();
 
-const stack = new cdk.Stack(app, 'aws-cdk-codepipeline-alexa-deploy');
+const stack = new Stack(app, 'aws-cdk-codepipeline-alexa-deploy');
 
 const bucket = new s3.Bucket(stack, 'PipelineBucket', {
   versioned: true,
-  removalPolicy: cdk.RemovalPolicy.Destroy,
+  removalPolicy: RemovalPolicy.Destroy,
 });
 const sourceAction = new cpactions.S3SourceAction({
   actionName: 'Source',
@@ -30,8 +30,8 @@ const deployStage = {
       runOrder: 1,
       inputArtifact: sourceAction.outputArtifact,
       clientId: 'clientId',
-      clientSecret: cdk.Secret.plainText('clientSecret'),
-      refreshToken: cdk.Secret.plainText('refreshToken'),
+      clientSecret: SecretValue.plainText('clientSecret'),
+      refreshToken: SecretValue.plainText('refreshToken'),
       skillId: 'amzn1.ask.skill.12345678-1234-1234-1234-123456789012',
     }),
   ],

packages/@aws-cdk/aws-codepipeline-actions/test/test.pipeline.ts

@@ -5,15 +5,15 @@ import codepipeline = require('@aws-cdk/aws-codepipeline');
 import lambda = require('@aws-cdk/aws-lambda');
 import s3 = require('@aws-cdk/aws-s3');
 import sns = require('@aws-cdk/aws-sns');
-import cdk = require('@aws-cdk/cdk');
+import { App, CfnParameter, SecretValue, Stack } from '@aws-cdk/cdk';
 import { Test } from 'nodeunit';
 import cpactions = require('../lib');
 
 // tslint:disable:object-literal-key-quotes
 
 export = {
   'basic pipeline'(test: Test) {
-    const stack = new cdk.Stack();
+    const stack = new Stack();
 
     const repository = new codecommit.Repository(stack, 'MyRepo', {
        repositoryName: 'my-repo',
@@ -50,7 +50,7 @@ export = {
   },
 
   'Tokens can be used as physical names of the Pipeline'(test: Test) {
-    const stack = new cdk.Stack(undefined, 'StackName');
+    const stack = new Stack(undefined, 'StackName');
 
     new codepipeline.Pipeline(stack, 'Pipeline', {
       pipelineName: stack.stackName,
@@ -66,9 +66,9 @@ export = {
   },
 
   'github action uses ThirdParty owner'(test: Test) {
-    const stack = new cdk.Stack();
+    const stack = new Stack();
 
-    const secret = new cdk.CfnParameter(stack, 'GitHubToken', { type: 'String', default: 'my-token' });
+    const secret = new CfnParameter(stack, 'GitHubToken', { type: 'String', default: 'my-token' });
 
     const p = new codepipeline.Pipeline(stack, 'P');
 
@@ -80,7 +80,7 @@ export = {
           runOrder: 8,
           outputArtifactName: 'A',
           branch: 'branch',
-          oauthToken: secret.stringValue,
+          oauthToken: SecretValue.plainText(secret.stringValue),
           owner: 'foo',
           repo: 'bar'
         }),
@@ -163,7 +163,7 @@ export = {
   },
 
   'onStateChange'(test: Test) {
-    const stack = new cdk.Stack();
+    const stack = new Stack();
 
     const topic = new sns.Topic(stack, 'Topic');
 
@@ -256,7 +256,7 @@ export = {
 
   'manual approval Action': {
     'allows passing an SNS Topic when constructing it'(test: Test) {
-      const stack = new cdk.Stack();
+      const stack = new Stack();
       const topic = new sns.Topic(stack, 'Topic');
       const manualApprovalAction = new cpactions.ManualApprovalAction({
         actionName: 'Approve',
@@ -273,7 +273,7 @@ export = {
   'PipelineProject': {
     'with a custom Project Name': {
       'sets the source and artifacts to CodePipeline'(test: Test) {
-        const stack = new cdk.Stack();
+        const stack = new Stack();
 
         new codebuild.PipelineProject(stack, 'MyProject', {
           projectName: 'MyProject',
@@ -307,7 +307,7 @@ export = {
   },
 
   'Lambda PipelineInvokeAction can be used to invoke Lambda functions from a CodePipeline'(test: Test) {
-    const stack = new cdk.Stack();
+    const stack = new Stack();
 
     const lambdaFun = new lambda.Function(stack, 'Function', {
       code: new lambda.InlineCode('bla'),
@@ -437,7 +437,7 @@ export = {
 
   'CodeCommit Action': {
     'does not poll for changes by default'(test: Test) {
-      const stack = new cdk.Stack();
+      const stack = new Stack();
       const sourceAction = new cpactions.CodeCommitSourceAction({
         actionName: 'stage',
         outputArtifactName: 'SomeArtifact',
@@ -450,7 +450,7 @@ export = {
     },
 
     'does not poll for source changes when explicitly set to false'(test: Test) {
-      const stack = new cdk.Stack();
+      const stack = new Stack();
       const sourceAction = new cpactions.CodeCommitSourceAction({
         actionName: 'stage',
         outputArtifactName: 'SomeArtifact',
@@ -469,9 +469,9 @@ export = {
       const pipelineRegion = 'us-west-2';
       const pipelineAccount = '123';
 
-      const app = new cdk.App();
+      const app = new App();
 
-      const stack = new cdk.Stack(app, 'TestStack', {
+      const stack = new Stack(app, 'TestStack', {
         env: {
           region: pipelineRegion,
           account: pipelineAccount,
@@ -582,12 +582,12 @@ export = {
   },
 };
 
-function stageForTesting(stack: cdk.Stack): codepipeline.IStage {
+function stageForTesting(stack: Stack): codepipeline.IStage {
   const pipeline = new codepipeline.Pipeline(stack, 'pipeline');
   return pipeline.addStage({ name: 'stage' });
 }
 
-function repositoryForTesting(stack: cdk.Stack): codecommit.Repository {
+function repositoryForTesting(stack: Stack): codecommit.Repository {
   return new codecommit.Repository(stack, 'Repository', {
     repositoryName: 'Repository'
   });

packages/@aws-cdk/aws-iam/lib/user.ts

@@ -1,4 +1,4 @@
-import { Construct } from '@aws-cdk/cdk';
+import { Construct, SecretValue } from '@aws-cdk/cdk';
 import { Group } from './group';
 import { CfnUser } from './iam.generated';
 import { IPrincipal, Policy } from './policy';
@@ -47,9 +47,12 @@ export interface UserProps {
    * The password for the user. This is required so the user can access the
    * AWS Management Console.
    *
+   * You can use `SecretValue.plainText` to specify a password in plain text or
+   * use `secretsmanager.Secret.import` to reference a secret in Secrets Manager.
+   *
    * @default User won't be able to access the management console without a password.
    */
-  readonly password?: string;
+  readonly password?: SecretValue;
 
   /**
    * Specifies whether the user is required to set a new password the next
@@ -142,7 +145,7 @@ export class User extends Construct implements IPrincipal {
   private parseLoginProfile(props: UserProps): CfnUser.LoginProfileProperty | undefined {
     if (props.password) {
       return {
-        password: props.password,
+        password: props.password.toString(),
         passwordResetRequired: props.passwordResetRequired
       };
     }

packages/@aws-cdk/aws-iam/test/example.attaching.lit.ts

@@ -1,12 +1,13 @@
 import cdk = require('@aws-cdk/cdk');
+import { SecretValue } from '@aws-cdk/cdk';
 import { Group, Policy, User } from '../lib';
 
 export class ExampleConstruct extends cdk.Construct {
   constructor(scope: cdk.Construct, id: string) {
     super(scope, id);
 
     /// !show
-    const user = new User(this, 'MyUser', { password: '1234' });
+    const user = new User(this, 'MyUser', { password: SecretValue.plainText('1234') });
     const group = new Group(this, 'MyGroup');
 
     const policy = new Policy(this, 'MyPolicy');

packages/@aws-cdk/aws-iam/test/integ.user.ts

@@ -1,4 +1,4 @@
-import { App, Stack } from "@aws-cdk/cdk";
+import { App, SecretValue, Stack } from "@aws-cdk/cdk";
 import { User } from "../lib";
 
 const app = new App();
@@ -7,7 +7,7 @@ const stack = new Stack(app, 'aws-cdk-iam-user');
 
 new User(stack, 'MyUser', {
   userName: 'benisrae',
-  password: '1234',
+  password: SecretValue.plainText('1234'),
   passwordResetRequired: true
 });
 

packages/@aws-cdk/aws-iam/test/test.user.ts

@@ -1,4 +1,4 @@
-import { App, Stack } from '@aws-cdk/cdk';
+import { App, SecretValue, Stack } from '@aws-cdk/cdk';
 import { Test } from 'nodeunit';
 import { User } from '../lib';
 
@@ -17,7 +17,7 @@ export = {
     const app = new App();
     const stack = new Stack(app, 'MyStack');
     new User(stack, 'MyUser', {
-      password: '1234'
+      password: SecretValue.plainText('1234')
     });
     test.deepEqual(app.synthesizeStack(stack.name).template, { Resources:
       { MyUserDC45028B:

packages/@aws-cdk/aws-rds/lib/cluster.ts

@@ -273,8 +273,12 @@ export class DatabaseCluster extends DatabaseClusterBase implements IDatabaseClu
       port: props.port,
       dbClusterParameterGroupName: props.parameterGroup && props.parameterGroup.parameterGroupName,
       // Admin
-      masterUsername: secret ? secret.jsonFieldValue('username') : props.masterUser.username,
-      masterUserPassword: secret ? secret.jsonFieldValue('password') : props.masterUser.password,
+      masterUsername: secret ? secret.secretJsonValue('username').toString() : props.masterUser.username,
+      masterUserPassword: secret
+        ? secret.secretJsonValue('password').toString()
+        : (props.masterUser.password
+            ? props.masterUser.password.toString()
+            : undefined),
       backupRetentionPeriod: props.backup && props.backup.retentionDays,
       preferredBackupWindow: props.backup && props.backup.preferredWindow,
       preferredMaintenanceWindow: props.preferredMaintenanceWindow,

packages/@aws-cdk/aws-rds/lib/props.ts

@@ -1,5 +1,6 @@
 import ec2 = require('@aws-cdk/aws-ec2');
 import kms = require('@aws-cdk/aws-kms');
+import { SecretValue } from '@aws-cdk/cdk';
 
 /**
  * The engine for the database cluster
@@ -74,7 +75,7 @@ export interface Login {
    *
    * @default a Secrets Manager generated password
    */
-  readonly password?: string;
+  readonly password?: SecretValue;
 
   /**
    * KMS encryption key to encrypt the generated secret.

packages/@aws-cdk/aws-rds/test/integ.cluster.ts

@@ -1,6 +1,7 @@
 import ec2 = require('@aws-cdk/aws-ec2');
 import kms = require('@aws-cdk/aws-kms');
 import cdk = require('@aws-cdk/cdk');
+import { SecretValue } from '@aws-cdk/cdk';
 import { DatabaseCluster, DatabaseClusterEngine } from '../lib';
 import { ClusterParameterGroup } from '../lib/cluster-parameter-group';
 
@@ -20,7 +21,7 @@ const cluster = new DatabaseCluster(stack, 'Database', {
   engine: DatabaseClusterEngine.Aurora,
   masterUser: {
     username: 'admin',
-    password: '7959866cacc02c2d243ecfe177464fe6',
+    password: SecretValue.plainText('7959866cacc02c2d243ecfe177464fe6'),
   },
   instanceProps: {
     instanceType: new ec2.InstanceTypePair(ec2.InstanceClass.Burstable2, ec2.InstanceSize.Small),