Merge branch 'main' into HEAD

hashicorp · Jul 3, 2024 · 7828fc8 · 7828fc8
2 parents b843b98 + 09df920
commit 7828fc8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/.changelog/36286.txt b/.changelog/36286.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_iot_topic_rule: Retry IAM eventual consistency errors on Update
+```
diff --git a/internal/service/iot/topic_rule.go b/internal/service/iot/topic_rule.go
@@ -1389,7 +1389,10 @@ func resourceTopicRuleUpdate(ctx context.Context, d *schema.ResourceData, meta i
 			TopicRulePayload: expandTopicRulePayload(d),
 		}
 
-		_, err := conn.ReplaceTopicRule(ctx, input)
+		_, err := tfresource.RetryWhenIsA[*awstypes.InvalidRequestException](ctx, propagationTimeout,
+			func() (interface{}, error) {
+				return conn.ReplaceTopicRule(ctx, input)
+			})
 
 		if err != nil {
 			return sdkdiag.AppendErrorf(diags, "replacing IoT Topic Rule (%s): %s", d.Id(), err)