Merge pull request #20530 from josephkphan/main

Fixing typo for passwords field in elasticache user and extending timeouts
hashicorp · Aug 17, 2021 · e8813c9 · e8813c9
2 parents 6abf27d + 9a71474
commit e8813c9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/.changelog/20530.txt b/.changelog/20530.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_elasticache_user: Correctly update `passwords`
+```
diff --git a/aws/resource_aws_elasticache_user.go b/aws/resource_aws_elasticache_user.go
@@ -173,8 +173,8 @@ func resourceAwsElasticacheUserUpdate(d *schema.ResourceData, meta interface{})
 			hasChange = true
 		}
 
-		if d.HasChange("password") {
-			req.Passwords = expandStringSet(d.Get("password").(*schema.Set))
+		if d.HasChange("passwords") {
+			req.Passwords = expandStringSet(d.Get("passwords").(*schema.Set))
 			hasChange = true
 		}
 
@@ -190,7 +190,6 @@ func resourceAwsElasticacheUserUpdate(d *schema.ResourceData, meta interface{})
 		}
 
 	}
-
 	// Tags are currently only supported in AWS Commercial.
 	if d.HasChange("tags_all") && meta.(*AWSClient).partition == endpoints.AwsPartitionID {
 		o, n := d.GetChange("tags_all")

diff --git a/aws/resource_aws_elasticache_user_test.go b/aws/resource_aws_elasticache_user_test.go
@@ -235,7 +235,7 @@ resource "aws_elasticache_user" "test" {
   user_name     = "username1"
   access_string = "on ~* +@all"
   engine        = "REDIS"
-  passwords     = ["password123456789"]
+  passwords     = ["password234567891", "password345678912"]
 }
 `, rName))
 }