aws-sdk-autoscaling 1.29.0 → 1.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74d10a4fc46b086f5231d2ed59ecd5515c49f5b6
-  data.tar.gz: 802a7c4ab011ff8c061f2fdf1a022139020f5ca2
+  metadata.gz: 288e141d45f5e335d1ea19f7adf053ebb99939a7
+  data.tar.gz: 615cee12a5afce59603543ce1a1ce5ba8694cdb4
 SHA512:
-  metadata.gz: c0dac9592d47b7ad159317e312b1e43e9beae3f1c24429ce5179bbce03de748cb379065f18af3bc5a41bff11885d446c6ddb9d3d1dd9ac8712562d4b20306608
-  data.tar.gz: 26dcba0378f970a0785e0d06eb68b16bd6cda9104b0bbb309939fa2dd9e6a3cf711fccf6d8f3ff1ece320898e13c17e3cc9176436e67a56e3c07c2c45724683c
+  metadata.gz: db683f319a28056e7e7327e3d0a2490ef81dbce65a7c31b1069b53092734a0ff14b09fe978be318c8e24ceac2f68d6e156729f63f9d1b6a965ce5b03eea9ea26
+  data.tar.gz: e3a7d661058fffee86e78ba3490654e56fcd78c1781e297ae8c2850011ef19555b00062e8d2932849fec0b344f6f585d31f1e124175b549f3b26a9237131fef9

data/lib/aws-sdk-autoscaling.rb

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

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

@@ -174,6 +174,15 @@ module Aws::AutoScaling
       data[:service_linked_role_arn]
     end
 
+    # The maximum amount of time, in seconds, that an instance can be in
+    # service.
+    #
+    # Valid Range: Minimum value of 604800.
+    # @return [Integer]
+    def max_instance_lifetime
+      data[:max_instance_lifetime]
+    end
+
     # @!endgroup
 
     # @return [Client]
@@ -809,6 +818,7 @@ module Aws::AutoScaling
     #         overrides: [
     #           {
     #             instance_type: "XmlStringMaxLen255",
+    #             weighted_capacity: "XmlStringMaxLen32",
     #           },
     #         ],
     #       },
@@ -833,18 +843,13 @@ module Aws::AutoScaling
     #     termination_policies: ["XmlStringMaxLen1600"],
     #     new_instances_protected_from_scale_in: false,
     #     service_linked_role_arn: "ResourceName",
+    #     max_instance_lifetime: 1,
     #   })
     # @param [Hash] options ({})
     # @option options [String] :launch_configuration_name
     #   The name of the launch configuration. If you specify
     #   `LaunchConfigurationName` in your update request, you can't specify
     #   `LaunchTemplate` or `MixedInstancesPolicy`.
-    #
-    #   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 get an error. If you have
-    #   previously enabled the collection of group metrics, you can disable it
-    #   using DisableMetricsCollection.
     # @option options [Types::LaunchTemplateSpecification] :launch_template
     #   The launch template and version to use to specify the updates. If you
     #   specify `LaunchTemplate` in your update request, you can't specify
@@ -963,6 +968,11 @@ module Aws::AutoScaling
     #
     #
     #   [1]: https://docs.aws.amazon.com/autoscaling/ec2/userguide/autoscaling-service-linked-role.html
+    # @option options [Integer] :max_instance_lifetime
+    #   The maximum amount of time, in seconds, that an instance can be in
+    #   service.
+    #
+    #   Valid Range: Minimum value of 604800.
     # @return [AutoScalingGroup]
     def update(options = {})
       options = options.merge(auto_scaling_group_name: @name)

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

@@ -828,6 +828,12 @@ module Aws::AutoScaling
     #
     #   [1]: https://docs.aws.amazon.com/autoscaling/ec2/userguide/autoscaling-service-linked-role.html
     #
+    # @option params [Integer] :max_instance_lifetime
+    #   The maximum amount of time, in seconds, that an instance can be in
+    #   service.
+    #
+    #   Valid Range: Minimum value of 604800.
+    #
     # @return [Struct] Returns an empty {Seahorse::Client::Response response}.
     #
     #
@@ -899,6 +905,7 @@ module Aws::AutoScaling
     #         overrides: [
     #           {
     #             instance_type: "XmlStringMaxLen255",
+    #             weighted_capacity: "XmlStringMaxLen32",
     #           },
     #         ],
     #       },
@@ -946,6 +953,7 @@ module Aws::AutoScaling
     #       },
     #     ],
     #     service_linked_role_arn: "ResourceName",
+    #     max_instance_lifetime: 1,
     #   })
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/autoscaling-2011-01-01/CreateAutoScalingGroup AWS API Documentation
@@ -1117,18 +1125,14 @@ module Aws::AutoScaling
     # @option params [String] :spot_price
     #   The maximum hourly price to be paid for any Spot Instance launched to
     #   fulfill the request. Spot Instances are launched when the price you
-    #   specify exceeds the current Spot market price. For more information,
-    #   see [Launching Spot Instances in Your Auto Scaling Group][1] in the
+    #   specify exceeds the current Spot price. For more information, see
+    #   [Launching Spot Instances in Your Auto Scaling Group][1] in the
     #   *Amazon EC2 Auto Scaling User Guide*.
     #
-    #   If a Spot price is set, then the Auto Scaling group will only launch
-    #   instances when the Spot price has been met, regardless of the setting
-    #   in the Auto Scaling group's `DesiredCapacity`.
-    #
-    #   <note markdown="1"> When you change your Spot price by creating a new launch
+    #   <note markdown="1"> When you change your maximum price by creating a new launch
     #   configuration, running instances will continue to run as long as the
-    #   Spot price for those running instances is higher than the current Spot
-    #   market price.
+    #   maximum price for those running instances is higher than the current
+    #   Spot price.
     #
     #    </note>
     #
@@ -1203,7 +1207,7 @@ module Aws::AutoScaling
     #   For more information, see [Instance Placement Tenancy][1] in the
     #   *Amazon EC2 Auto Scaling User Guide*.
     #
-    #   Valid values: `default` \| `dedicated`
+    #   Valid Values: `default` \| `dedicated`
     #
     #
     #
@@ -1835,6 +1839,7 @@ module Aws::AutoScaling
     #   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.launch_template.overrides[0].weighted_capacity #=> 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
@@ -1855,6 +1860,7 @@ module Aws::AutoScaling
     #   resp.auto_scaling_groups[0].health_check_grace_period #=> Integer
     #   resp.auto_scaling_groups[0].instances #=> Array
     #   resp.auto_scaling_groups[0].instances[0].instance_id #=> String
+    #   resp.auto_scaling_groups[0].instances[0].instance_type #=> String
     #   resp.auto_scaling_groups[0].instances[0].availability_zone #=> String
     #   resp.auto_scaling_groups[0].instances[0].lifecycle_state #=> String, one of "Pending", "Pending:Wait", "Pending:Proceed", "Quarantined", "InService", "Terminating", "Terminating:Wait", "Terminating:Proceed", "Terminated", "Detaching", "Detached", "EnteringStandby", "Standby"
     #   resp.auto_scaling_groups[0].instances[0].health_status #=> String
@@ -1863,6 +1869,7 @@ module Aws::AutoScaling
     #   resp.auto_scaling_groups[0].instances[0].launch_template.launch_template_name #=> String
     #   resp.auto_scaling_groups[0].instances[0].launch_template.version #=> String
     #   resp.auto_scaling_groups[0].instances[0].protected_from_scale_in #=> Boolean
+    #   resp.auto_scaling_groups[0].instances[0].weighted_capacity #=> String
     #   resp.auto_scaling_groups[0].created_time #=> Time
     #   resp.auto_scaling_groups[0].suspended_processes #=> Array
     #   resp.auto_scaling_groups[0].suspended_processes[0].process_name #=> String
@@ -1883,6 +1890,7 @@ module Aws::AutoScaling
     #   resp.auto_scaling_groups[0].termination_policies[0] #=> String
     #   resp.auto_scaling_groups[0].new_instances_protected_from_scale_in #=> Boolean
     #   resp.auto_scaling_groups[0].service_linked_role_arn #=> String
+    #   resp.auto_scaling_groups[0].max_instance_lifetime #=> Integer
     #   resp.next_token #=> String
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/autoscaling-2011-01-01/DescribeAutoScalingGroups AWS API Documentation
@@ -1952,6 +1960,7 @@ module Aws::AutoScaling
     #
     #   resp.auto_scaling_instances #=> Array
     #   resp.auto_scaling_instances[0].instance_id #=> String
+    #   resp.auto_scaling_instances[0].instance_type #=> String
     #   resp.auto_scaling_instances[0].auto_scaling_group_name #=> String
     #   resp.auto_scaling_instances[0].availability_zone #=> String
     #   resp.auto_scaling_instances[0].lifecycle_state #=> String
@@ -1961,6 +1970,7 @@ module Aws::AutoScaling
     #   resp.auto_scaling_instances[0].launch_template.launch_template_name #=> String
     #   resp.auto_scaling_instances[0].launch_template.version #=> String
     #   resp.auto_scaling_instances[0].protected_from_scale_in #=> Boolean
+    #   resp.auto_scaling_instances[0].weighted_capacity #=> String
     #   resp.next_token #=> String
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/autoscaling-2011-01-01/DescribeAutoScalingInstances AWS API Documentation
@@ -3298,6 +3308,15 @@ module Aws::AutoScaling
 
     # Moves the specified instances into the standby state.
     #
+    # If you choose to decrement the desired capacity of the Auto Scaling
+    # group, the instances can enter standby as long as the desired capacity
+    # of the Auto Scaling group after the instances are placed into standby
+    # is equal to or greater than the minimum capacity of the group.
+    #
+    # If you choose not to decrement the desired capacity of the Auto
+    # Scaling group, the Auto Scaling group launches new instances to
+    # replace the instances on standby.
+    #
     # For more information, see [Temporarily Removing Instances from Your
     # Auto Scaling Group][1] in the *Amazon EC2 Auto Scaling User Guide*.
     #
@@ -3454,6 +3473,9 @@ module Aws::AutoScaling
 
     # Moves the specified instances out of the standby state.
     #
+    # After you put the instances back in service, the desired capacity is
+    # incremented.
+    #
     # For more information, see [Temporarily Removing Instances from Your
     # Auto Scaling Group][1] in the *Amazon EC2 Auto Scaling User Guide*.
     #
@@ -4472,8 +4494,7 @@ module Aws::AutoScaling
     # To update an Auto Scaling group, specify the name of the group and the
     # parameter that you want to change. Any parameters that you don't
     # specify are not changed by this update request. The new settings take
-    # effect on any scaling activities after this call returns. Scaling
-    # activities that are currently in progress aren't affected.
+    # effect on any scaling activities after this call returns.
     #
     # If you associate a new launch configuration or template with an Auto
     # Scaling group, all new instances will get the updated configuration.
@@ -4520,12 +4541,6 @@ module Aws::AutoScaling
     #   `LaunchConfigurationName` in your update request, you can't specify
     #   `LaunchTemplate` or `MixedInstancesPolicy`.
     #
-    #   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 get an error. If you have
-    #   previously enabled the collection of group metrics, you can disable it
-    #   using DisableMetricsCollection.
-    #
     # @option params [Types::LaunchTemplateSpecification] :launch_template
     #   The launch template and version to use to specify the updates. If you
     #   specify `LaunchTemplate` in your update request, you can't specify
@@ -4658,6 +4673,12 @@ module Aws::AutoScaling
     #
     #   [1]: https://docs.aws.amazon.com/autoscaling/ec2/userguide/autoscaling-service-linked-role.html
     #
+    # @option params [Integer] :max_instance_lifetime
+    #   The maximum amount of time, in seconds, that an instance can be in
+    #   service.
+    #
+    #   Valid Range: Minimum value of 604800.
+    #
     # @return [Struct] Returns an empty {Seahorse::Client::Response response}.
     #
     #
@@ -4709,6 +4730,7 @@ module Aws::AutoScaling
     #         overrides: [
     #           {
     #             instance_type: "XmlStringMaxLen255",
+    #             weighted_capacity: "XmlStringMaxLen32",
     #           },
     #         ],
     #       },
@@ -4733,6 +4755,7 @@ module Aws::AutoScaling
     #     termination_policies: ["XmlStringMaxLen1600"],
     #     new_instances_protected_from_scale_in: false,
     #     service_linked_role_arn: "ResourceName",
+    #     max_instance_lifetime: 1,
     #   })
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/autoscaling-2011-01-01/UpdateAutoScalingGroup AWS API Documentation
@@ -4757,7 +4780,7 @@ module Aws::AutoScaling
         params: params,
         config: config)
       context[:gem_name] = 'aws-sdk-autoscaling'
-      context[:gem_version] = '1.29.0'
+      context[:gem_version] = '1.30.0'
       Seahorse::Client::Request.new(handlers, context)
     end
 

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

@@ -146,6 +146,7 @@ module Aws::AutoScaling
     LoadBalancerStates = Shapes::ListShape.new(name: 'LoadBalancerStates')
     LoadBalancerTargetGroupState = Shapes::StructureShape.new(name: 'LoadBalancerTargetGroupState')
     LoadBalancerTargetGroupStates = Shapes::ListShape.new(name: 'LoadBalancerTargetGroupStates')
+    MaxInstanceLifetime = Shapes::IntegerShape.new(name: 'MaxInstanceLifetime')
     MaxNumberOfAutoScalingGroups = Shapes::IntegerShape.new(name: 'MaxNumberOfAutoScalingGroups')
     MaxNumberOfLaunchConfigurations = Shapes::IntegerShape.new(name: 'MaxNumberOfLaunchConfigurations')
     MaxRecords = Shapes::IntegerShape.new(name: 'MaxRecords')
@@ -329,6 +330,7 @@ module Aws::AutoScaling
     AutoScalingGroup.add_member(:termination_policies, Shapes::ShapeRef.new(shape: TerminationPolicies, location_name: "TerminationPolicies"))
     AutoScalingGroup.add_member(:new_instances_protected_from_scale_in, Shapes::ShapeRef.new(shape: InstanceProtected, location_name: "NewInstancesProtectedFromScaleIn"))
     AutoScalingGroup.add_member(:service_linked_role_arn, Shapes::ShapeRef.new(shape: ResourceName, location_name: "ServiceLinkedRoleARN"))
+    AutoScalingGroup.add_member(:max_instance_lifetime, Shapes::ShapeRef.new(shape: MaxInstanceLifetime, location_name: "MaxInstanceLifetime"))
     AutoScalingGroup.struct_class = Types::AutoScalingGroup
 
     AutoScalingGroupNames.member = Shapes::ShapeRef.new(shape: ResourceName)
@@ -345,6 +347,7 @@ module Aws::AutoScaling
     AutoScalingGroupsType.struct_class = Types::AutoScalingGroupsType
 
     AutoScalingInstanceDetails.add_member(:instance_id, Shapes::ShapeRef.new(shape: XmlStringMaxLen19, required: true, location_name: "InstanceId"))
+    AutoScalingInstanceDetails.add_member(:instance_type, Shapes::ShapeRef.new(shape: XmlStringMaxLen255, location_name: "InstanceType"))
     AutoScalingInstanceDetails.add_member(:auto_scaling_group_name, Shapes::ShapeRef.new(shape: XmlStringMaxLen255, required: true, location_name: "AutoScalingGroupName"))
     AutoScalingInstanceDetails.add_member(:availability_zone, Shapes::ShapeRef.new(shape: XmlStringMaxLen255, required: true, location_name: "AvailabilityZone"))
     AutoScalingInstanceDetails.add_member(:lifecycle_state, Shapes::ShapeRef.new(shape: XmlStringMaxLen32, required: true, location_name: "LifecycleState"))
@@ -352,6 +355,7 @@ module Aws::AutoScaling
     AutoScalingInstanceDetails.add_member(:launch_configuration_name, Shapes::ShapeRef.new(shape: XmlStringMaxLen255, location_name: "LaunchConfigurationName"))
     AutoScalingInstanceDetails.add_member(:launch_template, Shapes::ShapeRef.new(shape: LaunchTemplateSpecification, location_name: "LaunchTemplate"))
     AutoScalingInstanceDetails.add_member(:protected_from_scale_in, Shapes::ShapeRef.new(shape: InstanceProtected, required: true, location_name: "ProtectedFromScaleIn"))
+    AutoScalingInstanceDetails.add_member(:weighted_capacity, Shapes::ShapeRef.new(shape: XmlStringMaxLen32, location_name: "WeightedCapacity"))
     AutoScalingInstanceDetails.struct_class = Types::AutoScalingInstanceDetails
 
     AutoScalingInstances.member = Shapes::ShapeRef.new(shape: AutoScalingInstanceDetails)
@@ -418,6 +422,7 @@ module Aws::AutoScaling
     CreateAutoScalingGroupType.add_member(:lifecycle_hook_specification_list, Shapes::ShapeRef.new(shape: LifecycleHookSpecifications, location_name: "LifecycleHookSpecificationList"))
     CreateAutoScalingGroupType.add_member(:tags, Shapes::ShapeRef.new(shape: Tags, location_name: "Tags"))
     CreateAutoScalingGroupType.add_member(:service_linked_role_arn, Shapes::ShapeRef.new(shape: ResourceName, location_name: "ServiceLinkedRoleARN"))
+    CreateAutoScalingGroupType.add_member(:max_instance_lifetime, Shapes::ShapeRef.new(shape: MaxInstanceLifetime, location_name: "MaxInstanceLifetime"))
     CreateAutoScalingGroupType.struct_class = Types::CreateAutoScalingGroupType
 
     CreateLaunchConfigurationType.add_member(:launch_configuration_name, Shapes::ShapeRef.new(shape: XmlStringMaxLen255, required: true, location_name: "LaunchConfigurationName"))
@@ -641,12 +646,14 @@ module Aws::AutoScaling
     Filters.member = Shapes::ShapeRef.new(shape: Filter)
 
     Instance.add_member(:instance_id, Shapes::ShapeRef.new(shape: XmlStringMaxLen19, required: true, location_name: "InstanceId"))
+    Instance.add_member(:instance_type, Shapes::ShapeRef.new(shape: XmlStringMaxLen255, location_name: "InstanceType"))
     Instance.add_member(:availability_zone, Shapes::ShapeRef.new(shape: XmlStringMaxLen255, required: true, location_name: "AvailabilityZone"))
     Instance.add_member(:lifecycle_state, Shapes::ShapeRef.new(shape: LifecycleState, required: true, location_name: "LifecycleState"))
     Instance.add_member(:health_status, Shapes::ShapeRef.new(shape: XmlStringMaxLen32, required: true, location_name: "HealthStatus"))
     Instance.add_member(:launch_configuration_name, Shapes::ShapeRef.new(shape: XmlStringMaxLen255, location_name: "LaunchConfigurationName"))
     Instance.add_member(:launch_template, Shapes::ShapeRef.new(shape: LaunchTemplateSpecification, location_name: "LaunchTemplate"))
     Instance.add_member(:protected_from_scale_in, Shapes::ShapeRef.new(shape: InstanceProtected, required: true, location_name: "ProtectedFromScaleIn"))
+    Instance.add_member(:weighted_capacity, Shapes::ShapeRef.new(shape: XmlStringMaxLen32, location_name: "WeightedCapacity"))
     Instance.struct_class = Types::Instance
 
     InstanceIds.member = Shapes::ShapeRef.new(shape: XmlStringMaxLen19)
@@ -709,6 +716,7 @@ module Aws::AutoScaling
     LaunchTemplate.struct_class = Types::LaunchTemplate
 
     LaunchTemplateOverrides.add_member(:instance_type, Shapes::ShapeRef.new(shape: XmlStringMaxLen255, location_name: "InstanceType"))
+    LaunchTemplateOverrides.add_member(:weighted_capacity, Shapes::ShapeRef.new(shape: XmlStringMaxLen32, location_name: "WeightedCapacity"))
     LaunchTemplateOverrides.struct_class = Types::LaunchTemplateOverrides
 
     LaunchTemplateSpecification.add_member(:launch_template_id, Shapes::ShapeRef.new(shape: XmlStringMaxLen255, location_name: "LaunchTemplateId"))
@@ -1015,6 +1023,7 @@ module Aws::AutoScaling
     UpdateAutoScalingGroupType.add_member(:termination_policies, Shapes::ShapeRef.new(shape: TerminationPolicies, location_name: "TerminationPolicies"))
     UpdateAutoScalingGroupType.add_member(:new_instances_protected_from_scale_in, Shapes::ShapeRef.new(shape: InstanceProtected, location_name: "NewInstancesProtectedFromScaleIn"))
     UpdateAutoScalingGroupType.add_member(:service_linked_role_arn, Shapes::ShapeRef.new(shape: ResourceName, location_name: "ServiceLinkedRoleARN"))
+    UpdateAutoScalingGroupType.add_member(:max_instance_lifetime, Shapes::ShapeRef.new(shape: MaxInstanceLifetime, location_name: "MaxInstanceLifetime"))
     UpdateAutoScalingGroupType.struct_class = Types::UpdateAutoScalingGroupType
 
     Values.member = Shapes::ShapeRef.new(shape: XmlString)

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

@@ -40,6 +40,12 @@ module Aws::AutoScaling
     end
     alias :instance_id :id
 
+    # The instance type of the EC2 instance.
+    # @return [String]
+    def instance_type
+      data[:instance_type]
+    end
+
     # The Availability Zone for the instance.
     # @return [String]
     def availability_zone
@@ -81,6 +87,15 @@ module Aws::AutoScaling
       data[:protected_from_scale_in]
     end
 
+    # The number of capacity units contributed by the instance based on its
+    # instance type.
+    #
+    # Valid Range: Minimum value of 1. Maximum value of 999.
+    # @return [String]
+    def weighted_capacity
+      data[:weighted_capacity]
+    end
+
     # @!endgroup
 
     # @return [Client]

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

@@ -179,7 +179,7 @@ module Aws::AutoScaling
 
     # The maximum hourly price to be paid for any Spot Instance launched to
     # fulfill the request. Spot Instances are launched when the price you
-    # specify exceeds the current Spot market price.
+    # specify exceeds the current Spot price.
     #
     # For more information, see [Launching Spot Instances in Your Auto
     # Scaling Group][1] in the *Amazon EC2 Auto Scaling User Guide*.

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

@@ -41,6 +41,7 @@ module Aws::AutoScaling
     #         overrides: [
     #           {
     #             instance_type: "XmlStringMaxLen255",
+    #             weighted_capacity: "XmlStringMaxLen32",
     #           },
     #         ],
     #       },
@@ -88,6 +89,7 @@ module Aws::AutoScaling
     #       },
     #     ],
     #     service_linked_role_arn: "ResourceName",
+    #     max_instance_lifetime: 1,
     #   })
     # @param [Hash] options ({})
     # @option options [required, String] :auto_scaling_group_name
@@ -298,6 +300,11 @@ module Aws::AutoScaling
     #
     #
     #   [1]: https://docs.aws.amazon.com/autoscaling/ec2/userguide/autoscaling-service-linked-role.html
+    # @option options [Integer] :max_instance_lifetime
+    #   The maximum amount of time, in seconds, that an instance can be in
+    #   service.
+    #
+    #   Valid Range: Minimum value of 604800.
     # @return [AutoScalingGroup]
     def create_group(options = {})
       resp = @client.create_auto_scaling_group(options)
@@ -477,18 +484,14 @@ module Aws::AutoScaling
     # @option options [String] :spot_price
     #   The maximum hourly price to be paid for any Spot Instance launched to
     #   fulfill the request. Spot Instances are launched when the price you
-    #   specify exceeds the current Spot market price. For more information,
-    #   see [Launching Spot Instances in Your Auto Scaling Group][1] in the
+    #   specify exceeds the current Spot price. For more information, see
+    #   [Launching Spot Instances in Your Auto Scaling Group][1] in the
     #   *Amazon EC2 Auto Scaling User Guide*.
     #
-    #   If a Spot price is set, then the Auto Scaling group will only launch
-    #   instances when the Spot price has been met, regardless of the setting
-    #   in the Auto Scaling group's `DesiredCapacity`.
-    #
-    #   <note markdown="1"> When you change your Spot price by creating a new launch
+    #   <note markdown="1"> When you change your maximum price by creating a new launch
     #   configuration, running instances will continue to run as long as the
-    #   Spot price for those running instances is higher than the current Spot
-    #   market price.
+    #   maximum price for those running instances is higher than the current
+    #   Spot price.
     #
     #    </note>
     #
@@ -559,7 +562,7 @@ module Aws::AutoScaling
     #   For more information, see [Instance Placement Tenancy][1] in the
     #   *Amazon EC2 Auto Scaling User Guide*.
     #
-    #   Valid values: `default` \| `dedicated`
+    #   Valid Values: `default` \| `dedicated`
     #
     #
     #

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

@@ -341,6 +341,13 @@ module Aws::AutoScaling
     #   Auto Scaling group uses to call other AWS services on your behalf.
     #   @return [String]
     #
+    # @!attribute [rw] max_instance_lifetime
+    #   The maximum amount of time, in seconds, that an instance can be in
+    #   service.
+    #
+    #   Valid Range: Minimum value of 604800.
+    #   @return [Integer]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/autoscaling-2011-01-01/AutoScalingGroup AWS API Documentation
     #
     class AutoScalingGroup < Struct.new(
@@ -368,7 +375,8 @@ module Aws::AutoScaling
       :tags,
       :termination_policies,
       :new_instances_protected_from_scale_in,
-      :service_linked_role_arn)
+      :service_linked_role_arn,
+      :max_instance_lifetime)
       include Aws::Structure
     end
 
@@ -435,6 +443,10 @@ module Aws::AutoScaling
     #   The ID of the instance.
     #   @return [String]
     #
+    # @!attribute [rw] instance_type
+    #   The instance type of the EC2 instance.
+    #   @return [String]
+    #
     # @!attribute [rw] auto_scaling_group_name
     #   The name of the Auto Scaling group for the instance.
     #   @return [String]
@@ -469,17 +481,26 @@ module Aws::AutoScaling
     #   Amazon EC2 Auto Scaling when scaling in.
     #   @return [Boolean]
     #
+    # @!attribute [rw] weighted_capacity
+    #   The number of capacity units contributed by the instance based on
+    #   its instance type.
+    #
+    #   Valid Range: Minimum value of 1. Maximum value of 999.
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/autoscaling-2011-01-01/AutoScalingInstanceDetails AWS API Documentation
     #
     class AutoScalingInstanceDetails < Struct.new(
       :instance_id,
+      :instance_type,
       :auto_scaling_group_name,
       :availability_zone,
       :lifecycle_state,
       :health_status,
       :launch_configuration_name,
       :launch_template,
-      :protected_from_scale_in)
+      :protected_from_scale_in,
+      :weighted_capacity)
       include Aws::Structure
     end
 
@@ -712,6 +733,7 @@ module Aws::AutoScaling
     #             overrides: [
     #               {
     #                 instance_type: "XmlStringMaxLen255",
+    #                 weighted_capacity: "XmlStringMaxLen32",
     #               },
     #             ],
     #           },
@@ -759,6 +781,7 @@ module Aws::AutoScaling
     #           },
     #         ],
     #         service_linked_role_arn: "ResourceName",
+    #         max_instance_lifetime: 1,
     #       }
     #
     # @!attribute [rw] auto_scaling_group_name
@@ -1012,6 +1035,13 @@ module Aws::AutoScaling
     #   [1]: https://docs.aws.amazon.com/autoscaling/ec2/userguide/autoscaling-service-linked-role.html
     #   @return [String]
     #
+    # @!attribute [rw] max_instance_lifetime
+    #   The maximum amount of time, in seconds, that an instance can be in
+    #   service.
+    #
+    #   Valid Range: Minimum value of 604800.
+    #   @return [Integer]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/autoscaling-2011-01-01/CreateAutoScalingGroupType AWS API Documentation
     #
     class CreateAutoScalingGroupType < Struct.new(
@@ -1035,7 +1065,8 @@ module Aws::AutoScaling
       :new_instances_protected_from_scale_in,
       :lifecycle_hook_specification_list,
       :tags,
-      :service_linked_role_arn)
+      :service_linked_role_arn,
+      :max_instance_lifetime)
       include Aws::Structure
     end
 
@@ -1237,18 +1268,14 @@ module Aws::AutoScaling
     # @!attribute [rw] spot_price
     #   The maximum hourly price to be paid for any Spot Instance launched
     #   to fulfill the request. Spot Instances are launched when the price
-    #   you specify exceeds the current Spot market price. For more
-    #   information, see [Launching Spot Instances in Your Auto Scaling
-    #   Group][1] in the *Amazon EC2 Auto Scaling User Guide*.
-    #
-    #   If a Spot price is set, then the Auto Scaling group will only launch
-    #   instances when the Spot price has been met, regardless of the
-    #   setting in the Auto Scaling group's `DesiredCapacity`.
+    #   you specify exceeds the current Spot price. For more information,
+    #   see [Launching Spot Instances in Your Auto Scaling Group][1] in the
+    #   *Amazon EC2 Auto Scaling User Guide*.
     #
-    #   <note markdown="1"> When you change your Spot price by creating a new launch
+    #   <note markdown="1"> When you change your maximum price by creating a new launch
     #   configuration, running instances will continue to run as long as the
-    #   Spot price for those running instances is higher than the current
-    #   Spot market price.
+    #   maximum price for those running instances is higher than the current
+    #   Spot price.
     #
     #    </note>
     #
@@ -1329,7 +1356,7 @@ module Aws::AutoScaling
     #   For more information, see [Instance Placement Tenancy][1] in the
     #   *Amazon EC2 Auto Scaling User Guide*.
     #
-    #   Valid values: `default` \| `dedicated`
+    #   Valid Values: `default` \| `dedicated`
     #
     #
     #
@@ -2304,7 +2331,7 @@ module Aws::AutoScaling
     #   information, see [Amazon EBS Volume Types][1] in the *Amazon EC2
     #   User Guide for Linux Instances*.
     #
-    #   Valid values: `standard` \| `io1` \| `gp2` \| `st1` \| `sc1`
+    #   Valid Values: `standard` \| `io1` \| `gp2` \| `st1` \| `sc1`
     #
     #
     #
@@ -2662,6 +2689,10 @@ module Aws::AutoScaling
     #   The ID of the instance.
     #   @return [String]
     #
+    # @!attribute [rw] instance_type
+    #   The instance type of the EC2 instance.
+    #   @return [String]
+    #
     # @!attribute [rw] availability_zone
     #   The Availability Zone in which the instance is running.
     #   @return [String]
@@ -2691,16 +2722,25 @@ module Aws::AutoScaling
     #   Amazon EC2 Auto Scaling when scaling in.
     #   @return [Boolean]
     #
+    # @!attribute [rw] weighted_capacity
+    #   The number of capacity units contributed by the instance based on
+    #   its instance type.
+    #
+    #   Valid Range: Minimum value of 1. Maximum value of 999.
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/autoscaling-2011-01-01/Instance AWS API Documentation
     #
     class Instance < Struct.new(
       :instance_id,
+      :instance_type,
       :availability_zone,
       :lifecycle_state,
       :health_status,
       :launch_configuration_name,
       :launch_template,
-      :protected_from_scale_in)
+      :protected_from_scale_in,
+      :weighted_capacity)
       include Aws::Structure
     end
 
@@ -2734,6 +2774,15 @@ module Aws::AutoScaling
     # Instances, and how the Auto Scaling group allocates instance types to
     # fulfill On-Demand and Spot capacity.
     #
+    # When you update `SpotAllocationStrategy`, `SpotInstancePools`, or
+    # `SpotMaxPrice`, this update action does not deploy any changes across
+    # the running Amazon EC2 instances in the group. Your existing Spot
+    # Instances continue to run as long as the maximum price for those
+    # instances is higher than the current Spot price. When scale out
+    # occurs, Amazon EC2 Auto Scaling launches instances based on the new
+    # settings. When scale in occurs, Amazon EC2 Auto Scaling terminates
+    # instances according to the group's termination policies.
+    #
     # @note When making an API call, you may pass InstancesDistribution
     #   data as a hash:
     #
@@ -2765,20 +2814,36 @@ module Aws::AutoScaling
     #   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.
+    #   Default if not set is 0. If you leave it set to 0, On-Demand
+    #   Instances are launched as a percentage of the Auto Scaling group's
+    #   desired capacity, per the `OnDemandPercentageAboveBaseCapacity`
+    #   setting.
+    #
+    #   <note markdown="1"> An update to this setting means a gradual replacement of instances
+    #   to maintain the specified number of On-Demand Instances for your
+    #   base capacity. When replacing instances, Amazon EC2 Auto Scaling
+    #   launches new instances before terminating the old ones.
+    #
+    #    </note>
     #   @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.
+    #   for your additional capacity beyond `OnDemandBaseCapacity`.
+    #
+    #   Default if not set is 100. If you leave it set to 100, the
+    #   percentages are 100% for On-Demand Instances and 0% for Spot
+    #   Instances.
+    #
+    #   <note markdown="1"> An update to this setting means a gradual replacement of instances
+    #   to maintain the percentage of On-Demand Instances for your
+    #   additional capacity above the base capacity. When replacing
+    #   instances, Amazon EC2 Auto Scaling launches new instances before
+    #   terminating the old ones.
+    #
+    #    </note>
     #
-    #   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.
+    #   Valid Range: Minimum value of 0. Maximum value of 100.
     #   @return [Integer]
     #
     # @!attribute [rw] spot_allocation_strategy
@@ -2802,10 +2867,12 @@ module Aws::AutoScaling
     # @!attribute [rw] spot_instance_pools
     #   The number of Spot Instance pools across which to allocate your Spot
     #   Instances. The Spot pools are determined from the different instance
-    #   types in the Overrides array of LaunchTemplate. The range is 1–20.
-    #   The default value is `2`.
+    #   types in the Overrides array of LaunchTemplate. Default if not set
+    #   is 2.
     #
-    #   Valid only when the Spot allocation strategy is `lowest-price`.
+    #   Used only when the Spot allocation strategy is `lowest-price`.
+    #
+    #   Valid Range: Minimum value of 1. Maximum value of 20.
     #   @return [Integer]
     #
     # @!attribute [rw] spot_max_price
@@ -2974,7 +3041,7 @@ module Aws::AutoScaling
     # @!attribute [rw] spot_price
     #   The maximum hourly price to be paid for any Spot Instance launched
     #   to fulfill the request. Spot Instances are launched when the price
-    #   you specify exceeds the current Spot market price.
+    #   you specify exceeds the current Spot price.
     #
     #   For more information, see [Launching Spot Instances in Your Auto
     #   Scaling Group][1] in the *Amazon EC2 Auto Scaling User Guide*.
@@ -3141,6 +3208,12 @@ module Aws::AutoScaling
     # launch template with multiple instance types that can be used to
     # launch On-Demand Instances and Spot Instances.
     #
+    # When you update the launch template or overrides, existing Amazon EC2
+    # instances continue to run. When scale out occurs, Amazon EC2 Auto
+    # Scaling launches instances to match the new settings. When scale in
+    # occurs, Amazon EC2 Auto Scaling terminates instances according to the
+    # group's termination policies.
+    #
     # @note When making an API call, you may pass LaunchTemplate
     #   data as a hash:
     #
@@ -3153,6 +3226,7 @@ module Aws::AutoScaling
     #         overrides: [
     #           {
     #             instance_type: "XmlStringMaxLen255",
+    #             weighted_capacity: "XmlStringMaxLen32",
     #           },
     #         ],
     #       }
@@ -3163,9 +3237,10 @@ module Aws::AutoScaling
     #   @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.
+    #   An optional setting. Any parameters that you specify override the
+    #   same parameters in the launch template. Currently, the only
+    #   supported override is instance type. You can specify between 1 and
+    #   20 instance types.
     #   @return [Array<Types::LaunchTemplateOverrides>]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/autoscaling-2011-01-01/LaunchTemplate AWS API Documentation
@@ -3183,6 +3258,7 @@ module Aws::AutoScaling
     #
     #       {
     #         instance_type: "XmlStringMaxLen255",
+    #         weighted_capacity: "XmlStringMaxLen32",
     #       }
     #
     # @!attribute [rw] instance_type
@@ -3196,10 +3272,22 @@ module Aws::AutoScaling
     #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html#AvailableInstanceTypes
     #   @return [String]
     #
+    # @!attribute [rw] weighted_capacity
+    #   The number of capacity units, which gives the instance type a
+    #   proportional weight to other instance types. For example, larger
+    #   instance types are generally weighted more than smaller instance
+    #   types. These are the same units that you chose to set the desired
+    #   capacity in terms of instances, or a performance attribute such as
+    #   vCPUs, memory, or I/O.
+    #
+    #   Valid Range: Minimum value of 1. Maximum value of 999.
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/autoscaling-2011-01-01/LaunchTemplateOverrides AWS API Documentation
     #
     class LaunchTemplateOverrides < Struct.new(
-      :instance_type)
+      :instance_type,
+      :weighted_capacity)
       include Aws::Structure
     end
 
@@ -3641,6 +3729,7 @@ module Aws::AutoScaling
     #           overrides: [
     #             {
     #               instance_type: "XmlStringMaxLen255",
+    #               weighted_capacity: "XmlStringMaxLen32",
     #             },
     #           ],
     #         },
@@ -3664,8 +3753,8 @@ module Aws::AutoScaling
     # @!attribute [rw] instances_distribution
     #   The instances distribution to use.
     #
-    #   If you leave this parameter unspecified when creating a mixed
-    #   instances policy, the default values are used.
+    #   If you leave this parameter unspecified, the value for each
+    #   parameter in `InstancesDistribution` uses a default value.
     #   @return [Types::InstancesDistribution]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/autoscaling-2011-01-01/MixedInstancesPolicy AWS API Documentation
@@ -3761,12 +3850,7 @@ module Aws::AutoScaling
     #       }
     #
     # @!attribute [rw] predefined_metric_type
-    #   The metric type.
-    #   @return [String]
-    #
-    # @!attribute [rw] resource_label
-    #   Identifies the resource associated with the metric type. The
-    #   following predefined metrics are available:
+    #   The metric type. The following predefined metrics are available:
     #
     #   * `ASGAverageCPUUtilization` - Average CPU utilization of the Auto
     #     Scaling group.
@@ -3779,19 +3863,23 @@ module Aws::AutoScaling
     #
     #   * `ALBRequestCountPerTarget` - Number of requests completed per
     #     target in an Application Load Balancer target group.
+    #   @return [String]
+    #
+    # @!attribute [rw] resource_label
+    #   Identifies the resource associated with the metric type. You can't
+    #   specify a resource label unless the metric type is
+    #   `ALBRequestCountPerTarget` and there is a target group attached to
+    #   the Auto Scaling group.
     #
-    #   For predefined metric types `ASGAverageCPUUtilization`,
-    #   `ASGAverageNetworkIn`, and `ASGAverageNetworkOut`, the parameter
-    #   must not be specified as the resource associated with the metric
-    #   type is the Auto Scaling group. For predefined metric type
-    #   `ALBRequestCountPerTarget`, the parameter must be specified in the
-    #   format:
+    #   The format is
     #   `app/load-balancer-name/load-balancer-id/targetgroup/target-group-name/target-group-id
-    #   `, where `app/load-balancer-name/load-balancer-id ` is the final
-    #   portion of the load balancer ARN, and
-    #   `targetgroup/target-group-name/target-group-id ` is the final
-    #   portion of the target group ARN. The target group must be attached
-    #   to the Auto Scaling group.
+    #   `, where
+    #
+    #   * `app/load-balancer-name/load-balancer-id ` is the final portion of
+    #     the load balancer ARN, and
+    #
+    #   * `targetgroup/target-group-name/target-group-id ` is the final
+    #     portion of the target group ARN.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/autoscaling-2011-01-01/PredefinedMetricSpecification AWS API Documentation
@@ -5053,6 +5141,7 @@ module Aws::AutoScaling
     #             overrides: [
     #               {
     #                 instance_type: "XmlStringMaxLen255",
+    #                 weighted_capacity: "XmlStringMaxLen32",
     #               },
     #             ],
     #           },
@@ -5077,6 +5166,7 @@ module Aws::AutoScaling
     #         termination_policies: ["XmlStringMaxLen1600"],
     #         new_instances_protected_from_scale_in: false,
     #         service_linked_role_arn: "ResourceName",
+    #         max_instance_lifetime: 1,
     #       }
     #
     # @!attribute [rw] auto_scaling_group_name
@@ -5087,12 +5177,6 @@ module Aws::AutoScaling
     #   The name of the launch configuration. If you specify
     #   `LaunchConfigurationName` in your update request, you can't specify
     #   `LaunchTemplate` or `MixedInstancesPolicy`.
-    #
-    #   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 get an error. If you
-    #   have previously enabled the collection of group metrics, you can
-    #   disable it using DisableMetricsCollection.
     #   @return [String]
     #
     # @!attribute [rw] launch_template
@@ -5243,6 +5327,13 @@ module Aws::AutoScaling
     #   [1]: https://docs.aws.amazon.com/autoscaling/ec2/userguide/autoscaling-service-linked-role.html
     #   @return [String]
     #
+    # @!attribute [rw] max_instance_lifetime
+    #   The maximum amount of time, in seconds, that an instance can be in
+    #   service.
+    #
+    #   Valid Range: Minimum value of 604800.
+    #   @return [Integer]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/autoscaling-2011-01-01/UpdateAutoScalingGroupType AWS API Documentation
     #
     class UpdateAutoScalingGroupType < Struct.new(
@@ -5261,7 +5352,8 @@ module Aws::AutoScaling
       :vpc_zone_identifier,
       :termination_policies,
       :new_instances_protected_from_scale_in,
-      :service_linked_role_arn)
+      :service_linked_role_arn,
+      :max_instance_lifetime)
       include Aws::Structure
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-autoscaling
 version: !ruby/object:Gem::Version
-  version: 1.29.0
+  version: 1.30.0
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-23 00:00:00.000000000 Z
+date: 2019-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core