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

resource/aws_elasticache_replication_group: Make at_rest_encryption_enabled nullable Bool #40514

Merged
merged 7 commits into from
Dec 13, 2024

Conversation

gdavison
Copy link
Contributor

@gdavison gdavison commented Dec 11, 2024

Description

Converts at_rest_encryption_enabled to nullable Bool so that default of true when engine is valkey does not cause perpetual diff which triggers replacement.

Relations

Closes #39955

References

Output from Acceptance Testing

% make testacc PKG=elasticache TESTS=TestAccElastiCacheReplicationGroup_

--- PASS: TestAccElastiCacheReplicationGroup_cacheClustersConflictsWithReplicasPerNodeGroup (5.71s)
--- PASS: TestAccElastiCacheReplicationGroup_ValidationMultiAz_noAutomaticFailover (6.32s)
--- PASS: TestAccElastiCacheReplicationGroup_ClusterMode_nonClusteredParameterGroup (793.40s)
--- PASS: TestAccElastiCacheReplicationGroup_Redis_basic (854.78s)
--- PASS: TestAccElastiCacheReplicationGroup_updateDescription (873.22s)
--- PASS: TestAccElastiCacheReplicationGroup_ClusterMode_singleNode (1351.93s)
--- PASS: TestAccElastiCacheReplicationGroup_deprecatedAvailabilityZones_multiAzInVPC (1426.94s)
--- PASS: TestAccElastiCacheReplicationGroup_multiAzInVPC (1456.45s)
--- PASS: TestAccElastiCacheReplicationGroup_multiAzNotInVPC (1491.58s)
--- PASS: TestAccElastiCacheReplicationGroup_autoFailoverEnabled_validateNumberCacheClusters (1.61s)
--- PASS: TestAccElastiCacheReplicationGroup_Engine_Redis_LogDeliveryConfigurations_ClusterMode_Enabled (1584.60s)
--- PASS: TestAccElastiCacheReplicationGroup_Redis_EngineVersion_v7 (876.52s)
--- PASS: TestAccElastiCacheReplicationGroup_stateUpgrade5590 (1750.08s)
--- PASS: TestAccElastiCacheReplicationGroup_uppercase (946.35s)
--- PASS: TestAccElastiCacheReplicationGroup_Valkey_disableAtRestEncryption (818.82s)
--- PASS: TestAccElastiCacheReplicationGroup_vpc (2239.35s)
--- PASS: TestAccElastiCacheReplicationGroup_stateUpgrade5270 (2307.39s)
--- PASS: TestAccElastiCacheReplicationGroup_ipDiscovery (2433.60s)
--- PASS: TestAccElastiCacheReplicationGroup_networkType (2532.98s)
--- PASS: TestAccElastiCacheReplicationGroup_useCMKKMSKeyID (910.48s)
--- PASS: TestAccElastiCacheReplicationGroup_ClusterMode_basic (2756.49s)
--- PASS: TestAccElastiCacheReplicationGroup_transitEncryption7x_basic (851.07s)
--- PASS: TestAccElastiCacheReplicationGroup_ClusterModeUpdateNumNodeGroupsAndReplicasPerNodeGroup_scaleUp (3166.57s)
--- PASS: TestAccElastiCacheReplicationGroup_ClusterMode_updateFromDisabled_Compatible_Enabled (3236.73s)
--- PASS: TestAccElastiCacheReplicationGroup_NumberCacheClustersMemberClusterDisappears_addMemberCluster (3311.39s)
--- PASS: TestAccElastiCacheReplicationGroup_authToken (3389.71s)
--- PASS: TestAccElastiCacheReplicationGroup_Valkey_basic (1634.30s)
--- PASS: TestAccElastiCacheReplicationGroup_NumberCacheClusters_autoFailoverDisabled (1908.70s)
--- PASS: TestAccElastiCacheReplicationGroup_NumberCacheClustersMemberClusterDisappears_noChange (2113.38s)
--- PASS: TestAccElastiCacheReplicationGroup_multiAzNotInVPC_repeated (3748.94s)
--- PASS: TestAccElastiCacheReplicationGroup_NumberCacheClusters_basic (2123.07s)
--- PASS: TestAccElastiCacheReplicationGroup_Redis_enableAtRestEncryption (1479.83s)
--- PASS: TestAccElastiCacheReplicationGroup_ClusterMode_updateReplicasPerNodeGroup (1840.50s)
--- PASS: TestAccElastiCacheReplicationGroup_transitEncryptionWithAuthToken (974.61s)
--- PASS: TestAccElastiCacheReplicationGroup_clusteringAndCacheNodesCausesError (1.03s)
--- PASS: TestAccElastiCacheReplicationGroup_dataTiering (841.94s)
--- PASS: TestAccElastiCacheReplicationGroup_Validation_globalReplicationGroupIdAndNodeType (1159.68s)
--- PASS: TestAccElastiCacheReplicationGroup_Engine_Redis_LogDeliveryConfigurations_ClusterMode_Disabled (1215.68s)
--- PASS: TestAccElastiCacheReplicationGroup_enableSnapshotting (1374.94s)
--- PASS: TestAccElastiCacheReplicationGroup_Redis_basic_v5 (1993.83s)
--- PASS: TestAccElastiCacheReplicationGroup_GlobalReplicationGroupIDClusterModeValidation_numNodeGroupsOnSecondary (1389.27s)
--- PASS: TestAccElastiCacheReplicationGroup_NumberCacheClusters_autoFailoverEnabled (3466.71s)
--- PASS: TestAccElastiCacheReplicationGroup_NumberCacheClusters_multiAZEnabled (3505.94s)
--- PASS: TestAccElastiCacheReplicationGroup_transitEncryption7x_Disable (2429.90s)
--- PASS: TestAccElastiCacheReplicationGroup_ClusterModeUpdateNumNodeGroupsAndReplicasPerNodeGroup_scaleDown (4371.82s)
--- PASS: TestAccElastiCacheReplicationGroup_transitEncryption7x_Enable (2572.72s)
--- PASS: TestAccElastiCacheReplicationGroup_autoMinorVersionUpgrade (965.71s)
--- PASS: TestAccElastiCacheReplicationGroup_finalSnapshot (1068.40s)
--- PASS: TestAccElastiCacheReplicationGroup_Validation_noNodeType (5.92s)
--- PASS: TestAccElastiCacheReplicationGroup_updateParameterGroup (957.25s)
--- PASS: TestAccElastiCacheReplicationGroup_ClusterModeUpdateNumNodeGroups_scaleDown (3583.51s)
--- PASS: TestAccElastiCacheReplicationGroup_ClusterModeUpdateNumNodeGroups_scaleUp (2639.13s)
--- PASS: TestAccElastiCacheReplicationGroup_tags (938.13s)
--- PASS: TestAccElastiCacheReplicationGroup_transitEncryption5x (2741.36s)
--- PASS: TestAccElastiCacheReplicationGroup_disappears (1375.65s)
--- PASS: TestAccElastiCacheReplicationGroup_updateUserGroups (1258.48s)
--- PASS: TestAccElastiCacheReplicationGroup_tagWithOtherModification (2475.24s)
--- PASS: TestAccElastiCacheReplicationGroup_updateNodeSize (2134.93s)
--- PASS: TestAccElastiCacheReplicationGroup_updateMaintenanceWindow (1528.72s)
--- PASS: TestAccElastiCacheReplicationGroup_EngineVersion_6xToRealVersion (1947.33s)
--- PASS: TestAccElastiCacheReplicationGroup_GlobalReplicationGroupID_basic (3035.80s)
--- PASS: TestAccElastiCacheReplicationGroup_NumberCacheClustersMemberClusterDisappearsRemoveMemberCluster_atTargetSize (1984.22s)
--- PASS: TestAccElastiCacheReplicationGroup_EngineVersion_update (7166.59s)
--- PASS: TestAccElastiCacheReplicationGroup_Engine_RedisToValkey (2392.07s)
--- PASS: TestAccElastiCacheReplicationGroup_NumberCacheClustersMemberClusterDisappearsRemoveMemberCluster_scaleDown (2673.34s)
--- PASS: TestAccElastiCacheReplicationGroup_GlobalReplicationGroupID_full (3613.51s)
--- PASS: TestAccElastiCacheReplicationGroup_GlobalReplicationGroupID_disappears (3655.38s)
--- PASS: TestAccElastiCacheReplicationGroup_GlobalReplicationGroupIDClusterMode_basic (5390.74s)

Copy link

Community Note

Voting for Prioritization

  • Please vote on this pull request by adding a 👍 reaction to the original post to help the community and maintainers prioritize this pull request.
  • Please see our prioritization guide for information on how we prioritize.
  • Please do not leave "+1" or other comments that do not add relevant new information or questions, they generate extra noise for issue followers and do not help prioritize the request.

For Submitters

  • Review the contribution guide relating to the type of change you are making to ensure all of the necessary steps have been taken.
  • For new resources and data sources, use skaff to generate scaffolding with comments detailing common expectations.
  • Whether or not the branch has been rebased will not impact prioritization, but doing so is always a welcome surprise.

@github-actions github-actions bot added documentation Introduces or discusses updates to documentation. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. service/elasticache Issues and PRs that pertain to the elasticache service. prioritized Part of the maintainer teams immediate focus. To be addressed within the current quarter. labels Dec 11, 2024
@gdavison gdavison marked this pull request as ready for review December 11, 2024 18:13
@gdavison gdavison requested a review from a team as a code owner December 11, 2024 18:13
@jar-b jar-b self-assigned this Dec 12, 2024
Copy link
Member

@jar-b jar-b left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 🎉

% make testacc PKG=elasticache TESTS="TestAccElastiCacheReplicationGroup_transitEncryption7x_basic|TestAccElastiCacheReplicationGroup_transitEncryption7x_Enable|TestAccElastiCacheReplicationGroup_transitEncryption7x_Disable|TestAccElastiCacheReplicationGroup_Redis_enableAtRestEncryption|TestAccElastiCacheReplicationGroup_Valkey_disableAtRestEncryption"
make: Verifying source code with gofmt...
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go1.23.3 test ./internal/service/elasticache/... -v -count 1 -parallel 20 -run='TestAccElastiCacheReplicationGroup_transitEncryption7x_basic|TestAccElastiCacheReplicationGroup_transitEncryption7x_Enable|TestAccElastiCacheReplicationGroup_transitEncryption7x_Disable|TestAccElastiCacheReplicationGroup_Redis_enableAtRestEncryption|TestAccElastiCacheReplicationGroup_Valkey_disableAtRestEncryption'  -timeout 360m
2024/12/12 10:17:22 Initializing Terraform AWS Provider...

--- PASS: TestAccElastiCacheReplicationGroup_Valkey_disableAtRestEncryption (712.52s)
--- PASS: TestAccElastiCacheReplicationGroup_transitEncryption7x_basic (797.36s)
--- PASS: TestAccElastiCacheReplicationGroup_Redis_enableAtRestEncryption (798.75s)
--- PASS: TestAccElastiCacheReplicationGroup_transitEncryption7x_Enable (2083.64s)
--- PASS: TestAccElastiCacheReplicationGroup_transitEncryption7x_Disable (2097.34s)
PASS
ok      github.com/hashicorp/terraform-provider-aws/internal/service/elasticache        2103.788s

@gdavison gdavison merged commit c023bbd into main Dec 13, 2024
60 checks passed
@gdavison gdavison deleted the b-elasticache-replication-group-nullable-bool branch December 13, 2024 17:39
@github-actions github-actions bot added this to the v5.82.0 milestone Dec 13, 2024
terraform-aws-provider bot pushed a commit that referenced this pull request Dec 13, 2024
@github-actions github-actions bot removed the prioritized Part of the maintainer teams immediate focus. To be addressed within the current quarter. label Dec 19, 2024
Copy link

This functionality has been released in v5.82.0 of the Terraform AWS Provider. Please see the Terraform documentation on provider versioning or reach out if you need any assistance upgrading.

For further feature requests or bug reports with this functionality, please create a new GitHub issue following the template. Thank you!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
documentation Introduces or discusses updates to documentation. service/elasticache Issues and PRs that pertain to the elasticache service. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Bug]: Can not disable transit encryption and at_rest_encryption
2 participants