Merge pull request #35736 from hashicorp/b-aws_eks_access_policy_asso…

…ciation-iam-eventual-consistency r/aws_eks_access_policy_association: Retry Create on IAM eventual consistency errors
hashicorp · Feb 9, 2024 · cee2213 · cee2213
2 parents 00b3c79 + 58abfa4
commit cee2213
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/.changelog/35736.txt b/.changelog/35736.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_eks_access_policy_association: Retry IAM eventual consistency errors on create
+```
diff --git a/internal/service/eks/access_policy_association.go b/internal/service/eks/access_policy_association.go
@@ -111,7 +111,9 @@ func resourceAccessPolicyAssociationCreate(ctx context.Context, d *schema.Resour
 		PrincipalArn: aws.String(principalARN),
 	}
 
-	_, err := conn.AssociateAccessPolicy(ctx, input)
+	_, err := tfresource.RetryWhenIsAErrorMessageContains[*types.ResourceNotFoundException](ctx, propagationTimeout, func() (interface{}, error) {
+		return conn.AssociateAccessPolicy(ctx, input)
+	}, "The specified principalArn could not be found")
 
 	if err != nil {
 		return sdkdiag.AppendErrorf(diags, "creating EKS Access Policy Association (%s): %s", id, err)