aws-sdk-ec2 1.123.0 → 1.128.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 371c26746dfbaa934fd7f46a920a5ae5fe21abe6
-  data.tar.gz: 35c4afde5911d9334260a37e33cc475dec89cbb8
+  metadata.gz: da9319d62639c6532b654cbae5c5e7d3093eb98f
+  data.tar.gz: 4adaabd2af56f38fd713e664d650317e5ce3fd5e
 SHA512:
-  metadata.gz: 323e43ffd6848582d2f0340d07fd542e20ae3ca99d3659af97239555fa5c4ba81b6e5bffbd45d045e42166a667399aa7a1da5d7ed03e5a4bcb98a8bd05820d57
-  data.tar.gz: c46ff76d3adcad7daa868e2ff923025e82287435f08afddf48bd06af9fe1ce84777870a1722ba8e058d99b8bd376614f575034003df584a40550199078265e0b
+  metadata.gz: 30e7cea1784f674e5c135bd49edc81c603a64f621bd09d34fa56ef13f0cd80f10aec87e8487c19ddc4f6cf83643a4bd45953ffa6ab4db99328a124108ffc1dd1
+  data.tar.gz: e6cde7965c29d2a8efe810feae942d667ad4e5616c61147ad42ba83aacf92e1062f18fb3dc8dce1215d842bf76988f94286d023a3a496f583f6fd6aeaf1f203c

data/lib/aws-sdk-ec2.rb

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

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

@@ -4277,7 +4277,7 @@ module Aws::EC2
     #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
     #
     # @option params [String] :client_token
-    #   Unique, case-sensitive identifier you provide to ensure the
+    #   Unique, case-sensitive identifier that you provide to ensure the
     #   idempotency of the request. For more information, see [Ensuring
     #   Idempotency][1].
     #
@@ -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,
@@ -5214,6 +5217,7 @@ module Aws::EC2
     #       elastic_inference_accelerators: [
     #         {
     #           type: "String", # required
+    #           count: 1,
     #         },
     #       ],
     #       security_group_ids: ["String"],
@@ -5475,6 +5479,7 @@ module Aws::EC2
     #       elastic_inference_accelerators: [
     #         {
     #           type: "String", # required
+    #           count: 1,
     #         },
     #       ],
     #       security_group_ids: ["String"],
@@ -5579,6 +5584,7 @@ module Aws::EC2
     #   resp.launch_template_version.launch_template_data.elastic_gpu_specifications[0].type #=> String
     #   resp.launch_template_version.launch_template_data.elastic_inference_accelerators #=> Array
     #   resp.launch_template_version.launch_template_data.elastic_inference_accelerators[0].type #=> String
+    #   resp.launch_template_version.launch_template_data.elastic_inference_accelerators[0].count #=> Integer
     #   resp.launch_template_version.launch_template_data.security_group_ids #=> Array
     #   resp.launch_template_version.launch_template_data.security_group_ids[0] #=> String
     #   resp.launch_template_version.launch_template_data.security_groups #=> Array
@@ -11541,8 +11547,10 @@ module Aws::EC2
     # * `default-vpc`\: The ID of the default VPC for your account, or
     #   `none`.
     #
-    # * `max-instances`\: The maximum number of On-Demand Instances that you
-    #   can run.
+    # * `max-instances`\: This attribute is no longer supported. The
+    #   returned value does not reflect your actual vCPU limit for running
+    #   On-Demand Instances. For more information, see [On-Demand Instance
+    #   Limits][1] in the *Amazon Elastic Compute Cloud User Guide*.
     #
     # * `vpc-max-security-groups-per-interface`\: The maximum number of
     #   security groups that you can assign to a network interface.
@@ -11553,6 +11561,10 @@ module Aws::EC2
     # * `vpc-max-elastic-ips`\: The maximum number of Elastic IP addresses
     #   that you can allocate for use with EC2-VPC.
     #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-on-demand-instances.html#ec2-on-demand-instances-limits
+    #
     # @option params [Array<String>] :attribute_names
     #   The account attribute names.
     #
@@ -13235,6 +13247,9 @@ module Aws::EC2
     #   resp.elastic_gpu_set[0].elastic_gpu_health.status #=> String, one of "OK", "IMPAIRED"
     #   resp.elastic_gpu_set[0].elastic_gpu_state #=> String, one of "ATTACHED"
     #   resp.elastic_gpu_set[0].instance_id #=> String
+    #   resp.elastic_gpu_set[0].tags #=> Array
+    #   resp.elastic_gpu_set[0].tags[0].key #=> String
+    #   resp.elastic_gpu_set[0].tags[0].value #=> String
     #   resp.max_results #=> Integer
     #   resp.next_token #=> String
     #
@@ -13564,7 +13579,7 @@ module Aws::EC2
       req.send_request(options)
     end
 
-    # Describes the specified EC2 Fleets or all your EC2 Fleets.
+    # Describes the specified EC2 Fleets or all of your EC2 Fleets.
     #
     # @option params [Boolean] :dry_run
     #   Checks whether you have the required permissions for the action,
@@ -13664,6 +13679,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
@@ -15614,8 +15630,8 @@ module Aws::EC2
     #   resp.instance_types[0].free_tier_eligible #=> Boolean
     #   resp.instance_types[0].supported_usage_classes #=> Array
     #   resp.instance_types[0].supported_usage_classes[0] #=> String, one of "spot", "on-demand"
-    #   resp.instance_types[0].supported_root_devices #=> Array
-    #   resp.instance_types[0].supported_root_devices[0] #=> String, one of "ebs", "instance-store"
+    #   resp.instance_types[0].supported_root_device_types #=> Array
+    #   resp.instance_types[0].supported_root_device_types[0] #=> String, one of "ebs", "instance-store"
     #   resp.instance_types[0].bare_metal #=> Boolean
     #   resp.instance_types[0].hypervisor #=> String, one of "nitro", "xen"
     #   resp.instance_types[0].processor_info.supported_architectures #=> Array
@@ -15741,8 +15757,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.
     #
@@ -16612,6 +16629,7 @@ module Aws::EC2
     #   resp.launch_template_versions[0].launch_template_data.elastic_gpu_specifications[0].type #=> String
     #   resp.launch_template_versions[0].launch_template_data.elastic_inference_accelerators #=> Array
     #   resp.launch_template_versions[0].launch_template_data.elastic_inference_accelerators[0].type #=> String
+    #   resp.launch_template_versions[0].launch_template_data.elastic_inference_accelerators[0].count #=> Integer
     #   resp.launch_template_versions[0].launch_template_data.security_group_ids #=> Array
     #   resp.launch_template_versions[0].launch_template_data.security_group_ids[0] #=> String
     #   resp.launch_template_versions[0].launch_template_data.security_groups #=> Array
@@ -26075,6 +26093,7 @@ module Aws::EC2
     #   resp.launch_template_data.elastic_gpu_specifications[0].type #=> String
     #   resp.launch_template_data.elastic_inference_accelerators #=> Array
     #   resp.launch_template_data.elastic_inference_accelerators[0].type #=> String
+    #   resp.launch_template_data.elastic_inference_accelerators[0].count #=> Integer
     #   resp.launch_template_data.security_group_ids #=> Array
     #   resp.launch_template_data.security_group_ids[0] #=> String
     #   resp.launch_template_data.security_groups #=> Array
@@ -33932,6 +33951,7 @@ module Aws::EC2
     #     elastic_inference_accelerators: [
     #       {
     #         type: "String", # required
+    #         count: 1,
     #       },
     #     ],
     #     tag_specifications: [
@@ -35420,7 +35440,7 @@ module Aws::EC2
         params: params,
         config: config)
       context[:gem_name] = 'aws-sdk-ec2'
-      context[:gem_version] = '1.123.0'
+      context[:gem_version] = '1.128.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')
@@ -803,6 +805,7 @@ module Aws::EC2
     ElasticInferenceAccelerator = Shapes::StructureShape.new(name: 'ElasticInferenceAccelerator')
     ElasticInferenceAcceleratorAssociation = Shapes::StructureShape.new(name: 'ElasticInferenceAcceleratorAssociation')
     ElasticInferenceAcceleratorAssociationList = Shapes::ListShape.new(name: 'ElasticInferenceAcceleratorAssociationList')
+    ElasticInferenceAcceleratorCount = Shapes::IntegerShape.new(name: 'ElasticInferenceAcceleratorCount')
     ElasticInferenceAccelerators = Shapes::ListShape.new(name: 'ElasticInferenceAccelerators')
     EnaSupport = Shapes::StringShape.new(name: 'EnaSupport')
     EnableEbsEncryptionByDefaultRequest = Shapes::StructureShape.new(name: 'EnableEbsEncryptionByDefaultRequest')
@@ -858,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')
@@ -1136,6 +1140,7 @@ module Aws::EC2
     LaunchTemplateEbsBlockDevice = Shapes::StructureShape.new(name: 'LaunchTemplateEbsBlockDevice')
     LaunchTemplateEbsBlockDeviceRequest = Shapes::StructureShape.new(name: 'LaunchTemplateEbsBlockDeviceRequest')
     LaunchTemplateElasticInferenceAccelerator = Shapes::StructureShape.new(name: 'LaunchTemplateElasticInferenceAccelerator')
+    LaunchTemplateElasticInferenceAcceleratorCount = Shapes::IntegerShape.new(name: 'LaunchTemplateElasticInferenceAcceleratorCount')
     LaunchTemplateElasticInferenceAcceleratorList = Shapes::ListShape.new(name: 'LaunchTemplateElasticInferenceAcceleratorList')
     LaunchTemplateElasticInferenceAcceleratorResponse = Shapes::StructureShape.new(name: 'LaunchTemplateElasticInferenceAcceleratorResponse')
     LaunchTemplateElasticInferenceAcceleratorResponseList = Shapes::ListShape.new(name: 'LaunchTemplateElasticInferenceAcceleratorResponseList')
@@ -2412,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"))
@@ -5098,9 +5109,11 @@ module Aws::EC2
     ElasticGpus.add_member(:elastic_gpu_health, Shapes::ShapeRef.new(shape: ElasticGpuHealth, location_name: "elasticGpuHealth"))
     ElasticGpus.add_member(:elastic_gpu_state, Shapes::ShapeRef.new(shape: ElasticGpuState, location_name: "elasticGpuState"))
     ElasticGpus.add_member(:instance_id, Shapes::ShapeRef.new(shape: String, location_name: "instanceId"))
+    ElasticGpus.add_member(:tags, Shapes::ShapeRef.new(shape: TagList, location_name: "tagSet"))
     ElasticGpus.struct_class = Types::ElasticGpus
 
     ElasticInferenceAccelerator.add_member(:type, Shapes::ShapeRef.new(shape: String, required: true, location_name: "Type"))
+    ElasticInferenceAccelerator.add_member(:count, Shapes::ShapeRef.new(shape: ElasticInferenceAcceleratorCount, location_name: "Count"))
     ElasticInferenceAccelerator.struct_class = Types::ElasticInferenceAccelerator
 
     ElasticInferenceAcceleratorAssociation.add_member(:elastic_inference_accelerator_arn, Shapes::ShapeRef.new(shape: String, location_name: "elasticInferenceAcceleratorArn"))
@@ -6214,7 +6227,7 @@ module Aws::EC2
     InstanceTypeInfo.add_member(:current_generation, Shapes::ShapeRef.new(shape: CurrentGenerationFlag, location_name: "currentGeneration"))
     InstanceTypeInfo.add_member(:free_tier_eligible, Shapes::ShapeRef.new(shape: FreeTierEligibleFlag, location_name: "freeTierEligible"))
     InstanceTypeInfo.add_member(:supported_usage_classes, Shapes::ShapeRef.new(shape: UsageClassTypeList, location_name: "supportedUsageClasses"))
-    InstanceTypeInfo.add_member(:supported_root_devices, Shapes::ShapeRef.new(shape: RootDeviceTypeList, location_name: "supportedRootDevices"))
+    InstanceTypeInfo.add_member(:supported_root_device_types, Shapes::ShapeRef.new(shape: RootDeviceTypeList, location_name: "supportedRootDeviceTypes"))
     InstanceTypeInfo.add_member(:bare_metal, Shapes::ShapeRef.new(shape: BareMetalFlag, location_name: "bareMetal"))
     InstanceTypeInfo.add_member(:hypervisor, Shapes::ShapeRef.new(shape: InstanceTypeHypervisor, location_name: "hypervisor"))
     InstanceTypeInfo.add_member(:processor_info, Shapes::ShapeRef.new(shape: ProcessorInfo, location_name: "processorInfo"))
@@ -6409,11 +6422,13 @@ module Aws::EC2
     LaunchTemplateEbsBlockDeviceRequest.struct_class = Types::LaunchTemplateEbsBlockDeviceRequest
 
     LaunchTemplateElasticInferenceAccelerator.add_member(:type, Shapes::ShapeRef.new(shape: String, required: true, location_name: "Type"))
+    LaunchTemplateElasticInferenceAccelerator.add_member(:count, Shapes::ShapeRef.new(shape: LaunchTemplateElasticInferenceAcceleratorCount, location_name: "Count"))
     LaunchTemplateElasticInferenceAccelerator.struct_class = Types::LaunchTemplateElasticInferenceAccelerator
 
     LaunchTemplateElasticInferenceAcceleratorList.member = Shapes::ShapeRef.new(shape: LaunchTemplateElasticInferenceAccelerator, location_name: "item")
 
     LaunchTemplateElasticInferenceAcceleratorResponse.add_member(:type, Shapes::ShapeRef.new(shape: String, location_name: "type"))
+    LaunchTemplateElasticInferenceAcceleratorResponse.add_member(:count, Shapes::ShapeRef.new(shape: Integer, location_name: "count"))
     LaunchTemplateElasticInferenceAcceleratorResponse.struct_class = Types::LaunchTemplateElasticInferenceAcceleratorResponse
 
     LaunchTemplateElasticInferenceAcceleratorResponseList.member = Shapes::ShapeRef.new(shape: LaunchTemplateElasticInferenceAcceleratorResponse, location_name: "item")
@@ -7232,6 +7247,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"))
@@ -7239,6 +7255,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

@@ -144,6 +144,7 @@ module Aws::EC2
     #     elastic_inference_accelerators: [
     #       {
     #         type: "String", # required
+    #         count: 1,
     #       },
     #     ],
     #     tag_specifications: [
@@ -1639,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

@@ -346,6 +346,7 @@ module Aws::EC2
     #     elastic_inference_accelerators: [
     #       {
     #         type: "String", # required
+    #         count: 1,
     #       },
     #     ],
     #     tag_specifications: [
@@ -889,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,99 @@ 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*. For examples of using Capacity Reservations in an EC2 Fleet,
+    # see [EC2 Fleet Example Configurations][2] in the *Amazon Elastic
+    # Compute Cloud User Guide*.
+    #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-capacity-reservations.html
+    # [2]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-fleet-examples.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 multiple instance pools have unused
+    #   Capacity Reservations, the On-Demand allocation strategy
+    #   (`lowest-price` or `prioritized`) is applied. If the number of
+    #   unused Capacity Reservations is less than the On-Demand target
+    #   capacity, the remaining On-Demand target capacity is launched
+    #   according to the On-Demand allocation strategy (`lowest-price` or
+    #   `prioritized`).
+    #
+    #   If you do not specify a value, the fleet fulfils the On-Demand
+    #   capacity according to the chosen On-Demand allocation strategy.
+    #   @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*. For examples of using Capacity Reservations in an EC2 Fleet,
+    # see [EC2 Fleet Example Configurations][2] in the *Amazon Elastic
+    # Compute Cloud User Guide*.
+    #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-capacity-reservations.html
+    # [2]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-fleet-examples.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 multiple instance pools have unused
+    #   Capacity Reservations, the On-Demand allocation strategy
+    #   (`lowest-price` or `prioritized`) is applied. If the number of
+    #   unused Capacity Reservations is less than the On-Demand target
+    #   capacity, the remaining On-Demand target capacity is launched
+    #   according to the On-Demand allocation strategy (`lowest-price` or
+    #   `prioritized`).
+    #
+    #   If you do not specify a value, the fleet fulfils the On-Demand
+    #   capacity according to the chosen On-Demand allocation strategy.
+    #   @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
@@ -4970,8 +5063,8 @@ module Aws::EC2
     #
     # @!attribute [rw] launch_template_and_overrides
     #   The launch templates and overrides that were used for launching the
-    #   instances. Any parameters that you specify in the Overrides override
-    #   the same parameters in the launch template.
+    #   instances. The values that you specify in the Overrides replace the
+    #   values in the launch template.
     #   @return [Types::LaunchTemplateAndOverridesResponse]
     #
     # @!attribute [rw] lifecycle
@@ -4991,7 +5084,7 @@ module Aws::EC2
     #
     # @!attribute [rw] error_message
     #   The error message that describes why the instance could not be
-    #   launched. For more information about error messages, see ee [Error
+    #   launched. For more information about error messages, see [Error
     #   Codes][1].
     #
     #
@@ -5013,8 +5106,8 @@ module Aws::EC2
     #
     # @!attribute [rw] launch_template_and_overrides
     #   The launch templates and overrides that were used for launching the
-    #   instances. Any parameters that you specify in the Overrides override
-    #   the same parameters in the launch template.
+    #   instances. The values that you specify in the Overrides replace the
+    #   values in the launch template.
     #   @return [Types::LaunchTemplateAndOverridesResponse]
     #
     # @!attribute [rw] lifecycle
@@ -5031,7 +5124,8 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] platform
-    #   The value is `Windows` for Windows instances; otherwise blank.
+    #   The value is `Windows` for Windows instances. Otherwise, the value
+    #   is blank.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CreateFleetInstance AWS API Documentation
@@ -5062,6 +5156,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,
@@ -5129,7 +5226,7 @@ module Aws::EC2
     #   @return [Boolean]
     #
     # @!attribute [rw] client_token
-    #   Unique, case-sensitive identifier you provide to ensure the
+    #   Unique, case-sensitive identifier that you provide to ensure the
     #   idempotency of the request. For more information, see [Ensuring
     #   Idempotency][1].
     #
@@ -5804,6 +5901,7 @@ module Aws::EC2
     #           elastic_inference_accelerators: [
     #             {
     #               type: "String", # required
+    #               count: 1,
     #             },
     #           ],
     #           security_group_ids: ["String"],
@@ -6008,6 +6106,7 @@ module Aws::EC2
     #           elastic_inference_accelerators: [
     #             {
     #               type: "String", # required
+    #               count: 1,
     #             },
     #           ],
     #           security_group_ids: ["String"],
@@ -12552,8 +12651,8 @@ module Aws::EC2
     #
     # @!attribute [rw] launch_template_and_overrides
     #   The launch templates and overrides that were used for launching the
-    #   instances. Any parameters that you specify in the Overrides override
-    #   the same parameters in the launch template.
+    #   instances. The values that you specify in the Overrides replace the
+    #   values in the launch template.
     #   @return [Types::LaunchTemplateAndOverridesResponse]
     #
     # @!attribute [rw] lifecycle
@@ -12573,7 +12672,7 @@ module Aws::EC2
     #
     # @!attribute [rw] error_message
     #   The error message that describes why the instance could not be
-    #   launched. For more information about error messages, see ee [Error
+    #   launched. For more information about error messages, see [Error
     #   Codes][1].
     #
     #
@@ -12767,8 +12866,8 @@ module Aws::EC2
     #
     # @!attribute [rw] launch_template_and_overrides
     #   The launch templates and overrides that were used for launching the
-    #   instances. Any parameters that you specify in the Overrides override
-    #   the same parameters in the launch template.
+    #   instances. The values that you specify in the Overrides replace the
+    #   values in the launch template.
     #   @return [Types::LaunchTemplateAndOverridesResponse]
     #
     # @!attribute [rw] lifecycle
@@ -12785,7 +12884,8 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] platform
-    #   The value is `Windows` for Windows instances; otherwise blank.
+    #   The value is `Windows` for Windows instances. Otherwise, the value
+    #   is blank.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribeFleetsInstances AWS API Documentation
@@ -14404,8 +14504,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.
     #
@@ -21761,7 +21862,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
@@ -21899,7 +22000,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]
@@ -22156,6 +22258,10 @@ module Aws::EC2
     #   attached.
     #   @return [String]
     #
+    # @!attribute [rw] tags
+    #   The tags assigned to the Elastic Graphics accelerator.
+    #   @return [Array<Types::Tag>]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ElasticGpus AWS API Documentation
     #
     class ElasticGpus < Struct.new(
@@ -22164,7 +22270,8 @@ module Aws::EC2
       :elastic_gpu_type,
       :elastic_gpu_health,
       :elastic_gpu_state,
-      :instance_id)
+      :instance_id,
+      :tags)
       include Aws::Structure
     end
 
@@ -22175,17 +22282,25 @@ module Aws::EC2
     #
     #       {
     #         type: "String", # required
+    #         count: 1,
     #       }
     #
     # @!attribute [rw] type
     #   The type of elastic inference accelerator. The possible values are
-    #   `eia1.small`, `eia1.medium`, and `eia1.large`.
+    #   `eia1.medium`, `eia1.large`, and `eia1.xlarge`.
     #   @return [String]
     #
+    # @!attribute [rw] count
+    #   The number of elastic inference accelerators of given type to be
+    #   attached to the instance. Only positive values allowed. If not
+    #   specified defaults to 1.
+    #   @return [Integer]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ElasticInferenceAccelerator AWS API Documentation
     #
     class ElasticInferenceAccelerator < Struct.new(
-      :type)
+      :type,
+      :count)
       include Aws::Structure
     end
 
@@ -23276,7 +23391,7 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] client_token
-    #   Unique, case-sensitive identifier you provide to ensure the
+    #   Unique, case-sensitive identifier that you provide to ensure the
     #   idempotency of the request. For more information, see [Ensuring
     #   Idempotency][1].
     #
@@ -23325,11 +23440,11 @@ module Aws::EC2
     #   the target capacity, or also attempts to `maintain` it. If you
     #   request a certain target capacity, EC2 Fleet only places the
     #   required requests; it does not attempt to replenish instances if
-    #   capacity is diminished, and does not submit requests in alternative
-    #   capacity pools if capacity is unavailable. To maintain a certain
-    #   target capacity, EC2 Fleet places the required requests to meet this
-    #   target capacity. It also automatically replenishes any interrupted
-    #   Spot Instances. Default: `maintain`.
+    #   capacity is diminished, and it does not submit requests in
+    #   alternative capacity pools if capacity is unavailable. To maintain a
+    #   certain target capacity, EC2 Fleet places the required requests to
+    #   meet this target capacity. It also automatically replenishes any
+    #   interrupted Spot Instances. Default: `maintain`.
     #   @return [String]
     #
     # @!attribute [rw] valid_from
@@ -28155,7 +28270,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
@@ -28194,8 +28309,8 @@ module Aws::EC2
     #   On-Demand.
     #   @return [Array<String>]
     #
-    # @!attribute [rw] supported_root_devices
-    #   Indicates the supported root devices.
+    # @!attribute [rw] supported_root_device_types
+    #   Indicates the supported root device types.
     #   @return [Array<String>]
     #
     # @!attribute [rw] bare_metal
@@ -28275,7 +28390,7 @@ module Aws::EC2
       :current_generation,
       :free_tier_eligible,
       :supported_usage_classes,
-      :supported_root_devices,
+      :supported_root_device_types,
       :bare_metal,
       :hypervisor,
       :processor_info,
@@ -29205,6 +29320,7 @@ module Aws::EC2
     #
     #       {
     #         type: "String", # required
+    #         count: 1,
     #       }
     #
     # @!attribute [rw] type
@@ -29212,10 +29328,17 @@ module Aws::EC2
     #   eia1.medium, eia1.large, and eia1.xlarge.
     #   @return [String]
     #
+    # @!attribute [rw] count
+    #   The number of elastic inference accelerators of given type to be
+    #   attached to the instance. Only positive values allowed. If not
+    #   specified defaults to 1.
+    #   @return [Integer]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/LaunchTemplateElasticInferenceAccelerator AWS API Documentation
     #
     class LaunchTemplateElasticInferenceAccelerator < Struct.new(
-      :type)
+      :type,
+      :count)
       include Aws::Structure
     end
 
@@ -29226,10 +29349,17 @@ module Aws::EC2
     #   eia1.medium, eia1.large, and eia1.xlarge.
     #   @return [String]
     #
+    # @!attribute [rw] count
+    #   The number of elastic inference accelerators of given type to be
+    #   attached to the instance. Only positive values allowed. If not
+    #   specified defaults to 1.
+    #   @return [Integer]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/LaunchTemplateElasticInferenceAcceleratorResponse AWS API Documentation
     #
     class LaunchTemplateElasticInferenceAcceleratorResponse < Struct.new(
-      :type)
+      :type,
+      :count)
       include Aws::Structure
     end
 
@@ -34041,6 +34171,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.
@@ -34066,6 +34201,7 @@ module Aws::EC2
     #
     class OnDemandOptions < Struct.new(
       :allocation_strategy,
+      :capacity_reservation_options,
       :single_instance_type,
       :single_availability_zone,
       :min_target_capacity,
@@ -34080,6 +34216,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,
@@ -34096,6 +34235,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.
@@ -34121,6 +34265,7 @@ module Aws::EC2
     #
     class OnDemandOptionsRequest < Struct.new(
       :allocation_strategy,
+      :capacity_reservation_options,
       :single_instance_type,
       :single_availability_zone,
       :min_target_capacity,
@@ -34586,7 +34731,7 @@ module Aws::EC2
     # Describes the placement of an instance.
     #
     # @!attribute [rw] group_name
-    #   The name of the placement group the instance is in.
+    #   The name of the placement group that the instance is in.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/PlacementResponse AWS API Documentation
@@ -36482,6 +36627,7 @@ module Aws::EC2
     #         elastic_inference_accelerators: [
     #           {
     #             type: "String", # required
+    #             count: 1,
     #           },
     #         ],
     #         security_group_ids: ["String"],
@@ -38891,6 +39037,7 @@ module Aws::EC2
     #         elastic_inference_accelerators: [
     #           {
     #             type: "String", # required
+    #             count: 1,
     #           },
     #         ],
     #         tag_specifications: [
@@ -42135,7 +42282,7 @@ module Aws::EC2
     #   is the default allocation strategy.
     #
     #   If the allocation strategy is `diversified`, EC2 Fleet launches
-    #   instances from all the Spot Instance pools that you specify.
+    #   instances from all of the Spot Instance pools that you specify.
     #
     #   If the allocation strategy is `capacity-optimized`, EC2 Fleet
     #   launches instances from Spot Instance pools with optimal capacity
@@ -42213,7 +42360,7 @@ module Aws::EC2
     #   is the default allocation strategy.
     #
     #   If the allocation strategy is `diversified`, EC2 Fleet launches
-    #   instances from all the Spot Instance pools that you specify.
+    #   instances from all of the Spot Instance pools that you specify.
     #
     #   If the allocation strategy is `capacity-optimized`, EC2 Fleet
     #   launches instances from Spot Instance pools with optimal capacity
@@ -42932,13 +43079,13 @@ module Aws::EC2
     # of 0 and add capacity later.
     #
     # You can use the On-Demand Instance `MaxTotalPrice` parameter, the Spot
-    # Instance `MaxTotalPrice`, or both to ensure your fleet cost does not
-    # exceed your budget. If you set a maximum price per hour for the
+    # Instance `MaxTotalPrice`, or both to ensure that your fleet cost does
+    # not exceed your budget. If you set a maximum price per hour for the
     # On-Demand Instances and Spot Instances in your request, EC2 Fleet will
-    # launch instances until it reaches the maximum amount you're willing
-    # to pay. When the maximum amount you're willing to pay is reached, the
-    # fleet stops launching instances even if it hasn’t met the target
-    # capacity. The `MaxTotalPrice` parameters are located in and
+    # launch instances until it reaches the maximum amount that you're
+    # willing to pay. When the maximum amount you're willing to pay is
+    # reached, the fleet stops launching instances even if it hasn’t met the
+    # target capacity. The `MaxTotalPrice` parameters are located in and
     #
     # @!attribute [rw] total_target_capacity
     #   The number of units to request, filled using
@@ -42984,9 +43131,9 @@ module Aws::EC2
     # your fleet cost does not exceed your budget. If you set a maximum
     # price per hour for the On-Demand Instances and Spot Instances in your
     # request, EC2 Fleet will launch instances until it reaches the maximum
-    # amount you're willing to pay. When the maximum amount you're willing
-    # to pay is reached, the fleet stops launching instances even if it
-    # hasn’t met the target capacity. The `MaxTotalPrice` parameters are
+    # amount that you're willing to pay. When the maximum amount you're
+    # willing to pay is reached, the fleet stops launching instances even if
+    # it hasn’t met the target capacity. The `MaxTotalPrice` parameters are
     # located in and .
     #
     # @note When making an API call, you may pass TargetCapacitySpecificationRequest

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.123.0
+  version: 1.128.0
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-03 00:00:00.000000000 Z
+date: 2019-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sigv4