Move spotPrice to CommonAutoScalingProps

aws · May 28, 2019 · 9ed3288 · 9ed3288
1 parent c321d2d
commit 9ed3288
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 17 deletions.
diff --git a/packages/@aws-cdk/aws-autoscaling/lib/auto-scaling-group.ts b/packages/@aws-cdk/aws-autoscaling/lib/auto-scaling-group.ts
@@ -148,6 +148,14 @@ export interface CommonAutoScalingGroupProps {
    * @default - Use subnet setting.
    */
   readonly associatePublicIpAddress?: boolean;
+
+  /**
+   * The maximum hourly price (in USD) to be paid for any Spot Instance launched to fulfill the request. Spot Instances are
+   * launched when the price you specify exceeds the current Spot market price.
+   *
+   * @default none
+   */
+  readonly spotPrice?: string;
 }
 
 /**
@@ -183,14 +191,6 @@ export interface AutoScalingGroupProps extends CommonAutoScalingGroupProps {
    * @default A role will automatically be created, it can be accessed via the `role` property
    */
   readonly role?: iam.IRole;
-
-  /**
-   * The maximum hourly price to be paid for any Spot Instance launched to fulfill the request. Spot Instances are
-   * launched when the price you specify exceeds the current Spot market price.
-   *
-   * @default none
-   */
-  readonly spotPrice?: string;
 }
 
 abstract class AutoScalingGroupBase extends Resource implements IAutoScalingGroup {

diff --git a/packages/@aws-cdk/aws-ecs/lib/cluster.ts b/packages/@aws-cdk/aws-ecs/lib/cluster.ts
@@ -462,14 +462,6 @@ export interface AddCapacityOptions extends AddAutoScalingGroupCapacityOptions,
    * @default - Amazon Linux 1
    */
   readonly machineImage?: ec2.IMachineImageSource;
-
-  /**
-   * The maximum hourly price to be paid for any Spot Instance launched to fulfill the request. Spot Instances are
-   * launched when the price you specify exceeds the current Spot market price.
-   *
-   * @default none
-   */
-  readonly spotPrice?: string;
 }
 
 export interface NamespaceOptions {

diff --git a/packages/@aws-cdk/aws-ecs/test/test.ecs-cluster.ts b/packages/@aws-cdk/aws-ecs/test/test.ecs-cluster.ts
@@ -265,7 +265,7 @@ export = {
   "allows specifying spot fleet"(test: Test) {
     // GIVEN
     const stack = new cdk.Stack();
-    const vpc = new ec2.VpcNetwork(stack, 'MyVpc', {});
+    const vpc = new ec2.Vpc(stack, 'MyVpc', {});
 
     const cluster = new ecs.Cluster(stack, 'EcsCluster', { vpc });
     cluster.addCapacity('DefaultAutoScalingGroup', {