r/aws_iam_user: Resolve merge conflict between #2940 and #2979

hashicorp · Jan 16, 2018 · 306bfb7 · 306bfb7
2 parents 70e75e7 + f2a525b
commit 306bfb7
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 1 deletion.
diff --git a/aws/resource_aws_iam_user.go b/aws/resource_aws_iam_user.go
@@ -136,7 +136,7 @@ func resourceAwsIamUserUpdate(d *schema.ResourceData, meta interface{}) error {
 			return fmt.Errorf("Error updating IAM User %s: %s", d.Id(), err)
 		}
 
-		d.SetId(*request.NewUserName)
+		d.SetId(nn.(string))
 		return resourceAwsIamUserRead(d, meta)
 	}
 	return nil

diff --git a/aws/resource_aws_iam_user_test.go b/aws/resource_aws_iam_user_test.go
@@ -80,6 +80,34 @@ func TestAccAWSUser_basic(t *testing.T) {
 	})
 }
 
+func TestAccAWSUser_nameChange(t *testing.T) {
+	var conf iam.GetUserOutput
+
+	name1 := fmt.Sprintf("test-user-%d", acctest.RandInt())
+	name2 := fmt.Sprintf("test-user-%d", acctest.RandInt())
+	path := "/"
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckAWSUserDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccAWSUserConfig(name1, path),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckAWSUserExists("aws_iam_user.user", &conf),
+				),
+			},
+			{
+				Config: testAccAWSUserConfig(name2, path),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckAWSUserExists("aws_iam_user.user", &conf),
+				),
+			},
+		},
+	})
+}
+
 func testAccCheckAWSUserDestroy(s *terraform.State) error {
 	iamconn := testAccProvider.Meta().(*AWSClient).iamconn