aws-sdk-ec2 1.638.0 → 1.639.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 452222266147bbc27e86b851715e5d6b001c21e9a902bb9bd035849e85914d49
-  data.tar.gz: '052599d5cb3420c2e93a60a00ff80e65d511f7d721ae96d72ce30e27d4e05827'
+  metadata.gz: 5a5ae92e1942a1af72d7f7aa72921b8bfb15feb7666f072ad6dea81be2af8409
+  data.tar.gz: bd32945a939d90d0e1510df31a36938a70f2f8e133582bfa0c0ffd0002550d8f
 SHA512:
-  metadata.gz: 71f09a80585c328a287a36049e404a08768d9d7322548b98f6e594dfedc25f330e92371e0283f0bea50744c31975ff3ee111a4a38bf0979cd8fff1aa0b828b89
-  data.tar.gz: 3038c396367b689b8d8632ef30f27e22faf829ca36453619d86b5a3c5fc7aa3503c95ea909ad9888571eed7d000e759decd8e1679b1a4485e00fddba9e1accec
+  metadata.gz: 87f823c4f994aa6841756f8d77359187fc3a9564a6718aecfde1818892462436ee5201cfb110d3f2b9ef90b677501c55560933236e78f9e38835f845327e5520
+  data.tar.gz: c569e63941404c5f8fe6613a29cfecba7a3132edaf3770ce90364b495c57030bf8c8e19a07f8af98c89cac1795e6c14dc5abadc9ebf48244c2c0514150be6dec

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 Unreleased Changes
 ------------------
 
+1.639.0 (2026-08-25)
+------------------
+
+* Feature - Fleet feature to support Capacity Reservation Resource Groups with Amazon EC2 Capacity Blocks and interruptible Capacity Reservations
+
 1.638.0 (2026-08-20)
 ------------------
 

data/VERSION

@@ -1 +1 @@
-1.638.0
+1.639.0

data/lib/aws-sdk-ec2/client.rb

@@ -8382,7 +8382,15 @@ module Aws::EC2
     #       max_total_price: "String",
     #     },
     #     reserved_capacity_options: {
-    #       reservation_types: ["interruptible-capacity-reservation"], # accepts interruptible-capacity-reservation
+    #       allocation_strategy: "prioritized", # accepts prioritized
+    #       reservation_types: ["on-demand-capacity-reservation"], # accepts on-demand-capacity-reservation, capacity-block, interruptible-capacity-reservation
+    #       capacity_reservation_target: {
+    #         capacity_reservation_ids: ["CapacityReservationId"],
+    #         capacity_reservation_resource_group_arns: ["ResourceGroupName"],
+    #       },
+    #       reserved_capacity_fallback_options: {
+    #         market_types: ["on-demand"], # accepts on-demand
+    #       },
     #     },
     #     excess_capacity_termination_policy: "no-termination", # accepts no-termination, termination
     #     launch_template_configs: [ # required
@@ -11340,7 +11348,7 @@ module Aws::EC2
     #       security_group_ids: ["SecurityGroupId"],
     #       security_groups: ["SecurityGroupName"],
     #       instance_market_options: {
-    #         market_type: "spot", # accepts spot, capacity-block, interruptible-capacity-reservation
+    #         market_type: "spot", # accepts spot, capacity-block, interruptible-capacity-reservation, on-demand
     #         spot_options: {
     #           max_price: "String",
     #           spot_instance_type: "one-time", # accepts one-time, persistent
@@ -11789,7 +11797,7 @@ module Aws::EC2
     #       security_group_ids: ["SecurityGroupId"],
     #       security_groups: ["SecurityGroupName"],
     #       instance_market_options: {
-    #         market_type: "spot", # accepts spot, capacity-block, interruptible-capacity-reservation
+    #         market_type: "spot", # accepts spot, capacity-block, interruptible-capacity-reservation, on-demand
     #         spot_options: {
     #           max_price: "String",
     #           spot_instance_type: "one-time", # accepts one-time, persistent
@@ -12022,7 +12030,7 @@ module Aws::EC2
     #   resp.launch_template_version.launch_template_data.security_group_ids[0] #=> String
     #   resp.launch_template_version.launch_template_data.security_groups #=> Array
     #   resp.launch_template_version.launch_template_data.security_groups[0] #=> String
-    #   resp.launch_template_version.launch_template_data.instance_market_options.market_type #=> String, one of "spot", "capacity-block", "interruptible-capacity-reservation"
+    #   resp.launch_template_version.launch_template_data.instance_market_options.market_type #=> String, one of "spot", "capacity-block", "interruptible-capacity-reservation", "on-demand"
     #   resp.launch_template_version.launch_template_data.instance_market_options.spot_options.max_price #=> String
     #   resp.launch_template_version.launch_template_data.instance_market_options.spot_options.spot_instance_type #=> String, one of "one-time", "persistent"
     #   resp.launch_template_version.launch_template_data.instance_market_options.spot_options.block_duration_minutes #=> Integer
@@ -30246,8 +30254,11 @@ module Aws::EC2
     #   resp.fleets[0].on_demand_options.single_availability_zone #=> Boolean
     #   resp.fleets[0].on_demand_options.min_target_capacity #=> Integer
     #   resp.fleets[0].on_demand_options.max_total_price #=> String
+    #   resp.fleets[0].reserved_capacity_options.allocation_strategy #=> String, one of "prioritized"
     #   resp.fleets[0].reserved_capacity_options.reservation_types #=> Array
-    #   resp.fleets[0].reserved_capacity_options.reservation_types[0] #=> String, one of "interruptible-capacity-reservation"
+    #   resp.fleets[0].reserved_capacity_options.reservation_types[0] #=> String, one of "on-demand-capacity-reservation", "capacity-block", "interruptible-capacity-reservation"
+    #   resp.fleets[0].reserved_capacity_options.reserved_capacity_fallback_options.market_types #=> Array
+    #   resp.fleets[0].reserved_capacity_options.reserved_capacity_fallback_options.market_types[0] #=> String, one of "on-demand"
     #   resp.fleets[0].tags #=> Array
     #   resp.fleets[0].tags[0].key #=> String
     #   resp.fleets[0].tags[0].value #=> String
@@ -36420,7 +36431,7 @@ module Aws::EC2
     #   resp.launch_template_versions[0].launch_template_data.security_group_ids[0] #=> String
     #   resp.launch_template_versions[0].launch_template_data.security_groups #=> Array
     #   resp.launch_template_versions[0].launch_template_data.security_groups[0] #=> String
-    #   resp.launch_template_versions[0].launch_template_data.instance_market_options.market_type #=> String, one of "spot", "capacity-block", "interruptible-capacity-reservation"
+    #   resp.launch_template_versions[0].launch_template_data.instance_market_options.market_type #=> String, one of "spot", "capacity-block", "interruptible-capacity-reservation", "on-demand"
     #   resp.launch_template_versions[0].launch_template_data.instance_market_options.spot_options.max_price #=> String
     #   resp.launch_template_versions[0].launch_template_data.instance_market_options.spot_options.spot_instance_type #=> String, one of "one-time", "persistent"
     #   resp.launch_template_versions[0].launch_template_data.instance_market_options.spot_options.block_duration_minutes #=> Integer
@@ -57096,7 +57107,7 @@ module Aws::EC2
     #   resp.launch_template_data.security_group_ids[0] #=> String
     #   resp.launch_template_data.security_groups #=> Array
     #   resp.launch_template_data.security_groups[0] #=> String
-    #   resp.launch_template_data.instance_market_options.market_type #=> String, one of "spot", "capacity-block", "interruptible-capacity-reservation"
+    #   resp.launch_template_data.instance_market_options.market_type #=> String, one of "spot", "capacity-block", "interruptible-capacity-reservation", "on-demand"
     #   resp.launch_template_data.instance_market_options.spot_options.max_price #=> String
     #   resp.launch_template_data.instance_market_options.spot_options.spot_instance_type #=> String, one of "one-time", "persistent"
     #   resp.launch_template_data.instance_market_options.spot_options.block_duration_minutes #=> Integer
@@ -74003,7 +74014,7 @@ module Aws::EC2
     #       version: "String",
     #     },
     #     instance_market_options: {
-    #       market_type: "spot", # accepts spot, capacity-block, interruptible-capacity-reservation
+    #       market_type: "spot", # accepts spot, capacity-block, interruptible-capacity-reservation, on-demand
     #       spot_options: {
     #         max_price: "String",
     #         spot_instance_type: "one-time", # accepts one-time, persistent
@@ -77186,7 +77197,7 @@ module Aws::EC2
         tracer: tracer
       )
       context[:gem_name] = 'aws-sdk-ec2'
-      context[:gem_version] = '1.638.0'
+      context[:gem_version] = '1.639.0'
       Seahorse::Client::Request.new(handlers, context)
     end
 

data/lib/aws-sdk-ec2/client_api.rb

@@ -410,6 +410,7 @@ module Aws::EC2
     CapacityReservationOptions = Shapes::StructureShape.new(name: 'CapacityReservationOptions')
     CapacityReservationOptionsRequest = Shapes::StructureShape.new(name: 'CapacityReservationOptionsRequest')
     CapacityReservationPreference = Shapes::StringShape.new(name: 'CapacityReservationPreference')
+    CapacityReservationResourceGroupArnSet = Shapes::ListShape.new(name: 'CapacityReservationResourceGroupArnSet')
     CapacityReservationSet = Shapes::ListShape.new(name: 'CapacityReservationSet')
     CapacityReservationSpecification = Shapes::StructureShape.new(name: 'CapacityReservationSpecification')
     CapacityReservationSpecificationResponse = Shapes::StructureShape.new(name: 'CapacityReservationSpecificationResponse')
@@ -1818,6 +1819,7 @@ module Aws::EC2
     FleetBlockDeviceMappingRequestList = Shapes::ListShape.new(name: 'FleetBlockDeviceMappingRequestList')
     FleetCapacityReservation = Shapes::StructureShape.new(name: 'FleetCapacityReservation')
     FleetCapacityReservationSet = Shapes::ListShape.new(name: 'FleetCapacityReservationSet')
+    FleetCapacityReservationTargetRequest = Shapes::StructureShape.new(name: 'FleetCapacityReservationTargetRequest')
     FleetCapacityReservationTenancy = Shapes::StringShape.new(name: 'FleetCapacityReservationTenancy')
     FleetCapacityReservationUsageStrategy = Shapes::StringShape.new(name: 'FleetCapacityReservationUsageStrategy')
     FleetData = Shapes::StructureShape.new(name: 'FleetData')
@@ -3375,6 +3377,11 @@ module Aws::EC2
     ReservationTypeList = Shapes::ListShape.new(name: 'ReservationTypeList')
     ReservationTypeListRequest = Shapes::ListShape.new(name: 'ReservationTypeListRequest')
     ReservationValue = Shapes::StructureShape.new(name: 'ReservationValue')
+    ReservedCapacityAllocationStrategy = Shapes::StringShape.new(name: 'ReservedCapacityAllocationStrategy')
+    ReservedCapacityFallbackMarketType = Shapes::StringShape.new(name: 'ReservedCapacityFallbackMarketType')
+    ReservedCapacityFallbackMarketTypeList = Shapes::ListShape.new(name: 'ReservedCapacityFallbackMarketTypeList')
+    ReservedCapacityFallbackOptions = Shapes::StructureShape.new(name: 'ReservedCapacityFallbackOptions')
+    ReservedCapacityFallbackOptionsRequest = Shapes::StructureShape.new(name: 'ReservedCapacityFallbackOptionsRequest')
     ReservedCapacityOptions = Shapes::StructureShape.new(name: 'ReservedCapacityOptions')
     ReservedCapacityOptionsRequest = Shapes::StructureShape.new(name: 'ReservedCapacityOptionsRequest')
     ReservedInstanceIdSet = Shapes::ListShape.new(name: 'ReservedInstanceIdSet')
@@ -3416,6 +3423,7 @@ module Aws::EC2
     ResetSnapshotAttributeRequest = Shapes::StructureShape.new(name: 'ResetSnapshotAttributeRequest')
     ResourceArn = Shapes::StringShape.new(name: 'ResourceArn')
     ResourceConfigurationArn = Shapes::StringShape.new(name: 'ResourceConfigurationArn')
+    ResourceGroupName = Shapes::StringShape.new(name: 'ResourceGroupName')
     ResourceIdList = Shapes::ListShape.new(name: 'ResourceIdList')
     ResourceList = Shapes::ListShape.new(name: 'ResourceList')
     ResourceStatement = Shapes::StructureShape.new(name: 'ResourceStatement')
@@ -5624,6 +5632,8 @@ module Aws::EC2
     CapacityReservationOptionsRequest.add_member(:usage_strategy, Shapes::ShapeRef.new(shape: FleetCapacityReservationUsageStrategy, location_name: "UsageStrategy"))
     CapacityReservationOptionsRequest.struct_class = Types::CapacityReservationOptionsRequest
 
+    CapacityReservationResourceGroupArnSet.member = Shapes::ShapeRef.new(shape: ResourceGroupName, location_name: "item")
+
     CapacityReservationSet.member = Shapes::ShapeRef.new(shape: CapacityReservation, location_name: "item")
 
     CapacityReservationSpecification.add_member(:capacity_reservation_preference, Shapes::ShapeRef.new(shape: CapacityReservationPreference, location_name: "CapacityReservationPreference"))
@@ -11687,6 +11697,10 @@ module Aws::EC2
 
     FleetCapacityReservationSet.member = Shapes::ShapeRef.new(shape: FleetCapacityReservation, location_name: "item")
 
+    FleetCapacityReservationTargetRequest.add_member(:capacity_reservation_ids, Shapes::ShapeRef.new(shape: CapacityReservationIdSet, location_name: "CapacityReservationId"))
+    FleetCapacityReservationTargetRequest.add_member(:capacity_reservation_resource_group_arns, Shapes::ShapeRef.new(shape: CapacityReservationResourceGroupArnSet, location_name: "CapacityReservationResourceGroupArn"))
+    FleetCapacityReservationTargetRequest.struct_class = Types::FleetCapacityReservationTargetRequest
+
     FleetData.add_member(:activity_status, Shapes::ShapeRef.new(shape: FleetActivityStatus, location_name: "activityStatus"))
     FleetData.add_member(:create_time, Shapes::ShapeRef.new(shape: DateTime, location_name: "createTime"))
     FleetData.add_member(:fleet_id, Shapes::ShapeRef.new(shape: FleetId, location_name: "fleetId"))
@@ -17639,10 +17653,23 @@ module Aws::EC2
     ReservationValue.add_member(:remaining_upfront_value, Shapes::ShapeRef.new(shape: String, location_name: "remainingUpfrontValue"))
     ReservationValue.struct_class = Types::ReservationValue
 
+    ReservedCapacityFallbackMarketTypeList.member = Shapes::ShapeRef.new(shape: ReservedCapacityFallbackMarketType, location_name: "item")
+
+    ReservedCapacityFallbackOptions.add_member(:market_types, Shapes::ShapeRef.new(shape: ReservedCapacityFallbackMarketTypeList, location_name: "marketTypeSet"))
+    ReservedCapacityFallbackOptions.struct_class = Types::ReservedCapacityFallbackOptions
+
+    ReservedCapacityFallbackOptionsRequest.add_member(:market_types, Shapes::ShapeRef.new(shape: ReservedCapacityFallbackMarketTypeList, location_name: "MarketType"))
+    ReservedCapacityFallbackOptionsRequest.struct_class = Types::ReservedCapacityFallbackOptionsRequest
+
+    ReservedCapacityOptions.add_member(:allocation_strategy, Shapes::ShapeRef.new(shape: ReservedCapacityAllocationStrategy, location_name: "allocationStrategy"))
     ReservedCapacityOptions.add_member(:reservation_types, Shapes::ShapeRef.new(shape: ReservationTypeList, location_name: "reservationTypeSet"))
+    ReservedCapacityOptions.add_member(:reserved_capacity_fallback_options, Shapes::ShapeRef.new(shape: ReservedCapacityFallbackOptions, location_name: "reservedCapacityFallbackOptions"))
     ReservedCapacityOptions.struct_class = Types::ReservedCapacityOptions
 
+    ReservedCapacityOptionsRequest.add_member(:allocation_strategy, Shapes::ShapeRef.new(shape: ReservedCapacityAllocationStrategy, location_name: "AllocationStrategy"))
     ReservedCapacityOptionsRequest.add_member(:reservation_types, Shapes::ShapeRef.new(shape: ReservationTypeListRequest, location_name: "ReservationType"))
+    ReservedCapacityOptionsRequest.add_member(:capacity_reservation_target, Shapes::ShapeRef.new(shape: FleetCapacityReservationTargetRequest, location_name: "CapacityReservationTarget"))
+    ReservedCapacityOptionsRequest.add_member(:reserved_capacity_fallback_options, Shapes::ShapeRef.new(shape: ReservedCapacityFallbackOptionsRequest, location_name: "ReservedCapacityFallbackOptions"))
     ReservedCapacityOptionsRequest.struct_class = Types::ReservedCapacityOptionsRequest
 
     ReservedInstanceIdSet.member = Shapes::ShapeRef.new(shape: ReservationId, location_name: "ReservedInstanceId")

data/lib/aws-sdk-ec2/resource.rb

@@ -165,7 +165,7 @@ module Aws::EC2
     #       version: "String",
     #     },
     #     instance_market_options: {
-    #       market_type: "spot", # accepts spot, capacity-block, interruptible-capacity-reservation
+    #       market_type: "spot", # accepts spot, capacity-block, interruptible-capacity-reservation, on-demand
     #       spot_options: {
     #         max_price: "String",
     #         spot_instance_type: "one-time", # accepts one-time, persistent

data/lib/aws-sdk-ec2/subnet.rb

@@ -426,7 +426,7 @@ module Aws::EC2
     #       version: "String",
     #     },
     #     instance_market_options: {
-    #       market_type: "spot", # accepts spot, capacity-block, interruptible-capacity-reservation
+    #       market_type: "spot", # accepts spot, capacity-block, interruptible-capacity-reservation, on-demand
     #       spot_options: {
     #         max_price: "String",
     #         spot_instance_type: "one-time", # accepts one-time, persistent

data/lib/aws-sdk-ec2/types.rb

@@ -11132,8 +11132,10 @@ module Aws::EC2
     #
     # @!attribute [rw] lifecycle
     #   Indicates if the instance that could not be launched was a Spot,
-    #   On-Demand, Capacity Block, or Interruptible Capacity Reservation
-    #   instance.
+    #   On-Demand, Capacity Block for ML, or interruptible Capacity
+    #   Reservation instance. If you are using `ReservedCapacityOptions`
+    #   with `on-demand-capacity-reservation` in the `ReservationTypes`
+    #   list, the value can also be `on-demand-capacity-reservation`.
     #   @return [String]
     #
     # @!attribute [rw] error_code
@@ -11177,7 +11179,8 @@ module Aws::EC2
     #
     # @!attribute [rw] lifecycle
     #   Indicates if the instance that was launched is a Spot, On-Demand,
-    #   Capacity Block, or Interruptible Capacity Reservation instance.
+    #   Capacity Block for ML, or interruptible Capacity Reservation
+    #   instance.
     #   @return [String]
     #
     # @!attribute [rw] instance_ids
@@ -25838,8 +25841,10 @@ module Aws::EC2
     #
     # @!attribute [rw] lifecycle
     #   Indicates if the instance that could not be launched was a Spot,
-    #   On-Demand, Capacity Block, or Interruptible Capacity Reservation
-    #   instance.
+    #   On-Demand, Capacity Block for ML, or interruptible Capacity
+    #   Reservation instance. If you are using `ReservedCapacityOptions`
+    #   with `on-demand-capacity-reservation` in the `ReservationTypes`
+    #   list, the value can also be `on-demand-capacity-reservation`.
     #   @return [String]
     #
     # @!attribute [rw] error_code
@@ -26043,7 +26048,8 @@ module Aws::EC2
     #
     # @!attribute [rw] lifecycle
     #   Indicates if the instance that was launched is a Spot, On-Demand,
-    #   Capacity Block, or Interruptible Capacity Reservation instance.
+    #   Capacity Block for ML, or interruptible Capacity Reservation
+    #   instance.
     #   @return [String]
     #
     # @!attribute [rw] instance_ids
@@ -44243,6 +44249,30 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # Describes the target Capacity Reservations or Capacity Reservation
+    # Resource Groups for an EC2 Fleet that launches into reserved capacity.
+    # You can specify Capacity Reservation IDs or a Capacity Reservation
+    # Resource Group ARN, but not both.
+    #
+    # @!attribute [rw] capacity_reservation_ids
+    #   The IDs of the Capacity Reservations in which to launch the
+    #   instances.
+    #   @return [Array<String>]
+    #
+    # @!attribute [rw] capacity_reservation_resource_group_arns
+    #   The ARNs of the Capacity Reservation Resource Groups in which to
+    #   launch the instances.
+    #   @return [Array<String>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/FleetCapacityReservationTargetRequest AWS API Documentation
+    #
+    class FleetCapacityReservationTargetRequest < Struct.new(
+      :capacity_reservation_ids,
+      :capacity_reservation_resource_group_arns)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # Describes an EC2 Fleet.
     #
     # @!attribute [rw] activity_status
@@ -77122,24 +77152,86 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # Describes the fallback behavior for an EC2 Fleet that uses reserved
+    # capacity when the reserved capacity is not enough to meet the target
+    # capacity. If you don't specify fallback options, EC2 Fleet does not
+    # fall back to any other market type after the specified reservation
+    # types are exhausted.
+    #
+    # @!attribute [rw] market_types
+    #   The instance purchasing options to fall back to when the reserved
+    #   capacity is not enough to meet the target capacity. The only
+    #   supported value is `on-demand`, which launches On-Demand Instances
+    #   to fulfill the remaining target capacity.
+    #   @return [Array<String>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ReservedCapacityFallbackOptions AWS API Documentation
+    #
+    class ReservedCapacityFallbackOptions < Struct.new(
+      :market_types)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # Describes the fallback behavior for an EC2 Fleet that uses reserved
+    # capacity when the reserved capacity is not enough to meet the target
+    # capacity. If you don't specify fallback options, EC2 Fleet does not
+    # fall back to any other market type after the specified reservation
+    # types are exhausted.
+    #
+    # @!attribute [rw] market_types
+    #   The instance purchasing options to fall back to when the reserved
+    #   capacity is not enough to meet the target capacity. The only
+    #   supported value is `on-demand`, which launches On-Demand Instances
+    #   to fulfill the remaining target capacity.
+    #   @return [Array<String>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ReservedCapacityFallbackOptionsRequest AWS API Documentation
+    #
+    class ReservedCapacityFallbackOptionsRequest < Struct.new(
+      :market_types)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # Defines EC2 Fleet preferences for utilizing reserved capacity when
-    # DefaultTargetCapacityType is set to `reserved-capacity`.
+    # `DefaultTargetCapacityType` is set to `reserved-capacity`. EC2 Fleet
+    # can fulfill reserved capacity using On-Demand Capacity Reservations,
+    # Capacity Blocks for ML, and interruptible Capacity Reservations.
+    #
+    # @!attribute [rw] allocation_strategy
+    #   The strategy that determines the order in which EC2 Fleet launches
+    #   instances across the reservation types that you specify. The only
+    #   supported value is `prioritized`, which launches instances in the
+    #   priority order that you specify in your launch template overrides.
+    #   If you don't specify an allocation strategy, instances are launched
+    #   in a random order.
+    #   @return [String]
     #
     # @!attribute [rw] reservation_types
     #   The types of Capacity Reservations used for fulfilling the EC2 Fleet
     #   request.
     #   @return [Array<String>]
     #
+    # @!attribute [rw] reserved_capacity_fallback_options
+    #   The fallback behavior for the EC2 Fleet when there is not enough
+    #   reserved capacity available to meet the target capacity.
+    #   @return [Types::ReservedCapacityFallbackOptions]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ReservedCapacityOptions AWS API Documentation
     #
     class ReservedCapacityOptions < Struct.new(
-      :reservation_types)
+      :allocation_strategy,
+      :reservation_types,
+      :reserved_capacity_fallback_options)
       SENSITIVE = []
       include Aws::Structure
     end
 
     # Defines EC2 Fleet preferences for utilizing reserved capacity when
-    # DefaultTargetCapacityType is set to `reserved-capacity`.
+    # `DefaultTargetCapacityType` is set to `reserved-capacity`. EC2 Fleet
+    # can fulfill reserved capacity using On-Demand Capacity Reservations,
+    # Capacity Blocks for ML, and interruptible Capacity Reservations.
     #
     # <note markdown="1"> This configuration can only be used if the EC2 Fleet is of type
     # `instant`.
@@ -77150,23 +77242,52 @@ module Aws::EC2
     # `DefaultTargetCapacityType` to `reserved-capacity` in the
     # `TargetCapacitySpecification`.
     #
-    # For more information about Interruptible Capacity Reservations, see
-    # [Launch instances into an Interruptible Capacity Reservation][1] in
+    # For more information about interruptible Capacity Reservations, see
+    # [Launch instances into an interruptible Capacity Reservation][1] in
     # the *Amazon EC2 User Guide*.
     #
     #
     #
     # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-fleet-launch-instances-interruptible-cr-walkthrough.html
     #
+    # @!attribute [rw] allocation_strategy
+    #   The strategy that determines the order in which EC2 Fleet launches
+    #   instances across the reservation types that you specify. The only
+    #   supported value is `prioritized`, which launches instances in the
+    #   priority order that you specify in your launch template overrides.
+    #   If you don't specify an allocation strategy, instances are launched
+    #   in a random order.
+    #   @return [String]
+    #
     # @!attribute [rw] reservation_types
     #   The types of Capacity Reservations to use for fulfilling the EC2
-    #   Fleet request.
+    #   Fleet request. This is an ordered list: EC2 Fleet attempts to launch
+    #   instances into each Capacity Reservation type in the order that you
+    #   specify them before moving on to the next type.
     #   @return [Array<String>]
     #
+    # @!attribute [rw] capacity_reservation_target
+    #   The Capacity Reservations or Capacity Reservation Resource Groups to
+    #   use for fulfilling the EC2 Fleet request. You can specify Capacity
+    #   Reservation IDs or a Capacity Reservation Resource Group ARN, but
+    #   not both.
+    #   @return [Types::FleetCapacityReservationTargetRequest]
+    #
+    # @!attribute [rw] reserved_capacity_fallback_options
+    #   The fallback behavior for the EC2 Fleet when there is not enough
+    #   reserved capacity available to meet the target capacity. This member
+    #   takes a `ReservedCapacityFallbackOptionsRequest` structure, in which
+    #   you set `MarketTypes` to the instance purchasing options to fall
+    #   back to.
+    #   @return [Types::ReservedCapacityFallbackOptionsRequest]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ReservedCapacityOptionsRequest AWS API Documentation
     #
     class ReservedCapacityOptionsRequest < Struct.new(
-      :reservation_types)
+      :allocation_strategy,
+      :reservation_types,
+      :capacity_reservation_target,
+      :reserved_capacity_fallback_options)
       SENSITIVE = []
       include Aws::Structure
     end

data/lib/aws-sdk-ec2.rb

@@ -78,7 +78,7 @@ module Aws::EC2
   autoload :VpcPeeringConnection, 'aws-sdk-ec2/vpc_peering_connection'
   autoload :VpcAddress, 'aws-sdk-ec2/vpc_address'
 
-  GEM_VERSION = '1.638.0'
+  GEM_VERSION = '1.639.0'
 
 end
 

data/sig/client.rbs

@@ -1633,7 +1633,15 @@ module Aws
                             max_total_price: ::String?
                           },
                           ?reserved_capacity_options: {
-                            reservation_types: Array[("interruptible-capacity-reservation")]?
+                            allocation_strategy: ("prioritized")?,
+                            reservation_types: Array[("on-demand-capacity-reservation" | "capacity-block" | "interruptible-capacity-reservation")]?,
+                            capacity_reservation_target: {
+                              capacity_reservation_ids: Array[::String]?,
+                              capacity_reservation_resource_group_arns: Array[::String]?
+                            }?,
+                            reserved_capacity_fallback_options: {
+                              market_types: Array[("on-demand")]?
+                            }?
                           },
                           ?excess_capacity_termination_policy: ("no-termination" | "termination"),
                           launch_template_configs: Array[
@@ -14352,7 +14360,7 @@ module Aws
                              version: ::String?
                            },
                            ?instance_market_options: {
-                             market_type: ("spot" | "capacity-block" | "interruptible-capacity-reservation")?,
+                             market_type: ("spot" | "capacity-block" | "interruptible-capacity-reservation" | "on-demand")?,
                              spot_options: {
                                max_price: ::String?,
                                spot_instance_type: ("one-time" | "persistent")?,

data/sig/params.rbs

@@ -251,7 +251,7 @@ module Aws
     }
 
       type launch_template_instance_market_options_request = {
-      market_type: ("spot" | "capacity-block" | "interruptible-capacity-reservation")?,
+      market_type: ("spot" | "capacity-block" | "interruptible-capacity-reservation" | "on-demand")?,
       spot_options: {
         max_price: ::String?,
         spot_instance_type: ("one-time" | "persistent")?,

data/sig/resource.rbs

@@ -188,7 +188,7 @@ module Aws
                                 version: ::String?
                               },
                               ?instance_market_options: {
-                                market_type: ("spot" | "capacity-block" | "interruptible-capacity-reservation")?,
+                                market_type: ("spot" | "capacity-block" | "interruptible-capacity-reservation" | "on-demand")?,
                                 spot_options: {
                                   max_price: ::String?,
                                   spot_instance_type: ("one-time" | "persistent")?,

data/sig/subnet.rbs

@@ -181,7 +181,7 @@ module Aws
                                 version: ::String?
                               },
                               ?instance_market_options: {
-                                market_type: ("spot" | "capacity-block" | "interruptible-capacity-reservation")?,
+                                market_type: ("spot" | "capacity-block" | "interruptible-capacity-reservation" | "on-demand")?,
                                 spot_options: {
                                   max_price: ::String?,
                                   spot_instance_type: ("one-time" | "persistent")?,

data/sig/types.rbs

@@ -9745,6 +9745,12 @@ module Aws::EC2
       SENSITIVE: []
     end
 
+    class FleetCapacityReservationTargetRequest
+      attr_accessor capacity_reservation_ids: ::Array[::String]
+      attr_accessor capacity_reservation_resource_group_arns: ::Array[::String]
+      SENSITIVE: []
+    end
+
     class FleetData
       attr_accessor activity_status: ("error" | "pending_fulfillment" | "pending_termination" | "fulfilled")
       attr_accessor create_time: ::Time
@@ -11987,7 +11993,7 @@ module Aws::EC2
     end
 
     class InstanceMarketOptionsRequest
-      attr_accessor market_type: ("spot" | "capacity-block" | "interruptible-capacity-reservation")
+      attr_accessor market_type: ("spot" | "capacity-block" | "interruptible-capacity-reservation" | "on-demand")
       attr_accessor spot_options: Types::SpotMarketOptions
       SENSITIVE: []
     end
@@ -13203,13 +13209,13 @@ module Aws::EC2
     end
 
     class LaunchTemplateInstanceMarketOptions
-      attr_accessor market_type: ("spot" | "capacity-block" | "interruptible-capacity-reservation")
+      attr_accessor market_type: ("spot" | "capacity-block" | "interruptible-capacity-reservation" | "on-demand")
       attr_accessor spot_options: Types::LaunchTemplateSpotMarketOptions
       SENSITIVE: []
     end
 
     class LaunchTemplateInstanceMarketOptionsRequest
-      attr_accessor market_type: ("spot" | "capacity-block" | "interruptible-capacity-reservation")
+      attr_accessor market_type: ("spot" | "capacity-block" | "interruptible-capacity-reservation" | "on-demand")
       attr_accessor spot_options: Types::LaunchTemplateSpotMarketOptionsRequest
       SENSITIVE: []
     end
@@ -16661,13 +16667,28 @@ module Aws::EC2
       SENSITIVE: []
     end
 
+    class ReservedCapacityFallbackOptions
+      attr_accessor market_types: ::Array[("on-demand")]
+      SENSITIVE: []
+    end
+
+    class ReservedCapacityFallbackOptionsRequest
+      attr_accessor market_types: ::Array[("on-demand")]
+      SENSITIVE: []
+    end
+
     class ReservedCapacityOptions
-      attr_accessor reservation_types: ::Array[("interruptible-capacity-reservation")]
+      attr_accessor allocation_strategy: ("prioritized")
+      attr_accessor reservation_types: ::Array[("on-demand-capacity-reservation" | "capacity-block" | "interruptible-capacity-reservation")]
+      attr_accessor reserved_capacity_fallback_options: Types::ReservedCapacityFallbackOptions
       SENSITIVE: []
     end
 
     class ReservedCapacityOptionsRequest
-      attr_accessor reservation_types: ::Array[("interruptible-capacity-reservation")]
+      attr_accessor allocation_strategy: ("prioritized")
+      attr_accessor reservation_types: ::Array[("on-demand-capacity-reservation" | "capacity-block" | "interruptible-capacity-reservation")]
+      attr_accessor capacity_reservation_target: Types::FleetCapacityReservationTargetRequest
+      attr_accessor reserved_capacity_fallback_options: Types::ReservedCapacityFallbackOptionsRequest
       SENSITIVE: []
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-ec2
 version: !ruby/object:Gem::Version
-  version: 1.638.0
+  version: 1.639.0
 platform: ruby
 authors:
 - Amazon Web Services