Skip to content

Make GCP SA token refresh non-blocking with warning on failure #718

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

Draft
hectorcast-db wants to merge 1 commit into
base: hectorcast-db/stack/port-5-token-audience-from-metadata
Choose a base branch
from
+10 −19
Draft

Make GCP SA token refresh non-blocking with warning on failure #718

Show file tree
Hide file tree
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
15 changes: 5 additions & 10 deletions ...-sdk-java/src/main/java/com/databricks/sdk/core/GoogleCredentialsCredentialsProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,17 +66,12 @@ public HeaderFactory configure(DatabricksConfig config) {
Map<String, String> headers = new HashMap<>();
headers.put("Authorization", String.format("Bearer %s", idToken.getTokenValue()));

if (config.getClientType() == ClientType.ACCOUNT) {
AccessToken token;
try {
token = finalServiceAccountCredentials.createScoped(GCP_SCOPES).refreshAccessToken();
} catch (IOException e) {
String message =
"Failed to refresh access token from Google service account credentials.";
LOG.error(message + e);
throw new DatabricksException(message, e);
}
try {
AccessToken token =
finalServiceAccountCredentials.createScoped(GCP_SCOPES).refreshAccessToken();
headers.put(SA_ACCESS_TOKEN_HEADER, token.getTokenValue());
} catch (IOException e) {
LOG.warn("Failed to refresh GCP SA access token, skipping header: {}", e.getMessage());
}

return headers;
Expand Down
14 changes: 5 additions & 9 deletions databricks-sdk-java/src/main/java/com/databricks/sdk/core/GoogleIdCredentialsProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,15 +69,11 @@ public HeaderFactory configure(DatabricksConfig config) {
throw new DatabricksException(message, e);
}

if (config.getClientType() == ClientType.ACCOUNT) {
try {
headers.put(
SA_ACCESS_TOKEN_HEADER, gcpScopedCredentials.refreshAccessToken().getTokenValue());
} catch (IOException e) {
String message = "Failed to refresh access token from scoped id token credentials.";
LOG.error(message + e);
throw new DatabricksException(message, e);
}
try {
headers.put(
SA_ACCESS_TOKEN_HEADER, gcpScopedCredentials.refreshAccessToken().getTokenValue());
} catch (IOException e) {
LOG.warn("Failed to refresh GCP SA access token, skipping header: {}", e.getMessage());
}

return headers;
Expand Down
Loading