This is an automated email from the ASF dual-hosted git repository. pnowojski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/flink.git
commit f71059732c6277ae676749702d92e551a39f36e0 Author: Piotr Nowojski <[email protected]> AuthorDate: Fri Mar 8 15:58:13 2024 +0100 [hotfix] Use newly defined ConfigOptions in MinioTestContainer --- .../flink/fs/s3/common/AbstractS3FileSystemFactory.java | 2 ++ .../org/apache/flink/fs/s3/common/MinioTestContainer.java | 12 +++++------- .../apache/flink/fs/s3/common/MinioTestContainerTest.java | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/flink-filesystems/flink-s3-fs-base/src/main/java/org/apache/flink/fs/s3/common/AbstractS3FileSystemFactory.java b/flink-filesystems/flink-s3-fs-base/src/main/java/org/apache/flink/fs/s3/common/AbstractS3FileSystemFactory.java index d5dd4975421..5b1743b8980 100644 --- a/flink-filesystems/flink-s3-fs-base/src/main/java/org/apache/flink/fs/s3/common/AbstractS3FileSystemFactory.java +++ b/flink-filesystems/flink-s3-fs-base/src/main/java/org/apache/flink/fs/s3/common/AbstractS3FileSystemFactory.java @@ -45,12 +45,14 @@ public abstract class AbstractS3FileSystemFactory implements FileSystemFactory { ConfigOptions.key("s3.access-key") .stringType() .noDefaultValue() + .withFallbackKeys("s3.access.key") .withDescription("This optionally defines S3 access key."); public static final ConfigOption<String> SECRET_KEY = ConfigOptions.key("s3.secret-key") .stringType() .noDefaultValue() + .withFallbackKeys("s3.secret.key") .withDescription("This optionally defines S3 secret key."); public static final ConfigOption<String> ENDPOINT = diff --git a/flink-filesystems/flink-s3-fs-base/src/test/java/org/apache/flink/fs/s3/common/MinioTestContainer.java b/flink-filesystems/flink-s3-fs-base/src/test/java/org/apache/flink/fs/s3/common/MinioTestContainer.java index 354be949aed..e8420efe7b1 100644 --- a/flink-filesystems/flink-s3-fs-base/src/test/java/org/apache/flink/fs/s3/common/MinioTestContainer.java +++ b/flink-filesystems/flink-s3-fs-base/src/test/java/org/apache/flink/fs/s3/common/MinioTestContainer.java @@ -39,8 +39,6 @@ import java.util.Locale; /** {@code MinioTestContainer} provides a {@code Minio} test instance. */ public class MinioTestContainer extends GenericContainer<MinioTestContainer> { - private static final String FLINK_CONFIG_S3_ENDPOINT = "s3.endpoint"; - private static final int DEFAULT_PORT = 9000; private static final String MINIO_ACCESS_KEY = "MINIO_ROOT_USER"; @@ -113,16 +111,16 @@ public class MinioTestContainer extends GenericContainer<MinioTestContainer> { * relevant parameter to access the {@code Minio} instance. */ public void setS3ConfigOptions(Configuration config) { - config.setString(FLINK_CONFIG_S3_ENDPOINT, getHttpEndpoint()); + config.set(AbstractS3FileSystemFactory.ENDPOINT, getHttpEndpoint()); config.setString("s3.path.style.access", "true"); - config.setString("s3.access.key", accessKey); - config.setString("s3.secret.key", secretKey); + config.set(AbstractS3FileSystemFactory.ACCESS_KEY, accessKey); + config.set(AbstractS3FileSystemFactory.SECRET_KEY, secretKey); } public void initializeFileSystem(Configuration config) { Preconditions.checkArgument( - config.containsKey(FLINK_CONFIG_S3_ENDPOINT), - FLINK_CONFIG_S3_ENDPOINT + config.containsKey(AbstractS3FileSystemFactory.ENDPOINT.key()), + AbstractS3FileSystemFactory.ENDPOINT.key() + " needs to be specified before initializing the FileSystems."); FileSystem.initialize(config, null); } diff --git a/flink-filesystems/flink-s3-fs-base/src/test/java/org/apache/flink/fs/s3/common/MinioTestContainerTest.java b/flink-filesystems/flink-s3-fs-base/src/test/java/org/apache/flink/fs/s3/common/MinioTestContainerTest.java index 988df5104fc..2d722a8adbe 100644 --- a/flink-filesystems/flink-s3-fs-base/src/test/java/org/apache/flink/fs/s3/common/MinioTestContainerTest.java +++ b/flink-filesystems/flink-s3-fs-base/src/test/java/org/apache/flink/fs/s3/common/MinioTestContainerTest.java @@ -93,8 +93,8 @@ public class MinioTestContainerTest { assertThat(config.containsKey("s3.endpoint")).isTrue(); assertThat(config.containsKey("s3.path.style.access")).isTrue(); - assertThat(config.containsKey("s3.access.key")).isTrue(); - assertThat(config.containsKey("s3.secret.key")).isTrue(); + assertThat(config.containsKey("s3.access-key")).isTrue(); + assertThat(config.containsKey("s3.secret-key")).isTrue(); } @Test
