Dev review fix

Author: jreynard-code

api/src/integrationTest/resources/application-test.yml

@@ -15,11 +15,11 @@ spring:
   cloud:
     aws:
       credentials:
-        access-key: "accessKeyId"
-        secret-key: "secretAccessKey"
+        access-key: "s3_username"
+        secret-key: "s3_password"
       s3:
         # We don't need/have a region for our local S3 service but the AWS SDK requires one to be configured
-        region: "region"
+        region: "dummy"
         # Enable path-style / disable DNS-style
         # By default, and for AWS S3, the client crafts its URL with the bucket as sub-domain of the endpoint
         # which is not how our current S3 implementation works as it expects the bucket in the path
@@ -124,5 +124,6 @@ csm:
       bucketName: "test-bucket"
       accessKeyId: "s3_username"
       secretAccessKey: "s3_password"
+      region: "dummy"
 
 

config/application-dev.sample.yml

@@ -40,15 +40,6 @@ spring:
         keycloak:
           truststore:
             certificate: "classpath:[fill-this-value].pem" # certificate file
-  cloud:
-    aws:
-      credentials:
-        access-key: "s3_username"
-        secret-key: "s3_password"
-      s3:
-        region: "dummy"
-        path-style-access-enabled: true
-        endpoint: "http://localhost:9000"
 
 csm:
   platform:
@@ -86,6 +77,7 @@ csm:
       bucketName: "cosmotech-api"
       accessKeyId: "s3_username"
       secretAccessKey: "s3_password"
+      region: "dummy"
     argo:
       base-uri: "http://localhost:2746"
       workflows:

connector/src/integrationTest/resources/application-connector-test.yml

@@ -15,11 +15,11 @@ spring:
   cloud:
     aws:
       credentials:
-        access-key: "accessKeyId"
-        secret-key: "secretAccessKey"
+        access-key: "s3_username"
+        secret-key: "s3_password"
       s3:
         # We don't need/have a region for our local S3 service but the AWS SDK requires one to be configured
-        region: "region"
+        region: "dummy"
         # Enable path-style / disable DNS-style
         # By default, and for AWS S3, the client crafts its URL with the bucket as sub-domain of the endpoint
         # which is not how our current S3 implementation works as it expects the bucket in the path
@@ -114,3 +114,4 @@ csm:
       bucketName: "test-bucket"
       accessKeyId: "s3_username"
       secretAccessKey: "s3_password"
+      region: "dummy"

dataset/src/integrationTest/resources/application-dataset-test.yml

@@ -15,11 +15,11 @@ spring:
   cloud:
     aws:
       credentials:
-        access-key: "accessKeyId"
-        secret-key: "secretAccessKey"
+        access-key: "s3_username"
+        secret-key: "s3_password"
       s3:
         # We don't need/have a region for our local S3 service but the AWS SDK requires one to be configured
-        region: "region"
+        region: "dummy"
         # Enable path-style / disable DNS-style
         # By default, and for AWS S3, the client crafts its URL with the bucket as sub-domain of the endpoint
         # which is not how our current S3 implementation works as it expects the bucket in the path
@@ -119,3 +119,4 @@ csm:
       bucketName: "test-bucket"
       accessKeyId: "s3_username"
       secretAccessKey: "s3_password"
+      region: "dummy"

organization/src/integrationTest/resources/application-organization-test.yml

@@ -15,11 +15,11 @@ spring:
   cloud:
     aws:
       credentials:
-        access-key: "accessKeyId"
-        secret-key: "secretAccessKey"
+        access-key: "s3_username"
+        secret-key: "s3_password"
       s3:
         # We don't need/have a region for our local S3 service but the AWS SDK requires one to be configured
-        region: "region"
+        region: "dummy"
         # Enable path-style / disable DNS-style
         # By default, and for AWS S3, the client crafts its URL with the bucket as sub-domain of the endpoint
         # which is not how our current S3 implementation works as it expects the bucket in the path
@@ -114,3 +114,4 @@ csm:
       bucketName: "test-bucket"
       accessKeyId: "s3_username"
       secretAccessKey: "s3_password"
+      region: "dummy"

run/src/integrationTest/resources/application-run-test.yml

@@ -15,11 +15,11 @@ spring:
   cloud:
     aws:
       credentials:
-        access-key: "accessKeyId"
-        secret-key: "secretAccessKey"
+        access-key: "s3_username"
+        secret-key: "s3_password"
       s3:
         # We don't need/have a region for our local S3 service but the AWS SDK requires one to be configured
-        region: "region"
+        region: "dummy"
         # Enable path-style / disable DNS-style
         # By default, and for AWS S3, the client crafts its URL with the bucket as sub-domain of the endpoint
         # which is not how our current S3 implementation works as it expects the bucket in the path
@@ -158,3 +158,4 @@ csm:
       bucketName: "test-bucket"
       accessKeyId: "s3_username"
       secretAccessKey: "s3_password"
+      region: "dummy"

runner/src/integrationTest/resources/application-runner-test.yml

@@ -11,11 +11,11 @@ spring:
   cloud:
     aws:
       credentials:
-        access-key: "accessKeyId"
-        secret-key: "secretAccessKey"
+        access-key: "s3_username"
+        secret-key: "s3_password"
       s3:
         # We don't need/have a region for our local S3 service but the AWS SDK requires one to be configured
-        region: "region"
+        region: "dummy"
         # Enable path-style / disable DNS-style
         # By default, and for AWS S3, the client crafts its URL with the bucket as sub-domain of the endpoint
         # which is not how our current S3 implementation works as it expects the bucket in the path
@@ -114,3 +114,4 @@ csm:
       bucketName: "test-bucket"
       accessKeyId: "s3_username"
       secretAccessKey: "s3_password"
+      region: "dummy"

solution/src/integrationTest/resources/application-solution-test.yml

@@ -15,11 +15,11 @@ spring:
   cloud:
     aws:
       credentials:
-        access-key: "accessKeyId"
-        secret-key: "secretAccessKey"
+        access-key: "s3_username"
+        secret-key: "s3_password"
       s3:
         # We don't need/have a region for our local S3 service but the AWS SDK requires one to be configured
-        region: "region"
+        region: "dummy"
         # Enable path-style / disable DNS-style
         # By default, and for AWS S3, the client crafts its URL with the bucket as sub-domain of the endpoint
         # which is not how our current S3 implementation works as it expects the bucket in the path
@@ -118,4 +118,4 @@ csm:
       bucketName: "test-bucket"
       accessKeyId: "s3_username"
       secretAccessKey: "s3_password"
-      region: "us-east-1"
+      region: "dummy"

workspace/src/integrationTest/resources/application-workspace-test.yml

@@ -15,11 +15,11 @@ spring:
   cloud:
     aws:
       credentials:
-        access-key: "accessKeyId"
-        secret-key: "secretAccessKey"
+        access-key: "s3_username"
+        secret-key: "s3_password"
       s3:
         # We don't need/have a region for our local S3 service but the AWS SDK requires one to be configured
-        region: "region"
+        region: "dummy"
         # Enable path-style / disable DNS-style
         # By default, and for AWS S3, the client crafts its URL with the bucket as sub-domain of the endpoint
         # which is not how our current S3 implementation works as it expects the bucket in the path
@@ -123,3 +123,4 @@ csm:
       bucketName: "test-bucket"
       accessKeyId: "s3_username"
       secretAccessKey: "s3_password"
+      region: "dummy"