Skip to content

Commit 2831d2d

Browse files
committed
Dev review fix
1 parent b449d1c commit 2831d2d

File tree

9 files changed

+33
-34
lines changed

9 files changed

+33
-34
lines changed

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ spring:
1515
cloud:
1616
aws:
1717
credentials:
18-
access-key: "accessKeyId"
19-
secret-key: "secretAccessKey"
18+
access-key: "s3_username"
19+
secret-key: "s3_password"
2020
s3:
2121
# We don't need/have a region for our local S3 service but the AWS SDK requires one to be configured
22-
region: "region"
22+
region: "dummy"
2323
# Enable path-style / disable DNS-style
2424
# By default, and for AWS S3, the client crafts its URL with the bucket as sub-domain of the endpoint
2525
# which is not how our current S3 implementation works as it expects the bucket in the path
@@ -124,5 +124,6 @@ csm:
124124
bucketName: "test-bucket"
125125
accessKeyId: "s3_username"
126126
secretAccessKey: "s3_password"
127+
region: "dummy"
127128

128129

config/application-dev.sample.yml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,6 @@ spring:
4040
keycloak:
4141
truststore:
4242
certificate: "classpath:[fill-this-value].pem" # certificate file
43-
cloud:
44-
aws:
45-
credentials:
46-
access-key: "s3_username"
47-
secret-key: "s3_password"
48-
s3:
49-
region: "dummy"
50-
path-style-access-enabled: true
51-
endpoint: "http://localhost:9000"
5243

5344
csm:
5445
platform:
@@ -86,6 +77,7 @@ csm:
8677
bucketName: "cosmotech-api"
8778
accessKeyId: "s3_username"
8879
secretAccessKey: "s3_password"
80+
region: "dummy"
8981
argo:
9082
base-uri: "http://localhost:2746"
9183
workflows:

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ spring:
1515
cloud:
1616
aws:
1717
credentials:
18-
access-key: "accessKeyId"
19-
secret-key: "secretAccessKey"
18+
access-key: "s3_username"
19+
secret-key: "s3_password"
2020
s3:
2121
# We don't need/have a region for our local S3 service but the AWS SDK requires one to be configured
22-
region: "region"
22+
region: "dummy"
2323
# Enable path-style / disable DNS-style
2424
# By default, and for AWS S3, the client crafts its URL with the bucket as sub-domain of the endpoint
2525
# which is not how our current S3 implementation works as it expects the bucket in the path
@@ -114,3 +114,4 @@ csm:
114114
bucketName: "test-bucket"
115115
accessKeyId: "s3_username"
116116
secretAccessKey: "s3_password"
117+
region: "dummy"

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ spring:
1515
cloud:
1616
aws:
1717
credentials:
18-
access-key: "accessKeyId"
19-
secret-key: "secretAccessKey"
18+
access-key: "s3_username"
19+
secret-key: "s3_password"
2020
s3:
2121
# We don't need/have a region for our local S3 service but the AWS SDK requires one to be configured
22-
region: "region"
22+
region: "dummy"
2323
# Enable path-style / disable DNS-style
2424
# By default, and for AWS S3, the client crafts its URL with the bucket as sub-domain of the endpoint
2525
# which is not how our current S3 implementation works as it expects the bucket in the path
@@ -119,3 +119,4 @@ csm:
119119
bucketName: "test-bucket"
120120
accessKeyId: "s3_username"
121121
secretAccessKey: "s3_password"
122+
region: "dummy"

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ spring:
1515
cloud:
1616
aws:
1717
credentials:
18-
access-key: "accessKeyId"
19-
secret-key: "secretAccessKey"
18+
access-key: "s3_username"
19+
secret-key: "s3_password"
2020
s3:
2121
# We don't need/have a region for our local S3 service but the AWS SDK requires one to be configured
22-
region: "region"
22+
region: "dummy"
2323
# Enable path-style / disable DNS-style
2424
# By default, and for AWS S3, the client crafts its URL with the bucket as sub-domain of the endpoint
2525
# which is not how our current S3 implementation works as it expects the bucket in the path
@@ -114,3 +114,4 @@ csm:
114114
bucketName: "test-bucket"
115115
accessKeyId: "s3_username"
116116
secretAccessKey: "s3_password"
117+
region: "dummy"

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ spring:
1515
cloud:
1616
aws:
1717
credentials:
18-
access-key: "accessKeyId"
19-
secret-key: "secretAccessKey"
18+
access-key: "s3_username"
19+
secret-key: "s3_password"
2020
s3:
2121
# We don't need/have a region for our local S3 service but the AWS SDK requires one to be configured
22-
region: "region"
22+
region: "dummy"
2323
# Enable path-style / disable DNS-style
2424
# By default, and for AWS S3, the client crafts its URL with the bucket as sub-domain of the endpoint
2525
# which is not how our current S3 implementation works as it expects the bucket in the path
@@ -158,3 +158,4 @@ csm:
158158
bucketName: "test-bucket"
159159
accessKeyId: "s3_username"
160160
secretAccessKey: "s3_password"
161+
region: "dummy"

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ spring:
1111
cloud:
1212
aws:
1313
credentials:
14-
access-key: "accessKeyId"
15-
secret-key: "secretAccessKey"
14+
access-key: "s3_username"
15+
secret-key: "s3_password"
1616
s3:
1717
# We don't need/have a region for our local S3 service but the AWS SDK requires one to be configured
18-
region: "region"
18+
region: "dummy"
1919
# Enable path-style / disable DNS-style
2020
# By default, and for AWS S3, the client crafts its URL with the bucket as sub-domain of the endpoint
2121
# which is not how our current S3 implementation works as it expects the bucket in the path
@@ -114,3 +114,4 @@ csm:
114114
bucketName: "test-bucket"
115115
accessKeyId: "s3_username"
116116
secretAccessKey: "s3_password"
117+
region: "dummy"

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ spring:
1515
cloud:
1616
aws:
1717
credentials:
18-
access-key: "accessKeyId"
19-
secret-key: "secretAccessKey"
18+
access-key: "s3_username"
19+
secret-key: "s3_password"
2020
s3:
2121
# We don't need/have a region for our local S3 service but the AWS SDK requires one to be configured
22-
region: "region"
22+
region: "dummy"
2323
# Enable path-style / disable DNS-style
2424
# By default, and for AWS S3, the client crafts its URL with the bucket as sub-domain of the endpoint
2525
# which is not how our current S3 implementation works as it expects the bucket in the path
@@ -118,4 +118,4 @@ csm:
118118
bucketName: "test-bucket"
119119
accessKeyId: "s3_username"
120120
secretAccessKey: "s3_password"
121-
region: "us-east-1"
121+
region: "dummy"

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ spring:
1515
cloud:
1616
aws:
1717
credentials:
18-
access-key: "accessKeyId"
19-
secret-key: "secretAccessKey"
18+
access-key: "s3_username"
19+
secret-key: "s3_password"
2020
s3:
2121
# We don't need/have a region for our local S3 service but the AWS SDK requires one to be configured
22-
region: "region"
22+
region: "dummy"
2323
# Enable path-style / disable DNS-style
2424
# By default, and for AWS S3, the client crafts its URL with the bucket as sub-domain of the endpoint
2525
# which is not how our current S3 implementation works as it expects the bucket in the path
@@ -123,3 +123,4 @@ csm:
123123
bucketName: "test-bucket"
124124
accessKeyId: "s3_username"
125125
secretAccessKey: "s3_password"
126+
region: "dummy"

0 commit comments

Comments
 (0)