Merge remote-tracking branch 'origin/develop' into feat-rspy342/persi…

…st-staging-jobs_julien
RS-PYTHON · Nov 27, 2024 · dcc1ccb · dcc1ccb
2 parents 59cfb31 + 39422cd
commit dcc1ccb
Show file tree

Hide file tree

Showing 23 changed files with 330 additions and 299 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,7 +13,32 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/)
 >- **Fixed** for any bug fixes.
 >- **Security** in case of vulnerabilities.
 
-## [0.2a6] - 2024-07-11
+## [0.2a7] - 2024-11-22
+
+> :warning: **BREAKING** : After [PR RS-PYTHON/rs-server#688](https://github.com/RS-PYTHON/rs-server/pull/688) configuration files should only be edited from the templates rs-server repository ([search link](https://github.com/search?q=repo%3ARS-PYTHON%2Frs-server+path%3Aservices%2F*%2Fconfig%2F*template*.yaml&type=code)).
+
+### Added
+
+- rs-server-adgs
+  - name to the queryable
+  - adgs2 mockup station in the conf
+- RSPY-131 : rs-server-pagination
+
+### Changed
+
+- Set value of `context` to on in pgstac_settings (needed for pagination)
+- rs-server-cadip : Sort is now by `PublicationDate`
+- RSPY-450 : Update pgstac to 0.8.6
+- bump docker image's tag
+
+### Fixed
+
+- Identation and removed useless quotes in multiple config files
+- RSPY-518 : Staging not integrated with Tempo
+- Missing CORS header for stac browser
+- RSPY-531 : Add Catalog obs environment variable to be configurable
+
+## [0.2a6] - 2024-11-07
 
 ### Added
 

diff --git a/charts/mockup-processor-dpr/README.md b/charts/mockup-processor-dpr/README.md
@@ -19,7 +19,7 @@ MOCKUP PROCESSOR DPR
 | image.name | string | `"rs-testmeans_dpr-processor-mock"` | Image name |
 | image.registry | string | `"ghcr.io"` | Image registry |
 | image.repository | string | `"rs-python"` | Image repository |
-| image.version | string | `"sha256:9604012b04cb7f5af403b5a91f0d316f44902f01f3d4fb81857b5d5d5288be30"` | Image version, can be a tag or a digest |
+| image.version | string | `"sha256:23d916e20f53ee7300776c8cb25091b7891a72b6bf80a5a0f324cc241d2a8c56"` | Image version, can be a tag or a digest |
 | namespace | string | `"processing"` | Namespace for the deployment |
 | obs.endpoint | string | `"http://minio.minio.svc.cluster.local:9000"` | URL of the object storage service endpoint |
 | obs.region | string | `"sbg"` | Region of the object storage service |

diff --git a/charts/mockup-processor-dpr/values.yaml b/charts/mockup-processor-dpr/values.yaml
@@ -46,7 +46,7 @@ image:
   # -- Image name
   name: rs-testmeans_dpr-processor-mock
   # -- Image version, can be a tag or a digest
-  version: sha256:9604012b04cb7f5af403b5a91f0d316f44902f01f3d4fb81857b5d5d5288be30
+  version: sha256:23d916e20f53ee7300776c8cb25091b7891a72b6bf80a5a0f324cc241d2a8c56
   # -- Image pull policy
   PullPolicy: IfNotPresent
   #imagePullSecrets: regcred

diff --git a/charts/mockup-station-adgs/README.md b/charts/mockup-station-adgs/README.md
@@ -24,7 +24,7 @@ MOCKUP STATION ADGS
 | image.name | string | `"rs-testmeans_adgs-station-mock"` | Image name |
 | image.registry | string | `"ghcr.io"` | Image registry |
 | image.repository | string | `"rs-python"` | Image repository |
-| image.version | string | `"sha256:25e34afb12145c4748fa315e901359a2a271a4cb54027b1a6e585224612d0106"` | Image version, can be a tag or a digest |
+| image.version | string | `"sha256:2726e4da2a548aefc648235a9a52c0936633098d2fedd689d1ab39658d24cafc"` | Image version, can be a tag or a digest |
 | namespace | string | `"processing"` | Namespace for the deployment |
 | probe.liveness.initialDelaySeconds | int | `30` | InitialDelaySeconds for the liveness probe |
 | probe.liveness.path | string | `"/health"` | Path for the liveness probe |

diff --git a/charts/mockup-station-adgs/values.yaml b/charts/mockup-station-adgs/values.yaml
@@ -66,7 +66,7 @@ image:
   # -- Image name
   name: rs-testmeans_adgs-station-mock
   # -- Image version, can be a tag or a digest
-  version: sha256:25e34afb12145c4748fa315e901359a2a271a4cb54027b1a6e585224612d0106 
+  version: sha256:2726e4da2a548aefc648235a9a52c0936633098d2fedd689d1ab39658d24cafc 
   # -- Image pull policy
   PullPolicy: Always
   #imagePullSecrets: regcred

diff --git a/charts/mockup-station-cadip/README.md b/charts/mockup-station-cadip/README.md
@@ -28,7 +28,7 @@ MOCKUP STATION CADIP
 | image.name | string | `"rs-testmeans_cadip-station-mock"` | Image name |
 | image.registry | string | `"ghcr.io"` | Image registry |
 | image.repository | string | `"rs-python"` | Image repository |
-| image.version | string | `"sha256:c5969ba8420f39c90125a527bd9eb79723b6129fbf7859c54fcfea98271b848e"` | Image version, can be a tag or a digest |
+| image.version | string | `"sha256:4831636c5adfee6cfc809bdeb25e361e084ddeb49e3aaaacca54a1b7be2137a9"` | Image version, can be a tag or a digest |
 | namespace | string | `"processing"` | Namespace for the deployment |
 | probe.liveness.initialDelaySeconds | int | `30` | InitialDelaySeconds for the liveness probe |
 | probe.liveness.path | string | `"/health"` | Path for the liveness probe |

diff --git a/charts/mockup-station-cadip/templates/configmap.yaml b/charts/mockup-station-cadip/templates/configmap.yaml
diff --git a/charts/mockup-station-cadip/values.yaml b/charts/mockup-station-cadip/values.yaml
@@ -74,7 +74,7 @@ image:
   # -- Image name
   name: rs-testmeans_cadip-station-mock
   # -- Image version, can be a tag or a digest
-  version: sha256:c5969ba8420f39c90125a527bd9eb79723b6129fbf7859c54fcfea98271b848e
+  version: sha256:4831636c5adfee6cfc809bdeb25e361e084ddeb49e3aaaacca54a1b7be2137a9
   # -- Image pull policy
   PullPolicy: Always
   #imagePullSecrets: regcred

diff --git a/charts/mockup-station-lta/README.md b/charts/mockup-station-lta/README.md
@@ -24,7 +24,7 @@ MOCKUP STATION LTA
 | image.name | string | `"rs-testmeans_lta-station-mock"` | Image name |
 | image.registry | string | `"ghcr.io"` | Image registry |
 | image.repository | string | `"rs-python"` | Image repository |
-| image.version | string | `"sha256:1a9fbc48f08304b0e403ea733297b647396dd520130567738b8f417cb9492223"` | Image version, can be a tag or a digest |
+| image.version | string | `"sha256:bb525c9ac981358fb483ac0db9543496b8c1add84664faa88885d3d80e97d978"` | Image version, can be a tag or a digest |
 | namespace | string | `"processing"` | Namespace for the deployment |
 | probe.liveness.initialDelaySeconds | int | `30` | InitialDelaySeconds for the liveness probe |
 | probe.liveness.path | string | `"/health"` | Path for the liveness probe |

diff --git a/charts/mockup-station-lta/values.yaml b/charts/mockup-station-lta/values.yaml
@@ -66,7 +66,7 @@ image:
   # -- Image name
   name: rs-testmeans_lta-station-mock
   # -- Image version, can be a tag or a digest
-  version: sha256:1a9fbc48f08304b0e403ea733297b647396dd520130567738b8f417cb9492223
+  version: sha256:bb525c9ac981358fb483ac0db9543496b8c1add84664faa88885d3d80e97d978
   # -- Image pull policy
   PullPolicy: Always
   #imagePullSecrets: regcred

diff --git a/charts/rs-server-adgs/README.md b/charts/rs-server-adgs/README.md
@@ -35,7 +35,7 @@ RS SERVER ADGS
 | image.name | string | `"rs-server-adgs"` | Image name |
 | image.registry | string | `"ghcr.io"` | Image registry |
 | image.repository | string | `"rs-python"` | Image repository |
-| image.version | string | `"0.2a6.post1.dev0"` | Image version, can be a tag or a digest |
+| image.version | string | `"0.2a7"` | Image version, can be a tag or a digest |
 | ingress.enabled | bool | `true` | Enabled/Disable ingress |
 | ingress.host | string | `"subdomain.example.com"` | Ingress host name |
 | ingress.issuer.name | string | `"letsencrypt-prod"` | Ingress Issuer name |

diff --git a/charts/rs-server-adgs/templates/configmap.yaml b/charts/rs-server-adgs/templates/configmap.yaml
@@ -44,15 +44,15 @@ data:
             username: PLACEHOLDER
             password: PLACEHOLDER
           headers:
-            Content-Type: PLACEHOLDER
+            Content-Type: application/x-www-form-urlencoded
         products:
           CAMS_GRF_AUX:
             productType: cams-ads-grf-aux
         search:
           type: ODataV4Search
           api_endpoint: {{ $v.endpoint.url }}
           need_auth: true
-          results_entry: responses | $
+          results_entry: $.value | $
           metadata_mapping:
             id:
             - null
@@ -86,7 +86,7 @@ data:
             - $.PublicationDate
             ChecksumValue:
             - null
-            - $.Checksum[0].Value
+            - '{$.Checksum[0].Value#to_lower}'
             attr_ptype:
             - null
             - $.attr_ptype
@@ -111,7 +111,7 @@ data:
           free_text_search_operations:
             $filter:
               union: ' OR '
-              wrapper: '"{}"'
+              wrapper: '{}'
               operations:
                 and:
                 - contains(Name, '{Name}')
@@ -130,12 +130,12 @@ data:
             sort_param_mapping:
               id: Name
               auxip:id: Id
-              created: PublicationDate
-              end_datetime: End
               file:size: ContentLength
               type: ContentType
               eviction_datetime: EvictionDate
-              published: PublicationDate
+              start_datetime: ContentDate/Start
+              end_datetime: ContentDate/End
+              created: PublicationDate
             sort_order_mapping:
               ascending: asc
               descending: desc
@@ -170,7 +170,7 @@ data:
           type: ODataV4Search
           api_endpoint: {{ $v.endpoint.url }}
           need_auth: true
-          results_entry: responses | $
+          results_entry: $.value | $
           metadata_mapping:
             id:
             - null
@@ -204,7 +204,7 @@ data:
             - $.PublicationDate
             ChecksumValue:
             - null
-            - $.Checksum[0].Value
+            - '{$.Checksum[0].Value#to_lower}'
             attr_ptype:
             - null
             - $.attr_ptype
@@ -229,7 +229,7 @@ data:
           free_text_search_operations:
             $filter:
               union: ' OR '
-              wrapper: '"{}"'
+              wrapper: '{}'
               operations:
                 and:
                 - contains(Name, '{Name}')
@@ -246,14 +246,14 @@ data:
           sort:
             sort_by_tpl: '&$orderby={sort_param} {sort_order}'
             sort_param_mapping:
-              id: Name
-              auxip:id: Id
-              created: PublicationDate
-              end_datetime: End
               file:size: ContentLength
               type: ContentType
               eviction_datetime: EvictionDate
-              published: PublicationDate
+              start_datetime: ContentDate/Start
+              end_datetime: ContentDate/End
+              id: Name
+              auxip:id: Id
+              created: PublicationDate
             sort_order_mapping:
               ascending: asc
               descending: desc

diff --git a/charts/rs-server-adgs/values.yaml b/charts/rs-server-adgs/values.yaml
@@ -167,7 +167,7 @@ image:
   # -- Image name
   name: rs-server-adgs
   # -- Image version, can be a tag or a digest
-  version: 0.2a6.post1.dev0
+  version: 0.2a7
   # -- Image pull policy
   PullPolicy: IfNotPresent
   #imagePullSecrets: regcred

diff --git a/charts/rs-server-cadip/README.md b/charts/rs-server-cadip/README.md
@@ -17,12 +17,11 @@ RS SERVER CADIP
 | affinity | object | `{}` | Pod affinity |
 | app.cadipSearchConfigFile | string | `"cadip_search_config.yaml"` | Cadip search configuration file for the application |
 | app.confDir | string | `"/app/conf"` | Config directory for the application |
-| app.eodagConfigFile | string | `"cadip_ws_config.yaml"` | Set properly the EODAG_ADGS_CONFIG env var. |
+| app.eodagConfigFile | string | `"cadip_ws_config.yaml"` | Set properly the EODAG_CADIP_CONFIG env var. |
 | app.eodagConfigFileTokenModule | string | `"cadip_ws_config_token_module.yaml"` |  |
 | app.port | int | `8000` | Port for the application |
-| app.station.cadip | object | `{"endpoint":{"url":{"file":"http://mockup-station-cadip-cadip-svc.processing.svc.cluster.local:8080/Files","root":"http://mockup-station-cadip-cadip-svc.processing.svc.cluster.local:8080","session":"http://mockup-station-cadip-cadip-svc.processing.svc.cluster.local:8080/Sessions"}}}` | CADIP station name |
-| app.station.cadip.endpoint.url | object | `{"file":"http://mockup-station-cadip-cadip-svc.processing.svc.cluster.local:8080/Files","root":"http://mockup-station-cadip-cadip-svc.processing.svc.cluster.local:8080","session":"http://mockup-station-cadip-cadip-svc.processing.svc.cluster.local:8080/Sessions"}` | CADIP station URL |
-| app.stationConfigFile | string | `"stations_cfg.json"` | Station configuration file for the application |
+| 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.workDir | string | `"/app"` | Working directory for the application |
@@ -35,7 +34,7 @@ RS SERVER CADIP
 | image.name | string | `"rs-server-cadip"` | Image name |
 | image.registry | string | `"ghcr.io"` | Image registry |
 | image.repository | string | `"rs-python"` | Image repository |
-| image.version | string | `"0.2a6.post1.dev0"` | Image version, can be a tag or a digest |
+| image.version | string | `"0.2a7"` | Image version, can be a tag or a digest |
 | ingress.enabled | bool | `true` | Enabled/Disable ingress |
 | ingress.host | string | `"subdomain.example.com"` | Ingress host name |
 | ingress.issuer.name | string | `"letsencrypt-prod"` | Ingress Issuer name |