CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 37 Packages Projects Releases Wiki Activity

FINERACT-2118: Make region as optional and remove hardcoded default value

Browse Source
This commit is contained in:
Adam Saghy
2025-07-28 18:11:08 +02:00
parent 0698c4ada5
commit 271ac859bc
4 changed files with 23 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/config/ContentS3Config.java
+4 -2
View File
@@ -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());
fineract-provider/src/main/resources/application.properties
+1 -1
View File
@@ -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}
fineract-provider/src/test/java/org/apache/fineract/infrastructure/core/config/ContentS3ConfigTest.java
+15 -25
View File
@@ -21,10 +21,12 @@ package org.apache.fineract.infrastructure.core.config;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -54,6 +56,13 @@ class ContentS3ConfigTest {
when(contentProperties.getS3()).thenReturn(s3Properties);
}
@AfterEach
void tearDown() {
reset(fineractProperties);
reset(contentProperties);
reset(s3Properties);
}
@Test
void testContentS3Client_WithCredentialsAndNoEndpoint() {
@@ -72,7 +81,7 @@ class ContentS3ConfigTest {
verify(s3Properties, times(2)).getAccessKey();
verify(s3Properties, times(2)).getSecretKey();
verify(s3Properties).getRegion();
verify(s3Properties, times(2)).getRegion();
verify(s3Properties).getEndpoint();
}
@@ -91,7 +100,7 @@ class ContentS3ConfigTest {
verify(s3Properties, times(1)).getAccessKey();
verify(s3Properties, times(0)).getSecretKey();
verify(s3Properties).getRegion();
verify(s3Properties, times(2)).getRegion();
verify(s3Properties).getEndpoint();
}
@@ -116,7 +125,7 @@ class ContentS3ConfigTest {
verify(s3Properties, times(2)).getAccessKey();
verify(s3Properties, times(2)).getSecretKey();
verify(s3Properties).getRegion();
verify(s3Properties, times(2)).getRegion();
verify(s3Properties, times(2)).getEndpoint();
verify(s3Properties).getPathStyleAddressingEnabled();
}
@@ -137,7 +146,7 @@ class ContentS3ConfigTest {
verify(s3Properties, times(1)).getAccessKey();
verify(s3Properties, times(0)).getSecretKey();
verify(s3Properties).getRegion();
verify(s3Properties, times(2)).getRegion();
verify(s3Properties).getEndpoint();
}
@@ -160,7 +169,7 @@ class ContentS3ConfigTest {
verify(s3Properties, times(2)).getAccessKey();
verify(s3Properties, times(2)).getSecretKey();
verify(s3Properties).getRegion();
verify(s3Properties, times(2)).getRegion();
verify(s3Properties).getEndpoint();
verify(s3Properties, never()).getPathStyleAddressingEnabled();
@@ -182,26 +191,7 @@ class ContentS3ConfigTest {
verify(s3Properties, times(1)).getAccessKey();
verify(s3Properties, times(1)).getSecretKey();
verify(s3Properties).getRegion();
verify(s3Properties).getEndpoint();
}
@Test
void testContentS3Client_WithOnlySecretKey() {
String region = "eu-central-1";
when(s3Properties.getAccessKey()).thenReturn(null);
when(s3Properties.getEndpoint()).thenReturn(null);
when(s3Properties.getRegion()).thenReturn(region);
S3Client s3Client = contentS3Config.contentS3Client(fineractProperties);
assertNotNull(s3Client);
verify(s3Properties, times(1)).getAccessKey();
verify(s3Properties, times(0)).getSecretKey();
verify(s3Properties).getRegion();
verify(s3Properties, times(2)).getRegion();
verify(s3Properties).getEndpoint();
}
}
fineract-provider/src/test/resources/application-test.properties
+3
View File
@@ -93,6 +93,9 @@ fineract.content.s3.enabled=false
fineract.content.s3.bucketName=
fineract.content.s3.accessKey=
fineract.content.s3.secretKey=
fineract.content.s3.region=
fineract.content.s3.endpoint=
fineract.content.s3.path-style-addressing-enabled=false
fineract.report.export.s3.bucket=${FINERACT_REPORT_EXPORT_S3_BUCKET_NAME:}
fineract.report.export.s3.enabled=${FINERACT_REPORT_EXPORT_S3_ENABLED:false}