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.

Sign up for GitHub

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

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

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
db8eb41
Fixing utypo for passwords field in elasticache user and extending ti…
jphanvenafi Aug 11, 2021
00e7419
Add CHANGELOG entry.
ewbankkit Aug 17, 2021
ea9bbc1
r/aws_elasticache_user: Remove custom create timeout.
ewbankkit Aug 17, 2021
9a71474
r/aws_elasticache_user: Test passwords update.
ewbankkit Aug 17, 2021
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
9 changes: 6 additions & 3 deletions aws/resource_aws_elasticache_user.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"fmt"
"log"
"strings"
"time"

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/endpoints"
Expand All @@ -27,6 +28,9 @@ func resourceAwsElasticacheUser() *schema.Resource {
State: schema.ImportStatePassthrough,
},
CustomizeDiff: SetTagsDiff,
Timeouts: &schema.ResourceTimeout{
Create: schema.DefaultTimeout(20 * time.Minute),
},

Schema: map[string]*schema.Schema{
"access_string": {
Expand Down Expand Up @@ -173,8 +177,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 +194,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