feat(core): environment-agnostic cloud assemblies

packages/@aws-cdk/aws-apigateway/test/integ.restapi.ts

@@ -58,6 +58,7 @@ class Test extends cdk.Stack {
       name: 'Basic',
       apiKey: key,
       description: 'Free tier monthly usage plan',
+      throttle: { rateLimit: 5 },
       quota: {
         limit: 10000,
         period: apigateway.Period.Month

packages/@aws-cdk/aws-ec2/lib/index.ts

@@ -4,7 +4,7 @@ export * from './machine-image';
 export * from './security-group';
 export * from './security-group-rule';
 export * from './vpc';
-export * from './vpc-network-provider';
+export * from './vpc-lookup';
 export * from './vpn';
 export * from './vpc-endpoint';
 

packages/@aws-cdk/aws-ec2/lib/machine-image.ts

@@ -1,4 +1,5 @@
-import { Construct, Context, Stack, Token } from '@aws-cdk/cdk';
+import ssm = require('@aws-cdk/aws-ssm');
+import { Construct, Stack, Token } from '@aws-cdk/cdk';
 
 /**
  * Interface for classes that can select an appropriate machine image to use
@@ -25,7 +26,8 @@ export class WindowsImage implements IMachineImageSource  {
    * Return the image to use in the given context
    */
   public getImage(scope: Construct): MachineImage {
-    const ami = Context.getSsmParameter(scope, this.imageParameterName(this.version));
+    const parameterName = this.imageParameterName(this.version);
+    const ami = ssm.StringParameter.valueForStringParameter(scope, parameterName);
     return new MachineImage(ami, new WindowsOS());
   }
 
@@ -102,7 +104,7 @@ export class AmazonLinuxImage implements IMachineImageSource {
     ].filter(x => x !== undefined); // Get rid of undefineds
 
     const parameterName = '/aws/service/ami-amazon-linux-latest/' + parts.join('-');
-    const ami = Context.getSsmParameter(scope, parameterName);
+    const ami = ssm.StringParameter.valueForStringParameter(scope, parameterName);
     return new MachineImage(ami, new LinuxOS());
   }
 }
@@ -180,9 +182,9 @@ export class GenericLinuxImage implements IMachineImageSource  {
   }
 
   public getImage(scope: Construct): MachineImage {
-    let region = Stack.of(scope).region;
+    const region = Stack.of(scope).region;
     if (Token.isUnresolved(region)) {
-      region = Context.getDefaultRegion(scope);
+      throw new Error(`Unable to determine AMI from AMI map since stack is region-agnostic`);
     }
 
     const ami = region !== 'test-region' ? this.amiMap[region] : 'ami-12345';

packages/@aws-cdk/aws-ec2/lib/vpc-lookup.ts

@@ -0,0 +1,41 @@
+/**
+ * Properties for looking up an existing VPC.
+ *
+ * The combination of properties must specify filter down to exactly one
+ * non-default VPC, otherwise an error is raised.
+ */
+export interface VpcLookupOptions {
+  /**
+   * The ID of the VPC
+   *
+   * If given, will import exactly this VPC.
+   *
+   * @default Don't filter on vpcId
+   */
+  readonly vpcId?: string;
+
+  /**
+   * The name of the VPC
+   *
+   * If given, will import the VPC with this name.
+   *
+   * @default Don't filter on vpcName
+   */
+  readonly vpcName?: string;
+
+  /**
+   * Tags on the VPC
+   *
+   * The VPC must have all of these tags
+   *
+   * @default Don't filter on tags
+   */
+  readonly tags?: {[key: string]: string};
+
+  /**
+   * Whether to match the default VPC
+   *
+   * @default Don't care whether we return the default VPC
+   */
+  readonly isDefault?: boolean;
+}