Merge pull request #1480 from RS-PYTHON/feat-324/stac-view-of-prip-products

Feat 324/stac view of prip products

Author: Padeanu

.github/dependabot.yml

@@ -27,6 +27,7 @@ updates:
     directories:
       - "/"
       - "/services/adgs"
+      - "/services/prip"
       - "/services/cadip"
       - "/services/catalog"
       - "/services/common"

.github/workflows/dependabot.yml

@@ -32,7 +32,7 @@ jobs:
 
       - name: Regenerate lock files
         run: |
-          for dir in services/adgs services/cadip services/catalog services/frontend services/staging; do
+          for dir in services/adgs services/prip services/cadip services/catalog services/frontend services/staging; do
             cd $dir
             poetry lock
             cd -

.github/workflows/publish-binaries.yml

@@ -145,6 +145,23 @@ jobs:
         with:
           package_directory: services/adgs
 
+  services-prip-whl:
+    if: github.actor != 'dependabot[bot]'
+    runs-on: ubuntu-latest
+    name: "'services/prip' wheel"
+    outputs:
+      version_name: ${{ steps.build-wheel.outputs.version_name }}
+      package_name: ${{ steps.build-wheel.outputs.package_name }}
+    continue-on-error: false
+    steps:
+      - uses: actions/checkout@v5
+        with:
+          fetch-depth: 0 # so that Dunamai produce the correct version
+      - id: build-wheel
+        uses: ./.github/actions/build-wheel
+        with:
+          package_directory: services/prip
+
   services-cadip-whl:
     if: github.actor != 'dependabot[bot]'
     runs-on: ubuntu-latest
@@ -230,7 +247,7 @@ jobs:
     if: github.actor != 'dependabot[bot]'
     runs-on: ubuntu-latest
     name: "Publish wheels and sdists"
-    needs: [services-common-whl, services-adgs-whl, services-cadip-whl, services-staging-whl, services-catalog-whl, services-frontend-whl]
+    needs: [services-common-whl, services-adgs-whl, services-prip-whl, services-cadip-whl, services-staging-whl, services-catalog-whl, services-frontend-whl]
     permissions:
       id-token: write  # IMPORTANT: this permission is mandatory for trusted publishing
     steps:
@@ -298,6 +315,53 @@ jobs:
           branch_name: ${{ needs.set-env.outputs.branch_name }}
           debug_mode: ${{ needs.set-env.outputs.debug_mode }}
 
+  services-prip-img:
+    if: github.actor != 'dependabot[bot]'
+    runs-on: ubuntu-latest
+    name: "'services/prip' Docker image"
+    needs: [set-env, services-common-whl, services-prip-whl]
+    permissions: write-all
+    outputs:
+      docker_image: ${{ steps.publish-docker.outputs.docker_image}}
+    steps:
+      - uses: actions/checkout@v5
+
+      # Download .whl files into a local dir
+      - name: Download .whl dependencies
+        uses: actions/download-artifact@v5
+        with:
+          name: ${{ needs.services-common-whl.outputs.package_name }}
+          path: ./build_context_path
+
+      - name: Download .whl dependencies
+        uses: actions/download-artifact@v5
+        with:
+          name: ${{ needs.services-prip-whl.outputs.package_name }}
+          path: ./build_context_path
+
+      - name: Copy layer-cleanup.sh script
+        run: cp -t ./build_context_path ./.github/scripts/layer-cleanup.sh
+        shell: bash
+
+      - name: Copy debug mode dependencies
+        if: ${{ needs.set-env.outputs.debug_mode }} == true
+        run: cp -t ./build_context_path ./.github/scripts/git_debug_image.sh
+        shell: bash
+
+      - id: publish-docker
+        uses: ./.github/actions/publish-docker
+        with:
+          dockerfile: ./services/prip/.github/Dockerfile
+          build_context_path: ./build_context_path
+          image_suffix: -prip
+          version_name: ${{ needs.services-prip-whl.outputs.version_name }}
+          dockerhub_username: ${{ vars.DOCKERHUB_USERNAME }}
+          dockerhub_token: ${{ secrets.DOCKERHUB_TOKEN }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          docker_tag: ${{ needs.set-env.outputs.docker_tag }}
+          branch_name: ${{ needs.set-env.outputs.branch_name }}
+          debug_mode: ${{ needs.set-env.outputs.debug_mode }}
+
   services-cadip-img:
     if: github.actor != 'dependabot[bot]'
     runs-on: ubuntu-latest
@@ -536,7 +600,7 @@ jobs:
     if: github.actor != 'dependabot[bot]'
     runs-on: ubuntu-latest
     name: "Test rs-demo"
-    needs: [set-env, services-adgs-img, services-cadip-img, services-catalog-img, services-frontend-img]
+    needs: [set-env, services-adgs-img, services-prip-img, services-cadip-img, services-catalog-img, services-frontend-img]
     steps:
       - name: Log into Docker registry
         uses: docker/login-action@v3

poetry.lock

@@ -64,6 +64,7 @@ packages = [
 [tool.poetry.dependencies]
 python = "^3.11"
 rs-server-adgs = {path = "services/adgs", develop = true}
+rs-server-prip = {path = "services/prip", develop = true}
 rs-server-cadip = {path = "services/cadip", develop = true}
 rs-server-catalog = {path = "services/catalog", develop = true}
 rs-server-common = {path = "services/common", develop = true}

pyproject.toml

@@ -63,7 +63,7 @@ def update(self, station: str):
         elif any(station == s for s in ("lta",)):
             self.lta = True
             self.value = station
-        elif any(station == s for s in ("s1a", "s2a")):
+        elif any(station == s for s in ("s1a", "s2b")):
             self.prip = True
             self.value = station
 
@@ -669,6 +669,9 @@ def update_single_value(input_value: Any, output_value: str) -> str:
             "services/cadip/config/cadip_ws_config.template.yaml",
             "services/cadip/config/cadip_ws_config.template_session.yaml",
         ],
+        ["services/prip/config/prip_search_config.template.yaml"],
+        ["services/prip/config/prip_ws_config_token_module.template.yaml"],
+        ["services/prip/config/prip_ws_config.template.yaml"],
     ):
         create_from_template(templates)
 
@@ -677,8 +680,10 @@ def update_single_value(input_value: Any, output_value: str) -> str:
         "services/common/config/rs-server.yaml",
         "services/adgs/config/adgs_ws_config.yaml",
         "services/cadip/config/cadip_ws_config.yaml",
+        "services/prip/config/prip_ws_config.yaml",
         "services/adgs/config/adgs_ws_config_token_module.yaml",
         "services/cadip/config/cadip_ws_config_token_module.yaml",
+        "services/prip/config/prip_ws_config_token_module.yaml",
     ):
         copy_to_demo(config_path_relative)
 
@@ -701,7 +706,6 @@ def remove_session_stations(output_config: dict):
         remove_session_stations,
     )
     copy_to_helm_or_infra([station_params], rs_helm_dir / "charts/rs-server-station-secrets/values.yaml")
-    copy_to_helm_or_infra([station_params], rs_deploy_dir / "apps/01-rs-server-station-secrets/values.yaml")
 
     copy_to_helm_or_infra(
         [
@@ -792,3 +796,37 @@ def remove_session_stations(output_config: dict):
         ],
         rs_helm_dir / "charts/rs-server-cadip/templates/configmap.yaml",
     )
+
+    copy_to_helm_or_infra(
+        [
+            HelmOrInfraParams(
+                "services/prip/config/prip_ws_config.yaml",
+                ["s1a"],  # use the first input station values for all other stations
+                [  # where to write in the output file
+                    "data",
+                    f"{DCB_OPEN} .Values.app.eodagConfigFile {DCB_CLOSE}",
+                    f"{DCB_OPEN}- range $k, $v := .Values.app.station {DCB_CLOSE}",
+                    f"{DCB_OPEN} $k {DCB_CLOSE}",
+                ],
+                0,  # output doc index
+            ),
+            HelmOrInfraParams(
+                "services/prip/config/prip_ws_config_token_module.yaml",
+                ["s1a"],  # use the first input station values for all other stations
+                [  # where to write in the output file
+                    "data",
+                    f"{DCB_OPEN} .Values.app.eodagConfigFileTokenModule {DCB_CLOSE}",
+                    f"{DCB_OPEN}- range $k, $v := .Values.app.station {DCB_CLOSE}",
+                    f"{DCB_OPEN} $k {DCB_CLOSE}",
+                ],
+                1,
+            ),
+            HelmOrInfraParams(
+                "services/prip/config/prip_search_config.yaml",
+                [],
+                ["data", f"{DCB_OPEN} .Values.app.pripSearchConfigFile {DCB_CLOSE}"],
+                2,
+            ),
+        ],
+        rs_helm_dir / "charts/rs-server-prip/templates/configmap.yaml",
+    )