diff --git a/clients/client-ec2/src/models/models_0.ts b/clients/client-ec2/src/models/models_0.ts index 7f262e07bfd7..329a218d8baa 100644 --- a/clients/client-ec2/src/models/models_0.ts +++ b/clients/client-ec2/src/models/models_0.ts @@ -2473,6 +2473,7 @@ export enum AllocationStrategy { CAPACITY_OPTIMIZED_PRIORITIZED = "capacityOptimizedPrioritized", DIVERSIFIED = "diversified", LOWEST_PRICE = "lowestPrice", + PRICE_CAPACITY_OPTIMIZED = "priceCapacityOptimized", } export enum AllocationType { diff --git a/clients/client-ec2/src/models/models_1.ts b/clients/client-ec2/src/models/models_1.ts index 9b4166c775ec..869dcaf06954 100644 --- a/clients/client-ec2/src/models/models_1.ts +++ b/clients/client-ec2/src/models/models_1.ts @@ -1210,6 +1210,7 @@ export enum SpotAllocationStrategy { CAPACITY_OPTIMIZED_PRIORITIZED = "capacity-optimized-prioritized", DIVERSIFIED = "diversified", LOWEST_PRICE = "lowest-price", + PRICE_CAPACITY_OPTIMIZED = "price-capacity-optimized", } export enum SpotInstanceInterruptionBehavior { @@ -1275,28 +1276,48 @@ export interface SpotOptionsRequest { *

The strategy that determines how to allocate the target Spot Instance capacity across the Spot Instance * pools specified by the EC2 Fleet launch configuration. For more information, see Allocation strategies for Spot Instances in the * Amazon EC2 User Guide.

- *

- * lowest-price - EC2 Fleet launches instances from the lowest-price Spot Instance pool that - * has available capacity. If the cheapest pool doesn't have available capacity, the Spot Instances - * come from the next cheapest pool that has available capacity. If a pool runs out of - * capacity before fulfilling your desired capacity, EC2 Fleet will continue to fulfill your - * request by drawing from the next cheapest pool. To ensure that your desired capacity is - * met, you might receive Spot Instances from several pools.

- *

- * diversified - EC2 Fleet launches instances from all - * of the Spot Instance pools that you specify.

- *

- * capacity-optimized (recommended) - EC2 Fleet - * launches instances from Spot Instance pools with optimal capacity for the number of instances that - * are launching. To give certain instance types a higher chance of launching first, use - * capacity-optimized-prioritized. Set a priority for each instance type by - * using the Priority parameter for LaunchTemplateOverrides. You can - * assign the same priority to different LaunchTemplateOverrides. EC2 implements - * the priorities on a best-effort basis, but optimizes for capacity first. - * capacity-optimized-prioritized is supported only if your fleet uses a - * launch template. Note that if the On-Demand AllocationStrategy is set to - * prioritized, the same priority is applied when fulfilling On-Demand - * capacity.

+ * + *
+ *
price-capacity-optimized (recommended)
+ *
+ *

EC2 Fleet identifies the pools with + * the highest capacity availability for the number of instances that are launching. This means + * that we will request Spot Instances from the pools that we believe have the lowest chance of interruption + * in the near term. EC2 Fleet then requests Spot Instances from the lowest priced of these pools.

+ *
+ *
capacity-optimized
+ *
+ *

EC2 Fleet identifies the pools with + * the highest capacity availability for the number of instances that are launching. This means + * that we will request Spot Instances from the pools that we believe have the lowest chance of interruption + * in the near term. To give certain + * instance types a higher chance of launching first, use + * capacity-optimized-prioritized. Set a priority for each instance type by + * using the Priority parameter for LaunchTemplateOverrides. You can + * assign the same priority to different LaunchTemplateOverrides. EC2 implements + * the priorities on a best-effort basis, but optimizes for capacity first. + * capacity-optimized-prioritized is supported only if your EC2 Fleet uses a + * launch template. Note that if the On-Demand AllocationStrategy is set to + * prioritized, the same priority is applied when fulfilling On-Demand + * capacity.

+ *
+ *
diversified
+ *
+ *

EC2 Fleet requests instances from all of the Spot Instance pools that you + * specify.

+ *
+ *
lowest-price
+ *
+ *

EC2 Fleet requests instances from the lowest priced Spot Instance pool that + * has available capacity. If the lowest priced pool doesn't have available capacity, the Spot Instances + * come from the next lowest priced pool that has available capacity. If a pool runs out of + * capacity before fulfilling your desired capacity, EC2 Fleet will continue to fulfill your + * request by drawing from the next lowest priced pool. To ensure that your desired capacity is + * met, you might receive Spot Instances from several pools. Because this strategy only considers instance + * price and not capacity availability, it might lead to high interruption rates.

+ *
+ *
+ * *

Default: lowest-price *

*/ diff --git a/clients/client-ec2/src/models/models_3.ts b/clients/client-ec2/src/models/models_3.ts index 4df33b4c99b1..a35b3a1dac26 100644 --- a/clients/client-ec2/src/models/models_3.ts +++ b/clients/client-ec2/src/models/models_3.ts @@ -3598,28 +3598,48 @@ export interface SpotOptions { *

The strategy that determines how to allocate the target Spot Instance capacity across the Spot Instance * pools specified by the EC2 Fleet launch configuration. For more information, see Allocation strategies for Spot Instances in the * Amazon EC2 User Guide.

- *

- * lowest-price - EC2 Fleet launches instances from the lowest-price Spot Instance pool that - * has available capacity. If the cheapest pool doesn't have available capacity, the Spot Instances - * come from the next cheapest pool that has available capacity. If a pool runs out of - * capacity before fulfilling your desired capacity, EC2 Fleet will continue to fulfill your - * request by drawing from the next cheapest pool. To ensure that your desired capacity is - * met, you might receive Spot Instances from several pools.

- *

- * diversified - EC2 Fleet launches instances from all of the Spot Instance pools that you - * specify.

- *

- * capacity-optimized (recommended) - EC2 Fleet launches instances from Spot Instance pools - * with optimal capacity for the number of instances that are launching. To give certain - * instance types a higher chance of launching first, use - * capacity-optimized-prioritized. Set a priority for each instance type by - * using the Priority parameter for LaunchTemplateOverrides. You can - * assign the same priority to different LaunchTemplateOverrides. EC2 implements - * the priorities on a best-effort basis, but optimizes for capacity first. - * capacity-optimized-prioritized is supported only if your fleet uses a - * launch template. Note that if the On-Demand AllocationStrategy is set to - * prioritized, the same priority is applied when fulfilling On-Demand - * capacity.

+ * + *
+ *
price-capacity-optimized (recommended)
+ *
+ *

EC2 Fleet identifies the pools with + * the highest capacity availability for the number of instances that are launching. This means + * that we will request Spot Instances from the pools that we believe have the lowest chance of interruption + * in the near term. EC2 Fleet then requests Spot Instances from the lowest priced of these pools.

+ *
+ *
capacity-optimized
+ *
+ *

EC2 Fleet identifies the pools with + * the highest capacity availability for the number of instances that are launching. This means + * that we will request Spot Instances from the pools that we believe have the lowest chance of interruption + * in the near term. To give certain + * instance types a higher chance of launching first, use + * capacity-optimized-prioritized. Set a priority for each instance type by + * using the Priority parameter for LaunchTemplateOverrides. You can + * assign the same priority to different LaunchTemplateOverrides. EC2 implements + * the priorities on a best-effort basis, but optimizes for capacity first. + * capacity-optimized-prioritized is supported only if your EC2 Fleet uses a + * launch template. Note that if the On-Demand AllocationStrategy is set to + * prioritized, the same priority is applied when fulfilling On-Demand + * capacity.

+ *
+ *
diversified
+ *
+ *

EC2 Fleet requests instances from all of the Spot Instance pools that you + * specify.

+ *
+ *
lowest-price
+ *
+ *

EC2 Fleet requests instances from the lowest priced Spot Instance pool that + * has available capacity. If the lowest priced pool doesn't have available capacity, the Spot Instances + * come from the next lowest priced pool that has available capacity. If a pool runs out of + * capacity before fulfilling your desired capacity, EC2 Fleet will continue to fulfill your + * request by drawing from the next lowest priced pool. To ensure that your desired capacity is + * met, you might receive Spot Instances from several pools. Because this strategy only considers instance + * price and not capacity availability, it might lead to high interruption rates.

+ *
+ *
+ * *

Default: lowest-price *

*/ diff --git a/clients/client-ec2/src/models/models_4.ts b/clients/client-ec2/src/models/models_4.ts index f826a7f1ee54..ff5f59be0b53 100644 --- a/clients/client-ec2/src/models/models_4.ts +++ b/clients/client-ec2/src/models/models_4.ts @@ -5041,28 +5041,48 @@ export interface SpotFleetRequestConfigData { *

The strategy that determines how to allocate the target Spot Instance capacity across the Spot Instance * pools specified by the Spot Fleet launch configuration. For more information, see Allocation * strategies for Spot Instances in the Amazon EC2 User Guide.

- *

- * lowestPrice - Spot Fleet launches instances from the lowest-price Spot Instance pool - * that has available capacity. If the cheapest pool doesn't have available capacity, the - * Spot Instances come from the next cheapest pool that has available capacity. If a pool runs out - * of capacity before fulfilling your desired capacity, Spot Fleet will continue to fulfill your - * request by drawing from the next cheapest pool. To ensure that your desired capacity is - * met, you might receive Spot Instances from several pools.

- *

- * diversified - Spot Fleet launches instances from all of the Spot Instance pools that you - * specify.

- *

- * capacityOptimized (recommended) - Spot Fleet launches instances from Spot Instance pools - * with optimal capacity for the number of instances that are launching. To give certain - * instance types a higher chance of launching first, use - * capacityOptimizedPrioritized. Set a priority for each instance type by - * using the Priority parameter for LaunchTemplateOverrides. You can - * assign the same priority to different LaunchTemplateOverrides. EC2 implements - * the priorities on a best-effort basis, but optimizes for capacity first. - * capacityOptimizedPrioritized is supported only if your Spot Fleet uses a - * launch template. Note that if the OnDemandAllocationStrategy is set to - * prioritized, the same priority is applied when fulfilling On-Demand - * capacity.

+ * + *
+ *
priceCapacityOptimized (recommended)
+ *
+ *

Spot Fleet identifies the pools with + * the highest capacity availability for the number of instances that are launching. This means + * that we will request Spot Instances from the pools that we believe have the lowest chance of interruption + * in the near term. Spot Fleet then requests Spot Instances from the lowest priced of these pools.

+ *
+ *
capacityOptimized
+ *
+ *

Spot Fleet identifies the pools with + * the highest capacity availability for the number of instances that are launching. This means + * that we will request Spot Instances from the pools that we believe have the lowest chance of interruption + * in the near term. To give certain + * instance types a higher chance of launching first, use + * capacityOptimizedPrioritized. Set a priority for each instance type by + * using the Priority parameter for LaunchTemplateOverrides. You can + * assign the same priority to different LaunchTemplateOverrides. EC2 implements + * the priorities on a best-effort basis, but optimizes for capacity first. + * capacityOptimizedPrioritized is supported only if your Spot Fleet uses a + * launch template. Note that if the OnDemandAllocationStrategy is set to + * prioritized, the same priority is applied when fulfilling On-Demand + * capacity.

+ *
+ *
diversified
+ *
+ *

Spot Fleet requests instances from all of the Spot Instance pools that you + * specify.

+ *
+ *
lowestPrice
+ *
+ *

Spot Fleet requests instances from the lowest priced Spot Instance pool that + * has available capacity. If the lowest priced pool doesn't have available capacity, the Spot Instances + * come from the next lowest priced pool that has available capacity. If a pool runs out of + * capacity before fulfilling your desired capacity, Spot Fleet will continue to fulfill your + * request by drawing from the next lowest priced pool. To ensure that your desired capacity is + * met, you might receive Spot Instances from several pools. Because this strategy only considers instance + * price and not capacity availability, it might lead to high interruption rates.

+ *
+ *
+ * *

Default: lowestPrice *

*/ diff --git a/codegen/sdk-codegen/aws-models/ec2.json b/codegen/sdk-codegen/aws-models/ec2.json index 046a7e26c561..be5422c8b8a8 100644 --- a/codegen/sdk-codegen/aws-models/ec2.json +++ b/codegen/sdk-codegen/aws-models/ec2.json @@ -1843,6 +1843,12 @@ "traits": { "smithy.api#enumValue": "capacityOptimizedPrioritized" } + }, + "PRICE_CAPACITY_OPTIMIZED": { + "target": "smithy.api#Unit", + "traits": { + "smithy.api#enumValue": "priceCapacityOptimized" + } } } }, @@ -80608,6 +80614,12 @@ "traits": { "smithy.api#enumValue": "capacity-optimized-prioritized" } + }, + "PRICE_CAPACITY_OPTIMIZED": { + "target": "smithy.api#Unit", + "traits": { + "smithy.api#enumValue": "price-capacity-optimized" + } } } }, @@ -80930,7 +80942,7 @@ "target": "com.amazonaws.ec2#AllocationStrategy", "traits": { "aws.protocols#ec2QueryName": "AllocationStrategy", - "smithy.api#documentation": "

The strategy that determines how to allocate the target Spot Instance capacity across the Spot Instance\n pools specified by the Spot Fleet launch configuration. For more information, see Allocation\n strategies for Spot Instances in the Amazon EC2 User Guide.

\n

\n lowestPrice - Spot Fleet launches instances from the lowest-price Spot Instance pool\n that has available capacity. If the cheapest pool doesn't have available capacity, the\n Spot Instances come from the next cheapest pool that has available capacity. If a pool runs out\n of capacity before fulfilling your desired capacity, Spot Fleet will continue to fulfill your\n request by drawing from the next cheapest pool. To ensure that your desired capacity is\n met, you might receive Spot Instances from several pools.

\n

\n diversified - Spot Fleet launches instances from all of the Spot Instance pools that you\n specify.

\n

\n capacityOptimized (recommended) - Spot Fleet launches instances from Spot Instance pools\n with optimal capacity for the number of instances that are launching. To give certain\n instance types a higher chance of launching first, use\n capacityOptimizedPrioritized. Set a priority for each instance type by\n using the Priority parameter for LaunchTemplateOverrides. You can\n assign the same priority to different LaunchTemplateOverrides. EC2 implements\n the priorities on a best-effort basis, but optimizes for capacity first.\n capacityOptimizedPrioritized is supported only if your Spot Fleet uses a\n launch template. Note that if the OnDemandAllocationStrategy is set to\n prioritized, the same priority is applied when fulfilling On-Demand\n capacity.

\n

Default: lowestPrice\n

", + "smithy.api#documentation": "

The strategy that determines how to allocate the target Spot Instance capacity across the Spot Instance\n pools specified by the Spot Fleet launch configuration. For more information, see Allocation\n strategies for Spot Instances in the Amazon EC2 User Guide.

\n \n
\n
priceCapacityOptimized (recommended)
\n
\n

Spot Fleet identifies the pools with \n the highest capacity availability for the number of instances that are launching. This means \n that we will request Spot Instances from the pools that we believe have the lowest chance of interruption \n in the near term. Spot Fleet then requests Spot Instances from the lowest priced of these pools.

\n
\n
capacityOptimized
\n
\n

Spot Fleet identifies the pools with \n the highest capacity availability for the number of instances that are launching. This means \n that we will request Spot Instances from the pools that we believe have the lowest chance of interruption \n in the near term. To give certain\n instance types a higher chance of launching first, use\n capacityOptimizedPrioritized. Set a priority for each instance type by\n using the Priority parameter for LaunchTemplateOverrides. You can\n assign the same priority to different LaunchTemplateOverrides. EC2 implements\n the priorities on a best-effort basis, but optimizes for capacity first.\n capacityOptimizedPrioritized is supported only if your Spot Fleet uses a\n launch template. Note that if the OnDemandAllocationStrategy is set to\n prioritized, the same priority is applied when fulfilling On-Demand\n capacity.

\n
\n
diversified
\n
\n

Spot Fleet requests instances from all of the Spot Instance pools that you\n specify.

\n
\n
lowestPrice
\n
\n

Spot Fleet requests instances from the lowest priced Spot Instance pool that\n has available capacity. If the lowest priced pool doesn't have available capacity, the Spot Instances\n come from the next lowest priced pool that has available capacity. If a pool runs out of\n capacity before fulfilling your desired capacity, Spot Fleet will continue to fulfill your\n request by drawing from the next lowest priced pool. To ensure that your desired capacity is\n met, you might receive Spot Instances from several pools. Because this strategy only considers instance \n price and not capacity availability, it might lead to high interruption rates.

\n
\n
\n \n

Default: lowestPrice\n

", "smithy.api#xmlName": "allocationStrategy" } }, @@ -81586,7 +81598,7 @@ "target": "com.amazonaws.ec2#SpotAllocationStrategy", "traits": { "aws.protocols#ec2QueryName": "AllocationStrategy", - "smithy.api#documentation": "

The strategy that determines how to allocate the target Spot Instance capacity across the Spot Instance\n pools specified by the EC2 Fleet launch configuration. For more information, see Allocation strategies for Spot Instances in the\n Amazon EC2 User Guide.

\n

\n lowest-price - EC2 Fleet launches instances from the lowest-price Spot Instance pool that\n has available capacity. If the cheapest pool doesn't have available capacity, the Spot Instances\n come from the next cheapest pool that has available capacity. If a pool runs out of\n capacity before fulfilling your desired capacity, EC2 Fleet will continue to fulfill your\n request by drawing from the next cheapest pool. To ensure that your desired capacity is\n met, you might receive Spot Instances from several pools.

\n

\n diversified - EC2 Fleet launches instances from all of the Spot Instance pools that you\n specify.

\n

\n capacity-optimized (recommended) - EC2 Fleet launches instances from Spot Instance pools\n with optimal capacity for the number of instances that are launching. To give certain\n instance types a higher chance of launching first, use\n capacity-optimized-prioritized. Set a priority for each instance type by\n using the Priority parameter for LaunchTemplateOverrides. You can\n assign the same priority to different LaunchTemplateOverrides. EC2 implements\n the priorities on a best-effort basis, but optimizes for capacity first.\n capacity-optimized-prioritized is supported only if your fleet uses a\n launch template. Note that if the On-Demand AllocationStrategy is set to\n prioritized, the same priority is applied when fulfilling On-Demand\n capacity.

\n

Default: lowest-price\n

", + "smithy.api#documentation": "

The strategy that determines how to allocate the target Spot Instance capacity across the Spot Instance\n pools specified by the EC2 Fleet launch configuration. For more information, see Allocation strategies for Spot Instances in the\n Amazon EC2 User Guide.

\n \n
\n
price-capacity-optimized (recommended)
\n
\n

EC2 Fleet identifies the pools with \n the highest capacity availability for the number of instances that are launching. This means \n that we will request Spot Instances from the pools that we believe have the lowest chance of interruption \n in the near term. EC2 Fleet then requests Spot Instances from the lowest priced of these pools.

\n
\n
capacity-optimized
\n
\n

EC2 Fleet identifies the pools with \n the highest capacity availability for the number of instances that are launching. This means \n that we will request Spot Instances from the pools that we believe have the lowest chance of interruption \n in the near term. To give certain\n instance types a higher chance of launching first, use\n capacity-optimized-prioritized. Set a priority for each instance type by\n using the Priority parameter for LaunchTemplateOverrides. You can\n assign the same priority to different LaunchTemplateOverrides. EC2 implements\n the priorities on a best-effort basis, but optimizes for capacity first.\n capacity-optimized-prioritized is supported only if your EC2 Fleet uses a\n launch template. Note that if the On-Demand AllocationStrategy is set to\n prioritized, the same priority is applied when fulfilling On-Demand\n capacity.

\n
\n
diversified
\n
\n

EC2 Fleet requests instances from all of the Spot Instance pools that you\n specify.

\n
\n
lowest-price
\n
\n

EC2 Fleet requests instances from the lowest priced Spot Instance pool that\n has available capacity. If the lowest priced pool doesn't have available capacity, the Spot Instances\n come from the next lowest priced pool that has available capacity. If a pool runs out of\n capacity before fulfilling your desired capacity, EC2 Fleet will continue to fulfill your\n request by drawing from the next lowest priced pool. To ensure that your desired capacity is\n met, you might receive Spot Instances from several pools. Because this strategy only considers instance \n price and not capacity availability, it might lead to high interruption rates.

\n
\n
\n \n

Default: lowest-price\n

", "smithy.api#xmlName": "allocationStrategy" } }, @@ -81665,7 +81677,7 @@ "AllocationStrategy": { "target": "com.amazonaws.ec2#SpotAllocationStrategy", "traits": { - "smithy.api#documentation": "

The strategy that determines how to allocate the target Spot Instance capacity across the Spot Instance\n pools specified by the EC2 Fleet launch configuration. For more information, see Allocation strategies for Spot Instances in the\n Amazon EC2 User Guide.

\n

\n lowest-price - EC2 Fleet launches instances from the lowest-price Spot Instance pool that\n has available capacity. If the cheapest pool doesn't have available capacity, the Spot Instances\n come from the next cheapest pool that has available capacity. If a pool runs out of\n capacity before fulfilling your desired capacity, EC2 Fleet will continue to fulfill your\n request by drawing from the next cheapest pool. To ensure that your desired capacity is\n met, you might receive Spot Instances from several pools.

\n

\n diversified - EC2 Fleet launches instances from all\n of the Spot Instance pools that you specify.

\n

\n capacity-optimized (recommended) - EC2 Fleet\n launches instances from Spot Instance pools with optimal capacity for the number of instances that\n are launching. To give certain instance types a higher chance of launching first, use\n capacity-optimized-prioritized. Set a priority for each instance type by\n using the Priority parameter for LaunchTemplateOverrides. You can\n assign the same priority to different LaunchTemplateOverrides. EC2 implements\n the priorities on a best-effort basis, but optimizes for capacity first.\n capacity-optimized-prioritized is supported only if your fleet uses a\n launch template. Note that if the On-Demand AllocationStrategy is set to\n prioritized, the same priority is applied when fulfilling On-Demand\n capacity.

\n

Default: lowest-price\n

" + "smithy.api#documentation": "

The strategy that determines how to allocate the target Spot Instance capacity across the Spot Instance\n pools specified by the EC2 Fleet launch configuration. For more information, see Allocation strategies for Spot Instances in the\n Amazon EC2 User Guide.

\n \n
\n
price-capacity-optimized (recommended)
\n
\n

EC2 Fleet identifies the pools with \n the highest capacity availability for the number of instances that are launching. This means \n that we will request Spot Instances from the pools that we believe have the lowest chance of interruption \n in the near term. EC2 Fleet then requests Spot Instances from the lowest priced of these pools.

\n
\n
capacity-optimized
\n
\n

EC2 Fleet identifies the pools with \n the highest capacity availability for the number of instances that are launching. This means \n that we will request Spot Instances from the pools that we believe have the lowest chance of interruption \n in the near term. To give certain\n instance types a higher chance of launching first, use\n capacity-optimized-prioritized. Set a priority for each instance type by\n using the Priority parameter for LaunchTemplateOverrides. You can\n assign the same priority to different LaunchTemplateOverrides. EC2 implements\n the priorities on a best-effort basis, but optimizes for capacity first.\n capacity-optimized-prioritized is supported only if your EC2 Fleet uses a\n launch template. Note that if the On-Demand AllocationStrategy is set to\n prioritized, the same priority is applied when fulfilling On-Demand\n capacity.

\n
\n
diversified
\n
\n

EC2 Fleet requests instances from all of the Spot Instance pools that you\n specify.

\n
\n
lowest-price
\n
\n

EC2 Fleet requests instances from the lowest priced Spot Instance pool that\n has available capacity. If the lowest priced pool doesn't have available capacity, the Spot Instances\n come from the next lowest priced pool that has available capacity. If a pool runs out of\n capacity before fulfilling your desired capacity, EC2 Fleet will continue to fulfill your\n request by drawing from the next lowest priced pool. To ensure that your desired capacity is\n met, you might receive Spot Instances from several pools. Because this strategy only considers instance \n price and not capacity availability, it might lead to high interruption rates.

\n
\n
\n \n

Default: lowest-price\n

" } }, "MaintenanceStrategies": {