aws-sdk-autoscaling 1.0.0.rc8 → 1.0.0.rc9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1e976b3bd2952542b6d62b122c30a955e196519
-  data.tar.gz: c3a70ca02fd47409f4f449b705fcaff37fc1af76
+  metadata.gz: e0bd0491a0f8416403fdfcb23cc62cac1d5be4e7
+  data.tar.gz: 716ace83a984c8af4b6cf22600afe6e682121b02
 SHA512:
-  metadata.gz: 4826c4a3fff83d8fe8aa60cbb177960efb5d1635b254514fa36aa78fd468502e47a4f928fe2e9e1c6a861dee74d9d66ef05070d372ed756ba88e4f5a3e26a611
-  data.tar.gz: 8f6796f03b93b7569dbb6eeba2a26ee96471954ab477b8c62042f67cd06c8209024923c4b9e6f3fc1f4c9a3b90ff77ac99e1469a2a8e31d55de39b31f2f3b0ae
+  metadata.gz: 3b13a1cf2cb5e35c6e6a4028f4a042a286bb843f537af24f7290ef74b4e9ef3bb3ddf52f7f4c6d26f70c9c64e1f9c4d7f729eca66283bfbf2717183239a3e3e1
+  data.tar.gz: 7f7ed585bc6973ab8dea9d75a25302c6d41e26b28b2eca1c200ab376359e329c1340a6ddea6846cc86f437d3e03ec120d7dc0d4bf71a8c07204e5b0c8bb8dd7a

data/lib/aws-sdk-autoscaling.rb

@@ -53,6 +53,6 @@ require_relative 'aws-sdk-autoscaling/customizations'
 # @service
 module Aws::AutoScaling
 
-  GEM_VERSION = '1.0.0.rc8'
+  GEM_VERSION = '1.0.0.rc9'
 
 end

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

@@ -397,7 +397,7 @@ module Aws::AutoScaling
     #   scalingpolicy = auto_scaling_group.put_scaling_policy({
     #     policy_name: "XmlStringMaxLen255", # required
     #     policy_type: "XmlStringMaxLen64",
-    #     adjustment_type: "XmlStringMaxLen255", # required
+    #     adjustment_type: "XmlStringMaxLen255",
     #     min_adjustment_step: 1,
     #     min_adjustment_magnitude: 1,
     #     scaling_adjustment: 1,
@@ -411,17 +411,41 @@ module Aws::AutoScaling
     #       },
     #     ],
     #     estimated_instance_warmup: 1,
+    #     target_tracking_configuration: {
+    #       predefined_metric_specification: {
+    #         predefined_metric_type: "ASGAverageCPUUtilization", # required, accepts ASGAverageCPUUtilization, ASGAverageNetworkIn, ASGAverageNetworkOut, ALBRequestCountPerTarget
+    #         resource_label: "XmlStringMaxLen1023",
+    #       },
+    #       customized_metric_specification: {
+    #         metric_name: "MetricName", # required
+    #         namespace: "MetricNamespace", # required
+    #         dimensions: [
+    #           {
+    #             name: "MetricDimensionName", # required
+    #             value: "MetricDimensionValue", # required
+    #           },
+    #         ],
+    #         statistic: "Average", # required, accepts Average, Minimum, Maximum, SampleCount, Sum
+    #         unit: "MetricUnit",
+    #       },
+    #       target_value: 1.0, # required
+    #       disable_scale_in: false,
+    #     },
     #   })
     # @param [Hash] options ({})
     # @option options [required, String] :policy_name
     #   The name of the policy.
     # @option options [String] :policy_type
-    #   The policy type. Valid values are `SimpleScaling` and `StepScaling`.
-    #   If the policy type is null, the value is treated as `SimpleScaling`.
-    # @option options [required, String] :adjustment_type
-    #   The adjustment type. Valid values are `ChangeInCapacity`,
+    #   The policy type. The valid values are `SimpleScaling`, `StepScaling`,
+    #   and `TargetTrackingScaling`. If the policy type is null, the value is
+    #   treated as `SimpleScaling`.
+    # @option options [String] :adjustment_type
+    #   The adjustment type. The valid values are `ChangeInCapacity`,
     #   `ExactCapacity`, and `PercentChangeInCapacity`.
     #
+    #   This parameter is supported if the policy type is `SimpleScaling` or
+    #   `StepScaling`.
+    #
     #   For more information, see [Dynamic Scaling][1] in the *Auto Scaling
     #   User Guide*.
     #
@@ -436,6 +460,9 @@ module Aws::AutoScaling
     #   `AdjustmentType` is `PercentChangeInCapacity`, the scaling policy
     #   changes the `DesiredCapacity` of the Auto Scaling group by at least
     #   this many instances. Otherwise, the error is `ValidationError`.
+    #
+    #   This parameter is supported if the policy type is `SimpleScaling` or
+    #   `StepScaling`.
     # @option options [Integer] :scaling_adjustment
     #   The amount by which to scale, based on the specified adjustment type.
     #   A positive value adds to the current capacity while a negative number
@@ -448,8 +475,7 @@ module Aws::AutoScaling
     #   before the next scaling activity can start. If this parameter is not
     #   specified, the default cooldown period for the group applies.
     #
-    #   This parameter is not supported unless the policy type is
-    #   `SimpleScaling`.
+    #   This parameter is supported if the policy type is `SimpleScaling`.
     #
     #   For more information, see [Auto Scaling Cooldowns][1] in the *Auto
     #   Scaling User Guide*.
@@ -458,11 +484,11 @@ module Aws::AutoScaling
     #
     #   [1]: http://docs.aws.amazon.com/autoscaling/latest/userguide/Cooldown.html
     # @option options [String] :metric_aggregation_type
-    #   The aggregation type for the CloudWatch metrics. Valid values are
+    #   The aggregation type for the CloudWatch metrics. The valid values are
     #   `Minimum`, `Maximum`, and `Average`. If the aggregation type is null,
     #   the value is treated as `Average`.
     #
-    #   This parameter is not supported if the policy type is `SimpleScaling`.
+    #   This parameter is supported if the policy type is `StepScaling`.
     # @option options [Array<Types::StepAdjustment>] :step_adjustments
     #   A set of adjustments that enable you to scale based on the size of the
     #   alarm breach.
@@ -474,7 +500,13 @@ module Aws::AutoScaling
     #   contribute to the CloudWatch metrics. The default is to use the value
     #   specified for the default cooldown period for the group.
     #
-    #   This parameter is not supported if the policy type is `SimpleScaling`.
+    #   This parameter is supported if the policy type is `StepScaling` or
+    #   `TargetTrackingScaling`.
+    # @option options [Types::TargetTrackingConfiguration] :target_tracking_configuration
+    #   The configuration of a target tracking policy.
+    #
+    #   This parameter is required if the policy type is
+    #   `TargetTrackingScaling` and not supported otherwise.
     # @return [ScalingPolicy]
     def put_scaling_policy(options = {})
       options = options.merge(auto_scaling_group_name: @name)

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

@@ -434,9 +434,7 @@ module Aws::AutoScaling
     # @option params [Integer] :desired_capacity
     #   The number of EC2 instances that should be running in the group. This
     #   number must be greater than or equal to the minimum size of the group
-    #   and less than or equal to the maximum size of the group. If you do not
-    #   specify a desired capacity, the default is the minimum size of the
-    #   group.
+    #   and less than or equal to the maximum size of the group.
     #
     # @option params [Integer] :default_cooldown
     #   The amount of time, in seconds, after a scaling activity completes
@@ -653,12 +651,8 @@ module Aws::AutoScaling
     #
     # @option params [String] :image_id
     #   The ID of the Amazon Machine Image (AMI) to use to launch your EC2
-    #   instances.
-    #
-    #   If you do not specify `InstanceId`, you must specify `ImageId`.
-    #
-    #   For more information, see [Finding an AMI][1] in the *Amazon Elastic
-    #   Compute Cloud User Guide*.
+    #   instances. For more information, see [Finding an AMI][1] in the
+    #   *Amazon Elastic Compute Cloud User Guide*.
     #
     #
     #
@@ -720,12 +714,10 @@ module Aws::AutoScaling
     #   [1]: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-metadata.html
     #
     # @option params [String] :instance_id
-    #   The ID of the instance to use to create the launch configuration. The
-    #   new launch configuration derives attributes from the instance, with
-    #   the exception of the block device mapping.
+    #   The ID of the instance to use to create the launch configuration.
     #
-    #   If you do not specify `InstanceId`, you must specify both `ImageId`
-    #   and `InstanceType`.
+    #   The new launch configuration derives attributes from the instance,
+    #   with the exception of the block device mapping.
     #
     #   To create a launch configuration with a block device mapping or
     #   override any other instance attributes, specify them as part of the
@@ -739,12 +731,9 @@ module Aws::AutoScaling
     #   [1]: http://docs.aws.amazon.com/autoscaling/latest/userguide/create-lc-with-instanceID.html
     #
     # @option params [String] :instance_type
-    #   The instance type of the EC2 instance.
-    #
-    #   If you do not specify `InstanceId`, you must specify `InstanceType`.
-    #
-    #   For information about available instance types, see [Available
-    #   Instance Types][1] in the *Amazon Elastic Compute Cloud User Guide.*
+    #   The instance type of the EC2 instance. For information about available
+    #   instance types, see [ Available Instance Types][1] in the *Amazon
+    #   Elastic Compute Cloud User Guide.*
     #
     #
     #
@@ -767,7 +756,7 @@ module Aws::AutoScaling
     #
     # @option params [Types::InstanceMonitoring] :instance_monitoring
     #   Enables detailed monitoring (`true`) or basic monitoring (`false`) for
-    #   the Auto Scaling instances. The default is `true`.
+    #   the Auto Scaling instances.
     #
     # @option params [String] :spot_price
     #   The maximum hourly price to be paid for any Spot Instance launched to
@@ -2186,6 +2175,17 @@ module Aws::AutoScaling
     #   resp.scaling_policies[0].alarms #=> Array
     #   resp.scaling_policies[0].alarms[0].alarm_name #=> String
     #   resp.scaling_policies[0].alarms[0].alarm_arn #=> String
+    #   resp.scaling_policies[0].target_tracking_configuration.predefined_metric_specification.predefined_metric_type #=> String, one of "ASGAverageCPUUtilization", "ASGAverageNetworkIn", "ASGAverageNetworkOut", "ALBRequestCountPerTarget"
+    #   resp.scaling_policies[0].target_tracking_configuration.predefined_metric_specification.resource_label #=> String
+    #   resp.scaling_policies[0].target_tracking_configuration.customized_metric_specification.metric_name #=> String
+    #   resp.scaling_policies[0].target_tracking_configuration.customized_metric_specification.namespace #=> String
+    #   resp.scaling_policies[0].target_tracking_configuration.customized_metric_specification.dimensions #=> Array
+    #   resp.scaling_policies[0].target_tracking_configuration.customized_metric_specification.dimensions[0].name #=> String
+    #   resp.scaling_policies[0].target_tracking_configuration.customized_metric_specification.dimensions[0].value #=> String
+    #   resp.scaling_policies[0].target_tracking_configuration.customized_metric_specification.statistic #=> String, one of "Average", "Minimum", "Maximum", "SampleCount", "Sum"
+    #   resp.scaling_policies[0].target_tracking_configuration.customized_metric_specification.unit #=> String
+    #   resp.scaling_policies[0].target_tracking_configuration.target_value #=> Float
+    #   resp.scaling_policies[0].target_tracking_configuration.disable_scale_in #=> Boolean
     #   resp.next_token #=> String
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/autoscaling-2011-01-01/DescribePolicies AWS API Documentation
@@ -2575,8 +2575,8 @@ module Aws::AutoScaling
 
     # Removes one or more instances from the specified Auto Scaling group.
     #
-    # After the instances are detached, you can manage them independent of
-    # the Auto Scaling group.
+    # After the instances are detached, you can manage them independently
+    # from the rest of the Auto Scaling group.
     #
     # If you do not specify the option to decrement the desired capacity,
     # Auto Scaling launches instances to replace the ones that are detached.
@@ -2873,14 +2873,14 @@ module Aws::AutoScaling
       req.send_request(options)
     end
 
-    # Moves the specified instances into the standby state.
+    # Moves the specified instances into `Standby` mode.
     #
-    # For more information, see [Temporarily Removing Instances from Your
-    # Auto Scaling Group][1] in the *Auto Scaling User Guide*.
+    # For more information, see [Auto Scaling Lifecycle][1] in the *Auto
+    # Scaling User Guide*.
     #
     #
     #
-    # [1]: http://docs.aws.amazon.com/autoscaling/latest/userguide/as-enter-exit-standby.html
+    # [1]: http://docs.aws.amazon.com/autoscaling/latest/userguide/AutoScalingGroupLifecycle.html
     #
     # @option params [Array<String>] :instance_ids
     #   One or more instances to move into `Standby` mode. You must specify at
@@ -3033,14 +3033,14 @@ module Aws::AutoScaling
       req.send_request(options)
     end
 
-    # Moves the specified instances out of the standby state.
+    # Moves the specified instances out of `Standby` mode.
     #
-    # For more information, see [Temporarily Removing Instances from Your
-    # Auto Scaling Group][1] in the *Auto Scaling User Guide*.
+    # For more information, see [Auto Scaling Lifecycle][1] in the *Auto
+    # Scaling User Guide*.
     #
     #
     #
-    # [1]: http://docs.aws.amazon.com/autoscaling/latest/userguide/as-enter-exit-standby.html
+    # [1]: http://docs.aws.amazon.com/autoscaling/latest/userguide/AutoScalingGroupLifecycle.html
     #
     # @option params [Array<String>] :instance_ids
     #   One or more instance IDs. You must specify at least one instance ID.
@@ -3319,13 +3319,17 @@ module Aws::AutoScaling
     #   The name of the policy.
     #
     # @option params [String] :policy_type
-    #   The policy type. Valid values are `SimpleScaling` and `StepScaling`.
-    #   If the policy type is null, the value is treated as `SimpleScaling`.
+    #   The policy type. The valid values are `SimpleScaling`, `StepScaling`,
+    #   and `TargetTrackingScaling`. If the policy type is null, the value is
+    #   treated as `SimpleScaling`.
     #
-    # @option params [required, String] :adjustment_type
-    #   The adjustment type. Valid values are `ChangeInCapacity`,
+    # @option params [String] :adjustment_type
+    #   The adjustment type. The valid values are `ChangeInCapacity`,
     #   `ExactCapacity`, and `PercentChangeInCapacity`.
     #
+    #   This parameter is supported if the policy type is `SimpleScaling` or
+    #   `StepScaling`.
+    #
     #   For more information, see [Dynamic Scaling][1] in the *Auto Scaling
     #   User Guide*.
     #
@@ -3343,6 +3347,9 @@ module Aws::AutoScaling
     #   changes the `DesiredCapacity` of the Auto Scaling group by at least
     #   this many instances. Otherwise, the error is `ValidationError`.
     #
+    #   This parameter is supported if the policy type is `SimpleScaling` or
+    #   `StepScaling`.
+    #
     # @option params [Integer] :scaling_adjustment
     #   The amount by which to scale, based on the specified adjustment type.
     #   A positive value adds to the current capacity while a negative number
@@ -3356,8 +3363,7 @@ module Aws::AutoScaling
     #   before the next scaling activity can start. If this parameter is not
     #   specified, the default cooldown period for the group applies.
     #
-    #   This parameter is not supported unless the policy type is
-    #   `SimpleScaling`.
+    #   This parameter is supported if the policy type is `SimpleScaling`.
     #
     #   For more information, see [Auto Scaling Cooldowns][1] in the *Auto
     #   Scaling User Guide*.
@@ -3367,11 +3373,11 @@ module Aws::AutoScaling
     #   [1]: http://docs.aws.amazon.com/autoscaling/latest/userguide/Cooldown.html
     #
     # @option params [String] :metric_aggregation_type
-    #   The aggregation type for the CloudWatch metrics. Valid values are
+    #   The aggregation type for the CloudWatch metrics. The valid values are
     #   `Minimum`, `Maximum`, and `Average`. If the aggregation type is null,
     #   the value is treated as `Average`.
     #
-    #   This parameter is not supported if the policy type is `SimpleScaling`.
+    #   This parameter is supported if the policy type is `StepScaling`.
     #
     # @option params [Array<Types::StepAdjustment>] :step_adjustments
     #   A set of adjustments that enable you to scale based on the size of the
@@ -3385,11 +3391,19 @@ module Aws::AutoScaling
     #   contribute to the CloudWatch metrics. The default is to use the value
     #   specified for the default cooldown period for the group.
     #
-    #   This parameter is not supported if the policy type is `SimpleScaling`.
+    #   This parameter is supported if the policy type is `StepScaling` or
+    #   `TargetTrackingScaling`.
+    #
+    # @option params [Types::TargetTrackingConfiguration] :target_tracking_configuration
+    #   The configuration of a target tracking policy.
+    #
+    #   This parameter is required if the policy type is
+    #   `TargetTrackingScaling` and not supported otherwise.
     #
     # @return [Types::PolicyARNType] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
     #
     #   * {Types::PolicyARNType#policy_arn #policy_arn} => String
+    #   * {Types::PolicyARNType#alarms #alarms} => Array&lt;Types::Alarm&gt;
     #
     #
     # @example Example: To add a scaling policy to an Auto Scaling group
@@ -3414,7 +3428,7 @@ module Aws::AutoScaling
     #     auto_scaling_group_name: "ResourceName", # required
     #     policy_name: "XmlStringMaxLen255", # required
     #     policy_type: "XmlStringMaxLen64",
-    #     adjustment_type: "XmlStringMaxLen255", # required
+    #     adjustment_type: "XmlStringMaxLen255",
     #     min_adjustment_step: 1,
     #     min_adjustment_magnitude: 1,
     #     scaling_adjustment: 1,
@@ -3428,11 +3442,34 @@ module Aws::AutoScaling
     #       },
     #     ],
     #     estimated_instance_warmup: 1,
+    #     target_tracking_configuration: {
+    #       predefined_metric_specification: {
+    #         predefined_metric_type: "ASGAverageCPUUtilization", # required, accepts ASGAverageCPUUtilization, ASGAverageNetworkIn, ASGAverageNetworkOut, ALBRequestCountPerTarget
+    #         resource_label: "XmlStringMaxLen1023",
+    #       },
+    #       customized_metric_specification: {
+    #         metric_name: "MetricName", # required
+    #         namespace: "MetricNamespace", # required
+    #         dimensions: [
+    #           {
+    #             name: "MetricDimensionName", # required
+    #             value: "MetricDimensionValue", # required
+    #           },
+    #         ],
+    #         statistic: "Average", # required, accepts Average, Minimum, Maximum, SampleCount, Sum
+    #         unit: "MetricUnit",
+    #       },
+    #       target_value: 1.0, # required
+    #       disable_scale_in: false,
+    #     },
     #   })
     #
     # @example Response structure
     #
     #   resp.policy_arn #=> String
+    #   resp.alarms #=> Array
+    #   resp.alarms[0].alarm_name #=> String
+    #   resp.alarms[0].alarm_arn #=> String
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/autoscaling-2011-01-01/PutScalingPolicy AWS API Documentation
     #
@@ -3973,16 +4010,17 @@ module Aws::AutoScaling
 
     # Updates the configuration for the specified Auto Scaling group.
     #
-    # The new settings take effect on any scaling activities after this call
-    # returns. Scaling activities that are currently in progress aren't
-    # affected.
-    #
     # To update an Auto Scaling group with a launch configuration with
-    # `InstanceMonitoring` set to `false`, you must first disable the
+    # `InstanceMonitoring` set to `False`, you must first disable the
     # collection of group metrics. Otherwise, you will get an error. If you
     # have previously enabled the collection of group metrics, you can
     # disable it using DisableMetricsCollection.
     #
+    # The new settings are registered upon the completion of this call. Any
+    # launch configuration settings take effect on any triggers after this
+    # call returns. Scaling activities that are currently in progress
+    # aren't affected.
+    #
     # Note the following:
     #
     # * If you specify a new value for `MinSize` without specifying a value
@@ -4155,7 +4193,7 @@ module Aws::AutoScaling
         params: params,
         config: config)
       context[:gem_name] = 'aws-sdk-autoscaling'
-      context[:gem_version] = '1.0.0.rc8'
+      context[:gem_version] = '1.0.0.rc9'
       Seahorse::Client::Request.new(handlers, context)
     end
 

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

@@ -55,6 +55,7 @@ module Aws::AutoScaling
     CreateAutoScalingGroupType = Shapes::StructureShape.new(name: 'CreateAutoScalingGroupType')
     CreateLaunchConfigurationType = Shapes::StructureShape.new(name: 'CreateLaunchConfigurationType')
     CreateOrUpdateTagsType = Shapes::StructureShape.new(name: 'CreateOrUpdateTagsType')
+    CustomizedMetricSpecification = Shapes::StructureShape.new(name: 'CustomizedMetricSpecification')
     DeleteAutoScalingGroupType = Shapes::StructureShape.new(name: 'DeleteAutoScalingGroupType')
     DeleteLifecycleHookAnswer = Shapes::StructureShape.new(name: 'DeleteLifecycleHookAnswer')
     DeleteLifecycleHookType = Shapes::StructureShape.new(name: 'DeleteLifecycleHookType')
@@ -88,6 +89,7 @@ module Aws::AutoScaling
     DetachLoadBalancersResultType = Shapes::StructureShape.new(name: 'DetachLoadBalancersResultType')
     DetachLoadBalancersType = Shapes::StructureShape.new(name: 'DetachLoadBalancersType')
     DisableMetricsCollectionQuery = Shapes::StructureShape.new(name: 'DisableMetricsCollectionQuery')
+    DisableScaleIn = Shapes::BooleanShape.new(name: 'DisableScaleIn')
     Ebs = Shapes::StructureShape.new(name: 'Ebs')
     EbsOptimized = Shapes::BooleanShape.new(name: 'EbsOptimized')
     EnableMetricsCollectionQuery = Shapes::StructureShape.new(name: 'EnableMetricsCollectionQuery')
@@ -136,9 +138,18 @@ module Aws::AutoScaling
     MaxRecords = Shapes::IntegerShape.new(name: 'MaxRecords')
     MetricCollectionType = Shapes::StructureShape.new(name: 'MetricCollectionType')
     MetricCollectionTypes = Shapes::ListShape.new(name: 'MetricCollectionTypes')
+    MetricDimension = Shapes::StructureShape.new(name: 'MetricDimension')
+    MetricDimensionName = Shapes::StringShape.new(name: 'MetricDimensionName')
+    MetricDimensionValue = Shapes::StringShape.new(name: 'MetricDimensionValue')
+    MetricDimensions = Shapes::ListShape.new(name: 'MetricDimensions')
     MetricGranularityType = Shapes::StructureShape.new(name: 'MetricGranularityType')
     MetricGranularityTypes = Shapes::ListShape.new(name: 'MetricGranularityTypes')
+    MetricName = Shapes::StringShape.new(name: 'MetricName')
+    MetricNamespace = Shapes::StringShape.new(name: 'MetricNamespace')
     MetricScale = Shapes::FloatShape.new(name: 'MetricScale')
+    MetricStatistic = Shapes::StringShape.new(name: 'MetricStatistic')
+    MetricType = Shapes::StringShape.new(name: 'MetricType')
+    MetricUnit = Shapes::StringShape.new(name: 'MetricUnit')
     Metrics = Shapes::ListShape.new(name: 'Metrics')
     MinAdjustmentMagnitude = Shapes::IntegerShape.new(name: 'MinAdjustmentMagnitude')
     MinAdjustmentStep = Shapes::IntegerShape.new(name: 'MinAdjustmentStep')
@@ -154,6 +165,7 @@ module Aws::AutoScaling
     PolicyIncrement = Shapes::IntegerShape.new(name: 'PolicyIncrement')
     PolicyNames = Shapes::ListShape.new(name: 'PolicyNames')
     PolicyTypes = Shapes::ListShape.new(name: 'PolicyTypes')
+    PredefinedMetricSpecification = Shapes::StructureShape.new(name: 'PredefinedMetricSpecification')
     ProcessNames = Shapes::ListShape.new(name: 'ProcessNames')
     ProcessType = Shapes::StructureShape.new(name: 'ProcessType')
     Processes = Shapes::ListShape.new(name: 'Processes')
@@ -200,6 +212,7 @@ module Aws::AutoScaling
     Tags = Shapes::ListShape.new(name: 'Tags')
     TagsType = Shapes::StructureShape.new(name: 'TagsType')
     TargetGroupARNs = Shapes::ListShape.new(name: 'TargetGroupARNs')
+    TargetTrackingConfiguration = Shapes::StructureShape.new(name: 'TargetTrackingConfiguration')
     TerminateInstanceInAutoScalingGroupType = Shapes::StructureShape.new(name: 'TerminateInstanceInAutoScalingGroupType')
     TerminationPolicies = Shapes::ListShape.new(name: 'TerminationPolicies')
     TimestampType = Shapes::TimestampShape.new(name: 'TimestampType')
@@ -383,6 +396,13 @@ module Aws::AutoScaling
     CreateOrUpdateTagsType.add_member(:tags, Shapes::ShapeRef.new(shape: Tags, required: true, location_name: "Tags"))
     CreateOrUpdateTagsType.struct_class = Types::CreateOrUpdateTagsType
 
+    CustomizedMetricSpecification.add_member(:metric_name, Shapes::ShapeRef.new(shape: MetricName, required: true, location_name: "MetricName"))
+    CustomizedMetricSpecification.add_member(:namespace, Shapes::ShapeRef.new(shape: MetricNamespace, required: true, location_name: "Namespace"))
+    CustomizedMetricSpecification.add_member(:dimensions, Shapes::ShapeRef.new(shape: MetricDimensions, location_name: "Dimensions"))
+    CustomizedMetricSpecification.add_member(:statistic, Shapes::ShapeRef.new(shape: MetricStatistic, required: true, location_name: "Statistic"))
+    CustomizedMetricSpecification.add_member(:unit, Shapes::ShapeRef.new(shape: MetricUnit, location_name: "Unit"))
+    CustomizedMetricSpecification.struct_class = Types::CustomizedMetricSpecification
+
     DeleteAutoScalingGroupType.add_member(:auto_scaling_group_name, Shapes::ShapeRef.new(shape: ResourceName, required: true, location_name: "AutoScalingGroupName"))
     DeleteAutoScalingGroupType.add_member(:force_delete, Shapes::ShapeRef.new(shape: ForceDelete, location_name: "ForceDelete"))
     DeleteAutoScalingGroupType.struct_class = Types::DeleteAutoScalingGroupType
@@ -652,6 +672,12 @@ module Aws::AutoScaling
 
     MetricCollectionTypes.member = Shapes::ShapeRef.new(shape: MetricCollectionType)
 
+    MetricDimension.add_member(:name, Shapes::ShapeRef.new(shape: MetricDimensionName, required: true, location_name: "Name"))
+    MetricDimension.add_member(:value, Shapes::ShapeRef.new(shape: MetricDimensionValue, required: true, location_name: "Value"))
+    MetricDimension.struct_class = Types::MetricDimension
+
+    MetricDimensions.member = Shapes::ShapeRef.new(shape: MetricDimension)
+
     MetricGranularityType.add_member(:granularity, Shapes::ShapeRef.new(shape: XmlStringMaxLen255, location_name: "Granularity"))
     MetricGranularityType.struct_class = Types::MetricGranularityType
 
@@ -671,12 +697,17 @@ module Aws::AutoScaling
     PoliciesType.struct_class = Types::PoliciesType
 
     PolicyARNType.add_member(:policy_arn, Shapes::ShapeRef.new(shape: ResourceName, location_name: "PolicyARN"))
+    PolicyARNType.add_member(:alarms, Shapes::ShapeRef.new(shape: Alarms, location_name: "Alarms"))
     PolicyARNType.struct_class = Types::PolicyARNType
 
     PolicyNames.member = Shapes::ShapeRef.new(shape: ResourceName)
 
     PolicyTypes.member = Shapes::ShapeRef.new(shape: XmlStringMaxLen64)
 
+    PredefinedMetricSpecification.add_member(:predefined_metric_type, Shapes::ShapeRef.new(shape: MetricType, required: true, location_name: "PredefinedMetricType"))
+    PredefinedMetricSpecification.add_member(:resource_label, Shapes::ShapeRef.new(shape: XmlStringMaxLen1023, location_name: "ResourceLabel"))
+    PredefinedMetricSpecification.struct_class = Types::PredefinedMetricSpecification
+
     ProcessNames.member = Shapes::ShapeRef.new(shape: XmlStringMaxLen255)
 
     ProcessType.add_member(:process_name, Shapes::ShapeRef.new(shape: XmlStringMaxLen255, required: true, location_name: "ProcessName"))
@@ -707,7 +738,7 @@ module Aws::AutoScaling
     PutScalingPolicyType.add_member(:auto_scaling_group_name, Shapes::ShapeRef.new(shape: ResourceName, required: true, location_name: "AutoScalingGroupName"))
     PutScalingPolicyType.add_member(:policy_name, Shapes::ShapeRef.new(shape: XmlStringMaxLen255, required: true, location_name: "PolicyName"))
     PutScalingPolicyType.add_member(:policy_type, Shapes::ShapeRef.new(shape: XmlStringMaxLen64, location_name: "PolicyType"))
-    PutScalingPolicyType.add_member(:adjustment_type, Shapes::ShapeRef.new(shape: XmlStringMaxLen255, required: true, location_name: "AdjustmentType"))
+    PutScalingPolicyType.add_member(:adjustment_type, Shapes::ShapeRef.new(shape: XmlStringMaxLen255, location_name: "AdjustmentType"))
     PutScalingPolicyType.add_member(:min_adjustment_step, Shapes::ShapeRef.new(shape: MinAdjustmentStep, deprecated: true, location_name: "MinAdjustmentStep"))
     PutScalingPolicyType.add_member(:min_adjustment_magnitude, Shapes::ShapeRef.new(shape: MinAdjustmentMagnitude, location_name: "MinAdjustmentMagnitude"))
     PutScalingPolicyType.add_member(:scaling_adjustment, Shapes::ShapeRef.new(shape: PolicyIncrement, location_name: "ScalingAdjustment"))
@@ -715,6 +746,7 @@ module Aws::AutoScaling
     PutScalingPolicyType.add_member(:metric_aggregation_type, Shapes::ShapeRef.new(shape: XmlStringMaxLen32, location_name: "MetricAggregationType"))
     PutScalingPolicyType.add_member(:step_adjustments, Shapes::ShapeRef.new(shape: StepAdjustments, location_name: "StepAdjustments"))
     PutScalingPolicyType.add_member(:estimated_instance_warmup, Shapes::ShapeRef.new(shape: EstimatedInstanceWarmup, location_name: "EstimatedInstanceWarmup"))
+    PutScalingPolicyType.add_member(:target_tracking_configuration, Shapes::ShapeRef.new(shape: TargetTrackingConfiguration, location_name: "TargetTrackingConfiguration"))
     PutScalingPolicyType.struct_class = Types::PutScalingPolicyType
 
     PutScheduledUpdateGroupActionType.add_member(:auto_scaling_group_name, Shapes::ShapeRef.new(shape: ResourceName, required: true, location_name: "AutoScalingGroupName"))
@@ -751,6 +783,7 @@ module Aws::AutoScaling
     ScalingPolicy.add_member(:metric_aggregation_type, Shapes::ShapeRef.new(shape: XmlStringMaxLen32, location_name: "MetricAggregationType"))
     ScalingPolicy.add_member(:estimated_instance_warmup, Shapes::ShapeRef.new(shape: EstimatedInstanceWarmup, location_name: "EstimatedInstanceWarmup"))
     ScalingPolicy.add_member(:alarms, Shapes::ShapeRef.new(shape: Alarms, location_name: "Alarms"))
+    ScalingPolicy.add_member(:target_tracking_configuration, Shapes::ShapeRef.new(shape: TargetTrackingConfiguration, location_name: "TargetTrackingConfiguration"))
     ScalingPolicy.struct_class = Types::ScalingPolicy
 
     ScalingProcessQuery.add_member(:auto_scaling_group_name, Shapes::ShapeRef.new(shape: ResourceName, required: true, location_name: "AutoScalingGroupName"))
@@ -833,6 +866,12 @@ module Aws::AutoScaling
 
     TargetGroupARNs.member = Shapes::ShapeRef.new(shape: XmlStringMaxLen511)
 
+    TargetTrackingConfiguration.add_member(:predefined_metric_specification, Shapes::ShapeRef.new(shape: PredefinedMetricSpecification, location_name: "PredefinedMetricSpecification"))
+    TargetTrackingConfiguration.add_member(:customized_metric_specification, Shapes::ShapeRef.new(shape: CustomizedMetricSpecification, location_name: "CustomizedMetricSpecification"))
+    TargetTrackingConfiguration.add_member(:target_value, Shapes::ShapeRef.new(shape: MetricScale, required: true, location_name: "TargetValue"))
+    TargetTrackingConfiguration.add_member(:disable_scale_in, Shapes::ShapeRef.new(shape: DisableScaleIn, location_name: "DisableScaleIn"))
+    TargetTrackingConfiguration.struct_class = Types::TargetTrackingConfiguration
+
     TerminateInstanceInAutoScalingGroupType.add_member(:instance_id, Shapes::ShapeRef.new(shape: XmlStringMaxLen19, required: true, location_name: "InstanceId"))
     TerminateInstanceInAutoScalingGroupType.add_member(:should_decrement_desired_capacity, Shapes::ShapeRef.new(shape: ShouldDecrementDesiredCapacity, required: true, location_name: "ShouldDecrementDesiredCapacity"))
     TerminateInstanceInAutoScalingGroupType.struct_class = Types::TerminateInstanceInAutoScalingGroupType
@@ -937,6 +976,7 @@ module Aws::AutoScaling
         o.errors << Shapes::ShapeRef.new(shape: LimitExceededFault)
         o.errors << Shapes::ShapeRef.new(shape: AlreadyExistsFault)
         o.errors << Shapes::ShapeRef.new(shape: ResourceContentionFault)
+        o.errors << Shapes::ShapeRef.new(shape: ResourceInUseFault)
       end)
 
       api.add_operation(:delete_auto_scaling_group, Seahorse::Model::Operation.new.tap do |o|
@@ -1003,6 +1043,7 @@ module Aws::AutoScaling
         o.input = Shapes::ShapeRef.new(shape: DeleteTagsType)
         o.output = Shapes::ShapeRef.new(shape: Shapes::StructureShape.new(struct_class: Aws::EmptyStructure))
         o.errors << Shapes::ShapeRef.new(shape: ResourceContentionFault)
+        o.errors << Shapes::ShapeRef.new(shape: ResourceInUseFault)
       end)
 
       api.add_operation(:describe_account_limits, Seahorse::Model::Operation.new.tap do |o|