Skip to content

Commit adc839a

Browse files
jreynard-codejreynard-code
committed
Remove csm.platform.twincache.tls.* properties in application-*-test.yml as its in csm.platform.tls.*
1 parent a3a1b64 commit adc839a

File tree

11 files changed

+90
-57
lines changed

11 files changed

+90
-57
lines changed

‎api/kubernetes/helm-chart/templates/_helpers.tpl‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -199,9 +199,4 @@ csm:
199199
{{- end }}
200200
blobPersistence:
201201
path: {{ include "cosmotech-api.blobPersistencePath" . }}
202-
{{- if .Values.api.tlsTruststore.enabled }}
203-
tls:
204-
enabled : {{ .Values.api.tlsTruststore.enabled }}
205-
bundle: {{ include "cosmotech-api.custom-rootca-bundle" . }}
206-
{{- end }}
207202
{{- end }}

‎api/kubernetes/helm-chart/values.yaml‎

Lines changed: 33 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,14 +170,14 @@ argo:
170170
config:
171171
csm:
172172
platform:
173-
tls:
174-
enabled: false
175-
bundle: ""
176173
twincache:
177174
host: redis.host.changeme
178175
password: changeme
179176
port: 6379
180177
username: default
178+
tls:
179+
enabled: false
180+
bundle: ""
181181
argo:
182182
base-uri: "http://argo-server:2746"
183183
workflows:
@@ -206,3 +206,33 @@ config:
206206
clientId: "changeme"
207207
clientSecret: "changeme"
208208
tenantId: "changeme"
209+
tls:
210+
enabled: false
211+
bundle: "changeme"
212+
internalResultServices:
213+
enabled: false
214+
storage:
215+
host: "localhost"
216+
port: 5432
217+
reader:
218+
username: "changeme"
219+
password: "changeme"
220+
writer:
221+
username: "changeme"
222+
password: "changeme"
223+
admin:
224+
username: "changeme"
225+
password: "changeme"
226+
eventBus:
227+
enabled: true
228+
tls:
229+
enabled: false
230+
bundle: ""
231+
host: "localhost"
232+
port: 5672
233+
listener:
234+
username: "changeme"
235+
password: "changeme"
236+
sender:
237+
username: "changeme"
238+
password: "changeme"

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ csm:
2424
clientId: "my_client_id"
2525
clientSecret: "my_client_secret"
2626
tenantId: "my_tenant_id"
27+
tls:
28+
enabled: false
29+
bundle: ""
2730
metrics:
2831
enabled: false
2932
api:
@@ -80,12 +83,12 @@ csm:
8083
twincache:
8184
host: "localhost"
8285
port: "6379"
83-
tls:
84-
enabled: false
85-
bundle: ""
8686
username: "default"
8787
# Leave it as blank as there's no auth with test container
8888
password:
89+
tls:
90+
enabled: false
91+
bundle: ""
8992
connector:
9093
default-page-size: 5
9194
rbac:

‎api/src/main/resources/application.yml‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,13 @@ spring:
1111
password: ${csm.platform.internalResultServices.eventBus.listener.password}
1212
username: ${csm.platform.internalResultServices.eventBus.listener.username}
1313
ssl:
14-
enabled: ${csm.platform.tls.enabled}
15-
bundle: ${csm.platform.tls.bundle}
14+
enabled: ${csm.platform.internalResultServices.eventBus.tls.enabled}
1615
data:
1716
redis:
1817
host: ${csm.platform.twincache.host}
1918
port: ${csm.platform.twincache.port}
2019
ssl:
21-
enabled: ${csm.platform.tls.enabled}
20+
enabled: ${csm.platform.twincache.tls.enabled}
2221
password: ${csm.platform.twincache.password}
2322
username: ${csm.platform.twincache.username}
2423
timeout: 60000
@@ -82,16 +81,16 @@ csm:
8281
port: "6379"
8382
username: "default_user"
8483
password: "default_password"
84+
tls:
85+
enabled: false
86+
bundle: ""
8587
dataset:
8688
# TODO: Should be way less than a thousand. See open ticket
8789
maxResult: 1000
8890
run:
8991
maxResult: 200
9092
runner:
9193
maxResult: 200
92-
tls:
93-
enabled: false
94-
bundle: ""
9594
internalResultServices:
9695
enabled: false
9796
storage:
@@ -108,6 +107,9 @@ csm:
108107
password: "storage_admin_password"
109108
eventBus:
110109
enabled: true
110+
tls:
111+
enabled: false
112+
bundle: ""
111113
host: "localhost"
112114
port: 5672
113115
default-exchange: "csm-exchange"

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ spring:
1515

1616
csm:
1717
platform:
18-
tls:
19-
enabled: false
20-
bundle: ""
2118
identityProvider:
2219
code: on_premise_one
2320
authorizationUrl: "http://fake_url:8080/authorize"
@@ -29,6 +26,9 @@ csm:
2926
clientId: "my_client_id"
3027
clientSecret: "my_client_secret"
3128
tenantId: "my_tenant_id"
29+
tls:
30+
enabled: false
31+
bundle: ""
3232
metrics:
3333
enabled: false
3434
api:
@@ -85,12 +85,12 @@ csm:
8585
twincache:
8686
host: "localhost"
8787
port: "6379"
88-
tls:
89-
enabled: false
90-
bundle: ""
9188
username: "default"
9289
# Leave it as blank as there's no auth with test container
9390
password:
91+
tls:
92+
enabled: false
93+
bundle: ""
9494
connector:
9595
default-page-size: 5
9696
rbac:

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ spring:
1515

1616
csm:
1717
platform:
18-
tls:
19-
enabled: false
20-
bundle: ""
2118
identityProvider:
2219
code: on_premise_one
2320
authorizationUrl: "http://fake_url:8080/authorize"
@@ -29,6 +26,9 @@ csm:
2926
clientId: "my_client_id"
3027
clientSecret: "my_client_secret"
3128
tenantId: "my_tenant_id"
29+
tls:
30+
enabled: false
31+
bundle: ""
3232
metrics:
3333
enabled: false
3434
api:
@@ -89,12 +89,12 @@ csm:
8989
twincache:
9090
host: "localhost"
9191
port: "6379"
92-
tls:
93-
enabled: false
94-
bundle: ""
9592
username: "default"
9693
# Leave it as blank as there's no auth with test container
9794
password:
95+
tls:
96+
enabled: false
97+
bundle: ""
9898
dataset:
9999
default-page-size: 5
100100
rbac:

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ spring:
1515

1616
csm:
1717
platform:
18-
tls:
19-
enabled: false
20-
bundle: ""
2118
identityProvider:
2219
code: on_premise_one
2320
authorizationUrl: "http://fake_url:8080/authorize"
@@ -29,6 +26,9 @@ csm:
2926
clientId: "my_client_id"
3027
clientSecret: "my_client_secret"
3128
tenantId: "my_tenant_id"
29+
tls:
30+
enabled: false
31+
bundle: ""
3232
metrics:
3333
enabled: false
3434
api:
@@ -85,12 +85,12 @@ csm:
8585
twincache:
8686
host: "localhost"
8787
port: "6379"
88-
tls:
89-
enabled: false
90-
bundle: ""
9188
username: "default"
9289
# Leave it as blank as there's no auth with test container
9390
password:
91+
tls:
92+
enabled: false
93+
bundle: ""
9494
organization:
9595
default-page-size: 5
9696
rbac:

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ management:
2626

2727
csm:
2828
platform:
29-
tls:
30-
enabled : false
31-
bundle: ""
3229
identityProvider:
3330
code: on_premise_one
3431
authorizationUrl: "http://fake_url:8080/authorize"
@@ -40,6 +37,9 @@ csm:
4037
clientId: "my_client_id"
4138
clientSecret: "my_client_secret"
4239
tenantId: "my_tenant_id"
40+
tls:
41+
enabled: false
42+
bundle: ""
4343
metrics:
4444
enabled: false
4545
api:
@@ -96,11 +96,11 @@ csm:
9696
twincache:
9797
host: "localhost"
9898
port: "6379"
99+
username: "default"
100+
password: "my-wonderful-password"
99101
tls:
100102
enabled: false
101103
bundle: ""
102-
username: "default"
103-
password: "my-wonderful-password"
104104
run:
105105
default-page-size: 5
106106
internalResultServices:
@@ -128,6 +128,9 @@ csm:
128128
listener:
129129
username: "user4"
130130
password: "pwd4"
131+
tls:
132+
enabled: false
133+
bundle: ""
131134
rbac:
132135
enabled: true
133136
containerRegistry:

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ management:
1515

1616
csm:
1717
platform:
18-
tls:
19-
enabled: false
20-
bundle: ""
2118
identityProvider:
2219
code: on_premise_one
2320
authorizationUrl: "http://fake_url:8080/authorize"
@@ -29,6 +26,9 @@ csm:
2926
clientId: "my_client_id"
3027
clientSecret: "my_client_secret"
3128
tenantId: "my_tenant_id"
29+
tls:
30+
enabled: false
31+
bundle: ""
3232
metrics:
3333
enabled: false
3434
api:
@@ -85,11 +85,11 @@ csm:
8585
twincache:
8686
host: "localhost"
8787
port: "6379"
88+
username: "default"
89+
password: "my-wonderful-password"
8890
tls:
8991
enabled: false
9092
bundle: ""
91-
username: "default"
92-
password: "my-wonderful-password"
9393
runner:
9494
default-page-size: 20
9595
rbac:

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ spring:
1515

1616
csm:
1717
platform:
18-
tls:
19-
enabled: false
20-
bundle: ""
2118
identityProvider:
2219
code: on_premise_one
2320
authorizationUrl: "http://fake_url:8080/authorize"
@@ -29,6 +26,9 @@ csm:
2926
clientId: "my_client_id"
3027
clientSecret: "my_client_secret"
3128
tenantId: "my_tenant_id"
29+
tls:
30+
enabled: false
31+
bundle: ""
3232
metrics:
3333
enabled: false
3434
api:
@@ -89,12 +89,12 @@ csm:
8989
twincache:
9090
host: "localhost"
9191
port: "6379"
92-
tls:
93-
enabled: false
94-
bundle: ""
9592
username: "default"
9693
# Leave it as blank as there's no auth with test container
9794
password:
95+
tls:
96+
enabled: false
97+
bundle: ""
9898
solution:
9999
default-page-size: 20
100100
rbac:

0 commit comments

Comments
 (0)