Merge branch 'master' into fix-e2e-test-tip-2

odeimaiz · web-flow · commit c1d534037110 · 2025-01-21T09:34:24.000+01:00
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -11,6 +11,9 @@ updates:
       - sanderegg
     assignees:
       - pcrespov
+      - sanderegg
+    labels:
+      - t:maintenance
     ignore:
       - dependency-name: docker-compose
         versions:
@@ -26,32 +29,10 @@ updates:
       - dependency-name: httpx
         versions:
           - 0.17.0
-  - package-ecosystem: pip
-    directory: "/packages/service-library"
-    schedule:
-      interval: weekly
-      time: "04:00"
-    open-pull-requests-limit: 10
-    reviewers:
-      - pcrespov
-      - sanderegg
-    assignees:
-      - pcrespov
-    ignore:
       - dependency-name: openapi-core
         versions:
           - "> 0.12.0, < 1"
-  - package-ecosystem: pip
-    directory: "/packages/postgres-database"
-    schedule:
-      interval: weekly
-      time: "04:00"
-    open-pull-requests-limit: 10
-    reviewers:
-      - pcrespov
-      - sanderegg
-    assignees:
-      - pcrespov
+
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
@@ -62,3 +43,5 @@ updates:
       - pcrespov
     assignees:
       - sanderegg
+    labels:
+      - t:maintenance
diff --git a/.github/workflows/ci-testing-deploy.yml b/.github/workflows/ci-testing-deploy.yml
@@ -1730,15 +1730,13 @@ jobs:
       matrix:
         python: ["3.11"]
         os: [ubuntu-22.04]
-        docker_buildx: [v0.10.4]
       fail-fast: false
     steps:
       - uses: actions/checkout@v4
       - name: setup docker buildx
         id: buildx
         uses: docker/setup-buildx-action@v3
         with:
-          version: ${{ matrix.docker_buildx }}
           driver: docker-container
       - name: setup python environment
         uses: actions/setup-python@v5
diff --git a/packages/postgres-database/docker/Dockerfile b/packages/postgres-database/docker/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG PYTHON_VERSION="3.11.9"
-ARG UV_VERSION="0.4"
+ARG UV_VERSION="0.5"
 FROM ghcr.io/astral-sh/uv:${UV_VERSION} AS uv_build
 # we docker image is built based on debian
 FROM python:${PYTHON_VERSION}-slim-bookworm AS base
diff --git a/packages/postgres-database/scripts/erd/Dockerfile b/packages/postgres-database/scripts/erd/Dockerfile
@@ -2,7 +2,7 @@
 
 # Define arguments in the global scope
 ARG PYTHON_VERSION="3.11.9"
-ARG UV_VERSION="0.4"
+ARG UV_VERSION="0.5"
 FROM ghcr.io/astral-sh/uv:${UV_VERSION} AS uv_build
 # we docker image is built based on debian
 FROM python:${PYTHON_VERSION}-slim-bookworm AS base
diff --git a/packages/service-integration/Dockerfile b/packages/service-integration/Dockerfile
@@ -2,7 +2,7 @@
 
 # Define arguments in the global scope
 ARG PYTHON_VERSION="3.11.9"
-ARG UV_VERSION="0.4"
+ARG UV_VERSION="0.5"
 FROM ghcr.io/astral-sh/uv:${UV_VERSION} AS uv_build
 # we docker image is built based on debian
 FROM python:${PYTHON_VERSION}-slim-bookworm AS base
diff --git a/requirements/tools/Dockerfile b/requirements/tools/Dockerfile
@@ -9,7 +9,7 @@
 #
 #
 ARG PYTHON_VERSION="3.11.9"
-ARG UV_VERSION="0.4"
+ARG UV_VERSION="0.5"
 FROM ghcr.io/astral-sh/uv:${UV_VERSION} AS uv_build
 # we docker image is built based on debian
 FROM python:${PYTHON_VERSION}-slim-bookworm AS base
diff --git a/scripts/erd/Dockerfile b/scripts/erd/Dockerfile
@@ -8,7 +8,7 @@
 #
 
 ARG PYTHON_VERSION="3.11.9"
-ARG UV_VERSION="0.4"
+ARG UV_VERSION="0.5"
 FROM ghcr.io/astral-sh/uv:${UV_VERSION} AS uv_build
 # we docker image is built based on debian
 FROM python:${PYTHON_VERSION}-slim-bookworm AS base
diff --git a/scripts/maintenance/migrate_project/Dockerfile b/scripts/maintenance/migrate_project/Dockerfile
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-ARG UV_VERSION="0.4"
+ARG UV_VERSION="0.5"
 FROM ghcr.io/astral-sh/uv:${UV_VERSION} AS uv_build
 # we docker image is built based on debian
 FROM python:3.11.9-buster
diff --git a/scripts/openapi/oas_resolver/Dockerfile b/scripts/openapi/oas_resolver/Dockerfile
@@ -2,7 +2,7 @@
 # Usage:
 # docker build . -t oas_resolver
 # docker run -v /path/to/api:/input -v /path/to/compiled/file:/output oas_resolver /input/path/to/openapi.yaml /output/output_file.yaml
-ARG UV_VERSION="0.4"
+ARG UV_VERSION="0.5"
 FROM ghcr.io/astral-sh/uv:${UV_VERSION} AS uv_build
 # we docker image is built based on debian
 FROM python:3.6-alpine
diff --git a/scripts/pydeps-docker/Dockerfile b/scripts/pydeps-docker/Dockerfile
@@ -9,7 +9,7 @@
 #
 #
 ARG PYTHON_VERSION="3.11.9"
-ARG UV_VERSION="0.4"
+ARG UV_VERSION="0.5"
 FROM ghcr.io/astral-sh/uv:${UV_VERSION} AS uv_build
 # we docker image is built based on debian
 FROM python:${PYTHON_VERSION}-slim-bookworm AS base
diff --git a/services/agent/Dockerfile b/services/agent/Dockerfile
@@ -2,7 +2,7 @@
 
 # Define arguments in the global scope
 ARG PYTHON_VERSION="3.11.9"
-ARG UV_VERSION="0.4"
+ARG UV_VERSION="0.5"
 
 FROM ghcr.io/astral-sh/uv:${UV_VERSION} AS uv_build
 # we docker image is built based on debian
diff --git a/services/api-server/Dockerfile b/services/api-server/Dockerfile
@@ -2,7 +2,7 @@
 
 # Define arguments in the global scope
 ARG PYTHON_VERSION="3.11.9"
-ARG UV_VERSION="0.4"
+ARG UV_VERSION="0.5"
 FROM ghcr.io/astral-sh/uv:${UV_VERSION} AS uv_build
 # we docker image is built based on debian
 FROM python:${PYTHON_VERSION}-slim-bookworm AS base
diff --git a/services/autoscaling/Dockerfile b/services/autoscaling/Dockerfile
@@ -2,7 +2,7 @@
 
 # Define arguments in the global scope
 ARG PYTHON_VERSION="3.11.9"
-ARG UV_VERSION="0.4"
+ARG UV_VERSION="0.5"
 FROM ghcr.io/astral-sh/uv:${UV_VERSION} AS uv_build
 # we docker image is built based on debian
 FROM python:${PYTHON_VERSION}-slim-bookworm AS base
diff --git a/services/catalog/Dockerfile b/services/catalog/Dockerfile
@@ -2,7 +2,7 @@
 
 # Define arguments in the global scope
 ARG PYTHON_VERSION="3.11.9"
-ARG UV_VERSION="0.4"
+ARG UV_VERSION="0.5"
 FROM ghcr.io/astral-sh/uv:${UV_VERSION} AS uv_build
 # we docker image is built based on debian
 FROM python:${PYTHON_VERSION}-slim-bookworm AS base
diff --git a/services/clusters-keeper/Dockerfile b/services/clusters-keeper/Dockerfile
@@ -2,7 +2,7 @@
 
 # Define arguments in the global scope
 ARG PYTHON_VERSION="3.11.9"
-ARG UV_VERSION="0.4"
+ARG UV_VERSION="0.5"
 FROM ghcr.io/astral-sh/uv:${UV_VERSION} AS uv_build
 # we docker image is built based on debian
 FROM python:${PYTHON_VERSION}-slim-bookworm AS base
diff --git a/services/dask-sidecar/Dockerfile b/services/dask-sidecar/Dockerfile
@@ -2,7 +2,7 @@
 
 # Define arguments in the global scope
 ARG PYTHON_VERSION="3.11.9"
-ARG UV_VERSION="0.4"
+ARG UV_VERSION="0.5"
 FROM ghcr.io/astral-sh/uv:${UV_VERSION} AS uv_build
 # we docker image is built based on debian
 FROM --platform=${TARGETPLATFORM} python:${PYTHON_VERSION}-slim-bookworm AS base
diff --git a/services/datcore-adapter/Dockerfile b/services/datcore-adapter/Dockerfile
@@ -2,7 +2,7 @@
 
 # Define arguments in the global scope
 ARG PYTHON_VERSION="3.11.9"
-ARG UV_VERSION="0.4"
+ARG UV_VERSION="0.5"
 FROM ghcr.io/astral-sh/uv:${UV_VERSION} AS uv_build
 # we docker image is built based on debian
 FROM python:${PYTHON_VERSION}-slim-bookworm AS base
diff --git a/services/director-v2/Dockerfile b/services/director-v2/Dockerfile
@@ -2,7 +2,7 @@
 
 # Define arguments in the global scope
 ARG PYTHON_VERSION="3.11.9"
-ARG UV_VERSION="0.4"
+ARG UV_VERSION="0.5"
 FROM ghcr.io/astral-sh/uv:${UV_VERSION} AS uv_build
 # we docker image is built based on debian
 FROM python:${PYTHON_VERSION}-slim-bookworm AS base
diff --git a/services/director/Dockerfile b/services/director/Dockerfile
@@ -2,7 +2,7 @@
 
 # Define arguments in the global scope
 ARG PYTHON_VERSION="3.11.9"
-ARG UV_VERSION="0.4"
+ARG UV_VERSION="0.5"
 FROM ghcr.io/astral-sh/uv:${UV_VERSION} AS uv_build
 # we docker image is built based on debian
 FROM python:${PYTHON_VERSION}-slim-bookworm AS base
diff --git a/services/dynamic-scheduler/Dockerfile b/services/dynamic-scheduler/Dockerfile
@@ -2,7 +2,7 @@
 
 # Define arguments in the global scope
 ARG PYTHON_VERSION="3.11.9"
-ARG UV_VERSION="0.4"
+ARG UV_VERSION="0.5"
 FROM ghcr.io/astral-sh/uv:${UV_VERSION} AS uv_build
 # we docker image is built based on debian
 FROM python:${PYTHON_VERSION}-slim-bookworm AS base
diff --git a/services/dynamic-sidecar/Dockerfile b/services/dynamic-sidecar/Dockerfile
@@ -2,7 +2,7 @@
 
 # Define arguments in the global scope
 ARG PYTHON_VERSION="3.11.9"
-ARG UV_VERSION="0.4"
+ARG UV_VERSION="0.5"
 FROM ghcr.io/astral-sh/uv:${UV_VERSION} AS uv_build
 # we docker image is built based on debian
 FROM python:${PYTHON_VERSION}-slim-bookworm AS base
diff --git a/services/efs-guardian/Dockerfile b/services/efs-guardian/Dockerfile
@@ -2,7 +2,7 @@
 
 # Define arguments in the global scope
 ARG PYTHON_VERSION="3.11.9"
-ARG UV_VERSION="0.4"
+ARG UV_VERSION="0.5"
 FROM ghcr.io/astral-sh/uv:${UV_VERSION} AS uv_build
 # we docker image is built based on debian
 FROM python:${PYTHON_VERSION}-slim-bookworm AS base
diff --git a/services/invitations/Dockerfile b/services/invitations/Dockerfile
@@ -2,7 +2,7 @@
 
 # Define arguments in the global scope
 ARG PYTHON_VERSION="3.11.9"
-ARG UV_VERSION="0.4"
+ARG UV_VERSION="0.5"
 FROM ghcr.io/astral-sh/uv:${UV_VERSION} AS uv_build
 # we docker image is built based on debian
 FROM python:${PYTHON_VERSION}-slim-bookworm AS base
diff --git a/services/migration/Dockerfile b/services/migration/Dockerfile
@@ -2,7 +2,7 @@
 
 # Define arguments in the global scope
 ARG PYTHON_VERSION="3.11.9"
-ARG UV_VERSION="0.4"
+ARG UV_VERSION="0.5"
 FROM ghcr.io/astral-sh/uv:${UV_VERSION} AS uv_build
 # we docker image is built based on debian
 FROM python:${PYTHON_VERSION}-slim-bookworm AS base
diff --git a/services/payments/Dockerfile b/services/payments/Dockerfile
@@ -2,7 +2,7 @@
 
 # Define arguments in the global scope
 ARG PYTHON_VERSION="3.11.9"
-ARG UV_VERSION="0.4"
+ARG UV_VERSION="0.5"
 FROM ghcr.io/astral-sh/uv:${UV_VERSION} AS uv_build
 # we docker image is built based on debian
 FROM python:${PYTHON_VERSION}-slim-bookworm AS base
diff --git a/services/resource-usage-tracker/Dockerfile b/services/resource-usage-tracker/Dockerfile
@@ -2,7 +2,7 @@
 
 # Define arguments in the global scope
 ARG PYTHON_VERSION="3.11.9"
-ARG UV_VERSION="0.4"
+ARG UV_VERSION="0.5"
 FROM ghcr.io/astral-sh/uv:${UV_VERSION} AS uv_build
 # we docker image is built based on debian
 FROM python:${PYTHON_VERSION}-slim-bookworm AS base
diff --git a/services/static-webserver/client/scripts/post-compile.py b/services/static-webserver/client/scripts/post-compile.py
@@ -1,41 +1,83 @@
-import os
 import json
-
+import os
+import random
+from pathlib import Path
 
 output_folders = [
-    "source-output", # dev output
+    "source-output",  # dev output
     "build-output",  # default production output
-    "build-client"   # I believe we create the production outputs here
+    "build-client",  # I believe we create the production outputs here
 ]
 
 
-def read_json_file(filename):
+def _get_applications_from_metadata():
     dirname = os.path.dirname(__file__)
-    meta_filename = os.path.join(dirname, filename)
-    with open(meta_filename, "r") as file:
+    meta_filename = os.path.join(dirname, "apps_metadata.json")
+    with open(meta_filename) as file:
         metadata = json.load(file)
         return metadata["applications"]
 
 
 def update_apps_metadata():
     dirname = os.path.dirname(__file__)
-    applications = read_json_file("apps_metadata.json")
+    applications = _get_applications_from_metadata()
     for i in applications:
         application = i.get("application")
         for output_folder in output_folders:
-            filename = os.path.join(dirname, '..', output_folder, application, "index.html")
-            if not os.path.isfile(filename):
-                continue
-            with open(filename, "r") as file:
-                data = file.read()
+            index_file_path = Path(dirname).joinpath(
+                "..", output_folder, application, "index.html"
+            )
+            if os.path.isfile(index_file_path):
+                print(f"Updating app metadata: {index_file_path.resolve()}")
                 replacements = i.get("replacements")
                 for key in replacements:
                     replace_text = replacements[key]
-                    data = data.replace("${"+key+"}", replace_text)
-            with open(filename, "w") as file: 
-                print(f"Updating app metadata: {filename}")
-                file.write(data)
+                    index_file_path.write_text(
+                        index_file_path.read_text().replace(
+                            "${" + key + "}",
+                            replace_text,
+                        )
+                    )
+
+
+def _get_output_file_paths(filename):
+    output_file_paths: list[Path] = []
+    dirname = os.path.dirname(__file__)
+    applications = _get_applications_from_metadata()
+    for i in applications:
+        application = i.get("application")
+        for output_folder in output_folders:
+            output_file_path = Path(dirname).joinpath(
+                "..", output_folder, application, filename
+            )
+            if output_file_path.is_file():
+                output_file_paths.append(output_file_path)
+    return output_file_paths
+
+
+def add_no_cache_param(vcs_ref_client):
+    index_file_paths = _get_output_file_paths("index.html")
+    for index_file_path in index_file_paths:
+        print(f"Updating vcs_ref_client: {index_file_path.resolve()}")
+        index_file_path.write_text(
+            index_file_path.read_text().replace(
+                "${boot_params}",
+                "nocache=" + vcs_ref_client,
+            )
+        )
+
+    boot_file_paths = _get_output_file_paths("boot.js")
+    for boot_file_path in boot_file_paths:
+        print(f"Updating addNoCacheParam URL_PARAMETERS: {boot_file_path.resolve()}")
+        boot_file_path.write_text(
+            boot_file_path.read_text().replace(
+                "addNoCacheParam : false",
+                "addNoCacheParam : true",
+            )
+        )
 
 
 if __name__ == "__main__":
     update_apps_metadata()
+    vcs_ref_client = os.getenv("VCS_REF_CLIENT", str(random.random()))
+    add_no_cache_param(vcs_ref_client)
diff --git a/services/static-webserver/client/source/boot/index.html b/services/static-webserver/client/source/boot/index.html
@@ -67,7 +67,7 @@
 </head>
 <body>
   ${preBootJs}
-  <script type="text/javascript" src="${appPath}boot.js"></script>
+  <script type="text/javascript" src="${appPath}boot.js?${boot_params}"></script>
 </body>
 <script>
   window.markerConfig = {
diff --git a/services/storage/Dockerfile b/services/storage/Dockerfile
@@ -2,7 +2,7 @@
 
 # Define arguments in the global scope
 ARG PYTHON_VERSION="3.11.9"
-ARG UV_VERSION="0.4"
+ARG UV_VERSION="0.5"
 FROM ghcr.io/astral-sh/uv:${UV_VERSION} AS uv_build
 # we docker image is built based on debian
 FROM python:${PYTHON_VERSION}-slim-bookworm AS base
diff --git a/services/web/Dockerfile b/services/web/Dockerfile
diff --git a/tests/performance/docker/Dockerfile b/tests/performance/docker/Dockerfile

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`#`
`10`	`10`	`#`
`11`	`11`	`ARG PYTHON_VERSION="3.11.9"`
`12`		`-ARG UV_VERSION="0.4"`
	`12`	`+ARG UV_VERSION="0.5"`
`13`	`13`	`FROM ghcr.io/astral-sh/uv:${UV_VERSION} AS uv_build`
`14`	`14`	`# we docker image is built based on debian`
`15`	`15`	`FROM python:${PYTHON_VERSION}-slim-bookworm AS base`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`#`
`9`	`9`
`10`	`10`	`ARG PYTHON_VERSION="3.11.9"`
`11`		`-ARG UV_VERSION="0.4"`
	`11`	`+ARG UV_VERSION="0.5"`
`12`	`12`	`FROM ghcr.io/astral-sh/uv:${UV_VERSION} AS uv_build`
`13`	`13`	`# we docker image is built based on debian`
`14`	`14`	`FROM python:${PYTHON_VERSION}-slim-bookworm AS base`