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

Jump to bottom

r/memory_db_cluster: Treat "snapshotting" status as pending when creating cluster #31077

Merged
merged 5 commits into from
Dec 18, 2023
Merged

r/memory_db_cluster: Treat "snapshotting" status as pending when creating cluster #31077

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f8ba86f
Treat "snapshotting" status as pending when creating cluster from a s…
exoego Apr 30, 2023
f4dc7ab
Merge branch 'main' into b-memory_db-bugfix-29748
johnsonaj Dec 15, 2023
c4c1eb0
fix test failures
johnsonaj Dec 15, 2023
5990f9d
tweak CHANGELOG entry
johnsonaj Dec 15, 2023
02971aa
Merge branch 'main' into b-memory_db-bugfix-29748
johnsonaj Dec 18, 2023
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/31077.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_memorydb_cluster: Treat `snapshotting` status as pending when creating cluster
```
74 changes: 37 additions & 37 deletions internal/service/memorydb/cluster_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (

func TestAccMemoryDBCluster_basic(t *testing.T) {
ctx := acctest.Context(t)
rName := "tf-test-" + sdkacctest.RandString(8)
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
resourceName := "aws_memorydb_cluster.test"

resource.ParallelTest(t, resource.TestCase{
Expand Down Expand Up @@ -49,7 +49,7 @@ func TestAccMemoryDBCluster_basic(t *testing.T) {
resource.TestCheckResourceAttr(resourceName, "node_type", "db.t4g.small"),
resource.TestCheckResourceAttr(resourceName, "num_replicas_per_shard", "1"),
resource.TestCheckResourceAttr(resourceName, "num_shards", "2"),
resource.TestCheckResourceAttr(resourceName, "parameter_group_name", "default.memorydb-redis6"),
resource.TestCheckResourceAttrSet(resourceName, "parameter_group_name"),
resource.TestCheckResourceAttr(resourceName, "port", "6379"),
resource.TestCheckResourceAttr(resourceName, "security_group_ids.#", "1"),
resource.TestCheckTypeSetElemAttrPair(resourceName, "security_group_ids.*", "aws_security_group.test", "id"),
Expand Down Expand Up @@ -83,7 +83,7 @@ func TestAccMemoryDBCluster_basic(t *testing.T) {

func TestAccMemoryDBCluster_defaults(t *testing.T) {
ctx := acctest.Context(t)
rName := "tf-test-" + sdkacctest.RandString(8)
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
resourceName := "aws_memorydb_cluster.test"

resource.ParallelTest(t, resource.TestCase{
Expand Down Expand Up @@ -111,7 +111,7 @@ func TestAccMemoryDBCluster_defaults(t *testing.T) {
resource.TestCheckResourceAttr(resourceName, "node_type", "db.t4g.small"),
resource.TestCheckResourceAttr(resourceName, "num_replicas_per_shard", "1"),
resource.TestCheckResourceAttr(resourceName, "num_shards", "1"),
resource.TestCheckResourceAttr(resourceName, "parameter_group_name", "default.memorydb-redis6"),
resource.TestCheckResourceAttrSet(resourceName, "parameter_group_name"),
resource.TestCheckResourceAttr(resourceName, "port", "6379"),
resource.TestCheckResourceAttr(resourceName, "security_group_ids.#", "0"),
resource.TestCheckResourceAttr(resourceName, "snapshot_retention_limit", "0"),
Expand All @@ -133,7 +133,7 @@ func TestAccMemoryDBCluster_defaults(t *testing.T) {

func TestAccMemoryDBCluster_disappears(t *testing.T) {
ctx := acctest.Context(t)
rName := "tf-test-" + sdkacctest.RandString(8)
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
resourceName := "aws_memorydb_cluster.test"

resource.ParallelTest(t, resource.TestCase{
Expand All @@ -156,7 +156,7 @@ func TestAccMemoryDBCluster_disappears(t *testing.T) {

func TestAccMemoryDBCluster_nameGenerated(t *testing.T) {
ctx := acctest.Context(t)
rName := "tf-test-" + sdkacctest.RandString(8)
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
resourceName := "aws_memorydb_cluster.test"

resource.ParallelTest(t, resource.TestCase{
Expand All @@ -179,7 +179,7 @@ func TestAccMemoryDBCluster_nameGenerated(t *testing.T) {

func TestAccMemoryDBCluster_namePrefix(t *testing.T) {
ctx := acctest.Context(t)
rName := "tf-test-" + sdkacctest.RandString(8)
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
resourceName := "aws_memorydb_cluster.test"

resource.ParallelTest(t, resource.TestCase{
Expand All @@ -204,7 +204,7 @@ func TestAccMemoryDBCluster_namePrefix(t *testing.T) {
func TestAccMemoryDBCluster_create_noTLS(t *testing.T) {
ctx := acctest.Context(t)

rName := "tf-test-" + sdkacctest.RandString(8)
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
resourceName := "aws_memorydb_cluster.test"

resource.ParallelTest(t, resource.TestCase{
Expand All @@ -231,7 +231,7 @@ func TestAccMemoryDBCluster_create_noTLS(t *testing.T) {

func TestAccMemoryDBCluster_create_withDataTiering(t *testing.T) {
ctx := acctest.Context(t)
rName := "tf-test-" + sdkacctest.RandString(8)
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
resourceName := "aws_memorydb_cluster.test"

resource.ParallelTest(t, resource.TestCase{
Expand All @@ -258,7 +258,7 @@ func TestAccMemoryDBCluster_create_withDataTiering(t *testing.T) {

func TestAccMemoryDBCluster_create_withKMS(t *testing.T) {
ctx := acctest.Context(t)
rName := "tf-test-" + sdkacctest.RandString(8)
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
resourceName := "aws_memorydb_cluster.test"

resource.ParallelTest(t, resource.TestCase{
Expand All @@ -285,7 +285,7 @@ func TestAccMemoryDBCluster_create_withKMS(t *testing.T) {

func TestAccMemoryDBCluster_create_withPort(t *testing.T) {
ctx := acctest.Context(t)
rName := "tf-test-" + sdkacctest.RandString(8)
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
resourceName := "aws_memorydb_cluster.test"

resource.ParallelTest(t, resource.TestCase{
Expand Down Expand Up @@ -313,8 +313,8 @@ func TestAccMemoryDBCluster_create_withPort(t *testing.T) {

func TestAccMemoryDBCluster_create_fromSnapshot(t *testing.T) {
ctx := acctest.Context(t)
rName1 := "tf-test-" + sdkacctest.RandString(8)
rName2 := "tf-test-" + sdkacctest.RandString(8)
rName1 := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
rName2 := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { acctest.PreCheck(ctx, t); testAccPreCheck(t) },
Expand All @@ -335,7 +335,7 @@ func TestAccMemoryDBCluster_create_fromSnapshot(t *testing.T) {

func TestAccMemoryDBCluster_delete_withFinalSnapshot(t *testing.T) {
ctx := acctest.Context(t)
rName := "tf-test-" + sdkacctest.RandString(8)
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
resourceName := "aws_memorydb_cluster.test"

resource.ParallelTest(t, resource.TestCase{
Expand Down Expand Up @@ -382,7 +382,7 @@ func TestAccMemoryDBCluster_delete_withFinalSnapshot(t *testing.T) {

func TestAccMemoryDBCluster_Update_aclName(t *testing.T) {
ctx := acctest.Context(t)
rName := "tf-test-" + sdkacctest.RandString(8)
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
resourceName := "aws_memorydb_cluster.test"

resource.ParallelTest(t, resource.TestCase{
Expand Down Expand Up @@ -421,7 +421,7 @@ func TestAccMemoryDBCluster_Update_aclName(t *testing.T) {

func TestAccMemoryDBCluster_Update_description(t *testing.T) {
ctx := acctest.Context(t)
rName := "tf-test-" + sdkacctest.RandString(8)
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
resourceName := "aws_memorydb_cluster.test"

resource.ParallelTest(t, resource.TestCase{
Expand Down Expand Up @@ -478,7 +478,7 @@ func TestAccMemoryDBCluster_Update_description(t *testing.T) {
func TestAccMemoryDBCluster_Update_engineVersion(t *testing.T) {
ctx := acctest.Context(t)

rName := "tf-test-" + sdkacctest.RandString(8)
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
resourceName := "aws_memorydb_cluster.test"

resource.ParallelTest(t, resource.TestCase{
Expand All @@ -491,7 +491,7 @@ func TestAccMemoryDBCluster_Update_engineVersion(t *testing.T) {
Config: testAccClusterConfig_engineVersionNull(rName),
Check: resource.ComposeTestCheckFunc(
testAccCheckClusterExists(ctx, resourceName),
resource.TestCheckResourceAttr(resourceName, "engine_version", "6.2"),
resource.TestCheckResourceAttrSet(resourceName, "engine_version"),
),
},
{
Expand All @@ -500,10 +500,10 @@ func TestAccMemoryDBCluster_Update_engineVersion(t *testing.T) {
ImportStateVerify: true,
},
{
Config: testAccClusterConfig_engineVersion(rName, "6.2"),
Config: testAccClusterConfig_engineVersion(rName, "7.1"),
Check: resource.ComposeTestCheckFunc(
testAccCheckClusterExists(ctx, resourceName),
resource.TestCheckResourceAttr(resourceName, "engine_version", "6.2"),
resource.TestCheckResourceAttr(resourceName, "engine_version", "7.1"),
),
},
{
Expand All @@ -517,7 +517,7 @@ func TestAccMemoryDBCluster_Update_engineVersion(t *testing.T) {

func TestAccMemoryDBCluster_Update_maintenanceWindow(t *testing.T) {
ctx := acctest.Context(t)
rName := "tf-test-" + sdkacctest.RandString(8)
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
resourceName := "aws_memorydb_cluster.test"

resource.ParallelTest(t, resource.TestCase{
Expand Down Expand Up @@ -556,7 +556,7 @@ func TestAccMemoryDBCluster_Update_maintenanceWindow(t *testing.T) {

func TestAccMemoryDBCluster_Update_nodeType(t *testing.T) {
ctx := acctest.Context(t)
rName := "tf-test-" + sdkacctest.RandString(8)
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
resourceName := "aws_memorydb_cluster.test"

resource.ParallelTest(t, resource.TestCase{
Expand Down Expand Up @@ -598,7 +598,7 @@ func TestAccMemoryDBCluster_Update_nodeType(t *testing.T) {
func TestAccMemoryDBCluster_Update_numShards_scaleUp(t *testing.T) {
ctx := acctest.Context(t)

rName := "tf-test-" + sdkacctest.RandString(8)
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
resourceName := "aws_memorydb_cluster.test"

resource.ParallelTest(t, resource.TestCase{
Expand Down Expand Up @@ -635,7 +635,7 @@ func TestAccMemoryDBCluster_Update_numShards_scaleUp(t *testing.T) {
func TestAccMemoryDBCluster_Update_numShards_scaleDown(t *testing.T) {
ctx := acctest.Context(t)

rName := "tf-test-" + sdkacctest.RandString(8)
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
resourceName := "aws_memorydb_cluster.test"

resource.ParallelTest(t, resource.TestCase{
Expand Down Expand Up @@ -672,7 +672,7 @@ func TestAccMemoryDBCluster_Update_numShards_scaleDown(t *testing.T) {
func TestAccMemoryDBCluster_Update_numReplicasPerShard_scaleUp(t *testing.T) {
ctx := acctest.Context(t)

rName := "tf-test-" + sdkacctest.RandString(8)
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
resourceName := "aws_memorydb_cluster.test"

resource.ParallelTest(t, resource.TestCase{
Expand Down Expand Up @@ -709,7 +709,7 @@ func TestAccMemoryDBCluster_Update_numReplicasPerShard_scaleUp(t *testing.T) {
func TestAccMemoryDBCluster_Update_numReplicasPerShard_scaleDown(t *testing.T) {
ctx := acctest.Context(t)

rName := "tf-test-" + sdkacctest.RandString(8)
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
resourceName := "aws_memorydb_cluster.test"

resource.ParallelTest(t, resource.TestCase{
Expand Down Expand Up @@ -743,7 +743,7 @@ func TestAccMemoryDBCluster_Update_numReplicasPerShard_scaleDown(t *testing.T) {

func TestAccMemoryDBCluster_Update_parameterGroup(t *testing.T) {
ctx := acctest.Context(t)
rName := "tf-test-" + sdkacctest.RandString(8)
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
resourceName := "aws_memorydb_cluster.test"

resource.ParallelTest(t, resource.TestCase{
Expand All @@ -753,10 +753,10 @@ func TestAccMemoryDBCluster_Update_parameterGroup(t *testing.T) {
CheckDestroy: testAccCheckClusterDestroy(ctx),
Steps: []resource.TestStep{
{
Config: testAccClusterConfig_parameterGroup(rName, "default.memorydb-redis6"),
Config: testAccClusterConfig_parameterGroup(rName, "default.memorydb-redis7"),
Check: resource.ComposeTestCheckFunc(
testAccCheckClusterExists(ctx, resourceName),
resource.TestCheckResourceAttr(resourceName, "parameter_group_name", "default.memorydb-redis6"),
resource.TestCheckResourceAttr(resourceName, "parameter_group_name", "default.memorydb-redis7"),
),
},
{
Expand All @@ -772,10 +772,10 @@ func TestAccMemoryDBCluster_Update_parameterGroup(t *testing.T) {
),
},
{
Config: testAccClusterConfig_parameterGroup(rName, "default.memorydb-redis6"),
Config: testAccClusterConfig_parameterGroup(rName, "default.memorydb-redis7"),
Check: resource.ComposeTestCheckFunc(
testAccCheckClusterExists(ctx, resourceName),
resource.TestCheckResourceAttr(resourceName, "parameter_group_name", "default.memorydb-redis6"),
resource.TestCheckResourceAttr(resourceName, "parameter_group_name", "default.memorydb-redis7"),
),
},
{
Expand All @@ -789,7 +789,7 @@ func TestAccMemoryDBCluster_Update_parameterGroup(t *testing.T) {

func TestAccMemoryDBCluster_Update_securityGroupIds(t *testing.T) {
ctx := acctest.Context(t)
rName := "tf-test-" + sdkacctest.RandString(8)
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
resourceName := "aws_memorydb_cluster.test"

resource.ParallelTest(t, resource.TestCase{
Expand Down Expand Up @@ -848,7 +848,7 @@ func TestAccMemoryDBCluster_Update_securityGroupIds(t *testing.T) {

func TestAccMemoryDBCluster_Update_snapshotRetentionLimit(t *testing.T) {
ctx := acctest.Context(t)
rName := "tf-test-" + sdkacctest.RandString(8)
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
resourceName := "aws_memorydb_cluster.test"

resource.ParallelTest(t, resource.TestCase{
Expand Down Expand Up @@ -899,7 +899,7 @@ func TestAccMemoryDBCluster_Update_snapshotRetentionLimit(t *testing.T) {

func TestAccMemoryDBCluster_Update_snapshotWindow(t *testing.T) {
ctx := acctest.Context(t)
rName := "tf-test-" + sdkacctest.RandString(8)
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
resourceName := "aws_memorydb_cluster.test"

resource.ParallelTest(t, resource.TestCase{
Expand Down Expand Up @@ -938,7 +938,7 @@ func TestAccMemoryDBCluster_Update_snapshotWindow(t *testing.T) {

func TestAccMemoryDBCluster_Update_snsTopicARN(t *testing.T) {
ctx := acctest.Context(t)
rName := "tf-test-" + sdkacctest.RandString(8)
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
resourceName := "aws_memorydb_cluster.test"

resource.ParallelTest(t, resource.TestCase{
Expand Down Expand Up @@ -989,7 +989,7 @@ func TestAccMemoryDBCluster_Update_snsTopicARN(t *testing.T) {

func TestAccMemoryDBCluster_Update_tags(t *testing.T) {
ctx := acctest.Context(t)
rName := "tf-test-" + sdkacctest.RandString(8)
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
resourceName := "aws_memorydb_cluster.test"

resource.ParallelTest(t, resource.TestCase{
Expand Down Expand Up @@ -1424,7 +1424,7 @@ func testAccClusterConfig_parameterGroup(rName, parameterGroup string) string {
fmt.Sprintf(`
resource "aws_memorydb_parameter_group" "test" {
name = %[1]q
family = "memorydb_redis6"
family = "memorydb_redis7"

parameter {
name = "active-defrag-cycle-max"
Expand Down
2 changes: 1 addition & 1 deletion internal/service/memorydb/wait.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ func waitACLDeleted(ctx context.Context, conn *memorydb.MemoryDB, aclId string)
// waitClusterAvailable waits for MemoryDB Cluster to reach an active state after modifications.
func waitClusterAvailable(ctx context.Context, conn *memorydb.MemoryDB, clusterId string, timeout time.Duration) error {
stateConf := &retry.StateChangeConf{
Pending: []string{ClusterStatusCreating, ClusterStatusUpdating},
Pending: []string{ClusterStatusCreating, ClusterStatusUpdating, ClusterStatusSnapshotting},
Target: []string{ClusterStatusAvailable},
Refresh: statusCluster(ctx, conn, clusterId),
Timeout: timeout,
Expand Down
Loading