code cleanups

hashicorp · Jun 9, 2015 · 4d59019 · 4d59019
1 parent 5f1ab2a
commit 4d59019
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/builtin/providers/aws/resource_aws_iam_group_membership.go b/builtin/providers/aws/resource_aws_iam_group_membership.go
@@ -124,7 +124,6 @@ func resourceAwsIamGroupMembershipDelete(d *schema.ResourceData, meta interface{
 		return err
 	}
 
-	d.SetId("")
 	return nil
 }
 

diff --git a/builtin/providers/aws/resource_aws_iam_group_membership_test.go b/builtin/providers/aws/resource_aws_iam_group_membership_test.go
@@ -47,15 +47,22 @@ func testAccCheckAWSGroupMembershipDestroy(s *terraform.State) error {
 
 		group := rs.Primary.Attributes["group"]
 
-		_, err := conn.GetGroup(&iam.GetGroupInput{
+		resp, err := conn.GetGroup(&iam.GetGroupInput{
 			GroupName: aws.String(group),
 		})
 		if err != nil {
 			// might error here
 			return err
 		}
 
-		return fmt.Errorf("Error: Group (%s) still exists", group)
+		users := []string{"test-user", "test-user-two", "test-user-three"}
+		for _, u := range resp.Users {
+			for _, i := range users {
+				if i == *u.UserName {
+					return fmt.Errorf("Error: User (s) still a member of Group (%s)", i, *resp.Group.GroupName)
+				}
+			}
+		}
 
 	}
-Original file line number
+Diff line change
@@ Expand Up @@
     		return err
     	}
-    	d.SetId("")
     	return nil
     }
@@ Expand Down @@