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

resource/aws_elasticache_replication_group: Make at_rest_encryption_enabled nullable Bool #40514

Merged
merged 7 commits into from
Dec 13, 2024
+245 −63
Merged

resource/aws_elasticache_replication_group: Make at_rest_encryption_enabled nullable Bool #40514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0e398d7
Adds checks for `at_rest_encryption_enabled` missing from `basic` tests
gdavison Dec 10, 2024
bb2a84e
Updates documentation
gdavison Dec 10, 2024
c4c5cc2
Uses `nullable.TypeNullableBool` for `at_rest_encryption_enabled` ins…
gdavison Dec 10, 2024
02969cc
Adds checks for `transit_encryption_enabled` and `transit_encryption_…
gdavison Dec 10, 2024
c944613
Adds checks for `transit_encryption_mode` missing from `transit_encr…
gdavison Dec 10, 2024
7f65eb5
Separates `transit_encryption_enabled` test into: enable on creation …
gdavison Dec 10, 2024
0562890
Adds CHANGELOG entry
gdavison Dec 11, 2024
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/40514.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
resource/aws_elasticache_replication_group: Prevent perpetual diff which triggers resource replacement on `at_rest_encryption_enabled` when `engine` is `valkey`.
```
18 changes: 11 additions & 7 deletions internal/service/elasticache/replication_group.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"fmt"
"log"
"slices"
"strconv"
"strings"
"time"

Expand Down Expand Up @@ -67,10 +68,11 @@ func resourceReplicationGroup() *schema.Resource {
Computed: true,
},
"at_rest_encryption_enabled": {
Type: schema.TypeBool,
Optional: true,
ForceNew: true,
Computed: true,
Type: nullable.TypeNullableBool,
Optional: true,
ForceNew: true,
Computed: true,
ValidateFunc: nullable.ValidateTypeStringNullableBool,
},
"auth_token": {
Type: schema.TypeString,
Expand Down Expand Up @@ -434,8 +436,10 @@ func resourceReplicationGroupCreate(ctx context.Context, d *schema.ResourceData,
Tags: getTagsIn(ctx),
}

if _, ok := d.GetOk("at_rest_encryption_enabled"); ok {
input.AtRestEncryptionEnabled = aws.Bool(d.Get("at_rest_encryption_enabled").(bool))
if v, ok := d.GetOk("at_rest_encryption_enabled"); ok {
if v, null, _ := nullable.Bool(v.(string)).ValueBool(); !null {
input.AtRestEncryptionEnabled = aws.Bool(v)
}
}

if v, ok := d.GetOk("auth_token"); ok {
Expand Down Expand Up @@ -764,7 +768,7 @@ func resourceReplicationGroupRead(ctx context.Context, d *schema.ResourceData, m
return sdkdiag.AppendErrorf(diags, "reading ElastiCache Replication Group (%s): reading Cache Cluster (%s): %s", d.Id(), aws.ToString(cacheCluster.CacheClusterId), err)
}

d.Set("at_rest_encryption_enabled", c.AtRestEncryptionEnabled)
d.Set("at_rest_encryption_enabled", strconv.FormatBool(aws.ToBool(c.AtRestEncryptionEnabled)))
// `aws_elasticache_cluster` resource doesn't define `security_group_names`, but `aws_elasticache_replication_group` does.
// The value for that comes from []CacheSecurityGroupMembership which is part of CacheCluster object in AWS API.
// We need to set it here, as it is not set in setFromCacheCluster, and we cannot add it to that function
Expand Down
Loading
Loading