add refresh credentials property to loadTableResult #1164
+24
−1
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -35,6 +35,7 @@ | |
| import java.util.Optional; | ||
| import java.util.Set; | ||
| import java.util.function.Function; | ||
| import org.apache.iceberg.aws.AwsClientProperties; | ||
| import org.apache.iceberg.catalog.Catalog; | ||
| import org.apache.iceberg.catalog.Namespace; | ||
| import org.apache.iceberg.catalog.TableIdentifier; | ||
|
|
@@ -397,16 +398,38 @@ public Response loadTable( | |
| .loadTableIfStale(tableIdentifier, ifNoneMatch, snapshots) | ||
| .orElseThrow(() -> new WebApplicationException(Response.Status.NOT_MODIFIED)); | ||
| } else { | ||
| String credentialsEndpoint = | ||
| String.format( | ||
| "/v1/%s/namespaces/%s/tables/%s/credentials", | ||
| prefix, tableIdentifier.namespace().toString(), tableIdentifier.name()); | ||
|
There was a problem hiding this comment. (Saw that #1164 (comment) got lost but think it still holds) There was a problem hiding this comment. Agree the uri should be : |
||
| LoadTableResponse originalResponse = | ||
| catalog | ||
| .loadTableWithAccessDelegationIfStale(tableIdentifier, ifNoneMatch, snapshots) | ||
| .orElseThrow(() -> new WebApplicationException(Response.Status.NOT_MODIFIED)); | ||
| if (delegationModes.contains(VENDED_CREDENTIALS)) { | ||
| response = | ||
| injectRefreshVendedCredentialProperties(originalResponse, credentialsEndpoint); | ||
| } else { | ||
| response = originalResponse; | ||
| } | ||
| } | ||
|
|
||
| return tryInsertETagHeader(Response.ok(response), response, namespace, table).build(); | ||
| }); | ||
| } | ||
|
|
||
| private LoadTableResponse injectRefreshVendedCredentialProperties( | ||
| LoadTableResponse originalResponse, String credentialsEndpoint) { | ||
| LoadTableResponse.Builder loadResponseBuilder = | ||
| LoadTableResponse.builder().withTableMetadata(originalResponse.tableMetadata()); | ||
|
Comment on lines
+423
to
+424
There was a problem hiding this comment. do we need to update metadata-location too ? |
||
| loadResponseBuilder.addAllConfig(originalResponse.config()); | ||
| loadResponseBuilder.addAllCredentials(originalResponse.credentials()); | ||
| loadResponseBuilder.addConfig( | ||
| AwsClientProperties.REFRESH_CREDENTIALS_ENDPOINT, credentialsEndpoint); | ||
| loadResponseBuilder.addConfig(AwsClientProperties.REFRESH_CREDENTIALS_ENABLED, "true"); | ||
|
Comment on lines
+427
to
+429
There was a problem hiding this comment. ADLS also now supports creds refresh
Comment on lines
+427
to
+429
There was a problem hiding this comment. we should check the credential type too and send this only when storage is AWS |
||
| return loadResponseBuilder.build(); | ||
| } | ||
|
|
||
| @Override | ||
| public Response tableExists( | ||
| String prefix, | ||
|
|
||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This needs to be configurable. E.g., some hosts may prefix the URL with
/polarisor with/your_account_nameor any number of prefixesThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
does that mean they will do something like
/polaris-catalog-nameinstead of just/catalog-name? or I'm misunderstanding this?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
prefixidentifies the catalog, does it not? Why would the.../credentialsendpoint for a table in one catalog need to be under a different prefix?