Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

resource/aws_appautoscaling_policy: Remove deprecated arguments and properly read step_scaling_policy_configuration into Terraform state #7706

Merged
merged 1 commit into from
Feb 27, 2019
Merged

resource/aws_appautoscaling_policy: Remove deprecated arguments and properly read step_scaling_policy_configuration into Terraform state #7706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
126 changes: 46 additions & 80 deletions aws/resource_aws_appautoscaling_policy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
package aws

import (
"bytes"
"fmt"
"log"
"strconv"
"time"

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/service/applicationautoscaling"
"github.com/hashicorp/terraform/helper/hashcode"
"github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform/helper/validation"
Expand Down Expand Up @@ -55,6 +53,7 @@ func resourceAwsAppautoscalingPolicy() *schema.Resource {
},
"step_scaling_policy_configuration": {
Type: schema.TypeList,
MaxItems: 1,
Optional: true,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
Expand Down Expand Up @@ -105,30 +104,29 @@ func resourceAwsAppautoscalingPolicy() *schema.Resource {
},

"adjustment_type": {
Type: schema.TypeString,
Optional: true,
Deprecated: "Use step_scaling_policy_configuration -> adjustment_type instead",
Type: schema.TypeString,
Optional: true,
Removed: "Use `step_scaling_policy_configuration` configuration block `adjustment_type` argument instead",
},
"cooldown": {
Type: schema.TypeInt,
Optional: true,
Deprecated: "Use step_scaling_policy_configuration -> cooldown instead",
Type: schema.TypeInt,
Optional: true,
Removed: "Use `step_scaling_policy_configuration` configuration block `cooldown` argument instead",
},
"metric_aggregation_type": {
Type: schema.TypeString,
Optional: true,
Deprecated: "Use step_scaling_policy_configuration -> metric_aggregation_type instead",
Type: schema.TypeString,
Optional: true,
Removed: "Use `step_scaling_policy_configuration` configuration block `metric_aggregation_type` argument instead",
},
"min_adjustment_magnitude": {
Type: schema.TypeInt,
Optional: true,
Deprecated: "Use step_scaling_policy_configuration -> min_adjustment_magnitude instead",
Type: schema.TypeInt,
Optional: true,
Removed: "Use `step_scaling_policy_configuration` configuration block `min_adjustment_magnitude` argument instead",
},
"step_adjustment": {
Type: schema.TypeSet,
Optional: true,
Deprecated: "Use step_scaling_policy_configuration -> step_adjustment instead",
Set: resourceAwsAppautoscalingAdjustmentHash,
Type: schema.TypeSet,
Optional: true,
Removed: "Use `step_scaling_policy_configuration` configuration block `step_adjustment` configuration block instead",
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"metric_interval_lower_bound": {
Expand Down Expand Up @@ -315,9 +313,12 @@ func resourceAwsAppautoscalingPolicyRead(d *schema.ResourceData, meta interface{
d.Set("scalable_dimension", p.ScalableDimension)
d.Set("service_namespace", p.ServiceNamespace)
d.Set("alarms", p.Alarms)
d.Set("step_scaling_policy_configuration", flattenStepScalingPolicyConfiguration(p.StepScalingPolicyConfiguration))
d.Set("target_tracking_scaling_policy_configuration",
flattenTargetTrackingScalingPolicyConfiguration(p.TargetTrackingScalingPolicyConfiguration))
if err := d.Set("step_scaling_policy_configuration", flattenStepScalingPolicyConfiguration(p.StepScalingPolicyConfiguration)); err != nil {
return fmt.Errorf("error setting step_scaling_policy_configuration: %s", err)
}
if err := d.Set("target_tracking_scaling_policy_configuration", flattenTargetTrackingScalingPolicyConfiguration(p.TargetTrackingScalingPolicyConfiguration)); err != nil {
return fmt.Errorf("error setting target_tracking_scaling_policy_configuration: %s", err)
}

return nil
}
Expand Down Expand Up @@ -504,43 +505,6 @@ func getAwsAppautoscalingPutScalingPolicyInput(d *schema.ResourceData) (applicat
params.ScalableDimension = aws.String(v.(string))
}

// Deprecated fields
// TODO: Remove in next major version
at, atOk := d.GetOk("adjustment_type")
cd, cdOk := d.GetOk("cooldown")
mat, matOk := d.GetOk("metric_aggregation_type")
mam, mamOk := d.GetOk("min_adjustment_magnitude")
sa, saOk := d.GetOk("step_adjustment")
if atOk || cdOk || matOk || mamOk || saOk {
cfg := &applicationautoscaling.StepScalingPolicyConfiguration{}

if atOk {
cfg.AdjustmentType = aws.String(at.(string))
}

if cdOk {
cfg.Cooldown = aws.Int64(int64(cd.(int)))
}

if matOk {
cfg.MetricAggregationType = aws.String(mat.(string))
}

if saOk {
steps, err := expandAppautoscalingStepAdjustments(sa.(*schema.Set).List())
if err != nil {
return params, fmt.Errorf("metric_interval_lower_bound and metric_interval_upper_bound must be strings!")
}
cfg.StepAdjustments = steps
}

if mamOk {
cfg.MinAdjustmentMagnitude = aws.Int64(int64(mam.(int)))
}

params.StepScalingPolicyConfiguration = cfg
}

if v, ok := d.GetOk("step_scaling_policy_configuration"); ok {
params.StepScalingPolicyConfiguration = expandStepScalingPolicyConfiguration(v.([]interface{}))
}
Expand Down Expand Up @@ -638,19 +602,35 @@ func flattenStepScalingPolicyConfiguration(cfg *applicationautoscaling.StepScali
m := make(map[string]interface{})

if cfg.AdjustmentType != nil {
m["adjustment_type"] = *cfg.AdjustmentType
m["adjustment_type"] = aws.StringValue(cfg.AdjustmentType)
}
if cfg.Cooldown != nil {
m["cooldown"] = *cfg.Cooldown
m["cooldown"] = aws.Int64Value(cfg.Cooldown)
}
if cfg.MetricAggregationType != nil {
m["metric_aggregation_type"] = *cfg.MetricAggregationType
m["metric_aggregation_type"] = aws.StringValue(cfg.MetricAggregationType)
}
if cfg.MinAdjustmentMagnitude != nil {
m["min_adjustment_magnitude"] = *cfg.MinAdjustmentMagnitude
m["min_adjustment_magnitude"] = aws.Int64Value(cfg.MinAdjustmentMagnitude)
}
if cfg.StepAdjustments != nil {
m["step_adjustment"] = flattenAppautoscalingStepAdjustments(cfg.StepAdjustments)
stepAdjustmentsResource := &schema.Resource{
Schema: map[string]*schema.Schema{
"metric_interval_lower_bound": {
Type: schema.TypeString,
Optional: true,
},
"metric_interval_upper_bound": {
Type: schema.TypeString,
Optional: true,
},
"scaling_adjustment": {
Type: schema.TypeInt,
Required: true,
},
},
}
m["step_adjustment"] = schema.NewSet(schema.HashResource(stepAdjustmentsResource), flattenAppautoscalingStepAdjustments(cfg.StepAdjustments))
}

return []interface{}{m}
Expand All @@ -662,13 +642,13 @@ func flattenAppautoscalingStepAdjustments(adjs []*applicationautoscaling.StepAdj
for i, adj := range adjs {
m := make(map[string]interface{})

m["scaling_adjustment"] = *adj.ScalingAdjustment
m["scaling_adjustment"] = int(aws.Int64Value(adj.ScalingAdjustment))

if adj.MetricIntervalLowerBound != nil {
m["metric_interval_lower_bound"] = *adj.MetricIntervalLowerBound
m["metric_interval_lower_bound"] = fmt.Sprintf("%g", aws.Float64Value(adj.MetricIntervalLowerBound))
}
if adj.MetricIntervalUpperBound != nil {
m["metric_interval_upper_bound"] = *adj.MetricIntervalUpperBound
m["metric_interval_upper_bound"] = fmt.Sprintf("%g", aws.Float64Value(adj.MetricIntervalUpperBound))
}

out[i] = m
Expand Down Expand Up @@ -748,17 +728,3 @@ func flattenPredefinedMetricSpecification(cfg *applicationautoscaling.Predefined
}
return []interface{}{m}
}

func resourceAwsAppautoscalingAdjustmentHash(v interface{}) int {
var buf bytes.Buffer
m := v.(map[string]interface{})
if v, ok := m["metric_interval_lower_bound"]; ok {
buf.WriteString(fmt.Sprintf("%f-", v))
}
if v, ok := m["metric_interval_upper_bound"]; ok {
buf.WriteString(fmt.Sprintf("%f-", v))
}
buf.WriteString(fmt.Sprintf("%d-", m["scaling_adjustment"].(int)))

return hashcode.String(buf.String())
}
Loading