qontract-development-cli 0.17.0__tar.gz → 0.17.2__tar.gz

{qontract_development_cli-0.17.0 → qontract_development_cli-0.17.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-development-cli
-Version: 0.17.0
+Version: 0.17.2
 Summary: Helper tool for qontract-reconcile development
 Project-URL: homepage, http://github.com/chassing/qontract-development-cli
 Project-URL: repository, http://github.com/chassing/qontract-development-cli
@@ -14,8 +14,8 @@ Requires-Dist: jinja2~=3.1
 Requires-Dist: pydantic-settings~=2.6
 Requires-Dist: pydantic~=2.9
 Requires-Dist: pyyaml~=6.0.2
-Requires-Dist: rich~=14.0
-Requires-Dist: typer~=0.24.1
+Requires-Dist: rich~=15.0
+Requires-Dist: typer~=0.25.1
 Requires-Dist: watchfiles~=1.1.0
 Description-Content-Type: text/markdown
 
@@ -153,6 +153,7 @@ An environment specifies app-interface instance settings, e.g., **dev** vs. **pr
 | container_platform                 | Default Docker container platform for all images | linux/amd64                                    |
 | gitlab_pr_submitter_queue_url      | Gitlab pr submitter queue url                    |                                                |
 | run_qontract_api                   | Run qontract-api container                       | false                                          |
+| run_qontract_api_subscriber        | Run qontract-api-subscriber container            | false                                          |
 | run_qontract_api_worker            | Run qontract-api-worker container                | false                                          |
 | run_cache                          | Run cache (Redis) container                      | false                                          |
 | run_qontract_reconcile             | Run qontract-reconcile container                 | true                                           |
@@ -216,6 +217,11 @@ The command line flag takes precedence over any configuration you might have in
 | qontract_api_container_platform        | Qontract-api container platform                                                                                                                                              | Default from [environment](#environment-settings)                    |
 | qontract_api_compose_file              | Qontract-api docker-compose file template                                                                                                                                    | `api.yml.j2`                                                         |
 | qontract_api_debugger_port             | Debugger port for qontract-api                                                                                                                                               | `5679`                                                               |
+| qontract_api_subscriber_build_image    | Build qontract-api-subscriber image                                                                                                                                          | `true`                                                               |
+| qontract_api_subscriber_image          | Qontract-api-subscriber image                                                                                                                                                | `quay.io/redhat-services-prod/.../qontract-api-master:latest`        |
+| qontract_api_subscriber_container_platform | Qontract-api-subscriber container platform                                                                                                                               | Default from [environment](#environment-settings)                    |
+| qontract_api_subscriber_compose_file   | Qontract-api-subscriber docker-compose file template                                                                                                                         | `subscriber.yml.j2`                                                  |
+| qontract_api_subscriber_debugger_port  | Debugger port for qontract-api-subscriber                                                                                                                                    | `5681`                                                               |
 | qontract_api_worker_build_image        | Build qontract-api-worker image                                                                                                                                              | `true`                                                               |
 | qontract_api_worker_image              | Qontract-api-worker image                                                                                                                                                    | `quay.io/redhat-services-prod/.../qontract-api-worker-master:latest` |
 | qontract_api_worker_container_platform | Qontract-api-worker container platform                                                                                                                                       | Default from [environment](#environment-settings)                    |
@@ -283,6 +289,19 @@ Note that the Qontract Reconcile container will not start running until it is co
         "enable": true
       }
     },
+    {
+      "name": "Python Debugger: Subscriber",
+      "type": "debugpy",
+      "request": "attach",
+      "connect": { "host": "localhost", "port": 5681 },
+      "pathMappings": [
+        { "localRoot": "${workspaceFolder}", "remoteRoot": "/opt/app-root/src" }
+      ],
+      "justMyCode": true,
+      "autoReload": {
+        "enable": true
+      }
+    },
     {
       "name": "Python Debugger: Worker",
       "type": "debugpy",
@@ -303,6 +322,7 @@ Note that the Qontract Reconcile container will not start running until it is co
       "configurations": [
         "Python Debugger: Reconcile",
         "Python Debugger: Api",
+        "Python Debugger: Subscriber",
         "Python Debugger: Worker"
       ],
       "stopAll": true,

{qontract_development_cli-0.17.0 → qontract_development_cli-0.17.2}/README.md

@@ -132,6 +132,7 @@ An environment specifies app-interface instance settings, e.g., **dev** vs. **pr
 | container_platform                 | Default Docker container platform for all images | linux/amd64                                    |
 | gitlab_pr_submitter_queue_url      | Gitlab pr submitter queue url                    |                                                |
 | run_qontract_api                   | Run qontract-api container                       | false                                          |
+| run_qontract_api_subscriber        | Run qontract-api-subscriber container            | false                                          |
 | run_qontract_api_worker            | Run qontract-api-worker container                | false                                          |
 | run_cache                          | Run cache (Redis) container                      | false                                          |
 | run_qontract_reconcile             | Run qontract-reconcile container                 | true                                           |
@@ -195,6 +196,11 @@ The command line flag takes precedence over any configuration you might have in
 | qontract_api_container_platform        | Qontract-api container platform                                                                                                                                              | Default from [environment](#environment-settings)                    |
 | qontract_api_compose_file              | Qontract-api docker-compose file template                                                                                                                                    | `api.yml.j2`                                                         |
 | qontract_api_debugger_port             | Debugger port for qontract-api                                                                                                                                               | `5679`                                                               |
+| qontract_api_subscriber_build_image    | Build qontract-api-subscriber image                                                                                                                                          | `true`                                                               |
+| qontract_api_subscriber_image          | Qontract-api-subscriber image                                                                                                                                                | `quay.io/redhat-services-prod/.../qontract-api-master:latest`        |
+| qontract_api_subscriber_container_platform | Qontract-api-subscriber container platform                                                                                                                               | Default from [environment](#environment-settings)                    |
+| qontract_api_subscriber_compose_file   | Qontract-api-subscriber docker-compose file template                                                                                                                         | `subscriber.yml.j2`                                                  |
+| qontract_api_subscriber_debugger_port  | Debugger port for qontract-api-subscriber                                                                                                                                    | `5681`                                                               |
 | qontract_api_worker_build_image        | Build qontract-api-worker image                                                                                                                                              | `true`                                                               |
 | qontract_api_worker_image              | Qontract-api-worker image                                                                                                                                                    | `quay.io/redhat-services-prod/.../qontract-api-worker-master:latest` |
 | qontract_api_worker_container_platform | Qontract-api-worker container platform                                                                                                                                       | Default from [environment](#environment-settings)                    |
@@ -262,6 +268,19 @@ Note that the Qontract Reconcile container will not start running until it is co
         "enable": true
       }
     },
+    {
+      "name": "Python Debugger: Subscriber",
+      "type": "debugpy",
+      "request": "attach",
+      "connect": { "host": "localhost", "port": 5681 },
+      "pathMappings": [
+        { "localRoot": "${workspaceFolder}", "remoteRoot": "/opt/app-root/src" }
+      ],
+      "justMyCode": true,
+      "autoReload": {
+        "enable": true
+      }
+    },
     {
       "name": "Python Debugger: Worker",
       "type": "debugpy",
@@ -282,6 +301,7 @@ Note that the Qontract Reconcile container will not start running until it is co
       "configurations": [
         "Python Debugger: Reconcile",
         "Python Debugger: Api",
+        "Python Debugger: Subscriber",
         "Python Debugger: Worker"
       ],
       "stopAll": true,

{qontract_development_cli-0.17.0 → qontract_development_cli-0.17.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "qontract-development-cli"
-version = "0.17.0"
+version = "0.17.2"
 description = "Helper tool for qontract-reconcile development"
 authors = [{ name = "Christian Assing", email = "cassing@redhat.com" }]
 license = { text = "MIT" }
@@ -13,15 +13,15 @@ dependencies = [
     "pydantic ~=2.9",
     "pydantic-settings ~=2.6",
     "pyyaml ~=6.0.2",
-    "rich ~=14.0",
-    "typer ~=0.24.1",
+    "rich ~=15.0",
+    "typer ~=0.25.1",
     "watchfiles ~=1.1.0",
 ]
 
 [dependency-groups]
 dev = [
     # dev dependencies
-    "mypy ~=1.13",
+    "mypy ~=2.0",
     "ruff ~=0.7",
     "types-pyyaml ~=6.0",
 ]

{qontract_development_cli-0.17.0 → qontract_development_cli-0.17.2}/qontract_development_cli/models.py

@@ -51,7 +51,7 @@ class ProfileSettings(BaseModel):
     qontract_api_compose_file: str = "api.yml.j2"
     qontract_api_debugger_port: int = 5679
 
-    # api-worker
+    # api-subscriber
     qontract_api_subscriber_build_image: bool = True
     qontract_api_subscriber_image: str = "quay.io/redhat-services-prod/app-sre-tenant/qontract-reconcile-master/qontract-api-master:latest"
     qontract_api_subscriber_container_platform: str | None = None
@@ -66,7 +66,7 @@ class ProfileSettings(BaseModel):
     qontract_api_worker_debugger_port: int = 5680
 
     # cache
-    cache_image: str = "redis:7-alpine"
+    cache_image: str = "valkey/valkey:8-alpine"
     cache_container_platform: str | None = None
     cache_compose_file: str = "cache.yml.j2"
 

{qontract_development_cli-0.17.0 → qontract_development_cli-0.17.2}/qontract_development_cli/shell.py

@@ -21,6 +21,15 @@ _docker_compose_bin = (
 )
 
 
+def _compose_base_cmd(compose_file: Path) -> list[str]:
+    """Build the base docker compose command with main and override files."""
+    cmd = [*_docker_compose_bin, "-f", str(compose_file)]
+    override = compose_file.parent / "compose.override.yml"
+    if override.exists():
+        cmd.extend(["-f", str(override)])
+    return cmd
+
+
 def compose_up(
     compose_file: Path,
     *,
@@ -29,7 +38,7 @@ def compose_up(
     build: bool = False,
 ) -> None:
     log.info("Starting all containers")
-    compose_cmd = [*_docker_compose_bin, "-f", str(compose_file), "up", "-d"]
+    compose_cmd = [*_compose_base_cmd(compose_file), "up", "-d"]
     if force_recreate:
         compose_cmd.append("--force-recreate")
     if remove_orphan:
@@ -41,7 +50,7 @@ def compose_up(
 
 def compose_restart(compose_file: Path, container: str) -> None:
     log.info(f"Restarting {container} container")
-    compose_cmd = [*_docker_compose_bin, "-f", str(compose_file), "restart", container]
+    compose_cmd = [*_compose_base_cmd(compose_file), "restart", container]
     subprocess.run(compose_cmd, check=True)
 
 
@@ -53,12 +62,12 @@ def container_restart(container: str) -> None:
 
 def compose_down(compose_file: Path) -> None:
     log.info("Stopping all containers")
-    compose_cmd = [*_docker_compose_bin, "-f", str(compose_file), "down"]
+    compose_cmd = [*_compose_base_cmd(compose_file), "down"]
     subprocess.run(compose_cmd, check=True)
 
 
 def compose_log_tail(compose_file: Path) -> Process:
-    compose_cmd = [*_docker_compose_bin, "-f", str(compose_file), "logs", "--follow"]
+    compose_cmd = [*_compose_base_cmd(compose_file), "logs", "--follow"]
     p = EndlessProcess(target=subprocess.run, args=(compose_cmd,))
     p.start()
     return p
@@ -71,7 +80,7 @@ def kill_log_tail(p: Process, compose_file: Path) -> None:
             "pkill",
             "-9",
             "-f",
-            " ".join([*_docker_compose_bin, "-f", str(compose_file), "logs"]),
+            " ".join([*_compose_base_cmd(compose_file), "logs"]),
         ],
         check=False,
     )
@@ -92,7 +101,8 @@ def compose_stop_project(project_name: str) -> None:
     for p in compose_list_projects():
         if p["Name"] == project_name:
             subprocess.run(
-                [*_docker_compose_bin, "-f", p["ConfigFiles"], "down"], check=True
+                [*_docker_compose_bin, "-f", p["ConfigFiles"].split(",")[0], "down"],
+                check=True,
             )
 
 

{qontract_development_cli-0.17.0 → qontract_development_cli-0.17.2}/qontract_development_cli/templates/cache.yml.j2

@@ -2,7 +2,6 @@ services:
   # Cache/Broker (Redis or Valkey compatible)
   cache:
     container_name: cache
-    platform: {{ profile.settings.cache_container_platform or env.settings.container_platform }}
     image: {{ profile.settings.cache_image }}
 
     ports:
@@ -10,12 +9,14 @@ services:
 
     healthcheck:
       test: ["CMD", "redis-cli", "ping"]
+      start_period: 5s
+      start_interval: 0.1s
       interval: 5s
       timeout: 3s
       retries: 5
 
     volumes:
-    - cache_data:/data
+    - cache_data_valkey:/data
 
 volumes:
-  cache_data:
+  cache_data_valkey:

{qontract_development_cli-0.17.0 → qontract_development_cli-0.17.2}/qontract_development_cli/templates/compose.override.yml.j2

@@ -17,12 +17,15 @@ services:
     depends_on:
       cache:
         condition: service_healthy
+
+    links:
+    - cache
     {% endif %}
 {% endif %}
 
 
-{% if env.settings.run_qontract_api_worker %}
-  qontract-api-worker:
+{% if env.settings.run_qontract_api_subscriber %}
+  qontract-api-subscriber:
     networks:
     - qontract-development
 
@@ -30,9 +33,23 @@ services:
     depends_on:
       cache:
         condition: service_healthy
+
+    links:
+    - cache
     {% endif %}
+{% endif %}
+
+
+{% if env.settings.run_qontract_api_worker %}
+  qontract-api-worker:
+    networks:
+    - qontract-development
 
     {% if env.settings.run_cache %}
+    depends_on:
+      cache:
+        condition: service_healthy
+
     links:
     - cache
     {% endif %}
@@ -62,21 +79,11 @@ services:
     - pki-volume:/etc/pki:z
     {% endif %}
 
-    {% if env.settings.run_qontract_api or env.settings.run_qontract_server or profile.settings.internal_redhat_ca %}
-    depends_on:
-    {% if env.settings.run_qontract_api %}
-      qontract-api:
-        condition: service_healthy
-    {% endif %}
-    {% if env.settings.run_qontract_server %}
-      qontract-server:
-        condition: service_healthy
-    {% endif %}
     {% if profile.settings.internal_redhat_ca %}
+    depends_on:
       internal-certificates:
         condition: service_completed_successfully # Let the init container create the pki directory first
     {% endif %}
-    {% endif %}
 
     {% if env.settings.run_qontract_server or env.settings.run_qontract_api or env.settings.run_vault %}
     links:

{qontract_development_cli-0.17.0 → qontract_development_cli-0.17.2}/qontract_development_cli/templates/internal-redhat-ca.yml.j2

@@ -1,6 +1,7 @@
 services:
   internal-certificates:
     image: {{ profile.settings.internal_redhat_ca_image }}
+    pull_policy: daily
     container_name: internal-certificates
     platform: {{ profile.settings.internal_redhat_ca_container_platform or env.settings.container_platform }}
     command: |

{qontract_development_cli-0.17.0 → qontract_development_cli-0.17.2}/qontract_development_cli/templates/vault.yml.j2

@@ -3,6 +3,7 @@ services:
     container_name: vault
     platform: {{ profile.settings.vault_container_platform or env.settings.container_platform }}
     image: {{ profile.settings.vault_image }}
+    pull_policy: daily
     environment:
     - VAULT_ADDR=http://127.0.0.1:8200
     - VAULT_TOKEN=root