Merge remote-tracking branch 'origin/develop' into feat/rspy511-multi…

…-station-search-aggregation_julien
RS-PYTHON · Dec 10, 2024 · 5ca1124 · 5ca1124
2 parents c2a9123 + c989bd7
commit 5ca1124
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 4 deletions.
diff --git a/charts/rs-server-adgs/README.md b/charts/rs-server-adgs/README.md
@@ -24,7 +24,7 @@ RS SERVER ADGS
 | app.station.adgs2.endpoint.url | string | `"http://mockup-station-adgs2-svc.processing.svc.cluster.local:8080/Products"` | ADGS2 URL |
 | app.stationConfigFile | string | `"stations_cfg.json"` | Station configuration file for the application |
 | app.uacURL | string | `"http://apikeymanager.processing.svc.cluster.local:8000/auth/check_key"` | URL of the API Key Manager service |
-| app.useTokenModule | bool | `true` | The way the token for the external stations is loaded: own module or let eodag to do it (set it to false) |
+| app.useTokenModule | bool | `false` | The way the token for the external stations is loaded: own module or let eodag to do it (set it to false) |
 | app.workDir | string | `"/app"` | Working directory for the application |
 | auth.secret.cookie_secret | string | `""` | Random string used to encode cookie-based HTTP sessions in SessionMiddleware |
 | auth.secret.oidc_client_id | string | `""` | OIDC CLient ID |

diff --git a/charts/rs-server-adgs/values.yaml b/charts/rs-server-adgs/values.yaml
@@ -38,7 +38,7 @@ app:
   eodagConfigFile: adgs_ws_config.yaml
   eodagConfigFileTokenModule: adgs_ws_config_token_module.yaml
   # -- The way the token for the external stations is loaded: own module or let eodag to do it (set it to false)
-  useTokenModule: true
+  useTokenModule: false
   station:
     adgs:
       endpoint:

diff --git a/charts/rs-server-cadip/README.md b/charts/rs-server-cadip/README.md
@@ -23,7 +23,7 @@ RS SERVER CADIP
 | app.station.cadip | object | `{"endpoint":{"url":{"odata":"http://mockup-station-cadip-cadip-svc.processing.svc.cluster.local:8080","token":"http://mockup-station-cadip-cadip-svc.processing.svc.cluster.local:8080/oauth2/token"}}}` | CADIP station name |
 | app.station.cadip.endpoint.url | object | `{"odata":"http://mockup-station-cadip-cadip-svc.processing.svc.cluster.local:8080","token":"http://mockup-station-cadip-cadip-svc.processing.svc.cluster.local:8080/oauth2/token"}` | CADIP station URL |
 | app.uacURL | string | `"http://apikeymanager.processing.svc.cluster.local:8000/auth/check_key"` | URL of the API Key Manager service |
-| app.useTokenModule | bool | `true` | allow EODAG to handle it (set it to false for EODAG). |
+| app.useTokenModule | bool | `false` | allow EODAG to handle it (set it to false for EODAG). |
 | app.workDir | string | `"/app"` | Working directory for the application |
 | auth.secret.cookie_secret | string | `""` | Random string used to encode cookie-based HTTP sessions in SessionMiddleware |
 | auth.secret.oidc_client_id | string | `""` | OIDC CLient ID |

diff --git a/charts/rs-server-cadip/values.yaml b/charts/rs-server-cadip/values.yaml
@@ -38,7 +38,7 @@ app:
   eodagConfigFileTokenModule: cadip_ws_config_token_module.yaml
   # -- The method for loading the token for external stations: use the custom module or 
   # -- allow EODAG to handle it (set it to false for EODAG).
-  useTokenModule: true
+  useTokenModule: false
   station:
     # -- CADIP station name
     cadip:

diff --git a/charts/rs-server-station-secrets/README.md b/charts/rs-server-station-secrets/README.md
@@ -26,6 +26,8 @@ RS SERVER STATION SECRETS
 | app.stations.adgs.domain | string | `"mockup-station-adgs-svc.processing.svc.cluster.local"` |  |
 | app.stations.adgs.service.name | string | `"auxip"` |  |
 | app.stations.adgs.service.url | string | `"http://mockup-station-adgs-svc.processing.svc.cluster.local:8080"` |  |
+| app.stations.adgs.trusteddomains[0] | string | `"trusted.domain1.eu"` |  |
+| app.stations.adgs.trusteddomains[1] | string | `"trusted.domain2.eu"` |  |
 | app.stations.adgs2.authentication.auth_type | string | `"oauth2"` |  |
 | app.stations.adgs2.authentication.authorization | string | `"Basic test"` |  |
 | app.stations.adgs2.authentication.client_id | string | `"client_id"` |  |

diff --git a/charts/rs-server-station-secrets/templates/secret.yaml b/charts/rs-server-station-secrets/templates/secret.yaml
@@ -33,4 +33,5 @@ data:
   RSPY__TOKEN__{{ $value.service.name | upper }}__{{ $key | upper }}__AUTHENTICATION__CLIENT__ID: {{ $value.authentication.client_id | b64enc | quote }}
   RSPY__TOKEN__{{ $value.service.name | upper }}__{{ $key | upper }}__AUTHENTICATION__CLIENT__SECRET: {{ $value.authentication.client_secret | b64enc | quote }}
   {{ if $value.authentication.authorization }}RSPY__TOKEN__{{ $value.service.name | upper }}__{{ $key | upper }}__AUTHENTICATION__AUTHORIZATION: {{ $value.authentication.authorization | b64enc | quote }}{{ end }}
+  {{ if $value.trusteddomains }}RSPY__TOKEN__{{ $value.service.name | upper }}__{{ $key | upper }}__TRUSTEDDOMAINS: {{ (printf "[%s]" ($value.trusteddomains | join ", ")) | b64enc | quote}} {{ end }}
 {{- end }}
diff --git a/charts/rs-server-station-secrets/values.yaml b/charts/rs-server-station-secrets/values.yaml
@@ -35,6 +35,9 @@ app:
         client_id: client_id
         client_secret: client_secret
         authorization: Basic test
+      trusteddomains:
+        - trusted.domain1.eu
+        - trusted.domain2.eu
     adgs2:
       service:
         name: auxip