From 0ab12a54f138a9d70e9bc6ba97b955c58f57f874 Mon Sep 17 00:00:00 2001
From: Patrick Gray <pgray@conductor.com>
Date: Sun, 13 Sep 2015 03:37:45 -0400
Subject: [PATCH] handle error of trying to remove a user from a group when
 their name has already changed

---
 builtin/providers/aws/resource_aws_iam_group_membership.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/builtin/providers/aws/resource_aws_iam_group_membership.go b/builtin/providers/aws/resource_aws_iam_group_membership.go
index c90511cd6..14bdd3713 100644
--- a/builtin/providers/aws/resource_aws_iam_group_membership.go
+++ b/builtin/providers/aws/resource_aws_iam_group_membership.go
@@ -135,6 +135,9 @@ func removeUsersFromGroup(conn *iam.IAM, users []*string, group string) error {
 		})
 
 		if err != nil {
+			if iamerr, ok := err.(awserr.Error); ok && iamerr.Code() == "NoSuchEntity" {
+				return nil
+			}
 			return err
 		}
 	}