Adding extra checks for destroyed resources (in tests) and added some…

… waitForStatus checks when deleting ACL entities
RedisLabs · Nov 7, 2023 · 5fe07a0 · 5fe07a0
1 parent 70ebf8d
commit 5fe07a0
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 3 deletions.
diff --git a/provider/datasource_rediscloud_acl_role_test.go b/provider/datasource_rediscloud_acl_role_test.go
@@ -32,7 +32,7 @@ func TestAccDataSourceRedisCloudAclRole_Default(t *testing.T) {
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:          func() { testAccPreCheck(t); testAccAwsPreExistingCloudAccountPreCheck(t) },
 		ProviderFactories: providerFactories,
-		CheckDestroy:      nil, // test doesn't create a resource at the moment, so don't need to check anything
+		CheckDestroy:      testAccCheckAclRoleDestroy,
 		Steps: []resource.TestStep{
 			{
 				Config: createAndGetRoleTerraform,
@@ -86,7 +86,7 @@ resource "rediscloud_subscription" "example" {
     support_oss_cluster_api=true
     throughput_measurement_by = "operations-per-second"
     throughput_measurement_value = 1000
-	modules = ["RedisJSON", "RedisBloom"]
+	modules = []
   }
 }
 

diff --git a/provider/datasource_rediscloud_acl_user_test.go b/provider/datasource_rediscloud_acl_user_test.go
@@ -37,7 +37,7 @@ func TestAccDataSourceRedisCloudAclUser_Default(t *testing.T) {
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:          func() { testAccPreCheck(t) },
 		ProviderFactories: providerFactories,
-		CheckDestroy:      nil, // test doesn't create a resource at the moment, so don't need to check anything
+		CheckDestroy:      testAccCheckAclUserDestroy,
 		Steps: []resource.TestStep{
 			{
 				Config: createAndGetUserTerraform,

diff --git a/provider/resource_rediscloud_acl_role.go b/provider/resource_rediscloud_acl_role.go
@@ -198,6 +198,14 @@ func resourceRedisCloudAclRoleDelete(ctx context.Context, d *schema.ResourceData
 		return diag.FromErr(err)
 	}
 
+	// Sometimes ACL Users and Roles flip between Active and Pending a few times after creation/update.
+	// This delay gives the API a chance to settle
+	// TODO Ultimately this is an API problem
+	err = waitForAclRoleToBeActive(ctx, id, api)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
 	err = api.client.Roles.Delete(ctx, id)
 
 	if err != nil {

diff --git a/provider/resource_rediscloud_acl_user.go b/provider/resource_rediscloud_acl_user.go
@@ -170,6 +170,14 @@ func resourceRedisCloudAclUserDelete(ctx context.Context, d *schema.ResourceData
 		return diag.FromErr(err)
 	}
 
+	// Sometimes ACL Users and Roles flip between Active and Pending a few times after creation/update.
+	// This delay gives the API a chance to settle
+	// TODO Ultimately this is an API problem
+	err = waitForAclUserToBeActive(ctx, id, api)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
 	err = api.client.Users.Delete(ctx, id)
 
 	if err != nil {