Update CADIP helm configuration

RS-PYTHON · Oct 25, 2024 · 38a489c · 38a489c
1 parent f56fd24
commit 38a489c
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 34 deletions.
diff --git a/charts/rs-server-cadip/templates/configmap.yaml b/charts/rs-server-cadip/templates/configmap.yaml
@@ -24,7 +24,7 @@ data:
       {{ $k }}:
         auth:
           type: TokenAuth
-          auth_uri: '{{ $v.endpoint.url.root }}/oauth2/token'
+          auth_uri: '{{ $v.endpoint.url.token }}'
           token_type: json
           token_key: access_token
           request_method: POST          
@@ -35,7 +35,7 @@ data:
 
         search:
           type: ODataV4Search
-          api_endpoint: '{{ $v.endpoint.url.file }}'
+          api_endpoint: '{{ $v.endpoint.url.odata }}/Files'
           need_auth: true
           results_entry: responses | $
           metadata_mapping:
@@ -81,9 +81,9 @@ data:
               - '$.PublicationDate'
             href:
               - null
-              - '{{ $v.endpoint.url.file }}({id})/$value'
+              - '{{ $v.endpoint.url.odata }}/Files({id})/$value'
             geometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))'
-            downloadLink: '{{ $v.endpoint.url.file }}({id})/$value'
+            downloadLink: '{{ $v.endpoint.url.odata }}/Files({id})/$value'
             title: '$.Name'
 
           free_text_search_operations:
@@ -104,15 +104,15 @@ data:
 
         download:
           type: HTTPDownload
-          base_uri: '{{ $v.endpoint.url.file }}'
+          base_uri: '{{ $v.endpoint.url.odata }}/Files'
           metadata_mapping:
             uid: '$.Id'
-            downloadLink: '{{ $v.endpoint.url.file }}({uid})/$value'
+            downloadLink: '{{ $v.endpoint.url.odata }}/Files({uid})/$value'
 
       {{ $k }}_session:
         auth:
           type: TokenAuth
-          auth_uri: '{{ $v.endpoint.url.root }}/oauth2/token'
+          auth_uri: '{{ $v.endpoint.url.token }}'
           token_type: json
           token_key: access_token
           request_method: POST          
@@ -122,7 +122,7 @@ data:
             collection: Sentinel1
         search:
           type: ODataV4Search
-          api_endpoint: '{{ $v.endpoint.url.session }}'
+          api_endpoint: '{{ $v.endpoint.url.odata }}/Sessions'
           need_auth: true
           results_entry: responses | $
           metadata_mapping:
@@ -204,7 +204,7 @@ data:
               - "$.PublicationDate"
             href:
               - null
-              - '{{ $v.endpoint.url.file }}({id})/$value'            
+              - '{{ $v.endpoint.url.odata }}/Sessions({id})/$value'
             geometry: "POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))"
             title: "$.Name"
 
@@ -228,10 +228,10 @@ data:
 
         download:
           type: HTTPDownload
-          base_uri: '{{ $v.endpoint.url.session }}'
+          base_uri: '{{ $v.endpoint.url.odata }}/Sessions'
           metadata_mapping:
             uid: "$.Id"
-            downloadLink: "{{ $v.endpoint.url.session }}({uid})/$value"
+            downloadLink: "{{ $v.endpoint.url.odata }}/Sessions({uid})/$value"
     {{ end }}
 ---
 apiVersion: v1
@@ -257,7 +257,7 @@ data:
 
         search:
           type: ODataV4Search
-          api_endpoint: '{{ $v.endpoint.url.file }}'
+          api_endpoint: '{{ $v.endpoint.url.odata }}/Files'
           need_auth: true
           results_entry: responses | $
           metadata_mapping:
@@ -303,9 +303,9 @@ data:
               - '$.PublicationDate'
             href:
               - null
-              - '{{ $v.endpoint.url.file }}({id})/$value'              
+              - '{{ $v.endpoint.url.odata }}/Files({id})/$value'
             geometry: 'POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))'
-            downloadLink: '{{ $v.endpoint.url.file }}({id})/$value'
+            downloadLink: '{{ $v.endpoint.url.odata }}/Files({id})/$value'
             title: '$.Name'
 
           free_text_search_operations:
@@ -326,10 +326,10 @@ data:
 
         download:
           type: HTTPDownload
-          base_uri: '{{ $v.endpoint.url.file }}'
+          base_uri: '{{ $v.endpoint.url.odata }}/Files'
           metadata_mapping:
             uid: '$.Id'
-            downloadLink: '{{ $v.endpoint.url.file }}({uid})/$value'
+            downloadLink: '{{ $v.endpoint.url.odata }}/Files({uid})/$value'
 
       {{ $k }}_session:
         auth:
@@ -344,7 +344,7 @@ data:
             collection: Sentinel1
         search:
           type: ODataV4Search
-          api_endpoint: '{{ $v.endpoint.url.session }}'
+          api_endpoint: '{{ $v.endpoint.url.odata }}/Sessions'
           need_auth: true
           results_entry: responses | $
           metadata_mapping:
@@ -426,7 +426,7 @@ data:
               - "$.PublicationDate"
             href:
               - null
-              - '{{ $v.endpoint.url.file }}({id})/$value'              
+              - '{{ $v.endpoint.url.odata }}/Sessions({id})/$value'
             geometry: "POLYGON((180 -90, 180 90, -180 90, -180 -90, 180 -90))"
             title: "$.Name"
 
@@ -450,10 +450,10 @@ data:
 
         download:
           type: HTTPDownload
-          base_uri: '{{ $v.endpoint.url.session }}'
+          base_uri: '{{ $v.endpoint.url.odata }}/Sessions'
           metadata_mapping:
             uid: "$.Id"
-            downloadLink: "{{ $v.endpoint.url.session }}({uid})/$value"
+            downloadLink: "{{ $v.endpoint.url.odata }}/Sessions({uid})/$value"
     {{ end }}
 ---
 apiVersion: v1

diff --git a/charts/rs-server-cadip/values.yaml b/charts/rs-server-cadip/values.yaml
@@ -29,13 +29,11 @@ app:
   workDir: /app
   # -- Config directory for the application
   confDir: /app/conf
-  # -- Station configuration file for the application
-  stationConfigFile: stations_cfg.json    
   # -- Cadip search configuration file for the application
   cadipSearchConfigFile: cadip_search_config.yaml
-  # -- EODAG configuration file for the application. If useTokenModule is true the adgs_ws_config_token_module.yaml
-  # -- shall be used. When useTokenModule is false, the adgs_ws_config.yaml shall be used. 
-  # -- Set properly the EODAG_ADGS_CONFIG env var.
+  # -- EODAG configuration file for the application. If useTokenModule is true the cadip_ws_config_token_module.yaml
+  # -- shall be used. When useTokenModule is false, the cadip_ws_config.yaml shall be used.
+  # -- Set properly the EODAG_CADIP_CONFIG env var.
   eodagConfigFile: cadip_ws_config.yaml
   eodagConfigFileTokenModule: cadip_ws_config_token_module.yaml
   # -- The method for loading the token for external stations: use the custom module or 
@@ -47,23 +45,20 @@ app:
       endpoint:
         # -- CADIP station URL
         url:
-          root: http://mockup-station-cadip-cadip-svc.processing.svc.cluster.local:8080
-          file: http://mockup-station-cadip-cadip-svc.processing.svc.cluster.local:8080/Files
-          session: http://mockup-station-cadip-cadip-svc.processing.svc.cluster.local:8080/Sessions
+          token: http://mockup-station-cadip-cadip-svc.processing.svc.cluster.local:8080/oauth2/token
+          odata: http://mockup-station-cadip-cadip-svc.processing.svc.cluster.local:8080
     # @ignored
     sgs:
       endpoint:
         url: 
-          root: http://mockup-station-cadip-sgs-svc.processing.svc.cluster.local:8080
-          file: http://mockup-station-cadip-sgs-svc.processing.svc.cluster.local:8080/Files
-          session: http://mockup-station-cadip-sgs-svc.processing.svc.cluster.local:8080/Sessions
+          token: http://mockup-station-cadip-sgs-svc.processing.svc.cluster.local:8080/oauth2/token
+          odata: http://mockup-station-cadip-sgs-svc.processing.svc.cluster.local:8080
     # @ignored
     mti:
       endpoint:
         url: 
-          root: http://mockup-station-cadip-mti-svc.processing.svc.cluster.local:8080
-          file: http://mockup-station-cadip-mti-svc.processing.svc.cluster.local:8080/Files
-          session: http://mockup-station-cadip-mti-svc.processing.svc.cluster.local:8080/Sessions
+          token: http://mockup-station-cadip-mti-svc.processing.svc.cluster.local:8080/oauth2/token
+          odata: http://mockup-station-cadip-mti-svc.processing.svc.cluster.local:8080
   # -- URL of the API Key Manager service
   uacURL: http://apikeymanager.processing.svc.cluster.local:8000/auth/check_key