XJDKC commented on code in PR #3729: URL: https://github.com/apache/polaris/pull/3729#discussion_r2893431586
########## polaris-core/src/main/java/org/apache/polaris/core/connection/GcpAuthenticationParametersDpo.java: ########## @@ -0,0 +1,72 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.polaris.core.connection; + +import jakarta.annotation.Nonnull; +import java.util.HashMap; +import java.util.Map; +import org.apache.iceberg.rest.auth.AuthProperties; +import org.apache.polaris.core.admin.model.AuthenticationParameters; +import org.apache.polaris.core.admin.model.GcpAuthenticationParameters; +import org.apache.polaris.core.credentials.PolarisCredentialManager; + +/** + * See {@link org.apache.iceberg.rest.RESTUtil#configHeaders(Map)} and {@link + * org.apache.iceberg.rest.auth.AuthManagers#loadAuthManager(String, Map)} for why we do this. + */ +public class GcpAuthenticationParametersDpo extends AuthenticationParametersDpo { + + public GcpAuthenticationParametersDpo() { + super(AuthenticationType.GCP.getCode()); + } + + @Nonnull + @Override + public Map<String, String> asIcebergCatalogProperties( + PolarisCredentialManager credentialManager) { + HashMap<String, String> properties = new HashMap<>(); Review Comment: I think we can support both approaches. For users who just want to use Polaris to experiment with GCP, they can rely on inferring credentials from environment variables. For production-level catalog federation, the catalog vendor should properly configure the credentials instead of relying on environment variables. For AWS SigV4, we use a service identity provider to supply the AWS credentials: [DefaultServiceIdentityProvider.java](https://github.com/apache/polaris/blob/main/runtime/service/src/main/java/org/apache/polaris/service/identity/provider/DefaultServiceIdentityProvider.java) [AwsIamServiceIdentityCredential.java](https://github.com/apache/polaris/blob/main/polaris-core/src/main/java/org/apache/polaris/core/identity/credential/AwsIamServiceIdentityCredential.java) [AwsIamServiceIdentityConfiguration.java](https://github.com/apache/polaris/blob/main/runtime/service/src/main/java/org/apache/polaris/service/identity/AwsIamServiceIdentityConfiguration.java) ########## polaris-core/src/main/java/org/apache/polaris/core/connection/iceberg/IcebergRestConnectionConfigInfoDpo.java: ########## @@ -43,19 +43,31 @@ public class IcebergRestConnectionConfigInfoDpo extends ConnectionConfigInfoDpo implements IcebergCatalogPropertiesProvider { + private static final String QUOTA_PROJECT_ID_HEADER_KEY = "x-goog-user-project"; Review Comment: I think we can just follow the header name, maybe it can be used for other cases as well. ########## polaris-core/src/main/java/org/apache/polaris/core/connection/iceberg/IcebergRestConnectionConfigInfoDpo.java: ########## @@ -43,19 +43,31 @@ public class IcebergRestConnectionConfigInfoDpo extends ConnectionConfigInfoDpo implements IcebergCatalogPropertiesProvider { + private static final String QUOTA_PROJECT_ID_HEADER_KEY = "x-goog-user-project"; + private final String remoteCatalogName; + @Nullable + public Map<String, String> getAdditionalHeaders() { + return additionalHeaders; + } + + @Nullable private final Map<String, String> additionalHeaders; + public IcebergRestConnectionConfigInfoDpo( @JsonProperty(value = "uri", required = true) @Nonnull String uri, @JsonProperty(value = "authenticationParameters", required = true) @Nonnull AuthenticationParametersDpo authenticationParameters, @JsonProperty(value = "serviceIdentity", required = false) @Nullable ServiceIdentityInfoDpo serviceIdentityInfo, @JsonProperty(value = "remoteCatalogName", required = false) @Nullable - String remoteCatalogName) { + String remoteCatalogName, + @JsonProperty(value = "additionalHeaders", required = false) @Nullable + Map<String, String> additionalHeaders) { super( ConnectionType.ICEBERG_REST.getCode(), uri, authenticationParameters, serviceIdentityInfo); this.remoteCatalogName = remoteCatalogName; + this.additionalHeaders = additionalHeaders; Review Comment: Wandering if we need to create an allowlist for the headers? ########## polaris-core/src/main/java/org/apache/polaris/core/connection/iceberg/IcebergRestConnectionConfigInfoDpo.java: ########## @@ -43,19 +43,31 @@ public class IcebergRestConnectionConfigInfoDpo extends ConnectionConfigInfoDpo implements IcebergCatalogPropertiesProvider { + private static final String QUOTA_PROJECT_ID_HEADER_KEY = "x-goog-user-project"; + private final String remoteCatalogName; + @Nullable + public Map<String, String> getAdditionalHeaders() { + return additionalHeaders; + } + + @Nullable private final Map<String, String> additionalHeaders; + public IcebergRestConnectionConfigInfoDpo( @JsonProperty(value = "uri", required = true) @Nonnull String uri, @JsonProperty(value = "authenticationParameters", required = true) @Nonnull AuthenticationParametersDpo authenticationParameters, @JsonProperty(value = "serviceIdentity", required = false) @Nullable ServiceIdentityInfoDpo serviceIdentityInfo, @JsonProperty(value = "remoteCatalogName", required = false) @Nullable - String remoteCatalogName) { + String remoteCatalogName, + @JsonProperty(value = "additionalHeaders", required = false) @Nullable Review Comment: I am okay with either option, either making it more generic or providing some syntax sugar for end users. But you are right, maybe in the future, we may need to allow users to pass in any properties they want. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
