r/aws_elasticache_user: Fix `UserNotFound: ... is not available for t…

…agging` errors on resource Read when there is a concurrent update to the user.
hashicorp · Nov 15, 2023 · 19ca309 · 19ca309
1 parent d8f4774
commit 19ca309
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/.changelog/34396.txt b/.changelog/34396.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_elasticache_user: Fix `UserNotFound: ... is not available for tagging` errors on resource Read when there is a concurrent update to the user
+```
diff --git a/internal/service/elasticache/user.go b/internal/service/elasticache/user.go
@@ -43,6 +43,7 @@ func ResourceUser() *schema.Resource {
 
 		Timeouts: &schema.ResourceTimeout{
 			Create: schema.DefaultTimeout(5 * time.Minute),
+			Read:   schema.DefaultTimeout(5 * time.Minute),
 			Update: schema.DefaultTimeout(5 * time.Minute),
 			Delete: schema.DefaultTimeout(5 * time.Minute),
 		},
@@ -186,7 +187,9 @@ func resourceUserRead(ctx context.Context, d *schema.ResourceData, meta interfac
 	var diags diag.Diagnostics
 	conn := meta.(*conns.AWSClient).ElastiCacheConn(ctx)
 
-	user, err := FindUserByID(ctx, conn, d.Id())
+	// An ongoing OOB update (where the user is in "modifying" state) can cause "UserNotFound: ... is not available for tagging" errors.
+	// https://github.com/hashicorp/terraform-provider-aws/issues/34002.
+	user, err := waitUserUpdated(ctx, conn, d.Id(), d.Timeout(schema.TimeoutRead))
 
 	if !d.IsNewResource() && tfresource.NotFound(err) {
 		log.Printf("[WARN] ElastiCache User (%s) not found, removing from state", d.Id())

diff --git a/internal/service/elasticache/user_test.go b/internal/service/elasticache/user_test.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"testing"
 
-	// "github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/elasticache"
 	sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
@@ -304,7 +304,6 @@ func TestAccElastiCacheUser_disappears(t *testing.T) {
 	})
 }
 
-/*
 // https://github.com/hashicorp/terraform-provider-aws/issues/34002.
 func TestAccElastiCacheUser_oobModify(t *testing.T) {
 	ctx := acctest.Context(t)
@@ -332,6 +331,7 @@ func TestAccElastiCacheUser_oobModify(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckUserUpdateOOB(ctx, &user),
 				),
+				ExpectNonEmptyPlan: true,
 			},
 			// Update tags.
 			{
@@ -345,7 +345,6 @@ func TestAccElastiCacheUser_oobModify(t *testing.T) {
 		},
 	})
 }
-*/
 
 func testAccCheckUserDestroy(ctx context.Context) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
@@ -398,7 +397,6 @@ func testAccCheckUserExists(ctx context.Context, n string, v *elasticache.User)
 	}
 }
 
-/*
 func testAccCheckUserUpdateOOB(ctx context.Context, v *elasticache.User) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		conn := acctest.Provider.Meta().(*conns.AWSClient).ElastiCacheConn(ctx)
@@ -411,7 +409,6 @@ func testAccCheckUserUpdateOOB(ctx context.Context, v *elasticache.User) resourc
 		return err
 	}
 }
-*/
 
 func testAccUserConfig_basic(rName string) string {
 	return fmt.Sprintf(`

diff --git a/website/docs/r/elasticache_user.html.markdown b/website/docs/r/elasticache_user.html.markdown
@@ -84,6 +84,7 @@ This resource exports the following attributes in addition to the arguments abov
 [Configuration options](https://developer.hashicorp.com/terraform/language/resources/syntax#operation-timeouts):
 
 - `create` - (Default `5m`)
+- `read` - (Default `5m`)
 - `update` - (Default `5m`)
 - `delete` - (Default `5m`)