Samrat002 commented on code in PR #27788: URL: https://github.com/apache/flink/pull/27788#discussion_r3214469601
########## flink-filesystems/flink-s3-fs-native/src/main/java/org/apache/flink/fs/s3native/BucketConfigProvider.java: ########## @@ -0,0 +1,181 @@ +/* + * 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.flink.fs.s3native; + +import org.apache.flink.annotation.Internal; +import org.apache.flink.annotation.VisibleForTesting; +import org.apache.flink.configuration.Configuration; +import org.apache.flink.configuration.IllegalConfigurationException; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.annotation.Nullable; + +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.function.BiConsumer; +import java.util.stream.Collectors; + +/** + * Parses bucket-specific S3 configuration using format {@code s3.bucket.<bucket-name>.<property>}. + * + * <p>Enables per-bucket overrides for endpoints, credentials, encryption, and IAM roles. Bucket + * names containing dots are supported; properties are matched by longest suffix first. + * + * <p>Immutable and thread-safe after construction. + */ +@Internal +final class BucketConfigProvider { + + private static final Logger LOG = LoggerFactory.getLogger(BucketConfigProvider.class); + static final String BUCKET_CONFIG_PREFIX = "s3.bucket."; + static final Map<String, BiConsumer<S3BucketConfig.Builder, String>> PROPERTY_APPLICATORS; + static final List<String> KNOWN_PROPERTIES_BY_LENGTH; + + static { + final Map<String, BiConsumer<S3BucketConfig.Builder, String>> applicators = + new LinkedHashMap<>(); + applicators.put("access-key", (b, v) -> b.accessKey(v)); + applicators.put("assume-role.arn", (b, v) -> b.assumeRoleArn(v)); + applicators.put("assume-role.external-id", (b, v) -> b.assumeRoleExternalId(v)); + applicators.put( + "assume-role.session-duration", + (b, v) -> { + try { + b.assumeRoleSessionDurationSeconds(Integer.parseInt(v)); + } catch (NumberFormatException e) { + throw new IllegalConfigurationException( + String.format( + "Invalid assume-role.session-duration '%s' for bucket '%s'. " + + "Must be a valid integer (e.g., 3600)", + v, b.getBucketName()), + e); + } + }); + applicators.put("assume-role.session-name", (b, v) -> b.assumeRoleSessionName(v)); + applicators.put("credentials.provider", (b, v) -> b.credentialsProvider(v)); + applicators.put("endpoint", (b, v) -> b.endpoint(v)); + applicators.put("path-style-access", (b, v) -> b.pathStyleAccess(Boolean.parseBoolean(v))); + applicators.put("region", (b, v) -> b.region(v)); + applicators.put("sse.kms-key-id", (b, v) -> b.sseKmsKeyId(v)); + applicators.put("sse.type", (b, v) -> b.sseType(v)); + applicators.put("secret-key", (b, v) -> b.secretKey(v)); + PROPERTY_APPLICATORS = Collections.unmodifiableMap(applicators); + + KNOWN_PROPERTIES_BY_LENGTH = + applicators.keySet().stream() + .sorted(Comparator.comparingInt(String::length).reversed()) + .collect(Collectors.toList()); + } + + private final Map<String, S3BucketConfig> bucketConfigs; + + BucketConfigProvider(Configuration flinkConfig) { + this.bucketConfigs = Collections.unmodifiableMap(parseBucketConfigs(flinkConfig)); + } + + @Nullable + S3BucketConfig getBucketConfig(String bucketName) { + return bucketConfigs.get(bucketName); + } + + @VisibleForTesting + boolean hasBucketConfig(String bucketName) { + return bucketConfigs.containsKey(bucketName); + } + + @VisibleForTesting + int size() { + return bucketConfigs.size(); + } + + private static Map<String, S3BucketConfig> parseBucketConfigs(Configuration flinkConfig) { + final Map<String, Map<String, String>> rawConfigs = new HashMap<>(); + + for (final String key : flinkConfig.keySet()) { + if (!key.startsWith(BUCKET_CONFIG_PREFIX)) { + continue; + } + final String suffix = key.substring(BUCKET_CONFIG_PREFIX.length()); + if (suffix.isBlank()) { + continue; + } + final String value = flinkConfig.getString(key, null); + if (value == null) { + continue; + } + + for (final String prop : KNOWN_PROPERTIES_BY_LENGTH) { + if (suffix.endsWith("." + prop)) { + final String bucketName = + suffix.substring(0, suffix.length() - prop.length() - 1); + if (bucketName.isEmpty()) { Review Comment: Done — replaced with `StringUtils.isNullOrWhitespaceOnly`. ########## flink-filesystems/flink-s3-fs-native/src/main/java/org/apache/flink/fs/s3native/NativeS3FileSystemFactory.java: ########## @@ -310,9 +316,51 @@ public FileSystem create(URI fsUri) throws IOException { String region = config.get(REGION); String endpoint = config.get(ENDPOINT); boolean pathStyleAccess = config.get(PATH_STYLE_ACCESS); + String sseType = config.get(SSE_TYPE); + String sseKmsKeyId = config.get(SSE_KMS_KEY_ID); + String assumeRoleArn = config.get(ASSUME_ROLE_ARN); + String assumeRoleExternalId = config.get(ASSUME_ROLE_EXTERNAL_ID); + String assumeRoleSessionName = config.get(ASSUME_ROLE_SESSION_NAME); + int assumeRoleSessionDuration = config.get(ASSUME_ROLE_SESSION_DURATION_SECONDS); + String credentialsProviderClasses = config.get(AWS_CREDENTIALS_PROVIDER); + + // Apply bucket-specific overrides + String bucketName = fsUri.getHost(); + if (bucketName == null || bucketName.isEmpty()) { Review Comment: Done — the `bucketName` null/empty guard now uses `StringUtils.isNullOrWhitespaceOnly`. -- 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]
