Skip to content

fix: IAM Policy 409 concurrent changes error - take 2 #15995

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

Merged
slevenick merged 5 commits into from
Feb 13, 2026
+12 −1
Merged

fix: IAM Policy 409 concurrent changes error - take 2 #15995

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c122b16
keeping the original errwrap code and adding the new errors.As check
tamir-deep Dec 18, 2025
5ed2f49
add tests
tamir-deep Dec 18, 2025
3238b1f
Merge branch 'GoogleCloudPlatform:main' into fix/25305-take2
tamir-deep Feb 10, 2026
4b1f684
move it inside the if/else
tamir-deep Feb 10, 2026
069f433
Merge branch 'fix/25305-take2' of https://github.com/tamir-deep/magic…
tamir-deep Feb 10, 2026
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
5 changes: 5 additions & 0 deletions mmv1/third_party/terraform/tpgresource/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,11 @@ func IsConflictError(err error) bool {
if e.Code == 409 || e.Code == 412 {
return true
}
} else if gErr := (*googleapi.Error)(nil); errors.As(err, &gErr) {
// For cases where the error is not wrapped by errwrap such in 409 IAM concurrency errors.
if gErr.Code == 409 || gErr.Code == 412 {
return true
}
}
return false
}
Expand Down
8 changes: 7 additions & 1 deletion mmv1/third_party/terraform/tpgresource/utils_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -973,7 +973,10 @@ func TestConflictError(t *testing.T) {
t.Error("did not find that a 409 was a conflict error.")
}
if !tpgresource.IsConflictError(errwrap.Wrapf("wrap", confErr)) {
t.Error("did not find that a wrapped 409 was a conflict error.")
t.Error("did not find that a wrapped (errwrap) 409 was a conflict error.")
}
if !tpgresource.IsConflictError(fmt.Errorf("wrap: %w", confErr)) {
t.Error("did not find that a wrapped (fmt.Errorf) 409 was a conflict error.")
}
confErr = &googleapi.Error{
Code: 412,
Expand All @@ -984,6 +987,9 @@ func TestConflictError(t *testing.T) {
if !tpgresource.IsConflictError(errwrap.Wrapf("wrap", confErr)) {
t.Error("did not find that a wrapped 412 was a conflict error.")
}
if !tpgresource.IsConflictError(fmt.Errorf("wrap: %w", confErr)) {
t.Error("did not find that a wrapped (fmt.Errorf) 412 was a conflict error.")
}
// skipping negative tests as other cases may be added later.
}

Expand Down
Loading