Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixing typo for passwords field in elasticache user and extending timeouts #20530

Merged
merged 4 commits into from
Aug 17, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/20530.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
resource/aws_elasticache_user: Correctly update `passwords`
```
5 changes: 2 additions & 3 deletions aws/resource_aws_elasticache_user.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand All @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion aws/resource_aws_elasticache_user_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ resource "aws_elasticache_user" "test" {
user_name = "username1"
access_string = "on ~* +@all"
engine = "REDIS"
passwords = ["password123456789"]
passwords = ["password234567891", "password345678912"]
}
`, rName))
}
Expand Down