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

provider/aws: Fixing ASG handling of not found

This commit is contained in:
Armon Dadgar 2014-12-09 17:11:50 -08:00 committed by Mitchell Hashimoto
parent 124d9fc0bd
commit 0ff62016ee
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -158,7 +158,7 @@ func resourceAwsAutoscalingGroupCreate(d *schema.ResourceData, meta interface{})
autoScalingGroupOpts.VPCZoneIdentifier = expandStringList( autoScalingGroupOpts.VPCZoneIdentifier = expandStringList(
v.(*schema.Set).List()) v.(*schema.Set).List())
} }
if v, ok := d.GetOk("termination_policies"); ok { if v, ok := d.GetOk("termination_policies"); ok {
autoScalingGroupOpts.TerminationPolicies = expandStringList( autoScalingGroupOpts.TerminationPolicies = expandStringList(
v.(*schema.Set).List()) v.(*schema.Set).List())
@ -296,17 +296,16 @@ func getAwsAutoscalingGroup(
return nil, fmt.Errorf("Error retrieving AutoScaling groups: %s", err) return nil, fmt.Errorf("Error retrieving AutoScaling groups: %s", err)
} }
// Verify AWS returned our sg // Search for the autoscaling group
if len(describeGroups.AutoScalingGroups) != 1 || for idx, asc := range describeGroups.AutoScalingGroups {
describeGroups.AutoScalingGroups[0].Name != d.Id() { if asc.Name == d.Id() {
if err != nil { return &describeGroups.AutoScalingGroups[idx], nil
return nil, fmt.Errorf(
"Unable to find AutoScaling group: %#v",
describeGroups.AutoScalingGroups)
} }
} }
return &describeGroups.AutoScalingGroups[0], nil // ASG not found
d.SetId("")
return nil, nil
} }
func resourceAwsAutoscalingGroupDrain(d *schema.ResourceData, meta interface{}) error { func resourceAwsAutoscalingGroupDrain(d *schema.ResourceData, meta interface{}) error {