Skip to content
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.

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

GCP: Use catalog endpoint as base when refreshing OAuth2 token #12638

Merged
merged 1 commit into from
Mar 28, 2025

Conversation

nastra
Copy link
Contributor

@nastra nastra commented Mar 25, 2025

No description provided.

@nastra nastra requested a review from danielcweeks March 25, 2025 08:16
@github-actions github-actions bot added the GCP label Mar 25, 2025
@nastra nastra added this to the Iceberg 1.9.0 milestone Mar 25, 2025
@nastra nastra force-pushed the gcs-use-correct-base-uri branch from 50deccc to f29db13 Compare March 27, 2025 07:41
@@ -49,6 +53,11 @@ private OAuth2RefreshCredentialsHandler(Map<String, String> properties) {
Preconditions.checkArgument(
null != properties.get(GCPProperties.GCS_OAUTH2_REFRESH_CREDENTIALS_ENDPOINT),
"Invalid credentials endpoint: null");
Preconditions.checkArgument(
null != properties.get(CatalogProperties.URI), "Invalid catalog endpoint: null");
this.credentialsEndpoint =
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why aren't we doing the same thing here that we do in ADLS?

RESTUtil.resolveEndpoint(
            properties.get(CatalogProperties.URI),
            properties.get(ADLS_REFRESH_CREDENTIALS_ENDPOINT));

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we're doing it for GCP in GCPProperties:

gcsOauth2RefreshCredentialsEndpoint =
RESTUtil.resolveEndpoint(
properties.get(CatalogProperties.URI),
properties.get(GCS_OAUTH2_REFRESH_CREDENTIALS_ENDPOINT));

For ADLS we're also doing the same in AzureProperties:
this.adlsRefreshCredentialsEndpoint =
RESTUtil.resolveEndpoint(
properties.get(CatalogProperties.URI),
properties.get(ADLS_REFRESH_CREDENTIALS_ENDPOINT));

For S3 it happens in AwsClientProperties:
this.refreshCredentialsEndpoint =
RESTUtil.resolveEndpoint(
properties.get(CatalogProperties.URI), properties.get(REFRESH_CREDENTIALS_ENDPOINT));

@danielcweeks danielcweeks merged commit 054eacd into apache:main Mar 28, 2025
42 checks passed
@nastra nastra deleted the gcs-use-correct-base-uri branch March 28, 2025 17:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants