Added the ability to inject a custom AmazonS3 client

Netflix · Jul 19, 2023 · a469abd · a469abd
1 parent c0048e3
commit a469abd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/awss3-storage/src/main/java/com/netflix/conductor/s3/config/S3Configuration.java b/awss3-storage/src/main/java/com/netflix/conductor/s3/config/S3Configuration.java
@@ -40,7 +40,7 @@ public ExternalPayloadStorage s3ExternalPayloadStorage(
             havingValue = "true",
             matchIfMissing = true)
     @Bean
-    public AmazonS3 amazonS3() {
-        return AmazonS3ClientBuilder.standard().withRegion(region).build();
+    public AmazonS3 amazonS3(S3Properties properties) {
+        return AmazonS3ClientBuilder.standard().withRegion(properties.getRegion()).build();
     }
 }
diff --git a/awss3-storage/src/main/java/com/netflix/conductor/s3/storage/S3PayloadStorage.java b/awss3-storage/src/main/java/com/netflix/conductor/s3/storage/S3PayloadStorage.java
@@ -56,7 +56,6 @@ public S3PayloadStorage(IDGenerator idGenerator, S3Properties properties, Amazon
         this.s3Client = s3Client;
         bucketName = properties.getBucketName();
         expirationSec = properties.getSignedUrlExpirationDuration().getSeconds();
-        String region = properties.getRegion();
     }
 
     /**