-
Notifications
You must be signed in to change notification settings - Fork 259
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix cloud_identity_group_membership to properly handle 403 responses (#…
…7089) (#5103) * Fix cloud_identity_group_membership to properly handle 403 responses when membership does not exist * Fix service account creation errors to cause entire test to fail immediately * Skip VCR for this test to avoid managing service accounts out-of-band Signed-off-by: Modular Magician <magic-modules@google.com> Signed-off-by: Modular Magician <magic-modules@google.com>
- Loading branch information
1 parent
25fe035
commit 6a0d5e5
Showing
4 changed files
with
116 additions
and
1 deletion.
There are no files selected for viewing
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
```release-note:none | ||
|
||
``` |
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
package google | ||
|
||
import ( | ||
"log" | ||
"strings" | ||
|
||
"github.com/hashicorp/errwrap" | ||
"google.golang.org/api/googleapi" | ||
) | ||
|
||
func transformCloudIdentityGroupMembershipReadError(err error) error { | ||
if gErr, ok := errwrap.GetType(err, &googleapi.Error{}).(*googleapi.Error); ok { | ||
if gErr.Code == 403 && strings.Contains(gErr.Message, "(or it may not exist)") { | ||
// This error occurs when either the group membership does not exist, or permission is denied. It is | ||
// deliberately ambiguous so that existence information is not revealed to the caller. However, for | ||
// the Read function, we can only assume that the membership does not exist, and proceed with attempting | ||
// other operations. Since handleNotFoundError(...) expects an error code of 404 when a resource does not | ||
// exist, to get the desired behavior, we modify the error code to be 404. | ||
gErr.Code = 404 | ||
} | ||
|
||
log.Printf("[DEBUG] Transformed CloudIdentityGroupMembership error") | ||
return gErr | ||
} | ||
|
||
return err | ||
} |
This file contains 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
This file contains 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