From 0315d511250a13766590c5e7bad3c4b4bb22c50f Mon Sep 17 00:00:00 2001
From: Mark Severson <markse@instructure.com>
Date: Tue, 17 May 2016 14:23:05 -0600
Subject: [PATCH] provider/aws: Query all pages of group membership

By default, group membership queries return pages of 100 users at a
time. Because of this, if there are more than 100 users in an
aws_iam_group_membership resource, the resource always reports as
needing to be changed (because it only sees 100 of the users as
existing in the group).

The group membership now queries all pages.

Fixes #6722
---
 .../aws/resource_aws_iam_group_membership.go  | 40 ++++++++++++-------
 1 file changed, 25 insertions(+), 15 deletions(-)

diff --git a/builtin/providers/aws/resource_aws_iam_group_membership.go b/builtin/providers/aws/resource_aws_iam_group_membership.go
index 14bdd3713..7977bbfb7 100644
--- a/builtin/providers/aws/resource_aws_iam_group_membership.go
+++ b/builtin/providers/aws/resource_aws_iam_group_membership.go
@@ -56,25 +56,35 @@ func resourceAwsIamGroupMembershipCreate(d *schema.ResourceData, meta interface{
 func resourceAwsIamGroupMembershipRead(d *schema.ResourceData, meta interface{}) error {
 	conn := meta.(*AWSClient).iamconn
 	group := d.Get("group").(string)
-	resp, err := conn.GetGroup(&iam.GetGroupInput{
-		GroupName: aws.String(group),
-	})
 
-	if err != nil {
-		if awsErr, ok := err.(awserr.Error); ok {
-			// aws specific error
-			if awsErr.Code() == "NoSuchEntity" {
-				// group not found
-				d.SetId("")
-				return nil
+	var ul []string
+	var marker *string
+	for {
+		resp, err := conn.GetGroup(&iam.GetGroupInput{
+			GroupName: aws.String(group),
+			Marker:    marker,
+		})
+
+		if err != nil {
+			if awsErr, ok := err.(awserr.Error); ok {
+				// aws specific error
+				if awsErr.Code() == "NoSuchEntity" {
+					// group not found
+					d.SetId("")
+					return nil
+				}
 			}
+			return err
 		}
-		return err
-	}
 
-	ul := make([]string, 0, len(resp.Users))
-	for _, u := range resp.Users {
-		ul = append(ul, *u.UserName)
+		for _, u := range resp.Users {
+			ul = append(ul, *u.UserName)
+		}
+
+		if !*resp.IsTruncated {
+			break
+		}
+		marker = resp.Marker
 	}
 
 	if err := d.Set("users", ul); err != nil {