From e378ea42b89ada74375c6804ad31679a967e2dec Mon Sep 17 00:00:00 2001 From: Radek Simko Date: Wed, 25 Feb 2015 21:46:56 +0000 Subject: [PATCH] Prevent empty string to be used as default health_check_type --- builtin/providers/aws/resource_aws_autoscaling_group.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/builtin/providers/aws/resource_aws_autoscaling_group.go b/builtin/providers/aws/resource_aws_autoscaling_group.go index ebe9ac72d..b914f307a 100644 --- a/builtin/providers/aws/resource_aws_autoscaling_group.go +++ b/builtin/providers/aws/resource_aws_autoscaling_group.go @@ -127,7 +127,6 @@ func resourceAwsAutoscalingGroupCreate(d *schema.ResourceData, meta interface{}) var autoScalingGroupOpts autoscaling.CreateAutoScalingGroupType 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.MinSize = aws.Integer(d.Get("min_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)) } + if v, ok := d.GetOk("health_check"); ok && v.(string) != "" { + autoScalingGroupOpts.HealthCheckType = aws.String(v.(string)) + } + if v, ok := d.GetOk("desired_capacity"); ok { autoScalingGroupOpts.DesiredCapacity = aws.Integer(v.(int)) }