Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add consistency check during CreateTopic to handle ABAC vs. eventual consistency issues #30432

Merged
merged 10 commits into from
Apr 14, 2023
Merged

Add consistency check during CreateTopic to handle ABAC vs. eventual consistency issues #30432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1c9b299
Add snippet to handle consistency check during CreateTopic to handle …
Apr 4, 2023
da8aca1
Add changelog entry
Apr 4, 2023
cb31779
Fix missing backtick in changelog
Apr 4, 2023
89a3cf7
Merge branch 'hashicorp:main' into b-fix-sns-topic-create
curator Apr 4, 2023
283c6d7
Merge branch 'hashicorp:main' into b-fix-sns-topic-create
curator Apr 4, 2023
6ee7ca1
Merge branch 'hashicorp:main' into b-fix-sns-topic-create
curator Apr 5, 2023
770c9ab
Merge branch 'hashicorp:main' into b-fix-sns-topic-create
curator Apr 7, 2023
8316328
Merge branch 'main' into HEAD
ewbankkit Apr 14, 2023
4b068eb
Tweak CHANGELOG entry.
ewbankkit Apr 14, 2023
13aeac2
Use 'tfresource.RetryWhenAWSErrMessageContains'.
ewbankkit Apr 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/30432.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
resource/aws_sns_topic: Fix IAM eventual consistency error creating SNS topics with ABAC-controlled permissions
```
7 changes: 6 additions & 1 deletion internal/service/sns/topic.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,12 @@ func resourceTopicCreate(ctx context.Context, d *schema.ResourceData, meta inter

d.SetId(aws.StringValue(output.TopicArn))

err = putTopicAttributes(ctx, conn, d.Id(), attributes)
// Retry for eventual consistency; if ABAC is in use, this takes some time
// usually about 10s, presumably for tags really to be there, and we get a
// permissions error.
_, err = tfresource.RetryWhenAWSErrMessageContains(ctx, propagationTimeout, func() (interface{}, error) {
return nil, putTopicAttributes(ctx, conn, d.Id(), attributes)
}, sns.ErrCodeAuthorizationErrorException, "no identity-based policy allows")

if err != nil {
return sdkdiag.AppendFromErr(diags, err)
Expand Down