FINERACT-2118: Make region as optional and remove hardcoded default value
This commit is contained in:
+4
-2
@@ -40,9 +40,11 @@ public class ContentS3Config {
|
||||
@Bean
|
||||
@ConditionalOnProperty("fineract.content.s3.enabled")
|
||||
public S3Client contentS3Client(FineractProperties fineractProperties) {
|
||||
S3ClientBuilder builder = S3Client.builder().credentialsProvider(getCredentialProvider(fineractProperties.getContent().getS3()))
|
||||
.region(Region.of(fineractProperties.getContent().getS3().getRegion()));
|
||||
S3ClientBuilder builder = S3Client.builder().credentialsProvider(getCredentialProvider(fineractProperties.getContent().getS3()));
|
||||
|
||||
if (!Strings.isNullOrEmpty(fineractProperties.getContent().getS3().getRegion())) {
|
||||
builder.region(Region.of(fineractProperties.getContent().getS3().getRegion()));
|
||||
}
|
||||
if (!Strings.isNullOrEmpty(fineractProperties.getContent().getS3().getEndpoint())) {
|
||||
builder.endpointOverride(URI.create(fineractProperties.getContent().getS3().getEndpoint()))
|
||||
.forcePathStyle(fineractProperties.getContent().getS3().getPathStyleAddressingEnabled());
|
||||
|
||||
@@ -165,7 +165,7 @@ fineract.content.s3.enabled=${FINERACT_CONTENT_S3_ENABLED:false}
|
||||
fineract.content.s3.bucketName=${FINERACT_CONTENT_S3_BUCKET_NAME:}
|
||||
fineract.content.s3.accessKey=${FINERACT_CONTENT_S3_ACCESS_KEY:}
|
||||
fineract.content.s3.secretKey=${FINERACT_CONTENT_S3_SECRET_KEY:}
|
||||
fineract.content.s3.region=${FINERACT_CONTENT_S3_REGION:us-east-1}
|
||||
fineract.content.s3.region=${FINERACT_CONTENT_S3_REGION:}
|
||||
fineract.content.s3.endpoint=${FINERACT_CONTENT_S3_ENDPOINT:}
|
||||
fineract.content.s3.path-style-addressing-enabled=${FINERACT_CONTENT_S3_PATH_STYLE_ADDRESSING_ENABLED:false}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user