aws-sdk-ec2 1.124.0 → 1.125.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc71ff23df209755f52fce9a6995c27059eb1624
-  data.tar.gz: fd76c333096e1549ff40f5d9e6648155a3b3fd4e
+  metadata.gz: 764d409f3afea114d99e249efb0041175b80a173
+  data.tar.gz: f98b0ca0f262004569a0c7db3f78b9a4aa8c851f
 SHA512:
-  metadata.gz: 88afb8a02c5bf8dd70b8f23f26a41ae4a839cbab94df9cde6fde6480681bcc31593b502be3e8fa9fd18aefd189d679f7dee4ebfb1ce8519ef3c53473bcf5e9fd
-  data.tar.gz: 12fdfcdfb74d10a0e20a63349bd1980c94d536f095d7b7dc80937a6b7abb58d8cab87ab412524147d48c55dd099ae74302a28e888cc666c801217c0f25dfe68b
+  metadata.gz: 81c92adce6a9ca375be694151c8c0d7c6b4519a1b70b48ccc5cbd3c39757144ee5f3cbbf20041f7c0fb44414e36881b754d46b45114c22bdeacc387447ebbbe2
+  data.tar.gz: a251dfccc7a708a3f5d618a39e6bd50282d27af2dcc5cd4c2ca4662e483b76a6a4c41e7fe8b8f1afa9814405199a8a4005fd27fa9c72e31a26b4df0edbfbcc4f

data/lib/aws-sdk-ec2.rb

@@ -66,6 +66,6 @@ require_relative 'aws-sdk-ec2/customizations'
 # @service
 module Aws::EC2
 
-  GEM_VERSION = '1.124.0'
+  GEM_VERSION = '1.125.0'
 
 end

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

@@ -4369,6 +4369,9 @@ module Aws::EC2
     #     },
     #     on_demand_options: {
     #       allocation_strategy: "lowest-price", # accepts lowest-price, prioritized
+    #       capacity_reservation_options: {
+    #         usage_strategy: "use-capacity-reservations-first", # accepts use-capacity-reservations-first
+    #       },
     #       single_instance_type: false,
     #       single_availability_zone: false,
     #       min_target_capacity: 1,
@@ -13667,6 +13670,7 @@ module Aws::EC2
     #   resp.fleets[0].spot_options.min_target_capacity #=> Integer
     #   resp.fleets[0].spot_options.max_total_price #=> String
     #   resp.fleets[0].on_demand_options.allocation_strategy #=> String, one of "lowest-price", "prioritized"
+    #   resp.fleets[0].on_demand_options.capacity_reservation_options.usage_strategy #=> String, one of "use-capacity-reservations-first"
     #   resp.fleets[0].on_demand_options.single_instance_type #=> Boolean
     #   resp.fleets[0].on_demand_options.single_availability_zone #=> Boolean
     #   resp.fleets[0].on_demand_options.min_target_capacity #=> Integer
@@ -15744,8 +15748,9 @@ module Aws::EC2
     #   * `hypervisor` - The hypervisor type of the instance (`ovm` \| `xen`).
     #
     #   * `iam-instance-profile.arn` - The instance profile associated with
-    #     the instance. Specified as an ARN. `image-id` - The ID of the image
-    #     used to launch the instance.
+    #     the instance. Specified as an ARN.
+    #
+    #   * `image-id` - The ID of the image used to launch the instance.
     #
     #   * `instance-id` - The ID of the instance.
     #
@@ -35426,7 +35431,7 @@ module Aws::EC2
         params: params,
         config: config)
       context[:gem_name] = 'aws-sdk-ec2'
-      context[:gem_version] = '1.124.0'
+      context[:gem_version] = '1.125.0'
       Seahorse::Client::Request.new(handlers, context)
     end
 

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

@@ -157,6 +157,8 @@ module Aws::EC2
     CapacityReservationId = Shapes::StringShape.new(name: 'CapacityReservationId')
     CapacityReservationIdSet = Shapes::ListShape.new(name: 'CapacityReservationIdSet')
     CapacityReservationInstancePlatform = Shapes::StringShape.new(name: 'CapacityReservationInstancePlatform')
+    CapacityReservationOptions = Shapes::StructureShape.new(name: 'CapacityReservationOptions')
+    CapacityReservationOptionsRequest = Shapes::StructureShape.new(name: 'CapacityReservationOptionsRequest')
     CapacityReservationPreference = Shapes::StringShape.new(name: 'CapacityReservationPreference')
     CapacityReservationSet = Shapes::ListShape.new(name: 'CapacityReservationSet')
     CapacityReservationSpecification = Shapes::StructureShape.new(name: 'CapacityReservationSpecification')
@@ -859,6 +861,7 @@ module Aws::EC2
     Filter = Shapes::StructureShape.new(name: 'Filter')
     FilterList = Shapes::ListShape.new(name: 'FilterList')
     FleetActivityStatus = Shapes::StringShape.new(name: 'FleetActivityStatus')
+    FleetCapacityReservationUsageStrategy = Shapes::StringShape.new(name: 'FleetCapacityReservationUsageStrategy')
     FleetData = Shapes::StructureShape.new(name: 'FleetData')
     FleetEventType = Shapes::StringShape.new(name: 'FleetEventType')
     FleetExcessCapacityTerminationPolicy = Shapes::StringShape.new(name: 'FleetExcessCapacityTerminationPolicy')
@@ -2414,6 +2417,12 @@ module Aws::EC2
 
     CapacityReservationIdSet.member = Shapes::ShapeRef.new(shape: String, location_name: "item")
 
+    CapacityReservationOptions.add_member(:usage_strategy, Shapes::ShapeRef.new(shape: FleetCapacityReservationUsageStrategy, location_name: "usageStrategy"))
+    CapacityReservationOptions.struct_class = Types::CapacityReservationOptions
+
+    CapacityReservationOptionsRequest.add_member(:usage_strategy, Shapes::ShapeRef.new(shape: FleetCapacityReservationUsageStrategy, location_name: "UsageStrategy"))
+    CapacityReservationOptionsRequest.struct_class = Types::CapacityReservationOptionsRequest
+
     CapacityReservationSet.member = Shapes::ShapeRef.new(shape: CapacityReservation, location_name: "item")
 
     CapacityReservationSpecification.add_member(:capacity_reservation_preference, Shapes::ShapeRef.new(shape: CapacityReservationPreference, location_name: "CapacityReservationPreference"))
@@ -7237,6 +7246,7 @@ module Aws::EC2
     OccurrenceDaySet.member = Shapes::ShapeRef.new(shape: Integer, location_name: "item")
 
     OnDemandOptions.add_member(:allocation_strategy, Shapes::ShapeRef.new(shape: FleetOnDemandAllocationStrategy, location_name: "allocationStrategy"))
+    OnDemandOptions.add_member(:capacity_reservation_options, Shapes::ShapeRef.new(shape: CapacityReservationOptions, location_name: "capacityReservationOptions"))
     OnDemandOptions.add_member(:single_instance_type, Shapes::ShapeRef.new(shape: Boolean, location_name: "singleInstanceType"))
     OnDemandOptions.add_member(:single_availability_zone, Shapes::ShapeRef.new(shape: Boolean, location_name: "singleAvailabilityZone"))
     OnDemandOptions.add_member(:min_target_capacity, Shapes::ShapeRef.new(shape: Integer, location_name: "minTargetCapacity"))
@@ -7244,6 +7254,7 @@ module Aws::EC2
     OnDemandOptions.struct_class = Types::OnDemandOptions
 
     OnDemandOptionsRequest.add_member(:allocation_strategy, Shapes::ShapeRef.new(shape: FleetOnDemandAllocationStrategy, location_name: "AllocationStrategy"))
+    OnDemandOptionsRequest.add_member(:capacity_reservation_options, Shapes::ShapeRef.new(shape: CapacityReservationOptionsRequest, location_name: "CapacityReservationOptions"))
     OnDemandOptionsRequest.add_member(:single_instance_type, Shapes::ShapeRef.new(shape: Boolean, location_name: "SingleInstanceType"))
     OnDemandOptionsRequest.add_member(:single_availability_zone, Shapes::ShapeRef.new(shape: Boolean, location_name: "SingleAvailabilityZone"))
     OnDemandOptionsRequest.add_member(:min_target_capacity, Shapes::ShapeRef.new(shape: Integer, location_name: "MinTargetCapacity"))

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

@@ -263,8 +263,9 @@ module Aws::EC2
     #   * `hypervisor` - The hypervisor type of the instance (`ovm` \| `xen`).
     #
     #   * `iam-instance-profile.arn` - The instance profile associated with
-    #     the instance. Specified as an ARN. `image-id` - The ID of the image
-    #     used to launch the instance.
+    #     the instance. Specified as an ARN.
+    #
+    #   * `image-id` - The ID of the image used to launch the instance.
     #
     #   * `instance-id` - The ID of the instance.
     #

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

@@ -1640,8 +1640,9 @@ module Aws::EC2
     #   * `hypervisor` - The hypervisor type of the instance (`ovm` \| `xen`).
     #
     #   * `iam-instance-profile.arn` - The instance profile associated with
-    #     the instance. Specified as an ARN. `image-id` - The ID of the image
-    #     used to launch the instance.
+    #     the instance. Specified as an ARN.
+    #
+    #   * `image-id` - The ID of the image used to launch the instance.
     #
     #   * `instance-id` - The ID of the instance.
     #

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

@@ -890,8 +890,9 @@ module Aws::EC2
     #   * `hypervisor` - The hypervisor type of the instance (`ovm` \| `xen`).
     #
     #   * `iam-instance-profile.arn` - The instance profile associated with
-    #     the instance. Specified as an ARN. `image-id` - The ID of the image
-    #     used to launch the instance.
+    #     the instance. Specified as an ARN.
+    #
+    #   * `image-id` - The ID of the image used to launch the instance.
     #
     #   * `instance-id` - The ID of the instance.
     #

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

@@ -2899,6 +2899,91 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # Describes the strategy for using unused Capacity Reservations for
+    # fulfilling On-Demand capacity.
+    #
+    # <note markdown="1"> This strategy can only be used if the EC2 Fleet is of type `instant`.
+    #
+    #  </note>
+    #
+    # For more information about Capacity Reservations, see [On-Demand
+    # Capacity Reservations][1] in the *Amazon Elastic Compute Cloud User
+    # Guide*.
+    #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-capacity-reservations.html
+    #
+    # @!attribute [rw] usage_strategy
+    #   Indicates whether to use unused Capacity Reservations for fulfilling
+    #   On-Demand capacity.
+    #
+    #   If you specify `use-capacity-reservations-first`, the fleet uses
+    #   unused Capacity Reservations to fulfill On-Demand capacity up to the
+    #   target On-Demand capacity. If the number of unused Capacity
+    #   Reservations is less than the On-Demand target capacity, the
+    #   remaining On-Demand target capacity is launched as usual. When
+    #   unused Capacity Reservations are used to fulfil On-Demand capacity,
+    #   the On-Demand allocation strategy (`lowest-price` or `prioritized`)
+    #   is applied to them.
+    #
+    #   If you do not specify a value, the fleet fulfils the On-Demand
+    #   capacity as usual.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CapacityReservationOptions AWS API Documentation
+    #
+    class CapacityReservationOptions < Struct.new(
+      :usage_strategy)
+      include Aws::Structure
+    end
+
+    # Describes the strategy for using unused Capacity Reservations for
+    # fulfilling On-Demand capacity.
+    #
+    # <note markdown="1"> This strategy can only be used if the EC2 Fleet is of type `instant`.
+    #
+    #  </note>
+    #
+    # For more information about Capacity Reservations, see [On-Demand
+    # Capacity Reservations][1] in the *Amazon Elastic Compute Cloud User
+    # Guide*.
+    #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-capacity-reservations.html
+    #
+    # @note When making an API call, you may pass CapacityReservationOptionsRequest
+    #   data as a hash:
+    #
+    #       {
+    #         usage_strategy: "use-capacity-reservations-first", # accepts use-capacity-reservations-first
+    #       }
+    #
+    # @!attribute [rw] usage_strategy
+    #   Indicates whether to use unused Capacity Reservations for fulfilling
+    #   On-Demand capacity.
+    #
+    #   If you specify `use-capacity-reservations-first`, the fleet uses
+    #   unused Capacity Reservations to fulfill On-Demand capacity up to the
+    #   target On-Demand capacity. If the number of unused Capacity
+    #   Reservations is less than the On-Demand target capacity, the
+    #   remaining On-Demand target capacity is launched as usual. When
+    #   unused Capacity Reservations are used to fulfil On-Demand capacity,
+    #   the On-Demand allocation strategy (`lowest-price` or `prioritized`)
+    #   is applied to them.
+    #
+    #   If you do not specify a value, the fleet fulfils the On-Demand
+    #   capacity as usual.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CapacityReservationOptionsRequest AWS API Documentation
+    #
+    class CapacityReservationOptionsRequest < Struct.new(
+      :usage_strategy)
+      include Aws::Structure
+    end
+
     # Describes an instance's Capacity Reservation targeting option. You
     # can specify only one parameter at a time. If you specify
     # `CapacityReservationPreference` and `CapacityReservationTarget`, the
@@ -5062,6 +5147,9 @@ module Aws::EC2
     #         },
     #         on_demand_options: {
     #           allocation_strategy: "lowest-price", # accepts lowest-price, prioritized
+    #           capacity_reservation_options: {
+    #             usage_strategy: "use-capacity-reservations-first", # accepts use-capacity-reservations-first
+    #           },
     #           single_instance_type: false,
     #           single_availability_zone: false,
     #           min_target_capacity: 1,
@@ -14406,8 +14494,9 @@ module Aws::EC2
     #     `xen`).
     #
     #   * `iam-instance-profile.arn` - The instance profile associated with
-    #     the instance. Specified as an ARN. `image-id` - The ID of the
-    #     image used to launch the instance.
+    #     the instance. Specified as an ARN.
+    #
+    #   * `image-id` - The ID of the image used to launch the instance.
     #
     #   * `instance-id` - The ID of the instance.
     #
@@ -21763,7 +21852,7 @@ module Aws::EC2
     # Describes the disk.
     #
     # @!attribute [rw] size_in_gb
-    #   The size of the disk in GiB.
+    #   The size of the disk in GB.
     #   @return [Integer]
     #
     # @!attribute [rw] count
@@ -21901,7 +21990,8 @@ module Aws::EC2
     #
     # @!attribute [rw] volume_type
     #   The volume type. If you set the type to `io1`, you must also specify
-    #   the IOPS that the volume supports.
+    #   the **Iops** parameter. If you set the type to `gp2`, `st1`, `sc1`,
+    #   or `standard`, you must omit the **Iops** parameter.
     #
     #   Default: `gp2`
     #   @return [String]
@@ -28165,7 +28255,7 @@ module Aws::EC2
     # Describes the disks that are available for the instance type.
     #
     # @!attribute [rw] total_size_in_gb
-    #   The total size of the disks, in GiB.
+    #   The total size of the disks, in GB.
     #   @return [Integer]
     #
     # @!attribute [rw] disks
@@ -34066,6 +34156,11 @@ module Aws::EC2
     #   `lowest-price`.
     #   @return [String]
     #
+    # @!attribute [rw] capacity_reservation_options
+    #   The strategy for using unused Capacity Reservations for fulfilling
+    #   On-Demand capacity. Only available for fleets of type `instant`.
+    #   @return [Types::CapacityReservationOptions]
+    #
     # @!attribute [rw] single_instance_type
     #   Indicates that the fleet uses a single instance type to launch all
     #   On-Demand Instances in the fleet.
@@ -34091,6 +34186,7 @@ module Aws::EC2
     #
     class OnDemandOptions < Struct.new(
       :allocation_strategy,
+      :capacity_reservation_options,
       :single_instance_type,
       :single_availability_zone,
       :min_target_capacity,
@@ -34105,6 +34201,9 @@ module Aws::EC2
     #
     #       {
     #         allocation_strategy: "lowest-price", # accepts lowest-price, prioritized
+    #         capacity_reservation_options: {
+    #           usage_strategy: "use-capacity-reservations-first", # accepts use-capacity-reservations-first
+    #         },
     #         single_instance_type: false,
     #         single_availability_zone: false,
     #         min_target_capacity: 1,
@@ -34121,6 +34220,11 @@ module Aws::EC2
     #   `lowest-price`.
     #   @return [String]
     #
+    # @!attribute [rw] capacity_reservation_options
+    #   The strategy for using unused Capacity Reservations for fulfilling
+    #   On-Demand capacity. Only available for fleets of type `instant`.
+    #   @return [Types::CapacityReservationOptionsRequest]
+    #
     # @!attribute [rw] single_instance_type
     #   Indicates that the fleet uses a single instance type to launch all
     #   On-Demand Instances in the fleet.
@@ -34146,6 +34250,7 @@ module Aws::EC2
     #
     class OnDemandOptionsRequest < Struct.new(
       :allocation_strategy,
+      :capacity_reservation_options,
       :single_instance_type,
       :single_availability_zone,
       :min_target_capacity,

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

@@ -859,8 +859,9 @@ module Aws::EC2
     #   * `hypervisor` - The hypervisor type of the instance (`ovm` \| `xen`).
     #
     #   * `iam-instance-profile.arn` - The instance profile associated with
-    #     the instance. Specified as an ARN. `image-id` - The ID of the image
-    #     used to launch the instance.
+    #     the instance. Specified as an ARN.
+    #
+    #   * `image-id` - The ID of the image used to launch the instance.
     #
     #   * `instance-id` - The ID of the instance.
     #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-ec2
 version: !ruby/object:Gem::Version
-  version: 1.124.0
+  version: 1.125.0
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-11 00:00:00.000000000 Z
+date: 2019-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sigv4