ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1052 from TimeInc/hct-bugfix 

Bug: Prevent empty string to be used as default health_check_type
This commit is contained in:
Jack Pearkes 2015-02-27 09:33:46 -08:00
parent 1f7e71b7f6 e378ea42b8
commit 053a7c0a8b
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
builtin/providers/aws/resource_aws_autoscaling_group.go
View File

@ -127,7 +127,6 @@ func resourceAwsAutoscalingGroupCreate(d *schema.ResourceData, meta interface{})
var autoScalingGroupOpts autoscaling.CreateAutoScalingGroupType var autoScalingGroupOpts autoscaling.CreateAutoScalingGroupType
autoScalingGroupOpts.AutoScalingGroupName = aws.String(d.Get("name").(string)) autoScalingGroupOpts.AutoScalingGroupName = aws.String(d.Get("name").(string))
autoScalingGroupOpts.HealthCheckType = aws.String(d.Get("health_check_type").(string))
autoScalingGroupOpts.LaunchConfigurationName = aws.String(d.Get("launch_configuration").(string)) autoScalingGroupOpts.LaunchConfigurationName = aws.String(d.Get("launch_configuration").(string))
autoScalingGroupOpts.MinSize = aws.Integer(d.Get("min_size").(int)) autoScalingGroupOpts.MinSize = aws.Integer(d.Get("min_size").(int))
autoScalingGroupOpts.MaxSize = aws.Integer(d.Get("max_size").(int)) autoScalingGroupOpts.MaxSize = aws.Integer(d.Get("max_size").(int))
@ -138,6 +137,10 @@ func resourceAwsAutoscalingGroupCreate(d *schema.ResourceData, meta interface{})
autoScalingGroupOpts.DefaultCooldown = aws.Integer(v.(int)) autoScalingGroupOpts.DefaultCooldown = aws.Integer(v.(int))
} }
if v, ok := d.GetOk("health_check"); ok && v.(string) != "" {
autoScalingGroupOpts.HealthCheckType = aws.String(v.(string))
}
if v, ok := d.GetOk("desired_capacity"); ok { if v, ok := d.GetOk("desired_capacity"); ok {
autoScalingGroupOpts.DesiredCapacity = aws.Integer(v.(int)) autoScalingGroupOpts.DesiredCapacity = aws.Integer(v.(int))
} }