Merge remote-tracking branch 'origin/master' into benisrae/escape-hat…

…ch-2
aws · Sep 27, 2018 · ea69c33 · ea69c33
2 parents 8e6648f + 9d00e36
commit ea69c33
Show file tree

Hide file tree

Showing 508 changed files with 52,498 additions and 52,498 deletions.
diff --git a/create-missing-libraries.sh b/create-missing-libraries.sh
@@ -134,7 +134,7 @@ EOM
 import { Test, testCase } from 'nodeunit';
 import {} from '../lib';
 
-exports = testCase({
+export = testCase({
     notTested(test: Test) {
         test.ok(true, 'No tests are specified for this package.');
         test.done();

diff --git a/docs/src/examples.rst b/docs/src/examples.rst
@@ -176,7 +176,7 @@ The following example creates the Aurora database **MyAuroraDatabase**.
            instanceType: new ec2.InstanceTypePair(ec2.InstanceClass.Burstable2, ec2.InstanceSize.Small),
            vpc: vpc,
            vpcPlacement: {
-             usePublicSubnets: true
+             subnetsToUse: ec2.SubnetType.Public
            }
          }
        });

diff --git a/examples/cdk-examples-typescript/advanced-usage/index.ts b/examples/cdk-examples-typescript/advanced-usage/index.ts
@@ -10,25 +10,25 @@ import cdk = require('@aws-cdk/cdk');
  * This stack demonstrates the use of the IAM policy library shipped with the CDK.
  */
 class PolicyExample extends cdk.Stack {
-    constructor(parent: cdk.App, name: string, props?: cdk.StackProps) {
-        super(parent, name, props);
-
-        // here's how to create an IAM Role with an assume policy for the Lambda
-        // service principal.
-        const role = new iam.Role(this, 'Role', {
-            assumedBy: new cdk.ServicePrincipal('lambda.amazon.aws.com')
-        });
-
-        // when you call `addToPolicy`, a default policy is defined and attached
-        // to the bucket.
-        const bucket = new s3.Bucket(this, 'MyBucket');
-
-        // the role also has a policy attached to it.
-        role.addToPolicy(new cdk.PolicyStatement()
-            .addResource(bucket.arnForObjects('*'))
-            .addResource(bucket.bucketArn)
-            .addActions('s3:*'));
-    }
+  constructor(parent: cdk.App, name: string, props?: cdk.StackProps) {
+    super(parent, name, props);
+
+    // here's how to create an IAM Role with an assume policy for the Lambda
+    // service principal.
+    const role = new iam.Role(this, 'Role', {
+      assumedBy: new cdk.ServicePrincipal('lambda.amazon.aws.com')
+    });
+
+    // when you call `addToPolicy`, a default policy is defined and attached
+    // to the bucket.
+    const bucket = new s3.Bucket(this, 'MyBucket');
+
+    // the role also has a policy attached to it.
+    role.addToPolicy(new cdk.PolicyStatement()
+      .addResource(bucket.arnForObjects('*'))
+      .addResource(bucket.bucketArn)
+      .addActions('s3:*'));
+  }
 }
 
 /**
@@ -38,154 +38,154 @@ class PolicyExample extends cdk.Stack {
  * the AZ list and the AMI IDs are different.
  */
 class EnvContextExample extends cdk.Stack {
-    constructor(parent: cdk.App, name: string, props?: cdk.StackProps) {
-        super(parent, name, props);
+  constructor(parent: cdk.App, name: string, props?: cdk.StackProps) {
+    super(parent, name, props);
 
-        // get the list of AZs for the current region/account
-        const azs = new cdk.AvailabilityZoneProvider(this).availabilityZones;
+    // get the list of AZs for the current region/account
+    const azs = new cdk.AvailabilityZoneProvider(this).availabilityZones;
 
-        // get the AMI ID for a specific Windows version in this region
-        const ami = new ec2.WindowsImage(ec2.WindowsVersion.WindowsServer2016EnglishNanoBase).getImage(this);
+    // get the AMI ID for a specific Windows version in this region
+    const ami = new ec2.WindowsImage(ec2.WindowsVersion.WindowsServer2016EnglishNanoBase).getImage(this);
 
-        for (const az of azs) {
-            if (typeof(az) !== 'string') {
-                continue;
-            }
+    for (const az of azs) {
+      if (typeof(az) !== 'string') {
+        continue;
+      }
 
-            // render construct name based on it's availablity zone
-            const constructName = `InstanceFor${az.replace(/-/g, '').toUpperCase()}`;
+      // render construct name based on it's availablity zone
+      const constructName = `InstanceFor${az.replace(/-/g, '').toUpperCase()}`;
 
-            new ec2.cloudformation.InstanceResource(this, constructName, {
-                imageId: ami.imageId,
-                availabilityZone: az,
-            });
-        }
+      new ec2.cloudformation.InstanceResource(this, constructName, {
+        imageId: ami.imageId,
+        availabilityZone: az,
+      });
     }
+  }
 }
 
 /**
  * This stack shows how to use the Include construct to merge an existing CloudFormation template
  * into your CDK stack and then add constructs and resources programmatically to it.
  */
 class IncludeExample extends cdk.Stack {
-    constructor(parent: cdk.App, name: string, props?: cdk.StackProps) {
-        super(parent, name, props);
-
-        // so you have an existing template...
-        // you can also load it from a file:
-        //     const template = JSON.parse(fs.readFileSync('./my-template.json).toString());
-        const template = {
-            Resources: {
-                IncludedQueue: {
-                    Type: "AWS::SQS::Queue",
-                    Properties: {
-                        VisibilityTimeout: 300
-                    }
-                }
-            }
-        };
-
-        // merge template as-is into the stack
-        new cdk.Include(this, 'Include', { template });
-
-        // add constructs (and resources) programmatically
-        new EnvContextExample(parent, 'Example');
-        new sqs.cloudformation.QueueResource(this, 'CDKQueue', {});
-    }
+  constructor(parent: cdk.App, name: string, props?: cdk.StackProps) {
+    super(parent, name, props);
+
+    // so you have an existing template...
+    // you can also load it from a file:
+    //   const template = JSON.parse(fs.readFileSync('./my-template.json).toString());
+    const template = {
+      Resources: {
+        IncludedQueue: {
+          Type: "AWS::SQS::Queue",
+          Properties: {
+            VisibilityTimeout: 300
+          }
+        }
+      }
+    };
+
+    // merge template as-is into the stack
+    new cdk.Include(this, 'Include', { template });
+
+    // add constructs (and resources) programmatically
+    new EnvContextExample(parent, 'Example');
+    new sqs.cloudformation.QueueResource(this, 'CDKQueue', {});
+  }
 }
 
 class NestedStackExample extends cdk.Stack {
-    constructor(parent: cdk.App, name: string, props?: cdk.StackProps) {
-        super(parent, name, props);
-
-        // pick up to 3 AZs from environment.
-        const azs = new cdk.AvailabilityZoneProvider(this).availabilityZones.slice(0, 3);
-
-        // add an "AWS::CloudFormation::Stack" resource which uses the MongoDB quickstart
-        // https://aws.amazon.com/quickstart/architecture/mongodb/
-        // only non-default values are provided here.
-        new cloudformation.StackResource(this, 'NestedStack', {
-            templateUrl: 'https://s3.amazonaws.com/quickstart-reference/mongodb/latest/templates/mongodb-master.template',
-            parameters: {
-                KeyPairName: 'my-key-pair',
-                RemoteAccessCIDR: '0.0.0.0/0',
-                AvailabilityZones: azs.join(','),
-                NumberOfAZs: azs.length.toString(),
-                MongoDBAdminPassword: 'root1234',
-            }
-        });
-    }
+  constructor(parent: cdk.App, name: string, props?: cdk.StackProps) {
+    super(parent, name, props);
+
+    // pick up to 3 AZs from environment.
+    const azs = new cdk.AvailabilityZoneProvider(this).availabilityZones.slice(0, 3);
+
+    // add an "AWS::CloudFormation::Stack" resource which uses the MongoDB quickstart
+    // https://aws.amazon.com/quickstart/architecture/mongodb/
+    // only non-default values are provided here.
+    new cloudformation.StackResource(this, 'NestedStack', {
+      templateUrl: 'https://s3.amazonaws.com/quickstart-reference/mongodb/latest/templates/mongodb-master.template',
+      parameters: {
+        KeyPairName: 'my-key-pair',
+        RemoteAccessCIDR: '0.0.0.0/0',
+        AvailabilityZones: azs.join(','),
+        NumberOfAZs: azs.length.toString(),
+        MongoDBAdminPassword: 'root1234',
+      }
+    });
+  }
 }
 
 /**
  * Demonstrates how resources can be referenced using .ref and .<attribute>
  * It also demonstrates how to modify resource options such as metadata
  */
 class ResourceReferencesExample extends cdk.Stack {
-    constructor(parent: cdk.App, name: string, props?: cdk.StackProps) {
-        super(parent, name, props);
-
-        const topic = new sns.cloudformation.TopicResource(this, 'Topic', {});
-        const queue = new sqs.cloudformation.QueueResource(this, 'Queue', {});
-
-        new sns.cloudformation.SubscriptionResource(this, 'Subscription', {
-            topicArn: topic.ref, // resolves to { Ref: <topic-id> }
-            protocol: 'sqs',
-            endpoint: queue.queueArn // resolves to { "Fn::GetAtt": [ <queue-id>, "Arn" ] }
-        });
-
-        // resource.options can be used to set options on a resource construct
-        queue.options.metadata = {
-            MyKey: "MyValue"
-        };
-    }
+  constructor(parent: cdk.App, name: string, props?: cdk.StackProps) {
+    super(parent, name, props);
+
+    const topic = new sns.cloudformation.TopicResource(this, 'Topic', {});
+    const queue = new sqs.cloudformation.QueueResource(this, 'Queue', {});
+
+    new sns.cloudformation.SubscriptionResource(this, 'Subscription', {
+      topicArn: topic.ref, // resolves to { Ref: <topic-id> }
+      protocol: 'sqs',
+      endpoint: queue.queueArn // resolves to { "Fn::GetAtt": [ <queue-id>, "Arn" ] }
+    });
+
+    // resource.options can be used to set options on a resource construct
+    queue.options.metadata = {
+      MyKey: "MyValue"
+    };
+  }
 }
 
 /**
  * Demonstrates how to use CloudFormation parameters, outputs, pseudo parameters and intrinsic functions.
  */
 class CloudFormationExample extends cdk.Stack {
-    constructor(parent: cdk.App, name: string, props?: cdk.StackProps) {
-        super(parent, name, props);
-
-        // parameters are constructs that synthesize into the template's "Parameters" section
-        const param = new cdk.Parameter(this, 'MyTemplateParameter', {
-            type: 'String',
-            default: 'HelloWorld'
-        });
-
-        // outputs are constructs the synthesize into the template's "Outputs" section
-        new cdk.Output(this, 'Output', {
-            description: 'This is an output of the template',
-            value: new cdk.FnConcat(new cdk.AwsAccountId(), '/', param.ref)
-        });
-
-        // stack.templateOptions can be used to specify template-level options
-        this.templateOptions.description = 'This goes into the "Description" attribute of the template';
-        this.templateOptions.metadata = {
-
-            // all CloudFormation's pseudo-parameters are supported via the `cdk.AwsXxx` classes
-            PseudoParameters: [
-                new cdk.AwsAccountId(),
-                new cdk.AwsDomainSuffix(),
-                new cdk.AwsNotificationARNs(),
-                new cdk.AwsNoValue(),
-                new cdk.AwsPartition(),
-                new cdk.AwsRegion(),
-                new cdk.AwsStackId(),
-                new cdk.AwsStackName(),
-            ],
-
-            // all CloudFormation's intrinsic functions are supported via the `cdk.FnXxx` classes
-            IntrinsicFunctions: [
-                new cdk.FnAnd(
-                    new cdk.FnFindInMap('MyMap', 'K1', 'K2'),
-                    new cdk.FnSub('hello ${world}', {
-                        world: new cdk.FnBase64(param.ref)  // resolves to { Ref: <param-id> }
-                    }))
-            ],
-        };
-    }
+  constructor(parent: cdk.App, name: string, props?: cdk.StackProps) {
+    super(parent, name, props);
+
+    // parameters are constructs that synthesize into the template's "Parameters" section
+    const param = new cdk.Parameter(this, 'MyTemplateParameter', {
+      type: 'String',
+      default: 'HelloWorld'
+    });
+
+    // outputs are constructs the synthesize into the template's "Outputs" section
+    new cdk.Output(this, 'Output', {
+      description: 'This is an output of the template',
+      value: new cdk.FnConcat(new cdk.AwsAccountId(), '/', param.ref)
+    });
+
+    // stack.templateOptions can be used to specify template-level options
+    this.templateOptions.description = 'This goes into the "Description" attribute of the template';
+    this.templateOptions.metadata = {
+
+      // all CloudFormation's pseudo-parameters are supported via the `cdk.AwsXxx` classes
+      PseudoParameters: [
+        new cdk.AwsAccountId(),
+        new cdk.AwsDomainSuffix(),
+        new cdk.AwsNotificationARNs(),
+        new cdk.AwsNoValue(),
+        new cdk.AwsPartition(),
+        new cdk.AwsRegion(),
+        new cdk.AwsStackId(),
+        new cdk.AwsStackName(),
+      ],
+
+      // all CloudFormation's intrinsic functions are supported via the `cdk.FnXxx` classes
+      IntrinsicFunctions: [
+        new cdk.FnAnd(
+          new cdk.FnFindInMap('MyMap', 'K1', 'K2'),
+          new cdk.FnSub('hello ${world}', {
+            world: new cdk.FnBase64(param.ref)  // resolves to { Ref: <param-id> }
+          }))
+      ],
+    };
+  }
 }
 
 const app = new cdk.App(process.argv);