aws-sdk-ec2 1.30.0 → 1.31.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9de39f6395c0f00573f4a5ad50ec4ea1b811f78
-  data.tar.gz: 3e90eff1ae4ec4cf4105c79fb8e68e25e67e608e
+  metadata.gz: 0ff8ee334afdd3d8025b50ace9ebf37fba0dbdf1
+  data.tar.gz: 016e1d479a98874df7ff358c9fce8ca19445252a
 SHA512:
-  metadata.gz: 6b3e845094ab1fa3c395556077eb7ae04db6182b7f8dfe6d1dbe3d9663f2d992e181ccaedfe10657021d77077cd5937ec42f61b468772c62d978b724ff69e3f4
-  data.tar.gz: bbd5f4cad596741adfadc37283fccb116948507540762081f6d65498ee78efb54f42e30dd5d7747bc913fa7fad28198f0e3ab4a24aa05428475bf5cf4401ae8f
+  metadata.gz: 331fa603642217f36979d84ecec5bec551eee7ea7f33759a84679adae9c4ac792a6ea91df05917bef916ab4e5b27ffcaf13ded346aeced6d6e7b85624c13f85d
+  data.tar.gz: 57a975a9579cde33c1b41d15ea890e6d7c06ae1852bd5892f36c71a756c33c6fa92fdc753feea8cce72cbc12a9e1d3c9de30b07f688891a1d4de156ce023b1af

data/lib/aws-sdk-ec2.rb

@@ -65,6 +65,6 @@ require_relative 'aws-sdk-ec2/customizations'
 # @service
 module Aws::EC2
 
-  GEM_VERSION = '1.30.0'
+  GEM_VERSION = '1.31.0'
 
 end

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

@@ -2008,8 +2008,8 @@ module Aws::EC2
     # Cancels one or more Spot Instance requests. Spot Instances are
     # instances that Amazon EC2 starts on your behalf when the maximum price
     # that you specify exceeds the current Spot price. For more information,
-    # see [Spot Instance Requests][1] in the *Amazon Elastic Compute Cloud
-    # User Guide*.
+    # see [Spot Instance Requests][1] in the *Amazon EC2 User Guide for
+    # Linux Instances*.
     #
     # Canceling a Spot Instance request does not terminate running Spot
     # Instances associated with the request.
@@ -2915,6 +2915,151 @@ module Aws::EC2
       req.send_request(options)
     end
 
+    # Launches an EC2 Fleet.
+    #
+    # You can create a single EC2 Fleet that includes multiple launch
+    # specifications that vary by instance type, AMI, Availability Zone, or
+    # subnet.
+    #
+    # For more information, see [Launching an EC2 Fleet][1] in the *Amazon
+    # Elastic Compute Cloud User Guide*.
+    #
+    #
+    #
+    # [1]: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-launch-ec2-fleet.html
+    #
+    # @option params [Boolean] :dry_run
+    #   Checks whether you have the required permissions for the action,
+    #   without actually making the request, and provides an error response.
+    #   If you have the required permissions, the error response is
+    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
+    #
+    # @option params [String] :client_token
+    #   Unique, case-sensitive identifier you provide to ensure the
+    #   idempotency of the request. For more information, see [Ensuring
+    #   Idempotency][1].
+    #
+    #
+    #
+    #   [1]: http://docs.aws.amazon.com/AWSEC2/latest/APIReference/Run_Instance_Idempotency.html
+    #
+    # @option params [Types::SpotOptionsRequest] :spot_options
+    #   Includes `SpotAllocationStrategy` and
+    #   `SpotInstanceInterruptionBehavior` inside this structure.
+    #
+    # @option params [String] :excess_capacity_termination_policy
+    #   Indicates whether running instances should be terminated if the total
+    #   target capacity of the EC2 Fleet is decreased below the current size
+    #   of the EC2 Fleet.
+    #
+    # @option params [required, Array<Types::FleetLaunchTemplateConfigRequest>] :launch_template_configs
+    #   The configuration for the EC2 Fleet.
+    #
+    # @option params [required, Types::TargetCapacitySpecificationRequest] :target_capacity_specification
+    #   The `TotalTargetCapacity`, `OnDemandTargetCapacity`,
+    #   `SpotTargetCapacity`, and `DefaultCapacityType` structure.
+    #
+    # @option params [Boolean] :terminate_instances_with_expiration
+    #   Indicates whether running instances should be terminated when the EC2
+    #   Fleet expires.
+    #
+    # @option params [String] :type
+    #   The type of request. Indicates whether the EC2 Fleet only `requests`
+    #   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`.
+    #
+    # @option params [Time,DateTime,Date,Integer,String] :valid_from
+    #   The start date and time of the request, in UTC format (for example,
+    #   *YYYY*-*MM*-*DD*T*HH*\:*MM*\:*SS*Z). The default is to start
+    #   fulfilling the request immediately.
+    #
+    # @option params [Time,DateTime,Date,Integer,String] :valid_until
+    #   The end date and time of the request, in UTC format (for example,
+    #   *YYYY*-*MM*-*DD*T*HH*\:*MM*\:*SS*Z). At this point, no new EC2 Fleet
+    #   requests are placed or able to fulfill the request. The default end
+    #   date is 7 days from the current date.
+    #
+    # @option params [Boolean] :replace_unhealthy_instances
+    #   Indicates whether EC2 Fleet should replace unhealthy instances.
+    #
+    # @option params [Array<Types::TagSpecification>] :tag_specifications
+    #   The tags for an EC2 Fleet resource.
+    #
+    # @return [Types::CreateFleetResult] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
+    #
+    #   * {Types::CreateFleetResult#fleet_id #fleet_id} => String
+    #
+    # @example Request syntax with placeholder values
+    #
+    #   resp = client.create_fleet({
+    #     dry_run: false,
+    #     client_token: "String",
+    #     spot_options: {
+    #       allocation_strategy: "lowest-price", # accepts lowest-price, diversified
+    #       instance_interruption_behavior: "hibernate", # accepts hibernate, stop, terminate
+    #     },
+    #     excess_capacity_termination_policy: "no-termination", # accepts no-termination, termination
+    #     launch_template_configs: [ # required
+    #       {
+    #         launch_template_specification: {
+    #           launch_template_id: "String",
+    #           launch_template_name: "LaunchTemplateName",
+    #           version: "String",
+    #         },
+    #         overrides: [
+    #           {
+    #             instance_type: "t1.micro", # accepts t1.micro, t2.nano, t2.micro, t2.small, t2.medium, t2.large, t2.xlarge, t2.2xlarge, m1.small, m1.medium, m1.large, m1.xlarge, m3.medium, m3.large, m3.xlarge, m3.2xlarge, m4.large, m4.xlarge, m4.2xlarge, m4.4xlarge, m4.10xlarge, m4.16xlarge, m2.xlarge, m2.2xlarge, m2.4xlarge, cr1.8xlarge, r3.large, r3.xlarge, r3.2xlarge, r3.4xlarge, r3.8xlarge, r4.large, r4.xlarge, r4.2xlarge, r4.4xlarge, r4.8xlarge, r4.16xlarge, x1.16xlarge, x1.32xlarge, x1e.xlarge, x1e.2xlarge, x1e.4xlarge, x1e.8xlarge, x1e.16xlarge, x1e.32xlarge, i2.xlarge, i2.2xlarge, i2.4xlarge, i2.8xlarge, i3.large, i3.xlarge, i3.2xlarge, i3.4xlarge, i3.8xlarge, i3.16xlarge, hi1.4xlarge, hs1.8xlarge, c1.medium, c1.xlarge, c3.large, c3.xlarge, c3.2xlarge, c3.4xlarge, c3.8xlarge, c4.large, c4.xlarge, c4.2xlarge, c4.4xlarge, c4.8xlarge, c5.large, c5.xlarge, c5.2xlarge, c5.4xlarge, c5.9xlarge, c5.18xlarge, cc1.4xlarge, cc2.8xlarge, g2.2xlarge, g2.8xlarge, g3.4xlarge, g3.8xlarge, g3.16xlarge, cg1.4xlarge, p2.xlarge, p2.8xlarge, p2.16xlarge, p3.2xlarge, p3.8xlarge, p3.16xlarge, d2.xlarge, d2.2xlarge, d2.4xlarge, d2.8xlarge, f1.2xlarge, f1.16xlarge, m5.large, m5.xlarge, m5.2xlarge, m5.4xlarge, m5.12xlarge, m5.24xlarge, h1.2xlarge, h1.4xlarge, h1.8xlarge, h1.16xlarge
+    #             max_price: "String",
+    #             subnet_id: "String",
+    #             availability_zone: "String",
+    #             weighted_capacity: 1.0,
+    #           },
+    #         ],
+    #       },
+    #     ],
+    #     target_capacity_specification: { # required
+    #       total_target_capacity: 1, # required
+    #       on_demand_target_capacity: 1,
+    #       spot_target_capacity: 1,
+    #       default_target_capacity_type: "spot", # accepts spot, on-demand
+    #     },
+    #     terminate_instances_with_expiration: false,
+    #     type: "request", # accepts request, maintain
+    #     valid_from: Time.now,
+    #     valid_until: Time.now,
+    #     replace_unhealthy_instances: false,
+    #     tag_specifications: [
+    #       {
+    #         resource_type: "customer-gateway", # accepts customer-gateway, dhcp-options, image, instance, internet-gateway, network-acl, network-interface, reserved-instances, route-table, snapshot, spot-instances-request, subnet, security-group, volume, vpc, vpn-connection, vpn-gateway
+    #         tags: [
+    #           {
+    #             key: "String",
+    #             value: "String",
+    #           },
+    #         ],
+    #       },
+    #     ],
+    #   })
+    #
+    # @example Response structure
+    #
+    #   resp.fleet_id #=> String
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CreateFleet AWS API Documentation
+    #
+    # @overload create_fleet(params = {})
+    # @param [Hash] params ({})
+    def create_fleet(params = {}, options = {})
+      req = build_request(:create_fleet, params)
+      req.send_request(options)
+    end
+
     # Creates one or more flow logs to capture IP traffic for a specific
     # network interface, subnet, or VPC. Flow logs are delivered to a
     # specified log group in Amazon CloudWatch Logs. If you specify a VPC or
@@ -4943,8 +5088,8 @@ module Aws::EC2
 
     # Creates a data feed for Spot Instances, enabling you to view Spot
     # Instance usage logs. You can create one data feed per AWS account. For
-    # more information, see [Spot Instance Data Feed][1] in the *Amazon
-    # Elastic Compute Cloud User Guide*.
+    # more information, see [Spot Instance Data Feed][1] in the *Amazon EC2
+    # User Guide for Linux Instances*.
     #
     #
     #
@@ -6286,6 +6431,61 @@ module Aws::EC2
       req.send_request(options)
     end
 
+    # Deletes the specified EC2 Fleet.
+    #
+    # After you delete an EC2 Fleet, the EC2 Fleet launches no new
+    # instances. You must specify whether the EC2 Fleet should also
+    # terminate its instances. If you terminate the instances, the EC2 Fleet
+    # enters the `deleted_terminating` state. Otherwise, the EC2 Fleet
+    # enters the `deleted_running` state, and the instances continue to run
+    # until they are interrupted or you terminate them manually.
+    #
+    # @option params [Boolean] :dry_run
+    #   Checks whether you have the required permissions for the action,
+    #   without actually making the request, and provides an error response.
+    #   If you have the required permissions, the error response is
+    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
+    #
+    # @option params [required, Array<String>] :fleet_ids
+    #   The IDs of the EC2 Fleets.
+    #
+    # @option params [required, Boolean] :terminate_instances
+    #   Indicates whether to terminate instances for an EC2 Fleet if it is
+    #   deleted successfully.
+    #
+    # @return [Types::DeleteFleetsResult] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
+    #
+    #   * {Types::DeleteFleetsResult#successful_fleet_deletions #successful_fleet_deletions} => Array&lt;Types::DeleteFleetSuccessItem&gt;
+    #   * {Types::DeleteFleetsResult#unsuccessful_fleet_deletions #unsuccessful_fleet_deletions} => Array&lt;Types::DeleteFleetErrorItem&gt;
+    #
+    # @example Request syntax with placeholder values
+    #
+    #   resp = client.delete_fleets({
+    #     dry_run: false,
+    #     fleet_ids: ["FleetIdentifier"], # required
+    #     terminate_instances: false, # required
+    #   })
+    #
+    # @example Response structure
+    #
+    #   resp.successful_fleet_deletions #=> Array
+    #   resp.successful_fleet_deletions[0].current_fleet_state #=> String, one of "submitted", "active", "deleted", "failed", "deleted-running", "deleted-terminating", "modifying"
+    #   resp.successful_fleet_deletions[0].previous_fleet_state #=> String, one of "submitted", "active", "deleted", "failed", "deleted-running", "deleted-terminating", "modifying"
+    #   resp.successful_fleet_deletions[0].fleet_id #=> String
+    #   resp.unsuccessful_fleet_deletions #=> Array
+    #   resp.unsuccessful_fleet_deletions[0].error.code #=> String, one of "fleetIdDoesNotExist", "fleetIdMalformed", "fleetNotInDeletableState", "unexpectedError"
+    #   resp.unsuccessful_fleet_deletions[0].error.message #=> String
+    #   resp.unsuccessful_fleet_deletions[0].fleet_id #=> String
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DeleteFleets AWS API Documentation
+    #
+    # @overload delete_fleets(params = {})
+    # @param [Hash] params ({})
+    def delete_fleets(params = {}, options = {})
+      req = build_request(:delete_fleets, params)
+      req.send_request(options)
+    end
+
     # Deletes one or more flow logs.
     #
     # @option params [required, Array<String>] :flow_log_ids
@@ -8710,6 +8910,227 @@ module Aws::EC2
       req.send_request(options)
     end
 
+    # Describes the events for the specified EC2 Fleet during the specified
+    # time.
+    #
+    # @option params [Boolean] :dry_run
+    #   Checks whether you have the required permissions for the action,
+    #   without actually making the request, and provides an error response.
+    #   If you have the required permissions, the error response is
+    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
+    #
+    # @option params [String] :event_type
+    #   The type of events to describe. By default, all events are described.
+    #
+    # @option params [Integer] :max_results
+    #   The maximum number of results to return in a single call. Specify a
+    #   value between 1 and 1000. The default value is 1000. To retrieve the
+    #   remaining results, make another call with the returned `NextToken`
+    #   value.
+    #
+    # @option params [String] :next_token
+    #   The token for the next set of results.
+    #
+    # @option params [required, String] :fleet_id
+    #   The ID of the EC2 Fleet.
+    #
+    # @option params [required, Time,DateTime,Date,Integer,String] :start_time
+    #   The start date and time for the events, in UTC format (for example,
+    #   *YYYY*-*MM*-*DD*T*HH*\:*MM*\:*SS*Z).
+    #
+    # @return [Types::DescribeFleetHistoryResult] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
+    #
+    #   * {Types::DescribeFleetHistoryResult#history_records #history_records} => Array&lt;Types::HistoryRecordEntry&gt;
+    #   * {Types::DescribeFleetHistoryResult#last_evaluated_time #last_evaluated_time} => Time
+    #   * {Types::DescribeFleetHistoryResult#next_token #next_token} => String
+    #   * {Types::DescribeFleetHistoryResult#fleet_id #fleet_id} => String
+    #   * {Types::DescribeFleetHistoryResult#start_time #start_time} => Time
+    #
+    # @example Request syntax with placeholder values
+    #
+    #   resp = client.describe_fleet_history({
+    #     dry_run: false,
+    #     event_type: "instance-change", # accepts instance-change, fleet-change, service-error
+    #     max_results: 1,
+    #     next_token: "String",
+    #     fleet_id: "FleetIdentifier", # required
+    #     start_time: Time.now, # required
+    #   })
+    #
+    # @example Response structure
+    #
+    #   resp.history_records #=> Array
+    #   resp.history_records[0].event_information.event_description #=> String
+    #   resp.history_records[0].event_information.event_sub_type #=> String
+    #   resp.history_records[0].event_information.instance_id #=> String
+    #   resp.history_records[0].event_type #=> String, one of "instance-change", "fleet-change", "service-error"
+    #   resp.history_records[0].timestamp #=> Time
+    #   resp.last_evaluated_time #=> Time
+    #   resp.next_token #=> String
+    #   resp.fleet_id #=> String
+    #   resp.start_time #=> Time
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribeFleetHistory AWS API Documentation
+    #
+    # @overload describe_fleet_history(params = {})
+    # @param [Hash] params ({})
+    def describe_fleet_history(params = {}, options = {})
+      req = build_request(:describe_fleet_history, params)
+      req.send_request(options)
+    end
+
+    # Describes the running instances for the specified EC2 Fleet.
+    #
+    # @option params [Boolean] :dry_run
+    #   Checks whether you have the required permissions for the action,
+    #   without actually making the request, and provides an error response.
+    #   If you have the required permissions, the error response is
+    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
+    #
+    # @option params [Integer] :max_results
+    #   The maximum number of results to return in a single call. Specify a
+    #   value between 1 and 1000. The default value is 1000. To retrieve the
+    #   remaining results, make another call with the returned `NextToken`
+    #   value.
+    #
+    # @option params [String] :next_token
+    #   The token for the next set of results.
+    #
+    # @option params [required, String] :fleet_id
+    #   The ID of the EC2 Fleet.
+    #
+    # @option params [Array<Types::Filter>] :filters
+    #   One or more filters.
+    #
+    # @return [Types::DescribeFleetInstancesResult] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
+    #
+    #   * {Types::DescribeFleetInstancesResult#active_instances #active_instances} => Array&lt;Types::ActiveInstance&gt;
+    #   * {Types::DescribeFleetInstancesResult#next_token #next_token} => String
+    #   * {Types::DescribeFleetInstancesResult#fleet_id #fleet_id} => String
+    #
+    # @example Request syntax with placeholder values
+    #
+    #   resp = client.describe_fleet_instances({
+    #     dry_run: false,
+    #     max_results: 1,
+    #     next_token: "String",
+    #     fleet_id: "FleetIdentifier", # required
+    #     filters: [
+    #       {
+    #         name: "String",
+    #         values: ["String"],
+    #       },
+    #     ],
+    #   })
+    #
+    # @example Response structure
+    #
+    #   resp.active_instances #=> Array
+    #   resp.active_instances[0].instance_id #=> String
+    #   resp.active_instances[0].instance_type #=> String
+    #   resp.active_instances[0].spot_instance_request_id #=> String
+    #   resp.active_instances[0].instance_health #=> String, one of "healthy", "unhealthy"
+    #   resp.next_token #=> String
+    #   resp.fleet_id #=> String
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribeFleetInstances AWS API Documentation
+    #
+    # @overload describe_fleet_instances(params = {})
+    # @param [Hash] params ({})
+    def describe_fleet_instances(params = {}, options = {})
+      req = build_request(:describe_fleet_instances, params)
+      req.send_request(options)
+    end
+
+    # Describes the specified EC2 Fleet.
+    #
+    # @option params [Boolean] :dry_run
+    #   Checks whether you have the required permissions for the action,
+    #   without actually making the request, and provides an error response.
+    #   If you have the required permissions, the error response is
+    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
+    #
+    # @option params [Integer] :max_results
+    #   The maximum number of results to return in a single call. Specify a
+    #   value between 1 and 1000. The default value is 1000. To retrieve the
+    #   remaining results, make another call with the returned `NextToken`
+    #   value.
+    #
+    # @option params [String] :next_token
+    #   The token for the next set of results.
+    #
+    # @option params [Array<String>] :fleet_ids
+    #   The ID of the EC2 Fleets.
+    #
+    # @option params [Array<Types::Filter>] :filters
+    #   One or more filters.
+    #
+    # @return [Types::DescribeFleetsResult] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
+    #
+    #   * {Types::DescribeFleetsResult#next_token #next_token} => String
+    #   * {Types::DescribeFleetsResult#fleets #fleets} => Array&lt;Types::FleetData&gt;
+    #
+    # @example Request syntax with placeholder values
+    #
+    #   resp = client.describe_fleets({
+    #     dry_run: false,
+    #     max_results: 1,
+    #     next_token: "String",
+    #     fleet_ids: ["FleetIdentifier"],
+    #     filters: [
+    #       {
+    #         name: "String",
+    #         values: ["String"],
+    #       },
+    #     ],
+    #   })
+    #
+    # @example Response structure
+    #
+    #   resp.next_token #=> String
+    #   resp.fleets #=> Array
+    #   resp.fleets[0].activity_status #=> String, one of "error", "pending-fulfillment", "pending-termination", "fulfilled"
+    #   resp.fleets[0].create_time #=> Time
+    #   resp.fleets[0].fleet_id #=> String
+    #   resp.fleets[0].fleet_state #=> String, one of "submitted", "active", "deleted", "failed", "deleted-running", "deleted-terminating", "modifying"
+    #   resp.fleets[0].client_token #=> String
+    #   resp.fleets[0].excess_capacity_termination_policy #=> String, one of "no-termination", "termination"
+    #   resp.fleets[0].fulfilled_capacity #=> Float
+    #   resp.fleets[0].fulfilled_on_demand_capacity #=> Float
+    #   resp.fleets[0].launch_template_configs #=> Array
+    #   resp.fleets[0].launch_template_configs[0].launch_template_specification.launch_template_id #=> String
+    #   resp.fleets[0].launch_template_configs[0].launch_template_specification.launch_template_name #=> String
+    #   resp.fleets[0].launch_template_configs[0].launch_template_specification.version #=> String
+    #   resp.fleets[0].launch_template_configs[0].overrides #=> Array
+    #   resp.fleets[0].launch_template_configs[0].overrides[0].instance_type #=> String, one of "t1.micro", "t2.nano", "t2.micro", "t2.small", "t2.medium", "t2.large", "t2.xlarge", "t2.2xlarge", "m1.small", "m1.medium", "m1.large", "m1.xlarge", "m3.medium", "m3.large", "m3.xlarge", "m3.2xlarge", "m4.large", "m4.xlarge", "m4.2xlarge", "m4.4xlarge", "m4.10xlarge", "m4.16xlarge", "m2.xlarge", "m2.2xlarge", "m2.4xlarge", "cr1.8xlarge", "r3.large", "r3.xlarge", "r3.2xlarge", "r3.4xlarge", "r3.8xlarge", "r4.large", "r4.xlarge", "r4.2xlarge", "r4.4xlarge", "r4.8xlarge", "r4.16xlarge", "x1.16xlarge", "x1.32xlarge", "x1e.xlarge", "x1e.2xlarge", "x1e.4xlarge", "x1e.8xlarge", "x1e.16xlarge", "x1e.32xlarge", "i2.xlarge", "i2.2xlarge", "i2.4xlarge", "i2.8xlarge", "i3.large", "i3.xlarge", "i3.2xlarge", "i3.4xlarge", "i3.8xlarge", "i3.16xlarge", "hi1.4xlarge", "hs1.8xlarge", "c1.medium", "c1.xlarge", "c3.large", "c3.xlarge", "c3.2xlarge", "c3.4xlarge", "c3.8xlarge", "c4.large", "c4.xlarge", "c4.2xlarge", "c4.4xlarge", "c4.8xlarge", "c5.large", "c5.xlarge", "c5.2xlarge", "c5.4xlarge", "c5.9xlarge", "c5.18xlarge", "cc1.4xlarge", "cc2.8xlarge", "g2.2xlarge", "g2.8xlarge", "g3.4xlarge", "g3.8xlarge", "g3.16xlarge", "cg1.4xlarge", "p2.xlarge", "p2.8xlarge", "p2.16xlarge", "p3.2xlarge", "p3.8xlarge", "p3.16xlarge", "d2.xlarge", "d2.2xlarge", "d2.4xlarge", "d2.8xlarge", "f1.2xlarge", "f1.16xlarge", "m5.large", "m5.xlarge", "m5.2xlarge", "m5.4xlarge", "m5.12xlarge", "m5.24xlarge", "h1.2xlarge", "h1.4xlarge", "h1.8xlarge", "h1.16xlarge"
+    #   resp.fleets[0].launch_template_configs[0].overrides[0].max_price #=> String
+    #   resp.fleets[0].launch_template_configs[0].overrides[0].subnet_id #=> String
+    #   resp.fleets[0].launch_template_configs[0].overrides[0].availability_zone #=> String
+    #   resp.fleets[0].launch_template_configs[0].overrides[0].weighted_capacity #=> Float
+    #   resp.fleets[0].target_capacity_specification.total_target_capacity #=> Integer
+    #   resp.fleets[0].target_capacity_specification.on_demand_target_capacity #=> Integer
+    #   resp.fleets[0].target_capacity_specification.spot_target_capacity #=> Integer
+    #   resp.fleets[0].target_capacity_specification.default_target_capacity_type #=> String, one of "spot", "on-demand"
+    #   resp.fleets[0].terminate_instances_with_expiration #=> Boolean
+    #   resp.fleets[0].type #=> String, one of "request", "maintain"
+    #   resp.fleets[0].valid_from #=> Time
+    #   resp.fleets[0].valid_until #=> Time
+    #   resp.fleets[0].replace_unhealthy_instances #=> Boolean
+    #   resp.fleets[0].spot_options.allocation_strategy #=> String, one of "lowest-price", "diversified"
+    #   resp.fleets[0].spot_options.instance_interruption_behavior #=> String, one of "hibernate", "stop", "terminate"
+    #   resp.fleets[0].tags #=> Array
+    #   resp.fleets[0].tags[0].key #=> String
+    #   resp.fleets[0].tags[0].value #=> String
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribeFleets AWS API Documentation
+    #
+    # @overload describe_fleets(params = {})
+    # @param [Hash] params ({})
+    def describe_fleets(params = {}, options = {})
+      req = build_request(:describe_fleets, params)
+      req.send_request(options)
+    end
+
     # Describes one or more flow logs. To view the information in your flow
     # logs (the log streams for the network interfaces), you must use the
     # CloudWatch Logs console or the CloudWatch Logs API.
@@ -13926,8 +14347,8 @@ module Aws::EC2
     end
 
     # Describes the data feed for Spot Instances. For more information, see
-    # [Spot Instance Data Feed][1] in the *Amazon Elastic Compute Cloud User
-    # Guide*.
+    # [Spot Instance Data Feed][1] in the *Amazon EC2 User Guide for Linux
+    # Instances*.
     #
     #
     #
@@ -14285,6 +14706,7 @@ module Aws::EC2
     #   resp.spot_fleet_request_configs[0].spot_fleet_request_config.client_token #=> String
     #   resp.spot_fleet_request_configs[0].spot_fleet_request_config.excess_capacity_termination_policy #=> String, one of "noTermination", "default"
     #   resp.spot_fleet_request_configs[0].spot_fleet_request_config.fulfilled_capacity #=> Float
+    #   resp.spot_fleet_request_configs[0].spot_fleet_request_config.on_demand_fulfilled_capacity #=> Float
     #   resp.spot_fleet_request_configs[0].spot_fleet_request_config.iam_fleet_role #=> String
     #   resp.spot_fleet_request_configs[0].spot_fleet_request_config.launch_specifications #=> Array
     #   resp.spot_fleet_request_configs[0].spot_fleet_request_config.launch_specifications[0].security_groups #=> Array
@@ -14352,6 +14774,7 @@ module Aws::EC2
     #   resp.spot_fleet_request_configs[0].spot_fleet_request_config.launch_template_configs[0].overrides[0].weighted_capacity #=> Float
     #   resp.spot_fleet_request_configs[0].spot_fleet_request_config.spot_price #=> String
     #   resp.spot_fleet_request_configs[0].spot_fleet_request_config.target_capacity #=> Integer
+    #   resp.spot_fleet_request_configs[0].spot_fleet_request_config.on_demand_target_capacity #=> Integer
     #   resp.spot_fleet_request_configs[0].spot_fleet_request_config.terminate_instances_with_expiration #=> Boolean
     #   resp.spot_fleet_request_configs[0].spot_fleet_request_config.type #=> String, one of "request", "maintain"
     #   resp.spot_fleet_request_configs[0].spot_fleet_request_config.valid_from #=> Time
@@ -14377,8 +14800,8 @@ module Aws::EC2
     # Describes the Spot Instance requests that belong to your account. Spot
     # Instances are instances that Amazon EC2 launches when the Spot price
     # that you specify exceeds the current Spot price. For more information,
-    # see [Spot Instance Requests][1] in the *Amazon Elastic Compute Cloud
-    # User Guide*.
+    # see [Spot Instance Requests][1] in the *Amazon EC2 User Guide for
+    # Linux Instances*.
     #
     # You can use `DescribeSpotInstanceRequests` to find a running Spot
     # Instance by examining the response. If the status of the Spot Instance
@@ -14387,8 +14810,8 @@ module Aws::EC2
     # DescribeInstances with a filter to look for instances where the
     # instance lifecycle is `spot`.
     #
-    # Spot Instance requests are deleted 4 hours after they are canceled and
-    # their instances are terminated.
+    # Spot Instance requests are deleted four hours after they are canceled
+    # and their instances are terminated.
     #
     #
     #
@@ -14487,7 +14910,7 @@ module Aws::EC2
     #     \| `closed` \| `cancelled` \| `failed`). Spot request status
     #     information can help you track your Amazon EC2 Spot Instance
     #     requests. For more information, see [Spot Request Status][1] in the
-    #     Amazon Elastic Compute Cloud User Guide.
+    #     *Amazon EC2 User Guide for Linux Instances*.
     #
     #   * `status-code` - The short code describing the most recent evaluation
     #     of your Spot Instance request.
@@ -14686,8 +15109,8 @@ module Aws::EC2
     end
 
     # Describes the Spot price history. For more information, see [Spot
-    # Instance Pricing History][1] in the *Amazon Elastic Compute Cloud User
-    # Guide*.
+    # Instance Pricing History][1] in the *Amazon EC2 User Guide for Linux
+    # Instances*.
     #
     # When you specify a start and end time, this operation returns the
     # prices of the instance types within the time range that you specified
@@ -14714,10 +15137,10 @@ module Aws::EC2
     #   * `spot-price` - The Spot price. The value must match exactly (or use
     #     wildcards; greater than or less than comparison is not supported).
     #
-    #   * `timestamp` - The timestamp of the Spot price history, in UTC format
-    #     (for example, *YYYY*-*MM*-*DD*T*HH*\:*MM*\:*SS*Z). You can use
-    #     wildcards (* and ?). Greater than or less than comparison is not
-    #     supported.
+    #   * `timestamp` - The time stamp of the Spot price history, in UTC
+    #     format (for example, *YYYY*-*MM*-*DD*T*HH*\:*MM*\:*SS*Z). You can
+    #     use wildcards (* and ?). Greater than or less than comparison is
+    #     not supported.
     #
     # @option params [String] :availability_zone
     #   Filters the results by the specified Availability Zone.
@@ -18597,6 +19020,58 @@ module Aws::EC2
       req.send_request(options)
     end
 
+    # Modifies the specified EC2 Fleet.
+    #
+    # While the EC2 Fleet is being modified, it is in the `modifying` state.
+    #
+    # @option params [Boolean] :dry_run
+    #   Checks whether you have the required permissions for the action,
+    #   without actually making the request, and provides an error response.
+    #   If you have the required permissions, the error response is
+    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
+    #
+    # @option params [String] :excess_capacity_termination_policy
+    #   Indicates whether running instances should be terminated if the total
+    #   target capacity of the EC2 Fleet is decreased below the current size
+    #   of the EC2 Fleet.
+    #
+    # @option params [required, String] :fleet_id
+    #   The ID of the EC2 Fleet.
+    #
+    # @option params [required, Types::TargetCapacitySpecificationRequest] :target_capacity_specification
+    #   The size of the EC2 Fleet.
+    #
+    # @return [Types::ModifyFleetResult] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
+    #
+    #   * {Types::ModifyFleetResult#return #return} => Boolean
+    #
+    # @example Request syntax with placeholder values
+    #
+    #   resp = client.modify_fleet({
+    #     dry_run: false,
+    #     excess_capacity_termination_policy: "no-termination", # accepts no-termination, termination
+    #     fleet_id: "FleetIdentifier", # required
+    #     target_capacity_specification: { # required
+    #       total_target_capacity: 1, # required
+    #       on_demand_target_capacity: 1,
+    #       spot_target_capacity: 1,
+    #       default_target_capacity_type: "spot", # accepts spot, on-demand
+    #     },
+    #   })
+    #
+    # @example Response structure
+    #
+    #   resp.return #=> Boolean
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ModifyFleet AWS API Documentation
+    #
+    # @overload modify_fleet(params = {})
+    # @param [Hash] params ({})
+    def modify_fleet(params = {}, options = {})
+      req = build_request(:modify_fleet, params)
+      req.send_request(options)
+    end
+
     # Modifies the specified attribute of the specified Amazon FPGA Image
     # (AFI).
     #
@@ -21659,6 +22134,11 @@ module Aws::EC2
 
     # Creates a Spot Fleet request.
     #
+    # The Spot Fleet request specifies the total target capacity and the
+    # On-Demand target capacity. Amazon EC2 calculates the difference
+    # between the total capacity and On-Demand capacity, and launches the
+    # difference as Spot capacity.
+    #
     # You can submit a single request that includes multiple launch
     # specifications that vary by instance type, AMI, Availability Zone, or
     # subnet.
@@ -21675,11 +22155,11 @@ module Aws::EC2
     # fleet.
     #
     # You can specify tags for the Spot Instances. You cannot tag other
-    # resource types in a Spot Fleet request; only the `instance` resource
-    # type is supported.
+    # resource types in a Spot Fleet request because only the `instance`
+    # resource type is supported.
     #
-    # For more information, see [Spot Fleet Requests][1] in the *Amazon
-    # Elastic Compute Cloud User Guide*.
+    # For more information, see [Spot Fleet Requests][1] in the *Amazon EC2
+    # User Guide for Linux Instances*.
     #
     #
     #
@@ -21858,6 +22338,7 @@ module Aws::EC2
     #       client_token: "String",
     #       excess_capacity_termination_policy: "noTermination", # accepts noTermination, default
     #       fulfilled_capacity: 1.0,
+    #       on_demand_fulfilled_capacity: 1.0,
     #       iam_fleet_role: "String", # required
     #       launch_specifications: [
     #         {
@@ -21964,6 +22445,7 @@ module Aws::EC2
     #       ],
     #       spot_price: "String",
     #       target_capacity: 1, # required
+    #       on_demand_target_capacity: 1,
     #       terminate_instances_with_expiration: false,
     #       type: "request", # accepts request, maintain
     #       valid_from: Time.now,
@@ -22005,7 +22487,7 @@ module Aws::EC2
     # Creates a Spot Instance request. Spot Instances are instances that
     # Amazon EC2 launches when the maximum price that you specify exceeds
     # the current Spot price. For more information, see [Spot Instance
-    # Requests][1] in the *Amazon Elastic Compute Cloud User Guide*.
+    # Requests][1] in the *Amazon EC2 User Guide for Linux Instances*.
     #
     #
     #
@@ -22045,13 +22527,13 @@ module Aws::EC2
     #   notice, which gives the instance a two-minute warning before it
     #   terminates.
     #
-    #   Note that you can't specify an Availability Zone group or a launch
-    #   group if you specify a duration.
+    #   You can't specify an Availability Zone group or a launch group if you
+    #   specify a duration.
     #
     # @option params [String] :client_token
     #   Unique, case-sensitive identifier that you provide to ensure the
     #   idempotency of the request. For more information, see [How to Ensure
-    #   Idempotency][1] in the *Amazon Elastic Compute Cloud User Guide*.
+    #   Idempotency][1] in the *Amazon EC2 User Guide for Linux Instances*.
     #
     #
     #
@@ -23118,7 +23600,8 @@ module Aws::EC2
     # @option params [Types::LaunchTemplateSpecification] :launch_template
     #   The launch template to use to launch the instances. Any parameters
     #   that you specify in RunInstances override the same parameters in the
-    #   launch template.
+    #   launch template. You can specify either the name or ID of a launch
+    #   template, but not both.
     #
     # @option params [Types::InstanceMarketOptionsRequest] :instance_market_options
     #   The market (purchasing) option for the instances.
@@ -24116,7 +24599,7 @@ module Aws::EC2
         params: params,
         config: config)
       context[:gem_name] = 'aws-sdk-ec2'
-      context[:gem_version] = '1.30.0'
+      context[:gem_version] = '1.31.0'
       Seahorse::Client::Request.new(handlers, context)
     end