From 3869c4695bb4d602dc862dfa00e83508e5b36b45 Mon Sep 17 00:00:00 2001 From: Shubhendu Ram Tripathi Date: Tue, 23 Apr 2024 15:53:27 +0530 Subject: [PATCH] Enable for running with DNS based endpoints Now tests can be run by setting SERVER_ENDPOINT both with IP and DNS based addresses like 192.168.0.142:22000 and localhost:22000 Signed-off-by: Shubhendu Ram Tripathi --- build/{.aws-sdk-java-v2 => aws-sdk-java-v2}/.gitattributes | 0 build/{.aws-sdk-java-v2 => aws-sdk-java-v2}/.gitignore | 0 .../app/build.gradle.kts | 0 .../main/java/io/minio/awssdk/v2/tests/FunctionalTests.java | 4 ++++ .../java/io/minio/awssdk/v2/tests/LimitedInputStream.java | 0 .../src/main/java/io/minio/awssdk/v2/tests/MintLogger.java | 0 .../src/main/java/io/minio/awssdk/v2/tests/S3TestUtils.java | 0 .../app/src/main/java/io/minio/awssdk/v2/tests/Utils.java | 0 .../gradle/wrapper/gradle-wrapper.properties | 0 build/{.aws-sdk-java-v2 => aws-sdk-java-v2}/gradlew | 0 build/{.aws-sdk-java-v2 => aws-sdk-java-v2}/gradlew.bat | 0 build/{.aws-sdk-java-v2 => aws-sdk-java-v2}/install.sh | 0 .../{.aws-sdk-java-v2 => aws-sdk-java-v2}/settings.gradle.kts | 0 run/core/{.aws-sdk-java-v2 => aws-sdk-java-v2}/run.sh | 0 14 files changed, 4 insertions(+) rename build/{.aws-sdk-java-v2 => aws-sdk-java-v2}/.gitattributes (100%) rename build/{.aws-sdk-java-v2 => aws-sdk-java-v2}/.gitignore (100%) rename build/{.aws-sdk-java-v2 => aws-sdk-java-v2}/app/build.gradle.kts (100%) rename build/{.aws-sdk-java-v2 => aws-sdk-java-v2}/app/src/main/java/io/minio/awssdk/v2/tests/FunctionalTests.java (98%) rename build/{.aws-sdk-java-v2 => aws-sdk-java-v2}/app/src/main/java/io/minio/awssdk/v2/tests/LimitedInputStream.java (100%) rename build/{.aws-sdk-java-v2 => aws-sdk-java-v2}/app/src/main/java/io/minio/awssdk/v2/tests/MintLogger.java (100%) rename build/{.aws-sdk-java-v2 => aws-sdk-java-v2}/app/src/main/java/io/minio/awssdk/v2/tests/S3TestUtils.java (100%) rename build/{.aws-sdk-java-v2 => aws-sdk-java-v2}/app/src/main/java/io/minio/awssdk/v2/tests/Utils.java (100%) rename build/{.aws-sdk-java-v2 => aws-sdk-java-v2}/gradle/wrapper/gradle-wrapper.properties (100%) rename build/{.aws-sdk-java-v2 => aws-sdk-java-v2}/gradlew (100%) rename build/{.aws-sdk-java-v2 => aws-sdk-java-v2}/gradlew.bat (100%) rename build/{.aws-sdk-java-v2 => aws-sdk-java-v2}/install.sh (100%) rename build/{.aws-sdk-java-v2 => aws-sdk-java-v2}/settings.gradle.kts (100%) rename run/core/{.aws-sdk-java-v2 => aws-sdk-java-v2}/run.sh (100%) diff --git a/build/.aws-sdk-java-v2/.gitattributes b/build/aws-sdk-java-v2/.gitattributes similarity index 100% rename from build/.aws-sdk-java-v2/.gitattributes rename to build/aws-sdk-java-v2/.gitattributes diff --git a/build/.aws-sdk-java-v2/.gitignore b/build/aws-sdk-java-v2/.gitignore similarity index 100% rename from build/.aws-sdk-java-v2/.gitignore rename to build/aws-sdk-java-v2/.gitignore diff --git a/build/.aws-sdk-java-v2/app/build.gradle.kts b/build/aws-sdk-java-v2/app/build.gradle.kts similarity index 100% rename from build/.aws-sdk-java-v2/app/build.gradle.kts rename to build/aws-sdk-java-v2/app/build.gradle.kts diff --git a/build/.aws-sdk-java-v2/app/src/main/java/io/minio/awssdk/v2/tests/FunctionalTests.java b/build/aws-sdk-java-v2/app/src/main/java/io/minio/awssdk/v2/tests/FunctionalTests.java similarity index 98% rename from build/.aws-sdk-java-v2/app/src/main/java/io/minio/awssdk/v2/tests/FunctionalTests.java rename to build/aws-sdk-java-v2/app/src/main/java/io/minio/awssdk/v2/tests/FunctionalTests.java index e9b06e5..f30e67f 100644 --- a/build/.aws-sdk-java-v2/app/src/main/java/io/minio/awssdk/v2/tests/FunctionalTests.java +++ b/build/aws-sdk-java-v2/app/src/main/java/io/minio/awssdk/v2/tests/FunctionalTests.java @@ -386,6 +386,7 @@ public static void main(String[] args) throws Exception, IOException, NoSuchAlgo s3Client = S3Client .builder() .endpointOverride(URI.create(endpoint)) + .forcePathStyle(true) .credentialsProvider(StaticCredentialsProvider.create(credentials)) .region(region) .httpClient(sdkHttpClient) @@ -399,6 +400,7 @@ public static void main(String[] args) throws Exception, IOException, NoSuchAlgo s3AsyncClient = S3AsyncClient .builder() .endpointOverride(URI.create(endpoint)) + .forcePathStyle(true) .credentialsProvider(StaticCredentialsProvider.create(credentials)) .region(region) .httpClient(sdkAsyncHttpClient) @@ -407,12 +409,14 @@ public static void main(String[] args) throws Exception, IOException, NoSuchAlgo s3Client = S3Client .builder() .endpointOverride(URI.create(endpoint)) + .forcePathStyle(true) .credentialsProvider(StaticCredentialsProvider.create(credentials)) .region(region) .build(); s3AsyncClient = S3AsyncClient .builder() .endpointOverride(URI.create(endpoint)) + .forcePathStyle(true) .credentialsProvider(StaticCredentialsProvider.create(credentials)) .region(region) .build(); diff --git a/build/.aws-sdk-java-v2/app/src/main/java/io/minio/awssdk/v2/tests/LimitedInputStream.java b/build/aws-sdk-java-v2/app/src/main/java/io/minio/awssdk/v2/tests/LimitedInputStream.java similarity index 100% rename from build/.aws-sdk-java-v2/app/src/main/java/io/minio/awssdk/v2/tests/LimitedInputStream.java rename to build/aws-sdk-java-v2/app/src/main/java/io/minio/awssdk/v2/tests/LimitedInputStream.java diff --git a/build/.aws-sdk-java-v2/app/src/main/java/io/minio/awssdk/v2/tests/MintLogger.java b/build/aws-sdk-java-v2/app/src/main/java/io/minio/awssdk/v2/tests/MintLogger.java similarity index 100% rename from build/.aws-sdk-java-v2/app/src/main/java/io/minio/awssdk/v2/tests/MintLogger.java rename to build/aws-sdk-java-v2/app/src/main/java/io/minio/awssdk/v2/tests/MintLogger.java diff --git a/build/.aws-sdk-java-v2/app/src/main/java/io/minio/awssdk/v2/tests/S3TestUtils.java b/build/aws-sdk-java-v2/app/src/main/java/io/minio/awssdk/v2/tests/S3TestUtils.java similarity index 100% rename from build/.aws-sdk-java-v2/app/src/main/java/io/minio/awssdk/v2/tests/S3TestUtils.java rename to build/aws-sdk-java-v2/app/src/main/java/io/minio/awssdk/v2/tests/S3TestUtils.java diff --git a/build/.aws-sdk-java-v2/app/src/main/java/io/minio/awssdk/v2/tests/Utils.java b/build/aws-sdk-java-v2/app/src/main/java/io/minio/awssdk/v2/tests/Utils.java similarity index 100% rename from build/.aws-sdk-java-v2/app/src/main/java/io/minio/awssdk/v2/tests/Utils.java rename to build/aws-sdk-java-v2/app/src/main/java/io/minio/awssdk/v2/tests/Utils.java diff --git a/build/.aws-sdk-java-v2/gradle/wrapper/gradle-wrapper.properties b/build/aws-sdk-java-v2/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from build/.aws-sdk-java-v2/gradle/wrapper/gradle-wrapper.properties rename to build/aws-sdk-java-v2/gradle/wrapper/gradle-wrapper.properties diff --git a/build/.aws-sdk-java-v2/gradlew b/build/aws-sdk-java-v2/gradlew similarity index 100% rename from build/.aws-sdk-java-v2/gradlew rename to build/aws-sdk-java-v2/gradlew diff --git a/build/.aws-sdk-java-v2/gradlew.bat b/build/aws-sdk-java-v2/gradlew.bat similarity index 100% rename from build/.aws-sdk-java-v2/gradlew.bat rename to build/aws-sdk-java-v2/gradlew.bat diff --git a/build/.aws-sdk-java-v2/install.sh b/build/aws-sdk-java-v2/install.sh similarity index 100% rename from build/.aws-sdk-java-v2/install.sh rename to build/aws-sdk-java-v2/install.sh diff --git a/build/.aws-sdk-java-v2/settings.gradle.kts b/build/aws-sdk-java-v2/settings.gradle.kts similarity index 100% rename from build/.aws-sdk-java-v2/settings.gradle.kts rename to build/aws-sdk-java-v2/settings.gradle.kts diff --git a/run/core/.aws-sdk-java-v2/run.sh b/run/core/aws-sdk-java-v2/run.sh similarity index 100% rename from run/core/.aws-sdk-java-v2/run.sh rename to run/core/aws-sdk-java-v2/run.sh