aws-sdk-autoscaling 1.11.0 → 1.12.0

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

@@ -119,6 +119,7 @@ module Aws::AutoScaling
     InstanceMonitoring = Shapes::StructureShape.new(name: 'InstanceMonitoring')
     InstanceProtected = Shapes::BooleanShape.new(name: 'InstanceProtected')
     Instances = Shapes::ListShape.new(name: 'Instances')
+    InstancesDistribution = Shapes::StructureShape.new(name: 'InstancesDistribution')
     InvalidNextToken = Shapes::StructureShape.new(name: 'InvalidNextToken')
     LaunchConfiguration = Shapes::StructureShape.new(name: 'LaunchConfiguration')
     LaunchConfigurationNameType = Shapes::StructureShape.new(name: 'LaunchConfigurationNameType')
@@ -126,7 +127,9 @@ module Aws::AutoScaling
     LaunchConfigurationNamesType = Shapes::StructureShape.new(name: 'LaunchConfigurationNamesType')
     LaunchConfigurations = Shapes::ListShape.new(name: 'LaunchConfigurations')
     LaunchConfigurationsType = Shapes::StructureShape.new(name: 'LaunchConfigurationsType')
+    LaunchTemplate = Shapes::StructureShape.new(name: 'LaunchTemplate')
     LaunchTemplateName = Shapes::StringShape.new(name: 'LaunchTemplateName')
+    LaunchTemplateOverrides = Shapes::StructureShape.new(name: 'LaunchTemplateOverrides')
     LaunchTemplateSpecification = Shapes::StructureShape.new(name: 'LaunchTemplateSpecification')
     LifecycleActionResult = Shapes::StringShape.new(name: 'LifecycleActionResult')
     LifecycleActionToken = Shapes::StringShape.new(name: 'LifecycleActionToken')
@@ -163,6 +166,7 @@ module Aws::AutoScaling
     Metrics = Shapes::ListShape.new(name: 'Metrics')
     MinAdjustmentMagnitude = Shapes::IntegerShape.new(name: 'MinAdjustmentMagnitude')
     MinAdjustmentStep = Shapes::IntegerShape.new(name: 'MinAdjustmentStep')
+    MixedInstancesPolicy = Shapes::StructureShape.new(name: 'MixedInstancesPolicy')
     MonitoringEnabled = Shapes::BooleanShape.new(name: 'MonitoringEnabled')
     NoDevice = Shapes::BooleanShape.new(name: 'NoDevice')
     NotificationConfiguration = Shapes::StructureShape.new(name: 'NotificationConfiguration')
@@ -170,6 +174,9 @@ module Aws::AutoScaling
     NotificationTargetResourceName = Shapes::StringShape.new(name: 'NotificationTargetResourceName')
     NumberOfAutoScalingGroups = Shapes::IntegerShape.new(name: 'NumberOfAutoScalingGroups')
     NumberOfLaunchConfigurations = Shapes::IntegerShape.new(name: 'NumberOfLaunchConfigurations')
+    OnDemandBaseCapacity = Shapes::IntegerShape.new(name: 'OnDemandBaseCapacity')
+    OnDemandPercentageAboveBaseCapacity = Shapes::IntegerShape.new(name: 'OnDemandPercentageAboveBaseCapacity')
+    Overrides = Shapes::ListShape.new(name: 'Overrides')
     PoliciesType = Shapes::StructureShape.new(name: 'PoliciesType')
     PolicyARNType = Shapes::StructureShape.new(name: 'PolicyARNType')
     PolicyIncrement = Shapes::IntegerShape.new(name: 'PolicyIncrement')
@@ -212,6 +219,7 @@ module Aws::AutoScaling
     SetInstanceProtectionQuery = Shapes::StructureShape.new(name: 'SetInstanceProtectionQuery')
     ShouldDecrementDesiredCapacity = Shapes::BooleanShape.new(name: 'ShouldDecrementDesiredCapacity')
     ShouldRespectGracePeriod = Shapes::BooleanShape.new(name: 'ShouldRespectGracePeriod')
+    SpotInstancePools = Shapes::IntegerShape.new(name: 'SpotInstancePools')
     SpotPrice = Shapes::StringShape.new(name: 'SpotPrice')
     StepAdjustment = Shapes::StructureShape.new(name: 'StepAdjustment')
     StepAdjustments = Shapes::ListShape.new(name: 'StepAdjustments')
@@ -296,6 +304,7 @@ module Aws::AutoScaling
     AutoScalingGroup.add_member(:auto_scaling_group_arn, Shapes::ShapeRef.new(shape: ResourceName, location_name: "AutoScalingGroupARN"))
     AutoScalingGroup.add_member(:launch_configuration_name, Shapes::ShapeRef.new(shape: XmlStringMaxLen255, location_name: "LaunchConfigurationName"))
     AutoScalingGroup.add_member(:launch_template, Shapes::ShapeRef.new(shape: LaunchTemplateSpecification, location_name: "LaunchTemplate"))
+    AutoScalingGroup.add_member(:mixed_instances_policy, Shapes::ShapeRef.new(shape: MixedInstancesPolicy, location_name: "MixedInstancesPolicy"))
     AutoScalingGroup.add_member(:min_size, Shapes::ShapeRef.new(shape: AutoScalingGroupMinSize, required: true, location_name: "MinSize"))
     AutoScalingGroup.add_member(:max_size, Shapes::ShapeRef.new(shape: AutoScalingGroupMaxSize, required: true, location_name: "MaxSize"))
     AutoScalingGroup.add_member(:desired_capacity, Shapes::ShapeRef.new(shape: AutoScalingGroupDesiredCapacity, required: true, location_name: "DesiredCapacity"))
@@ -387,6 +396,7 @@ module Aws::AutoScaling
     CreateAutoScalingGroupType.add_member(:auto_scaling_group_name, Shapes::ShapeRef.new(shape: XmlStringMaxLen255, required: true, location_name: "AutoScalingGroupName"))
     CreateAutoScalingGroupType.add_member(:launch_configuration_name, Shapes::ShapeRef.new(shape: ResourceName, location_name: "LaunchConfigurationName"))
     CreateAutoScalingGroupType.add_member(:launch_template, Shapes::ShapeRef.new(shape: LaunchTemplateSpecification, location_name: "LaunchTemplate"))
+    CreateAutoScalingGroupType.add_member(:mixed_instances_policy, Shapes::ShapeRef.new(shape: MixedInstancesPolicy, location_name: "MixedInstancesPolicy"))
     CreateAutoScalingGroupType.add_member(:instance_id, Shapes::ShapeRef.new(shape: XmlStringMaxLen19, location_name: "InstanceId"))
     CreateAutoScalingGroupType.add_member(:min_size, Shapes::ShapeRef.new(shape: AutoScalingGroupMinSize, required: true, location_name: "MinSize"))
     CreateAutoScalingGroupType.add_member(:max_size, Shapes::ShapeRef.new(shape: AutoScalingGroupMaxSize, required: true, location_name: "MaxSize"))
@@ -642,6 +652,14 @@ module Aws::AutoScaling
 
     Instances.member = Shapes::ShapeRef.new(shape: Instance)
 
+    InstancesDistribution.add_member(:on_demand_allocation_strategy, Shapes::ShapeRef.new(shape: XmlString, location_name: "OnDemandAllocationStrategy"))
+    InstancesDistribution.add_member(:on_demand_base_capacity, Shapes::ShapeRef.new(shape: OnDemandBaseCapacity, location_name: "OnDemandBaseCapacity"))
+    InstancesDistribution.add_member(:on_demand_percentage_above_base_capacity, Shapes::ShapeRef.new(shape: OnDemandPercentageAboveBaseCapacity, location_name: "OnDemandPercentageAboveBaseCapacity"))
+    InstancesDistribution.add_member(:spot_allocation_strategy, Shapes::ShapeRef.new(shape: XmlString, location_name: "SpotAllocationStrategy"))
+    InstancesDistribution.add_member(:spot_instance_pools, Shapes::ShapeRef.new(shape: SpotInstancePools, location_name: "SpotInstancePools"))
+    InstancesDistribution.add_member(:spot_max_price, Shapes::ShapeRef.new(shape: SpotPrice, location_name: "SpotMaxPrice"))
+    InstancesDistribution.struct_class = Types::InstancesDistribution
+
     LaunchConfiguration.add_member(:launch_configuration_name, Shapes::ShapeRef.new(shape: XmlStringMaxLen255, required: true, location_name: "LaunchConfigurationName"))
     LaunchConfiguration.add_member(:launch_configuration_arn, Shapes::ShapeRef.new(shape: ResourceName, location_name: "LaunchConfigurationARN"))
     LaunchConfiguration.add_member(:image_id, Shapes::ShapeRef.new(shape: XmlStringMaxLen255, required: true, location_name: "ImageId"))
@@ -679,6 +697,13 @@ module Aws::AutoScaling
     LaunchConfigurationsType.add_member(:next_token, Shapes::ShapeRef.new(shape: XmlString, location_name: "NextToken"))
     LaunchConfigurationsType.struct_class = Types::LaunchConfigurationsType
 
+    LaunchTemplate.add_member(:launch_template_specification, Shapes::ShapeRef.new(shape: LaunchTemplateSpecification, location_name: "LaunchTemplateSpecification"))
+    LaunchTemplate.add_member(:overrides, Shapes::ShapeRef.new(shape: Overrides, location_name: "Overrides"))
+    LaunchTemplate.struct_class = Types::LaunchTemplate
+
+    LaunchTemplateOverrides.add_member(:instance_type, Shapes::ShapeRef.new(shape: XmlStringMaxLen255, location_name: "InstanceType"))
+    LaunchTemplateOverrides.struct_class = Types::LaunchTemplateOverrides
+
     LaunchTemplateSpecification.add_member(:launch_template_id, Shapes::ShapeRef.new(shape: XmlStringMaxLen255, location_name: "LaunchTemplateId"))
     LaunchTemplateSpecification.add_member(:launch_template_name, Shapes::ShapeRef.new(shape: LaunchTemplateName, location_name: "LaunchTemplateName"))
     LaunchTemplateSpecification.add_member(:version, Shapes::ShapeRef.new(shape: XmlStringMaxLen255, location_name: "Version"))
@@ -742,6 +767,10 @@ module Aws::AutoScaling
 
     Metrics.member = Shapes::ShapeRef.new(shape: XmlStringMaxLen255)
 
+    MixedInstancesPolicy.add_member(:launch_template, Shapes::ShapeRef.new(shape: LaunchTemplate, location_name: "LaunchTemplate"))
+    MixedInstancesPolicy.add_member(:instances_distribution, Shapes::ShapeRef.new(shape: InstancesDistribution, location_name: "InstancesDistribution"))
+    MixedInstancesPolicy.struct_class = Types::MixedInstancesPolicy
+
     NotificationConfiguration.add_member(:auto_scaling_group_name, Shapes::ShapeRef.new(shape: ResourceName, location_name: "AutoScalingGroupName"))
     NotificationConfiguration.add_member(:topic_arn, Shapes::ShapeRef.new(shape: ResourceName, location_name: "TopicARN"))
     NotificationConfiguration.add_member(:notification_type, Shapes::ShapeRef.new(shape: XmlStringMaxLen255, location_name: "NotificationType"))
@@ -749,6 +778,8 @@ module Aws::AutoScaling
 
     NotificationConfigurations.member = Shapes::ShapeRef.new(shape: NotificationConfiguration)
 
+    Overrides.member = Shapes::ShapeRef.new(shape: LaunchTemplateOverrides)
+
     PoliciesType.add_member(:scaling_policies, Shapes::ShapeRef.new(shape: ScalingPolicies, location_name: "ScalingPolicies"))
     PoliciesType.add_member(:next_token, Shapes::ShapeRef.new(shape: XmlString, location_name: "NextToken"))
     PoliciesType.struct_class = Types::PoliciesType
@@ -949,6 +980,7 @@ module Aws::AutoScaling
     UpdateAutoScalingGroupType.add_member(:auto_scaling_group_name, Shapes::ShapeRef.new(shape: ResourceName, required: true, location_name: "AutoScalingGroupName"))
     UpdateAutoScalingGroupType.add_member(:launch_configuration_name, Shapes::ShapeRef.new(shape: ResourceName, location_name: "LaunchConfigurationName"))
     UpdateAutoScalingGroupType.add_member(:launch_template, Shapes::ShapeRef.new(shape: LaunchTemplateSpecification, location_name: "LaunchTemplate"))
+    UpdateAutoScalingGroupType.add_member(:mixed_instances_policy, Shapes::ShapeRef.new(shape: MixedInstancesPolicy, location_name: "MixedInstancesPolicy"))
     UpdateAutoScalingGroupType.add_member(:min_size, Shapes::ShapeRef.new(shape: AutoScalingGroupMinSize, location_name: "MinSize"))
     UpdateAutoScalingGroupType.add_member(:max_size, Shapes::ShapeRef.new(shape: AutoScalingGroupMaxSize, location_name: "MaxSize"))
     UpdateAutoScalingGroupType.add_member(:desired_capacity, Shapes::ShapeRef.new(shape: AutoScalingGroupDesiredCapacity, location_name: "DesiredCapacity"))

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

@@ -316,18 +316,18 @@ module Aws::AutoScaling
     #   })
     # @param [Hash] options ({})
     # @option options [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 options [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 [EmptyStructure]
     def set_health(options = {})
       options = options.merge(instance_id: @id)

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

@@ -40,8 +40,8 @@ module Aws::AutoScaling
     end
     alias :lifecycle_hook_name :name
 
-    # The state of the EC2 instance to which you want to attach the
-    # lifecycle hook. The following are possible values:
+    # The state of the EC2 instance to which to attach the lifecycle hook.
+    # The following are possible values:
     #
     # * autoscaling:EC2\_INSTANCE\_LAUNCHING
     #
@@ -305,18 +305,18 @@ module Aws::AutoScaling
     #   This parameter is required for new lifecycle hooks, but optional when
     #   updating existing hooks.
     # @option options [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 options [String] :notification_metadata
     #   Contains additional information that you want to include any time
     #   Amazon EC2 Auto Scaling sends a message to the notification target.
@@ -353,7 +353,7 @@ module Aws::AutoScaling
     # @option options [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 options [String] :instance_id
     #   The ID of the instance.

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

@@ -31,6 +31,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
@@ -72,22 +94,26 @@ module Aws::AutoScaling
     #   The name of the Auto Scaling group. This name must be unique within
     #   the scope of your AWS account.
     # @option options [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 options [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 options [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 options [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*.
@@ -156,9 +182,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*.
     #
     #
     #
@@ -281,9 +307,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
@@ -322,8 +348,8 @@ module Aws::AutoScaling
     #   [1]: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-metadata.html
     # @option options [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`.
@@ -378,7 +404,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
@@ -421,9 +447,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.
@@ -607,7 +633,7 @@ module Aws::AutoScaling
     #   The name of the Auto Scaling group.
     # @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
@@ -703,7 +729,8 @@ module Aws::AutoScaling
     #   })
     # @param [Hash] options ({})
     # @option options [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.
     # @return [Tag::Collection]
     def tags(options = {})
       batches = Enumerator.new do |y|

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

@@ -53,7 +53,7 @@ module Aws::AutoScaling
     # time can be up to one month in the future.
     #
     # When `StartTime` and `EndTime` are specified with `Recurrence`, they
-    # form the boundaries of when the recurring action will start and stop.
+    # form the boundaries of when the recurring action starts and stops.
     # @return [Time]
     def start_time
       data[:start_time]

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

@@ -105,7 +105,7 @@ module Aws::AutoScaling
     #
     #
     #
-    # [1]: http://docs.aws.amazon.com/autoscaling/ec2/DeveloperGuide/as-scale-based-on-demand.html
+    # [1]: http://docs.aws.amazon.com/autoscaling/ec2/userguide/as-scale-based-on-demand.html
     #
     # @!attribute [rw] adjustment_type
     #   The policy adjustment type. The valid values are `ChangeInCapacity`,
@@ -237,6 +237,10 @@ module Aws::AutoScaling
     #   The launch template for the group.
     #   @return [Types::LaunchTemplateSpecification]
     #
+    # @!attribute [rw] mixed_instances_policy
+    #   The mixed instances policy for the group.
+    #   @return [Types::MixedInstancesPolicy]
+    #
     # @!attribute [rw] min_size
     #   The minimum size of the group.
     #   @return [Integer]
@@ -291,9 +295,9 @@ module Aws::AutoScaling
     #   @return [Array<Types::SuspendedProcess>]
     #
     # @!attribute [rw] 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*.
     #
     #
     #
@@ -342,6 +346,7 @@ module Aws::AutoScaling
       :auto_scaling_group_arn,
       :launch_configuration_name,
       :launch_template,
+      :mixed_instances_policy,
       :min_size,
       :max_size,
       :desired_capacity,
@@ -612,8 +617,8 @@ module Aws::AutoScaling
     #   Suppresses a device mapping.
     #
     #   If this parameter is true for the root device, the instance might
-    #   fail the EC2 health check. Amazon EC2 Auto Scaling launches a
-    #   replacement instance if the instance fails the health check.
+    #   fail the EC2 health check. In that case, Amazon EC2 Auto Scaling
+    #   launches a replacement instance.
     #   @return [Boolean]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/autoscaling-2011-01-01/BlockDeviceMapping AWS API Documentation
@@ -687,6 +692,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
@@ -730,26 +757,32 @@ module Aws::AutoScaling
     #   @return [String]
     #
     # @!attribute [rw] 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.
     #   @return [String]
     #
     # @!attribute [rw] 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.
     #   @return [Types::LaunchTemplateSpecification]
     #
+    # @!attribute [rw] 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.
+    #   @return [Types::MixedInstancesPolicy]
+    #
     # @!attribute [rw] 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*.
@@ -838,9 +871,9 @@ module Aws::AutoScaling
     #   @return [Integer]
     #
     # @!attribute [rw] 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*.
     #
     #
     #
@@ -909,6 +942,7 @@ module Aws::AutoScaling
       :auto_scaling_group_name,
       :launch_configuration_name,
       :launch_template,
+      :mixed_instances_policy,
       :instance_id,
       :min_size,
       :max_size,
@@ -1002,9 +1036,8 @@ module Aws::AutoScaling
     #
     #   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*.
+    #   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
@@ -1052,7 +1085,7 @@ module Aws::AutoScaling
     # @!attribute [rw] 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.
+    #   except for the block device mapping.
     #
     #   If you do not specify `InstanceId`, you must specify both `ImageId`
     #   and `InstanceType`.
@@ -1121,7 +1154,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
@@ -1171,9 +1204,9 @@ module Aws::AutoScaling
     #   `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.
@@ -1300,7 +1333,7 @@ module Aws::AutoScaling
     #   @return [String]
     #
     # @!attribute [rw] 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.
@@ -1356,7 +1389,7 @@ module Aws::AutoScaling
     #
     # @!attribute [rw] topic_arn
     #   The Amazon Resource Name (ARN) of the Amazon Simple Notification
-    #   Service (SNS) topic.
+    #   Service (Amazon SNS) topic.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/autoscaling-2011-01-01/DeleteNotificationConfigurationType AWS API Documentation
@@ -1753,8 +1786,8 @@ module Aws::AutoScaling
     #
     # @!attribute [rw] 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 limited to that group. This list is limited to 50 items. If you
+    #   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.
     #   @return [Array<String>]
     #
@@ -1896,7 +1929,9 @@ module Aws::AutoScaling
     #       }
     #
     # @!attribute [rw] 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.
     #   @return [Array<Types::Filter>]
     #
     # @!attribute [rw] next_token
@@ -1919,9 +1954,12 @@ module Aws::AutoScaling
     end
 
     # @!attribute [rw] termination_policy_types
-    #   The termination policies supported by Amazon EC2 Auto Scaling
-    #   (`OldestInstance`, `OldestLaunchConfiguration`, `NewestInstance`,
-    #   `ClosestToNextInstanceHour`, and `Default`).
+    #   The termination policies supported by Amazon EC2 Auto Scaling:
+    #   `OldestInstance`, `OldestLaunchConfiguration`, `NewestInstance`,
+    #   `ClosestToNextInstanceHour`, `Default`, `OldestLaunchTemplate`, and
+    #   `AllocationStrategy`. Currently, the `OldestLaunchTemplate` and
+    #   `AllocationStrategy` policies are only supported for Auto Scaling
+    #   groups with MixedInstancesPolicy.
     #   @return [Array<String>]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/autoscaling-2011-01-01/DescribeTerminationPolicyTypesAnswer AWS API Documentation
@@ -2438,15 +2476,15 @@ module Aws::AutoScaling
     #   @return [String]
     #
     # @!attribute [rw] lifecycle_state
-    #   A description of the current lifecycle state. Note that the
-    #   `Quarantined` state is not used.
+    #   A description of the current lifecycle state. The `Quarantined`
+    #   state is not used.
     #   @return [String]
     #
     # @!attribute [rw] health_status
     #   The last reported health status of the instance. "Healthy" means
     #   that the instance is healthy and should remain in service.
-    #   "Unhealthy" means that the instance is unhealthy and Amazon EC2
-    #   Auto Scaling should terminate and replace it.
+    #   "Unhealthy" means that the instance is unhealthy and that Amazon
+    #   EC2 Auto Scaling should terminate and replace it.
     #   @return [String]
     #
     # @!attribute [rw] launch_configuration_name
@@ -2497,6 +2535,94 @@ module Aws::AutoScaling
       include Aws::Structure
     end
 
+    # Describes an instances distribution for an Auto Scaling group with
+    # MixedInstancesPolicy.
+    #
+    # The instances distribution specifies the distribution of On-Demand
+    # Instances and Spot Instances, the maximum price to pay for Spot
+    # Instances, and how the Auto Scaling group allocates instance types.
+    #
+    # @note When making an API call, you may pass InstancesDistribution
+    #   data as a hash:
+    #
+    #       {
+    #         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",
+    #       }
+    #
+    # @!attribute [rw] on_demand_allocation_strategy
+    #   Indicates how to allocate instance types to fulfill On-Demand
+    #   capacity.
+    #
+    #   The only valid value is `prioritized`, which is also the default
+    #   value. This strategy uses the order of instance types in the
+    #   **Overrides** array of LaunchTemplate to define the launch priority
+    #   of each instance type. The first instance type in the array is
+    #   prioritized higher than the last. If all your On-Demand capacity
+    #   cannot be fulfilled using your highest priority instance, then the
+    #   Auto Scaling groups launches the remaining capacity using the second
+    #   priority instance type, and so on.
+    #   @return [String]
+    #
+    # @!attribute [rw] on_demand_base_capacity
+    #   The minimum amount of the Auto Scaling group's capacity that must
+    #   be fulfilled by On-Demand Instances. This base portion is
+    #   provisioned first as your group scales.
+    #
+    #   The default value is 0. If you leave this parameter set to 0,
+    #   On-Demand Instances are launched as a percentage of the Auto Scaling
+    #   group's desired capacity, per the
+    #   **OnDemandPercentageAboveBaseCapacity** setting.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] on_demand_percentage_above_base_capacity
+    #   Controls the percentages of On-Demand Instances and Spot Instances
+    #   for your additional capacity beyond **OnDemandBaseCapacity**.
+    #
+    #   The range is 0–100. The default value is 100. If you leave this
+    #   parameter set to 100, the percentages are 100% for On-Demand
+    #   Instances and 0% for Spot Instances.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] spot_allocation_strategy
+    #   Indicates how to allocate Spot capacity across Spot pools.
+    #
+    #   The only valid value is `lowest-price`, which is also the default
+    #   value. The Auto Scaling group selects the cheapest Spot pools and
+    #   evenly allocates your Spot capacity across the number of Spot pools
+    #   that you specify.
+    #   @return [String]
+    #
+    # @!attribute [rw] spot_instance_pools
+    #   The number of Spot pools to use to allocate your Spot capacity. The
+    #   Spot pools are determined from the different instance types in the
+    #   **Overrides** array of LaunchTemplate.
+    #
+    #   The range is 1–20 and the default is 2.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] spot_max_price
+    #   The maximum price per unit hour that you are willing to pay for a
+    #   Spot Instance. If you leave this value blank (which is the default),
+    #   the maximum Spot price is set at the On-Demand price.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/autoscaling-2011-01-01/InstancesDistribution AWS API Documentation
+    #
+    class InstancesDistribution < Struct.new(
+      :on_demand_allocation_strategy,
+      :on_demand_base_capacity,
+      :on_demand_percentage_above_base_capacity,
+      :spot_allocation_strategy,
+      :spot_instance_pools,
+      :spot_max_price)
+      include Aws::Structure
+    end
+
     # Describes a launch configuration.
     #
     # @!attribute [rw] launch_configuration_name
@@ -2690,7 +2816,86 @@ module Aws::AutoScaling
       include Aws::Structure
     end
 
-    # Describes a launch template.
+    # Describes a launch template and overrides.
+    #
+    # The overrides are used to override the instance type specified by the
+    # launch template with multiple instance types that can be used to
+    # launch On-Demand Instances and Spot Instances.
+    #
+    # @note When making an API call, you may pass LaunchTemplate
+    #   data as a hash:
+    #
+    #       {
+    #         launch_template_specification: {
+    #           launch_template_id: "XmlStringMaxLen255",
+    #           launch_template_name: "LaunchTemplateName",
+    #           version: "XmlStringMaxLen255",
+    #         },
+    #         overrides: [
+    #           {
+    #             instance_type: "XmlStringMaxLen255",
+    #           },
+    #         ],
+    #       }
+    #
+    # @!attribute [rw] launch_template_specification
+    #   The launch template to use. You must specify either the launch
+    #   template ID or launch template name in the request.
+    #   @return [Types::LaunchTemplateSpecification]
+    #
+    # @!attribute [rw] overrides
+    #   Any parameters that you specify override the same parameters in the
+    #   launch template. Currently, the only supported override is instance
+    #   type.
+    #
+    #   You must specify between 2 and 20 overrides.
+    #   @return [Array<Types::LaunchTemplateOverrides>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/autoscaling-2011-01-01/LaunchTemplate AWS API Documentation
+    #
+    class LaunchTemplate < Struct.new(
+      :launch_template_specification,
+      :overrides)
+      include Aws::Structure
+    end
+
+    # Describes an override for a launch template.
+    #
+    # @note When making an API call, you may pass LaunchTemplateOverrides
+    #   data as a hash:
+    #
+    #       {
+    #         instance_type: "XmlStringMaxLen255",
+    #       }
+    #
+    # @!attribute [rw] instance_type
+    #   The instance type.
+    #
+    #   For information about available instance types, see [Available
+    #   Instance Types][1] in the *Amazon Elastic Compute Cloud User Guide.*
+    #
+    #
+    #
+    #   [1]: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html#AvailableInstanceTypes
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/autoscaling-2011-01-01/LaunchTemplateOverrides AWS API Documentation
+    #
+    class LaunchTemplateOverrides < Struct.new(
+      :instance_type)
+      include Aws::Structure
+    end
+
+    # Describes a launch template and the launch template version.
+    #
+    # The launch template that is specified must be configured for use with
+    # an Auto Scaling group. For more information, see [Creating a Launch
+    # Template for an Auto Scaling group][1] in the *Amazon EC2 Auto Scaling
+    # User Guide*.
+    #
+    #
+    #
+    # [1]: http://docs.aws.amazon.com/autoscaling/ec2/userguide/create-launch-template.html
     #
     # @note When making an API call, you may pass LaunchTemplateSpecification
     #   data as a hash:
@@ -2749,8 +2954,8 @@ module Aws::AutoScaling
     #   @return [String]
     #
     # @!attribute [rw] lifecycle_transition
-    #   The state of the EC2 instance to which you want to attach the
-    #   lifecycle hook. The following are possible values:
+    #   The state of the EC2 instance to which to attach the lifecycle hook.
+    #   The following are possible values:
     #
     #   * autoscaling:EC2\_INSTANCE\_LAUNCHING
     #
@@ -2897,11 +3102,11 @@ module Aws::AutoScaling
     #
     # If you attach a load balancer to an existing Auto Scaling group, the
     # initial state is `Adding`. The state transitions to `Added` after all
-    # instances in the group are registered with the load balancer. If ELB
-    # health checks are enabled for the load balancer, the state transitions
-    # to `InService` after at least one instance in the group passes the
-    # health check. If EC2 health checks are enabled instead, the load
-    # balancer remains in the `Added` state.
+    # instances in the group are registered with the load balancer. If
+    # Elastic Load Balancing health checks are enabled for the load
+    # balancer, the state transitions to `InService` after at least one
+    # instance in the group passes the health check. If EC2 health checks
+    # are enabled instead, the load balancer remains in the `Added` state.
     #
     # @!attribute [rw] load_balancer_name
     #   The name of the load balancer.
@@ -2940,11 +3145,11 @@ module Aws::AutoScaling
     #
     # If you attach a target group to an existing Auto Scaling group, the
     # initial state is `Adding`. The state transitions to `Added` after all
-    # Auto Scaling instances are registered with the target group. If ELB
-    # health checks are enabled, the state transitions to `InService` after
-    # at least one Auto Scaling instance passes the health check. If EC2
-    # health checks are enabled instead, the target group remains in the
-    # `Added` state.
+    # Auto Scaling instances are registered with the target group. If
+    # Elastic Load Balancing health checks are enabled, the state
+    # transitions to `InService` after at least one Auto Scaling instance
+    # passes the health check. If EC2 health checks are enabled instead, the
+    # target group remains in the `Added` state.
     #
     # @!attribute [rw] load_balancer_target_group_arn
     #   The Amazon Resource Name (ARN) of the target group.
@@ -3047,6 +3252,70 @@ module Aws::AutoScaling
       include Aws::Structure
     end
 
+    # Describes a mixed instances policy for an Auto Scaling group. With
+    # mixed instances, your Auto Scaling group can provision a combination
+    # of On-Demand Instances and Spot Instances across multiple instance
+    # types. For more information, see [Using Multiple Instance Types and
+    # Purchase Options][1] in the *Amazon EC2 Auto Scaling User Guide*.
+    #
+    # When you create your Auto Scaling group, you can specify a launch
+    # configuration or template as a parameter for the top-level object, or
+    # you can specify a mixed instances policy, but not both at the same
+    # time.
+    #
+    #
+    #
+    # [1]: http://docs.aws.amazon.com/autoscaling/ec2/userguide/AutoScalingGroup.html#asg-purchase-options
+    #
+    # @note When making an API call, you may pass MixedInstancesPolicy
+    #   data as a hash:
+    #
+    #       {
+    #         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",
+    #         },
+    #       }
+    #
+    # @!attribute [rw] launch_template
+    #   The launch template and overrides.
+    #
+    #   This parameter is required when creating an Auto Scaling group with
+    #   a mixed instances policy, but is not required when updating the
+    #   group.
+    #   @return [Types::LaunchTemplate]
+    #
+    # @!attribute [rw] instances_distribution
+    #   The instances distribution to use.
+    #
+    #   If you leave this parameter unspecified when creating the group, the
+    #   default values are used.
+    #   @return [Types::InstancesDistribution]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/autoscaling-2011-01-01/MixedInstancesPolicy AWS API Documentation
+    #
+    class MixedInstancesPolicy < Struct.new(
+      :launch_template,
+      :instances_distribution)
+      include Aws::Structure
+    end
+
     # Describes a notification.
     #
     # @!attribute [rw] auto_scaling_group_name
@@ -3055,7 +3324,7 @@ module Aws::AutoScaling
     #
     # @!attribute [rw] topic_arn
     #   The Amazon Resource Name (ARN) of the Amazon Simple Notification
-    #   Service (SNS) topic.
+    #   Service (Amazon SNS) topic.
     #   @return [String]
     #
     # @!attribute [rw] notification_type
@@ -3134,17 +3403,17 @@ module Aws::AutoScaling
     #   Identifies the resource associated with the metric type. The
     #   following predefined metrics are available:
     #
-    #   * `ASGAverageCPUUtilization` - average CPU utilization of the Auto
-    #     Scaling group
+    #   * `ASGAverageCPUUtilization` - Average CPU utilization of the Auto
+    #     Scaling group.
     #
-    #   * `ASGAverageNetworkIn` - average number of bytes received on all
-    #     network interfaces by the Auto Scaling group
+    #   * `ASGAverageNetworkIn` - Average number of bytes received on all
+    #     network interfaces by the Auto Scaling group.
     #
-    #   * `ASGAverageNetworkOut` - average number of bytes sent out on all
-    #     network interfaces by the Auto Scaling group
+    #   * `ASGAverageNetworkOut` - Average number of bytes sent out on all
+    #     network interfaces by the Auto Scaling group.
     #
-    #   * `ALBRequestCountPerTarget` - number of requests completed per
-    #     target in an Application Load Balancer target group
+    #   * `ALBRequestCountPerTarget` - Number of requests completed per
+    #     target in an Application Load Balancer target group.
     #
     #   For predefined metric types `ASGAverageCPUUtilization`,
     #   `ASGAverageNetworkIn`, and `ASGAverageNetworkOut`, the parameter
@@ -3262,19 +3531,19 @@ module Aws::AutoScaling
     #   @return [String]
     #
     # @!attribute [rw] 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 lifecycle hook. This target can be either an SQS queue or an SNS
+    #   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":
+    #   sends it a test message. Test messages contain the following
+    #   additional key-value pair: `"Event":
     #   "autoscaling:TEST_NOTIFICATION"`.
     #   @return [String]
     #
@@ -3329,12 +3598,12 @@ module Aws::AutoScaling
     #
     # @!attribute [rw] topic_arn
     #   The Amazon Resource Name (ARN) of the Amazon Simple Notification
-    #   Service (SNS) topic.
+    #   Service (Amazon SNS) topic.
     #   @return [String]
     #
     # @!attribute [rw] notification_types
-    #   The type of event that will cause the notification to be sent. For
-    #   details about notification types supported by Amazon EC2 Auto
+    #   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 [Array<String>]
     #
@@ -3613,8 +3882,8 @@ module Aws::AutoScaling
     # @!attribute [rw] 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
-    #   lifecycle hook.
+    #   token to the notification target that you specified when you created
+    #   the lifecycle hook.
     #   @return [String]
     #
     # @!attribute [rw] instance_id
@@ -3803,8 +4072,7 @@ module Aws::AutoScaling
     #   and time can be up to one month in the future.
     #
     #   When `StartTime` and `EndTime` are specified with `Recurrence`, they
-    #   form the boundaries of when the recurring action will start and
-    #   stop.
+    #   form the boundaries of when the recurring action starts and stops.
     #   @return [Time]
     #
     # @!attribute [rw] end_time
@@ -3968,21 +4236,20 @@ module Aws::AutoScaling
     #   @return [String]
     #
     # @!attribute [rw] 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.
     #   @return [String]
     #
     # @!attribute [rw] 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 [Boolean]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/autoscaling-2011-01-01/SetInstanceHealthQuery AWS API Documentation
@@ -4036,25 +4303,25 @@ module Aws::AutoScaling
     # For the following examples, suppose that you have an alarm with a
     # breach threshold of 50:
     #
-    # * If you want the adjustment to be triggered when the metric is
-    #   greater than or equal to 50 and less than 60, specify a lower bound
-    #   of 0 and an upper bound of 10.
+    # * To trigger the adjustment when the metric is greater than or equal
+    #   to 50 and less than 60, specify a lower bound of 0 and an upper
+    #   bound of 10.
     #
-    # * If you want the adjustment to be triggered when the metric is
-    #   greater than 40 and less than or equal to 50, specify a lower bound
-    #   of -10 and an upper bound of 0.
+    # * To trigger the adjustment when the metric is greater than 40 and
+    #   less than or equal to 50, specify a lower bound of -10 and an upper
+    #   bound of 0.
     #
     # There are a few rules for the step adjustments for your step policy:
     #
     # * The ranges of your step adjustments can't overlap or have a gap.
     #
-    # * At most one step adjustment can have a null lower bound. If one step
-    #   adjustment has a negative lower bound, then there must be a step
-    #   adjustment with a null lower bound.
+    # * At most, one step adjustment can have a null lower bound. If one
+    #   step adjustment has a negative lower bound, then there must be a
+    #   step adjustment with a null lower bound.
     #
-    # * At most one step adjustment can have a null upper bound. If one step
-    #   adjustment has a positive upper bound, then there must be a step
-    #   adjustment with a null upper bound.
+    # * At most, one step adjustment can have a null upper bound. If one
+    #   step adjustment has a positive upper bound, then there must be a
+    #   step adjustment with a null upper bound.
     #
     # * The upper and lower bound can't be null in the same step
     #   adjustment.
@@ -4260,11 +4527,11 @@ module Aws::AutoScaling
     #   @return [Float]
     #
     # @!attribute [rw] disable_scale_in
-    #   Indicates whether scale in by the target tracking policy is
-    #   disabled. If scale in is disabled, the target tracking policy won't
-    #   remove instances from the Auto Scaling group. Otherwise, the target
-    #   tracking policy can remove instances from the Auto Scaling group.
-    #   The default is disabled.
+    #   Indicates whether scaling in by the target tracking policy is
+    #   disabled. If scaling in is disabled, the target tracking policy
+    #   doesn't remove instances from the Auto Scaling group. Otherwise,
+    #   the target tracking policy can remove instances from the Auto
+    #   Scaling group. The default is disabled.
     #   @return [Boolean]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/autoscaling-2011-01-01/TargetTrackingConfiguration AWS API Documentation
@@ -4313,6 +4580,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,
@@ -4332,15 +4621,22 @@ module Aws::AutoScaling
     #   @return [String]
     #
     # @!attribute [rw] 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.
     #   @return [String]
     #
     # @!attribute [rw] 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.
     #   @return [Types::LaunchTemplateSpecification]
     #
+    # @!attribute [rw] 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.
+    #   @return [Types::MixedInstancesPolicy]
+    #
     # @!attribute [rw] min_size
     #   The minimum size of the Auto Scaling group.
     #   @return [Integer]
@@ -4391,9 +4687,9 @@ module Aws::AutoScaling
     #   @return [Integer]
     #
     # @!attribute [rw] 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*.
     #
     #
     #
@@ -4445,6 +4741,7 @@ module Aws::AutoScaling
       :auto_scaling_group_name,
       :launch_configuration_name,
       :launch_template,
+      :mixed_instances_policy,
       :min_size,
       :max_size,
       :desired_capacity,