fix: IAM Policy 409 concurrent changes error - take 2#5144
Merged
modular-magician merged 1 commit intoGoogleCloudPlatform:mainfrom Feb 13, 2026
Conversation
[upstream:36e905682dbbc21df5dc2832ae7956835d316898] Signed-off-by: Modular Magician <magic-modules@google.com>
modular-magician
requested review from
melinath
and removed request for
a team
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes hashicorp/terraform-provider-google#25305
There is already a backoff retry mechanism but it's broken due to wrapped error. The current usage for checking if it's googleapi error doesn't work well.
#15972 reverted #15825 due to regressions. However, the original IAM 409 concurrent error is now back due to that.
I debugged that specific error and found that the
errvar returned is by the typefmt.Errorfon level 0 andgoogleapi.Erroron level 1.errwrap simply doesn't detect it.
I wanted to avoid walking or unwrapping and make minimal changes as possible.
Given the fact we have to keep using errwrap for now, I added the same changes I did originally below the current errwrap code and also I added tests.
I tested the generated provider and it solves the 409 issue.
Tagging @slevenick @ScottSuarez @BBBmau for extra verification and input.
Release Note Template for Downstream PRs (will be copied)
See Write release notes for guidance.
Derived from GoogleCloudPlatform/magic-modules#15995