provider/aws: Fixing ASG handling of not found

builtin/providers/aws/resource_aws_autoscaling_group.go

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