Skip to content

b/433111438 Add backoff/retry logic for updating group settings #730

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
jpassing merged 1 commit into from
Jul 21, 2025
Merged

b/433111438 Add backoff/retry logic for updating group settings #730

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
54 changes: 50 additions & 4 deletions .../src/main/java/com/google/solutions/jitaccess/apis/clients/CloudIdentityGroupsClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ public class CloudIdentityGroupsClient {
private static final int SEARCH_PAGE_SIZE = 1000;
public static final String LABEL_DISCUSSION_FORUM = "cloudidentity.googleapis.com/groups.discussion_forum";
public static final String LABEL_SECURITY = "cloudidentity.googleapis.com/groups.security";
private static final int MAX_GROUP_SETTINGS_PATCH_ATTEMPTS = 5;

private final @NotNull Options options;
private final @NotNull GoogleCredentials credentials;
Expand Down Expand Up @@ -147,6 +148,54 @@ private static void translateAndThrowApiException(
}
}


/**
* Update group settings to restrictive defaults.
*/
private void restrictGroupSettings(@NotNull GroupId emailAddress) throws IOException {
var settingsClient = createSettingsClient();

//
// The group settings API is prone to fail for newly created groups.
//
for (int attempt = 0; attempt < MAX_GROUP_SETTINGS_PATCH_ATTEMPTS; attempt++) {
try {
settingsClient
.groups()
.update(emailAddress.email, this.RESTRICTED_SETTINGS)
.execute();

//
// Successful update -> quit loop.
//
return;
}
catch (GoogleJsonResponseException e) {
if (
e.getStatusCode() == 404 ||
e.getStatusCode() == 400 &&
e.getDetails() != null &&
e.getDetails().getErrors() != null &&
e.getDetails().getErrors()
.stream()
.anyMatch(err -> e.getMessage() != null && err.getMessage().contains("INVALID_GAIA_GROUP"))) {

//
// This is most likely an intermittent error.
//
try {
Thread.sleep(200);
}
catch (InterruptedException ignored) {
}
}
else {
throw (GoogleJsonResponseException) e.fillInStackTrace();
}
}
}
}

//---------------------------------------------------------------------
// Manage groups.
//---------------------------------------------------------------------
Expand Down Expand Up @@ -323,10 +372,7 @@ public enum GroupType {
//
// Lock down group settings.
//
createSettingsClient()
.groups()
.update(emailAddress.email, this.RESTRICTED_SETTINGS)
.execute();
restrictGroupSettings(emailAddress);

return groupKey;
}
Expand Down