feat: export S3_BUCKET from minio provider + fix S3_ENDPOINT_URL

scc-digitalhub · Feb 14, 2025 · a5688f0 · a5688f0
1 parent 532fd9f
commit a5688f0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/application/src/main/resources/application.yml b/application/src/main/resources/application.yml
@@ -224,7 +224,7 @@ files:
     s3:
       access-key: ${AWS_ACCESS_KEY:}
       secret-key: ${AWS_SECRET_KEY:}
-      endpoint: ${S3_ENDPOINT:}
+      endpoint: ${S3_ENDPOINT_URL:}
       bucket: ${S3_BUCKET:}
       signature-version: s3v4
       region: ${S3_REGION:us-east-1}
@@ -263,6 +263,7 @@ credentials:
       enable: ${MINIO_CREDENTIALS_PROVIDER:false}      
       endpoint:  ${MINIO_CREDENTIALS_ENDPOINT:${files.store.s3.endpoint}}
       region: ${MINIO_CREDENTIALS_REGION:${files.store.s3.region}}
+      bucket: ${MINIO_CREDENTIALS_REGION:${files.store.s3.bucket}}
       claim:  ${MINIO_CREDENTIALS_CLAIM:minio/policy}
       policy:  ${MINIO_CREDENTIALS_POLICY:readwrite}
       duration:  ${MINIO_CREDENTIALS_DURATION:86400}

diff --git a/...rovider-minio/src/main/java/it/smartcommunitylabdhub/credentials/minio/MinioProvider.java b/...rovider-minio/src/main/java/it/smartcommunitylabdhub/credentials/minio/MinioProvider.java
@@ -68,6 +68,9 @@ public class MinioProvider implements CredentialsProvider, InitializingBean {
     @Value("${credentials.provider.minio.region}")
     private String region;
 
+    @Value("${credentials.provider.minio.bucket}")
+    private String bucket;
+
     @Value("${credentials.provider.minio.enable}")
     private Boolean enabled;
 
@@ -138,6 +141,7 @@ private MinioSessionCredentials generate(@NotNull String username, @NotNull Stri
                 .sessionToken(response.sessionToken())
                 .endpoint(endpointUrl)
                 .region(region)
+                .bucket(bucket)
                 .signatureVersion("s3v4")
                 .build();
         } catch (NoSuchAlgorithmException | ProviderException e) {

diff --git a/...nio/src/main/java/it/smartcommunitylabdhub/credentials/minio/MinioSessionCredentials.java b/...nio/src/main/java/it/smartcommunitylabdhub/credentials/minio/MinioSessionCredentials.java
@@ -44,7 +44,7 @@ public class MinioSessionCredentials extends AbstractCredentials {
     @JsonProperty("aws_session_token")
     private String sessionToken;
 
-    @JsonProperty("s3_endpoint")
+    @JsonProperty("s3_endpoint_url")
     private String endpoint;
 
     @JsonProperty("s3_region")
@@ -53,6 +53,9 @@ public class MinioSessionCredentials extends AbstractCredentials {
     @JsonProperty("s3_signature_version")
     private String signatureVersion;
 
+    @JsonProperty("s3_bucket")
+    private String bucket;
+
     @Override
     public void eraseCredentials() {
         //clear credentials