aws-sdk-autoscaling 1.11.0 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2621a9c59c9696d09e56ab16d090574270681a78
-  data.tar.gz: d6d88dbb459a82b1bd01d20eb558a9bfea68149d
+  metadata.gz: 9dad6a541c79a2c7024058da32caf859b063009f
+  data.tar.gz: 2f60ae724a65acbadaa1be086480c3dc15bb7fe0
 SHA512:
-  metadata.gz: 35347f6dad830ba5b56000c7428be4fcb51f6c11a7e58b23151eea974059e384c1b97fe2971e72a99a2aab45bfd5d1821124474d1eae4dae622db5ad157e8dbd
-  data.tar.gz: c73fcceb61837df5cddbe6c203a3006e6ca07def6587fb01b66351cd254fe654da592d8589c6c491cdab39ac3836d827443803f08d10135887f80da474a0b5c4
+  metadata.gz: a0e5d143782697159513d96401e4a86182399eb436bcd720f500d77fd6e1d0de83145eb20f44daa3905c3b79a0ae37e1ebc75126364747cd4753009e96d9a867
+  data.tar.gz: 570d57115ad3ccf5953d70db47138be7998d73a6fee9444557b0f11fc38b2cd2bf527c48396c0904112cbe6cf9fdf32d6e92b34573938d3d6782d70a4fa046d3

data/lib/aws-sdk-autoscaling.rb

@@ -53,6 +53,6 @@ require_relative 'aws-sdk-autoscaling/customizations'
 # @service
 module Aws::AutoScaling
 
-  GEM_VERSION = '1.11.0'
+  GEM_VERSION = '1.12.0'
 
 end

data/lib/aws-sdk-autoscaling/auto_scaling_group.rb

@@ -49,6 +49,12 @@ module Aws::AutoScaling
       data[:launch_template]
     end
 
+    # The mixed instances policy for the group.
+    # @return [Types::MixedInstancesPolicy]
+    def mixed_instances_policy
+      data[:mixed_instances_policy]
+    end
+
     # The minimum size of the group.
     # @return [Integer]
     def min_size
@@ -120,9 +126,9 @@ module Aws::AutoScaling
       data[:suspended_processes]
     end
 
-    # The name of the placement group into which you'll launch your
-    # instances, if any. For more information, see [Placement Groups][1] in
-    # the *Amazon Elastic Compute Cloud User Guide*.
+    # The name of the placement group into which to launch your instances,
+    # if any. For more information, see [Placement Groups][1] in the *Amazon
+    # Elastic Compute Cloud User Guide*.
     #
     #
     #
@@ -394,7 +400,7 @@ module Aws::AutoScaling
     #   })
     # @param [Hash] options ({})
     # @option options [Boolean] :force_delete
-    #   Specifies that the group will be deleted along with all instances
+    #   Specifies that the group is to be deleted along with all instances
     #   associated with the group, without waiting for all instances to be
     #   terminated. This parameter also deletes any lifecycle actions
     #   associated with the group.
@@ -774,6 +780,28 @@ module Aws::AutoScaling
     #       launch_template_name: "LaunchTemplateName",
     #       version: "XmlStringMaxLen255",
     #     },
+    #     mixed_instances_policy: {
+    #       launch_template: {
+    #         launch_template_specification: {
+    #           launch_template_id: "XmlStringMaxLen255",
+    #           launch_template_name: "LaunchTemplateName",
+    #           version: "XmlStringMaxLen255",
+    #         },
+    #         overrides: [
+    #           {
+    #             instance_type: "XmlStringMaxLen255",
+    #           },
+    #         ],
+    #       },
+    #       instances_distribution: {
+    #         on_demand_allocation_strategy: "XmlString",
+    #         on_demand_base_capacity: 1,
+    #         on_demand_percentage_above_base_capacity: 1,
+    #         spot_allocation_strategy: "XmlString",
+    #         spot_instance_pools: 1,
+    #         spot_max_price: "SpotPrice",
+    #       },
+    #     },
     #     min_size: 1,
     #     max_size: 1,
     #     desired_capacity: 1,
@@ -789,11 +817,16 @@ module Aws::AutoScaling
     #   })
     # @param [Hash] options ({})
     # @option options [String] :launch_configuration_name
-    #   The name of the launch configuration. If you specify a launch
-    #   configuration, you can't specify a launch template.
+    #   The name of the launch configuration. If you specify this parameter,
+    #   you can't specify a launch template or a mixed instances policy.
     # @option options [Types::LaunchTemplateSpecification] :launch_template
-    #   The launch template to use to specify the updates. If you specify a
-    #   launch template, you can't specify a launch configuration.
+    #   The launch template and version to use to specify the updates. If you
+    #   specify this parameter, you can't specify a launch configuration or a
+    #   mixed instances policy.
+    # @option options [Types::MixedInstancesPolicy] :mixed_instances_policy
+    #   The mixed instances policy to use to specify the updates. If you
+    #   specify this parameter, you can't specify a launch configuration or a
+    #   launch template.
     # @option options [Integer] :min_size
     #   The minimum size of the Auto Scaling group.
     # @option options [Integer] :max_size
@@ -829,9 +862,9 @@ module Aws::AutoScaling
     #
     #   [1]: http://docs.aws.amazon.com/autoscaling/ec2/userguide/healthcheck.html
     # @option options [String] :placement_group
-    #   The name of the placement group into which you'll launch your
-    #   instances, if any. For more information, see [Placement Groups][1] in
-    #   the *Amazon Elastic Compute Cloud User Guide*.
+    #   The name of the placement group into which to launch your instances,
+    #   if any. For more information, see [Placement Groups][1] in the *Amazon
+    #   Elastic Compute Cloud User Guide*.
     #
     #
     #
@@ -1052,7 +1085,7 @@ module Aws::AutoScaling
     # @param [Hash] options ({})
     # @option options [Array<String>] :policy_names
     #   The names of one or more policies. If you omit this parameter, all
-    #   policies are described. If an group name is provided, the results are
+    #   policies are described. If a group name is provided, the results are
     #   limited to that group. This list is limited to 50 items. If you
     #   specify an unknown policy name, it is ignored with no error.
     # @option options [Array<String>] :policy_types

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

@@ -15,6 +15,7 @@ require 'aws-sdk-core/plugins/helpful_socket_errors.rb'
 require 'aws-sdk-core/plugins/retry_errors.rb'
 require 'aws-sdk-core/plugins/global_configuration.rb'
 require 'aws-sdk-core/plugins/regional_endpoint.rb'
+require 'aws-sdk-core/plugins/endpoint_discovery.rb'
 require 'aws-sdk-core/plugins/response_paging.rb'
 require 'aws-sdk-core/plugins/stub_responses.rb'
 require 'aws-sdk-core/plugins/idempotency_token.rb'
@@ -45,6 +46,7 @@ module Aws::AutoScaling
     add_plugin(Aws::Plugins::RetryErrors)
     add_plugin(Aws::Plugins::GlobalConfiguration)
     add_plugin(Aws::Plugins::RegionalEndpoint)
+    add_plugin(Aws::Plugins::EndpointDiscovery)
     add_plugin(Aws::Plugins::ResponsePaging)
     add_plugin(Aws::Plugins::StubResponses)
     add_plugin(Aws::Plugins::IdempotencyToken)
@@ -98,6 +100,10 @@ module Aws::AutoScaling
     #
     #   @option options [String] :access_key_id
     #
+    #   @option options [Boolean] :active_endpoint_cache (false)
+    #     When set to `true`, a thread polling for endpoints will be running in
+    #     the background every 60 secs (default). Defaults to `false`.
+    #
     #   @option options [Boolean] :client_side_monitoring (false)
     #     When `true`, client-side metrics will be collected for all API requests from
     #     this client.
@@ -123,6 +129,21 @@ module Aws::AutoScaling
     #     option. You should only configure an `:endpoint` when connecting
     #     to test endpoints. This should be avalid HTTP(S) URI.
     #
+    #   @option options [Integer] :endpoint_cache_max_entries (1000)
+    #     Used for the maximum size limit of the LRU cache storing endpoints data
+    #     for endpoint discovery enabled operations. Defaults to 1000.
+    #
+    #   @option options [Integer] :endpoint_cache_max_threads (10)
+    #     Used for the maximum threads in use for polling endpoints to be cached, defaults to 10.
+    #
+    #   @option options [Integer] :endpoint_cache_poll_interval (60)
+    #     When :endpoint_discovery and :active_endpoint_cache is enabled,
+    #     Use this option to config the time interval in seconds for making
+    #     requests fetching endpoints information. Defaults to 60 sec.
+    #
+    #   @option options [Boolean] :endpoint_discovery (false)
+    #     When set to `true`, endpoint discovery will be enabled for operations when available. Defaults to `false`.
+    #
     #   @option options [Aws::Log::Formatter] :log_formatter (Aws::Log::Formatter.default)
     #     The log formatter.
     #
@@ -378,8 +399,8 @@ module Aws::AutoScaling
     end
 
     # Creates or updates one or more scheduled scaling actions for an Auto
-    # Scaling group. When updating a scheduled scaling action, if you leave
-    # a parameter unspecified, the corresponding value remains unchanged.
+    # Scaling group. If you leave a parameter unspecified when updating a
+    # scheduled scaling action, the corresponding value remains unchanged.
     #
     # @option params [required, String] :auto_scaling_group_name
     #   The name of the Auto Scaling group.
@@ -528,24 +549,29 @@ module Aws::AutoScaling
     #   the scope of your AWS account.
     #
     # @option params [String] :launch_configuration_name
-    #   The name of the launch configuration. You must specify one of the
-    #   following: a launch configuration, a launch template, or an EC2
-    #   instance.
+    #   The name of the launch configuration. This parameter, a launch
+    #   template, a mixed instances policy, or an EC2 instance must be
+    #   specified.
     #
     # @option params [Types::LaunchTemplateSpecification] :launch_template
-    #   The launch template to use to launch instances. You must specify one
-    #   of the following: a launch template, a launch configuration, or an EC2
-    #   instance.
+    #   The launch template to use to launch instances. This parameter, a
+    #   launch configuration, a mixed instances policy, or an EC2 instance
+    #   must be specified.
+    #
+    # @option params [Types::MixedInstancesPolicy] :mixed_instances_policy
+    #   The mixed instances policy to use to launch instances. This parameter,
+    #   a launch template, a launch configuration, or an EC2 instance must be
+    #   specified.
     #
     # @option params [String] :instance_id
     #   The ID of the instance used to create a launch configuration for the
-    #   group. You must specify one of the following: an EC2 instance, a
-    #   launch configuration, or a launch template.
+    #   group. This parameter, a launch configuration, a launch template, or a
+    #   mixed instances policy must be specified.
     #
     #   When you specify an ID of an instance, Amazon EC2 Auto Scaling creates
     #   a new launch configuration and associates it with the group. This
     #   launch configuration derives its attributes from the specified
-    #   instance, with the exception of the block device mapping.
+    #   instance, except for the block device mapping.
     #
     #   For more information, see [Create an Auto Scaling Group Using an EC2
     #   Instance][1] in the *Amazon EC2 Auto Scaling User Guide*.
@@ -624,9 +650,9 @@ module Aws::AutoScaling
     #   [1]: http://docs.aws.amazon.com/autoscaling/ec2/userguide/healthcheck.html
     #
     # @option params [String] :placement_group
-    #   The name of the placement group into which you'll launch your
-    #   instances, if any. For more information, see [Placement Groups][1] in
-    #   the *Amazon Elastic Compute Cloud User Guide*.
+    #   The name of the placement group into which to launch your instances,
+    #   if any. For more information, see [Placement Groups][1] in the *Amazon
+    #   Elastic Compute Cloud User Guide*.
     #
     #
     #
@@ -743,6 +769,28 @@ module Aws::AutoScaling
     #       launch_template_name: "LaunchTemplateName",
     #       version: "XmlStringMaxLen255",
     #     },
+    #     mixed_instances_policy: {
+    #       launch_template: {
+    #         launch_template_specification: {
+    #           launch_template_id: "XmlStringMaxLen255",
+    #           launch_template_name: "LaunchTemplateName",
+    #           version: "XmlStringMaxLen255",
+    #         },
+    #         overrides: [
+    #           {
+    #             instance_type: "XmlStringMaxLen255",
+    #           },
+    #         ],
+    #       },
+    #       instances_distribution: {
+    #         on_demand_allocation_strategy: "XmlString",
+    #         on_demand_base_capacity: 1,
+    #         on_demand_percentage_above_base_capacity: 1,
+    #         spot_allocation_strategy: "XmlString",
+    #         spot_instance_pools: 1,
+    #         spot_max_price: "SpotPrice",
+    #       },
+    #     },
     #     instance_id: "XmlStringMaxLen19",
     #     min_size: 1, # required
     #     max_size: 1, # required
@@ -833,9 +881,9 @@ module Aws::AutoScaling
     #   One or more security groups with which to associate the instances.
     #
     #   If your instances are launched in EC2-Classic, you can either specify
-    #   security group names or the security group IDs. For more information
-    #   about security groups for EC2-Classic, see [Amazon EC2 Security
-    #   Groups][1] in the *Amazon Elastic Compute Cloud User Guide*.
+    #   security group names or the security group IDs. For more information,
+    #   see [Amazon EC2 Security Groups][1] in the *Amazon Elastic Compute
+    #   Cloud User Guide*.
     #
     #   If your instances are launched into a VPC, specify security group IDs.
     #   For more information, see [Security Groups for Your VPC][2] in the
@@ -878,8 +926,8 @@ module Aws::AutoScaling
     #
     # @option params [String] :instance_id
     #   The ID of the instance to use to create the launch configuration. The
-    #   new launch configuration derives attributes from the instance, with
-    #   the exception of the block device mapping.
+    #   new launch configuration derives attributes from the instance, except
+    #   for the block device mapping.
     #
     #   If you do not specify `InstanceId`, you must specify both `ImageId`
     #   and `InstanceType`.
@@ -941,7 +989,7 @@ module Aws::AutoScaling
     #   The name or the Amazon Resource Name (ARN) of the instance profile
     #   associated with the IAM role for the instance.
     #
-    #   EC2 instances launched with an IAM role will automatically have AWS
+    #   EC2 instances launched with an IAM role automatically have AWS
     #   security credentials available. You can use IAM roles with Amazon EC2
     #   Auto Scaling to automatically enable applications running on your EC2
     #   instances to securely access other AWS resources. For more
@@ -987,9 +1035,9 @@ module Aws::AutoScaling
     #   The tenancy of the instance. An instance with a tenancy of `dedicated`
     #   runs on single-tenant hardware and can only be launched into a VPC.
     #
-    #   You must set the value of this parameter to `dedicated` if want to
-    #   launch Dedicated Instances into a shared tenancy VPC (VPC with
-    #   instance placement tenancy attribute set to `default`).
+    #   To launch Dedicated Instances into a shared tenancy VPC (a VPC with
+    #   the instance placement tenancy attribute set to `default`), you must
+    #   set the value of this parameter to `dedicated`.
     #
     #   If you specify this parameter, be sure to specify at least one subnet
     #   when you create your group.
@@ -1144,8 +1192,8 @@ module Aws::AutoScaling
     #
     # To remove instances from the Auto Scaling group before deleting it,
     # call DetachInstances with the list of instances and the option to
-    # decrement the desired capacity so that Amazon EC2 Auto Scaling does
-    # not launch replacement instances.
+    # decrement the desired capacity. This ensures that Amazon EC2 Auto
+    # Scaling does not launch replacement instances.
     #
     # To terminate all instances before deleting the Auto Scaling group,
     # call UpdateAutoScalingGroup and set the minimum size and desired
@@ -1155,7 +1203,7 @@ module Aws::AutoScaling
     #   The name of the Auto Scaling group.
     #
     # @option params [Boolean] :force_delete
-    #   Specifies that the group will be deleted along with all instances
+    #   Specifies that the group is to be deleted along with all instances
     #   associated with the group, without waiting for all instances to be
     #   terminated. This parameter also deletes any lifecycle actions
     #   associated with the group.
@@ -1278,7 +1326,7 @@ module Aws::AutoScaling
     #
     # @option params [required, String] :topic_arn
     #   The Amazon Resource Name (ARN) of the Amazon Simple Notification
-    #   Service (SNS) topic.
+    #   Service (Amazon SNS) topic.
     #
     # @return [Struct] Returns an empty {Seahorse::Client::Response response}.
     #
@@ -1613,6 +1661,17 @@ module Aws::AutoScaling
     #   resp.auto_scaling_groups[0].launch_template.launch_template_id #=> String
     #   resp.auto_scaling_groups[0].launch_template.launch_template_name #=> String
     #   resp.auto_scaling_groups[0].launch_template.version #=> String
+    #   resp.auto_scaling_groups[0].mixed_instances_policy.launch_template.launch_template_specification.launch_template_id #=> String
+    #   resp.auto_scaling_groups[0].mixed_instances_policy.launch_template.launch_template_specification.launch_template_name #=> String
+    #   resp.auto_scaling_groups[0].mixed_instances_policy.launch_template.launch_template_specification.version #=> String
+    #   resp.auto_scaling_groups[0].mixed_instances_policy.launch_template.overrides #=> Array
+    #   resp.auto_scaling_groups[0].mixed_instances_policy.launch_template.overrides[0].instance_type #=> String
+    #   resp.auto_scaling_groups[0].mixed_instances_policy.instances_distribution.on_demand_allocation_strategy #=> String
+    #   resp.auto_scaling_groups[0].mixed_instances_policy.instances_distribution.on_demand_base_capacity #=> Integer
+    #   resp.auto_scaling_groups[0].mixed_instances_policy.instances_distribution.on_demand_percentage_above_base_capacity #=> Integer
+    #   resp.auto_scaling_groups[0].mixed_instances_policy.instances_distribution.spot_allocation_strategy #=> String
+    #   resp.auto_scaling_groups[0].mixed_instances_policy.instances_distribution.spot_instance_pools #=> Integer
+    #   resp.auto_scaling_groups[0].mixed_instances_policy.instances_distribution.spot_max_price #=> String
     #   resp.auto_scaling_groups[0].min_size #=> Integer
     #   resp.auto_scaling_groups[0].max_size #=> Integer
     #   resp.auto_scaling_groups[0].desired_capacity #=> Integer
@@ -2061,8 +2120,8 @@ module Aws::AutoScaling
 
     # Describes the load balancers for the specified Auto Scaling group.
     #
-    # Note that this operation describes only Classic Load Balancers. If you
-    # have Application Load Balancers, use DescribeLoadBalancerTargetGroups
+    # This operation describes only Classic Load Balancers. If you have
+    # Application Load Balancers, use DescribeLoadBalancerTargetGroups
     # instead.
     #
     # @option params [required, String] :auto_scaling_group_name
@@ -2127,8 +2186,8 @@ module Aws::AutoScaling
     # Describes the available CloudWatch metrics for Amazon EC2 Auto
     # Scaling.
     #
-    # Note that the `GroupStandbyInstances` metric is not returned by
-    # default. You must explicitly request this metric when calling
+    # The `GroupStandbyInstances` metric is not returned by default. You
+    # must explicitly request this metric when calling
     # EnableMetricsCollection.
     #
     # @return [Types::DescribeMetricCollectionTypesAnswer] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
@@ -2273,7 +2332,7 @@ module Aws::AutoScaling
     #
     # @option params [Array<String>] :policy_names
     #   The names of one or more policies. If you omit this parameter, all
-    #   policies are described. If an group name is provided, the results are
+    #   policies are described. If a group name is provided, the results are
     #   limited to that group. This list is limited to 50 items. If you
     #   specify an unknown policy name, it is ignored with no error.
     #
@@ -2633,7 +2692,8 @@ module Aws::AutoScaling
     # no match, no special message is returned.
     #
     # @option params [Array<Types::Filter>] :filters
-    #   A filter used to scope the tags to return.
+    #   One or more filters to scope the tags to return. The maximum number of
+    #   filters per filter type (for example, `auto-scaling-group`) is 1000.
     #
     # @option params [String] :next_token
     #   The token for the next set of items to return. (You received this
@@ -2719,6 +2779,14 @@ module Aws::AutoScaling
     # Describes the termination policies supported by Amazon EC2 Auto
     # Scaling.
     #
+    # For more information, see [Controlling Which Auto Scaling Instances
+    # Terminate During Scale In][1] in the *Amazon EC2 Auto Scaling User
+    # Guide*.
+    #
+    #
+    #
+    # [1]: http://docs.aws.amazon.com/autoscaling/ec2/userguide/as-instance-termination.html
+    #
     # @return [Types::DescribeTerminationPolicyTypesAnswer] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
     #
     #   * {Types::DescribeTerminationPolicyTypesAnswer#termination_policy_types #termination_policy_types} => Array&lt;String&gt;
@@ -2894,14 +2962,14 @@ module Aws::AutoScaling
     # Detaches one or more Classic Load Balancers from the specified Auto
     # Scaling group.
     #
-    # Note that this operation detaches only Classic Load Balancers. If you
-    # have Application Load Balancers, use DetachLoadBalancerTargetGroups
+    # This operation detaches only Classic Load Balancers. If you have
+    # Application Load Balancers, use DetachLoadBalancerTargetGroups
     # instead.
     #
     # When you detach a load balancer, it enters the `Removing` state while
     # deregistering the instances in the group. When all instances are
     # deregistered, then you can no longer describe the load balancer using
-    # DescribeLoadBalancers. Note that the instances remain running.
+    # DescribeLoadBalancers. The instances remain running.
     #
     # @option params [required, String] :auto_scaling_group_name
     #   The name of the Auto Scaling group.
@@ -3292,12 +3360,11 @@ module Aws::AutoScaling
     end
 
     # Creates or updates a lifecycle hook for the specified Auto Scaling
-    # Group.
+    # group.
     #
-    # A lifecycle hook tells Amazon EC2 Auto Scaling that you want to
-    # perform an action on an instance that is not actively in service; for
-    # example, either when the instance launches or before the instance
-    # terminates.
+    # A lifecycle hook tells Amazon EC2 Auto Scaling to perform an action on
+    # an instance that is not actively in service; for example, either when
+    # the instance launches or before the instance terminates.
     #
     # This step is a part of the procedure for adding a lifecycle hook to an
     # Auto Scaling group:
@@ -3358,18 +3425,18 @@ module Aws::AutoScaling
     #   updating existing hooks.
     #
     # @option params [String] :notification_target_arn
-    #   The ARN of the notification target that Amazon EC2 Auto Scaling will
-    #   use to notify you when an instance is in the transition state for the
+    #   The ARN of the notification target that Amazon EC2 Auto Scaling uses
+    #   to notify you when an instance is in the transition state for the
     #   lifecycle hook. This target can be either an SQS queue or an SNS
     #   topic. If you specify an empty string, this overrides the current ARN.
     #
     #   This operation uses the JSON format when sending notifications to an
-    #   Amazon SQS queue, and an email key/value pair format when sending
+    #   Amazon SQS queue, and an email key-value pair format when sending
     #   notifications to an Amazon SNS topic.
     #
     #   When you specify a notification target, Amazon EC2 Auto Scaling sends
-    #   it a test message. Test messages contains the following additional
-    #   key/value pair: `"Event": "autoscaling:TEST_NOTIFICATION"`.
+    #   it a test message. Test messages contain the following additional
+    #   key-value pair: `"Event": "autoscaling:TEST_NOTIFICATION"`.
     #
     # @option params [String] :notification_metadata
     #   Contains additional information that you want to include any time
@@ -3434,7 +3501,7 @@ module Aws::AutoScaling
     #
     # This configuration overwrites any existing configuration.
     #
-    # For more information see [Getting SNS Notifications When Your Auto
+    # For more information, see [Getting SNS Notifications When Your Auto
     # Scaling Group Scales][1] in the *Auto Scaling User Guide*.
     #
     #
@@ -3446,12 +3513,12 @@ module Aws::AutoScaling
     #
     # @option params [required, String] :topic_arn
     #   The Amazon Resource Name (ARN) of the Amazon Simple Notification
-    #   Service (SNS) topic.
+    #   Service (Amazon SNS) topic.
     #
     # @option params [required, Array<String>] :notification_types
-    #   The type of event that will cause the notification to be sent. For
-    #   details about notification types supported by Amazon EC2 Auto Scaling,
-    #   see DescribeAutoScalingNotificationTypes.
+    #   The type of event that causes the notification to be sent. For more
+    #   information about notification types supported by Amazon EC2 Auto
+    #   Scaling, see DescribeAutoScalingNotificationTypes.
     #
     # @return [Struct] Returns an empty {Seahorse::Client::Response response}.
     #
@@ -3487,8 +3554,8 @@ module Aws::AutoScaling
 
     # Creates or updates a policy for an Auto Scaling group. To update an
     # existing policy, use the existing policy name and set the parameters
-    # you want to change. Any existing parameter not changed in an update to
-    # an existing policy is not changed in this update request.
+    # to change. Any existing parameter not changed in an update to an
+    # existing policy is not changed in this update request.
     #
     # If you exceed your maximum limit of step adjustments, which by default
     # is 20 per region, the call fails. For information about updating this
@@ -3668,8 +3735,8 @@ module Aws::AutoScaling
     end
 
     # Creates or updates a scheduled scaling action for an Auto Scaling
-    # group. When updating a scheduled scaling action, if you leave a
-    # parameter unspecified, the corresponding value remains unchanged.
+    # group. If you leave a parameter unspecified when updating a scheduled
+    # scaling action, the corresponding value remains unchanged.
     #
     # For more information, see [Scheduled Scaling][1] in the *Amazon EC2
     # Auto Scaling User Guide*.
@@ -3800,7 +3867,7 @@ module Aws::AutoScaling
     # @option params [String] :lifecycle_action_token
     #   A token that uniquely identifies a specific lifecycle action
     #   associated with an instance. Amazon EC2 Auto Scaling sends this token
-    #   to the notification target you specified when you created the
+    #   to the notification target that you specified when you created the
     #   lifecycle hook.
     #
     # @option params [String] :instance_id
@@ -3966,19 +4033,19 @@ module Aws::AutoScaling
     #   The ID of the instance.
     #
     # @option params [required, String] :health_status
-    #   The health status of the instance. Set to `Healthy` if you want the
-    #   instance to remain in service. Set to `Unhealthy` if you want the
-    #   instance to be out of service. Amazon EC2 Auto Scaling will terminate
-    #   and replace the unhealthy instance.
+    #   The health status of the instance. Set to `Healthy` to have the
+    #   instance remain in service. Set to `Unhealthy` to have the instance be
+    #   out of service. Amazon EC2 Auto Scaling terminates and replaces the
+    #   unhealthy instance.
     #
     # @option params [Boolean] :should_respect_grace_period
     #   If the Auto Scaling group of the specified instance has a
     #   `HealthCheckGracePeriod` specified for the group, by default, this
-    #   call will respect the grace period. Set this to `False`, if you do not
-    #   want the call to respect the grace period associated with the group.
+    #   call respects the grace period. Set this to `False`, to have the call
+    #   not respect the grace period associated with the group.
     #
-    #   For more information, see the description of the health check grace
-    #   period for CreateAutoScalingGroup.
+    #   For more information about the health check grace period, see
+    #   CreateAutoScalingGroup.
     #
     # @return [Struct] Returns an empty {Seahorse::Client::Response response}.
     #
@@ -4075,8 +4142,8 @@ module Aws::AutoScaling
     # Suspends the specified automatic scaling processes, or all processes,
     # for the specified Auto Scaling group.
     #
-    # Note that if you suspend either the `Launch` or `Terminate` process
-    # types, it can prevent other process types from functioning properly.
+    # If you suspend either the `Launch` or `Terminate` process types, it
+    # can prevent other process types from functioning properly.
     #
     # To resume processes that have been suspended, use ResumeProcesses.
     #
@@ -4205,9 +4272,9 @@ module Aws::AutoScaling
     #
     # To update an Auto Scaling group with a launch configuration with
     # `InstanceMonitoring` set to `false`, you must first disable the
-    # collection of group metrics. Otherwise, you will get an error. If you
-    # have previously enabled the collection of group metrics, you can
-    # disable it using DisableMetricsCollection.
+    # collection of group metrics. Otherwise, you get an error. If you have
+    # previously enabled the collection of group metrics, you can disable it
+    # using DisableMetricsCollection.
     #
     # Note the following:
     #
@@ -4227,12 +4294,18 @@ module Aws::AutoScaling
     #   The name of the Auto Scaling group.
     #
     # @option params [String] :launch_configuration_name
-    #   The name of the launch configuration. If you specify a launch
-    #   configuration, you can't specify a launch template.
+    #   The name of the launch configuration. If you specify this parameter,
+    #   you can't specify a launch template or a mixed instances policy.
     #
     # @option params [Types::LaunchTemplateSpecification] :launch_template
-    #   The launch template to use to specify the updates. If you specify a
-    #   launch template, you can't specify a launch configuration.
+    #   The launch template and version to use to specify the updates. If you
+    #   specify this parameter, you can't specify a launch configuration or a
+    #   mixed instances policy.
+    #
+    # @option params [Types::MixedInstancesPolicy] :mixed_instances_policy
+    #   The mixed instances policy to use to specify the updates. If you
+    #   specify this parameter, you can't specify a launch configuration or a
+    #   launch template.
     #
     # @option params [Integer] :min_size
     #   The minimum size of the Auto Scaling group.
@@ -4276,9 +4349,9 @@ module Aws::AutoScaling
     #   [1]: http://docs.aws.amazon.com/autoscaling/ec2/userguide/healthcheck.html
     #
     # @option params [String] :placement_group
-    #   The name of the placement group into which you'll launch your
-    #   instances, if any. For more information, see [Placement Groups][1] in
-    #   the *Amazon Elastic Compute Cloud User Guide*.
+    #   The name of the placement group into which to launch your instances,
+    #   if any. For more information, see [Placement Groups][1] in the *Amazon
+    #   Elastic Compute Cloud User Guide*.
     #
     #
     #
@@ -4360,6 +4433,28 @@ module Aws::AutoScaling
     #       launch_template_name: "LaunchTemplateName",
     #       version: "XmlStringMaxLen255",
     #     },
+    #     mixed_instances_policy: {
+    #       launch_template: {
+    #         launch_template_specification: {
+    #           launch_template_id: "XmlStringMaxLen255",
+    #           launch_template_name: "LaunchTemplateName",
+    #           version: "XmlStringMaxLen255",
+    #         },
+    #         overrides: [
+    #           {
+    #             instance_type: "XmlStringMaxLen255",
+    #           },
+    #         ],
+    #       },
+    #       instances_distribution: {
+    #         on_demand_allocation_strategy: "XmlString",
+    #         on_demand_base_capacity: 1,
+    #         on_demand_percentage_above_base_capacity: 1,
+    #         spot_allocation_strategy: "XmlString",
+    #         spot_instance_pools: 1,
+    #         spot_max_price: "SpotPrice",
+    #       },
+    #     },
     #     min_size: 1,
     #     max_size: 1,
     #     desired_capacity: 1,
@@ -4396,7 +4491,7 @@ module Aws::AutoScaling
         params: params,
         config: config)
       context[:gem_name] = 'aws-sdk-autoscaling'
-      context[:gem_version] = '1.11.0'
+      context[:gem_version] = '1.12.0'
       Seahorse::Client::Request.new(handlers, context)
     end