OAP-224 oap-storage-cloud: jclouds -> aws sdk

oaplatform · Nov 27, 2024 · b6529f1 · b6529f1
1 parent ec72ba9
commit b6529f1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/.../oap-storage-cloud-aws-s3/src/main/java/oap/storage/cloud/awss3/FileSystemCloudApiS3.java b/.../oap-storage-cloud-aws-s3/src/main/java/oap/storage/cloud/awss3/FileSystemCloudApiS3.java
@@ -89,12 +89,9 @@
 
 @Slf4j
 public class FileSystemCloudApiS3 implements FileSystemCloudApi {
-    private final FileSystemConfiguration fileSystemConfiguration;
     private final S3AsyncClient s3Client;
 
     public FileSystemCloudApiS3( FileSystemConfiguration fileSystemConfiguration, String bucketName ) {
-        this.fileSystemConfiguration = fileSystemConfiguration;
-
         S3AsyncClientBuilder builder = S3AsyncClient.builder();
 
         Object endpoint = fileSystemConfiguration.get( "s3", bucketName, "jclouds.endpoint" );
@@ -111,6 +108,11 @@ public FileSystemCloudApiS3( FileSystemConfiguration fileSystemConfiguration, St
             builder = builder.credentialsProvider( StaticCredentialsProvider.create( AwsBasicCredentials.create( accessKey.toString(), accessSecret.toString() ) ) );
         }
 
+        Object region = fileSystemConfiguration.get( "s3", bucketName, "jclouds.region" );
+        if( region != null ) {
+            builder = builder.region( Region.of( region.toString() ) );
+        }
+
         builder = builder.multipartEnabled( true );
 
         s3Client = builder.build();

diff --git a/oap-storage/oap-storage-cloud-test/src/main/java/oap/storage/cloud/S3MockFixture.java b/oap-storage/oap-storage-cloud-test/src/main/java/oap/storage/cloud/S3MockFixture.java
@@ -186,6 +186,7 @@ public FileSystemConfiguration getFileSystemConfiguration( String container ) {
         return new FileSystemConfiguration( Map.of(
             "fs.s3.clouds.identity", "access_key",
             "fs.s3.clouds.credential", "access_secret",
+            "fs.s3.clouds.region", Region.AWS_GLOBAL.id(),
             "fs.s3.clouds.s3.virtual-host-buckets", false,
             "fs.s3.clouds.endpoint", "http://localhost:" + getHttpPort(),
             "fs.s3.clouds.headers", "DEBUG",