From f8ba86f17bd7271fb69e3a1a4951baa1b62d9e36 Mon Sep 17 00:00:00 2001 From: exoego Date: Mon, 1 May 2023 08:47:41 +0900 Subject: [PATCH 1/3] Treat "snapshotting" status as pending when creating cluster from a snapshot --- .changelog/31077.txt | 3 +++ internal/service/memorydb/wait.go | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 .changelog/31077.txt diff --git a/.changelog/31077.txt b/.changelog/31077.txt new file mode 100644 index 000000000000..85512f2fd72a --- /dev/null +++ b/.changelog/31077.txt @@ -0,0 +1,3 @@ +```release-note:bug +resource/aws_memorydb_cluster: Treat "snapshotting" status as pending when creating cluster +``` \ No newline at end of file diff --git a/internal/service/memorydb/wait.go b/internal/service/memorydb/wait.go index cba30f066ec4..153d9a2ee70c 100644 --- a/internal/service/memorydb/wait.go +++ b/internal/service/memorydb/wait.go @@ -57,7 +57,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, From c4c1eb09809eada6d0d71f288e3c21c4b6d65ee0 Mon Sep 17 00:00:00 2001 From: Adrian Johnson Date: Fri, 15 Dec 2023 17:21:03 -0600 Subject: [PATCH 2/3] fix test failures --- internal/service/memorydb/cluster_test.go | 74 +++++++++++------------ 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/internal/service/memorydb/cluster_test.go b/internal/service/memorydb/cluster_test.go index 8dac81c4c76c..d8112b172fcf 100644 --- a/internal/service/memorydb/cluster_test.go +++ b/internal/service/memorydb/cluster_test.go @@ -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{ @@ -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"), @@ -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{ @@ -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"), @@ -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{ @@ -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{ @@ -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{ @@ -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{ @@ -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{ @@ -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{ @@ -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{ @@ -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) }, @@ -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{ @@ -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{ @@ -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{ @@ -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{ @@ -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"), ), }, { @@ -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"), ), }, { @@ -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{ @@ -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{ @@ -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{ @@ -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{ @@ -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{ @@ -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{ @@ -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{ @@ -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"), ), }, { @@ -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"), ), }, { @@ -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{ @@ -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{ @@ -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{ @@ -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{ @@ -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{ @@ -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" From 5990f9d2d84f0824501e07b2bcf8a6d23e8b8a9a Mon Sep 17 00:00:00 2001 From: Adrian Johnson Date: Fri, 15 Dec 2023 17:22:07 -0600 Subject: [PATCH 3/3] tweak CHANGELOG entry --- .changelog/31077.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changelog/31077.txt b/.changelog/31077.txt index 85512f2fd72a..14fa4b7c17a9 100644 --- a/.changelog/31077.txt +++ b/.changelog/31077.txt @@ -1,3 +1,3 @@ ```release-note:bug -resource/aws_memorydb_cluster: Treat "snapshotting" status as pending when creating cluster +resource/aws_memorydb_cluster: Treat `snapshotting` status as pending when creating cluster ``` \ No newline at end of file