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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-development-cli
-Version: 0.16.0
+Version: 0.17.0
 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
@@ -15,7 +15,7 @@ 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.21.0
+Requires-Dist: typer~=0.24.1
 Requires-Dist: watchfiles~=1.1.0
 Description-Content-Type: text/markdown
 

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

@@ -1,6 +1,6 @@
 [project]
 name = "qontract-development-cli"
-version = "0.16.0"
+version = "0.17.0"
 description = "Helper tool for qontract-reconcile development"
 authors = [{ name = "Christian Assing", email = "cassing@redhat.com" }]
 license = { text = "MIT" }
@@ -14,7 +14,7 @@ dependencies = [
     "pydantic-settings ~=2.6",
     "pyyaml ~=6.0.2",
     "rich ~=14.0",
-    "typer ~=0.21.0",
+    "typer ~=0.24.1",
     "watchfiles ~=1.1.0",
 ]
 

{qontract_development_cli-0.16.0 → qontract_development_cli-0.17.0}/qontract_development_cli/commands/profile.py

@@ -269,6 +269,7 @@ def run(  # noqa: C901, PLR0912, PLR0913, PLR0915
         cache=env.settings.run_cache,
         reconcile=env.settings.run_qontract_reconcile,
         server=env.settings.run_qontract_server,
+        subscriber=env.settings.run_qontract_api_subscriber,
         vault=env.settings.run_vault,
         worker=env.settings.run_qontract_api_worker,
     )

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

@@ -18,6 +18,7 @@ class EnvSettings(BaseModel):
     container_platform: str = "linux/amd64"
     gitlab_pr_submitter_queue_url: str = ""
     run_qontract_api: bool = False
+    run_qontract_api_subscriber: bool = False
     run_qontract_api_worker: bool = False
     run_cache: bool = False
     run_qontract_reconcile: bool = True
@@ -50,9 +51,16 @@ class ProfileSettings(BaseModel):
     qontract_api_compose_file: str = "api.yml.j2"
     qontract_api_debugger_port: int = 5679
 
+    # api-worker
+    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
+    qontract_api_subscriber_compose_file: str = "subscriber.yml.j2"
+    qontract_api_subscriber_debugger_port: int = 5681
+
     # api-worker
     qontract_api_worker_build_image: bool = True
-    qontract_api_worker_image: str = "quay.io/redhat-services-prod/app-sre-tenant/qontract-reconcile-master/qontract-api-worker-master:latest"
+    qontract_api_worker_image: str = "quay.io/redhat-services-prod/app-sre-tenant/qontract-reconcile-master/qontract-api-master:latest"
     qontract_api_worker_container_platform: str | None = None
     qontract_api_worker_compose_file: str = "worker.yml.j2"
     qontract_api_worker_debugger_port: int = 5680
@@ -119,10 +127,12 @@ class ProfileSettings(BaseModel):
         cache: bool,
         reconcile: bool,
         server: bool,
+        subscriber: bool,
         vault: bool,
         worker: bool,
     ) -> list[str]:
         files = [self.qontract_api_compose_file] if api else []
+        files += [self.qontract_api_subscriber_compose_file] if subscriber else []
         files += [self.qontract_api_worker_compose_file] if worker else []
         files += [self.cache_compose_file] if cache else []
         files += [self.qontract_reconcile_compose_file] if reconcile else []

{qontract_development_cli-0.16.0 → qontract_development_cli-0.17.0}/qontract_development_cli/templates/api.yml.j2

@@ -26,7 +26,6 @@ services:
 
     volumes:
     - {{ profile.settings.qontract_api_path.expanduser().absolute() }}/app.sh:/opt/app-root/src/app.sh:z
-    - {{ profile.settings.qontract_api_path.expanduser().absolute() }}/.env.yaml:/opt/app-root/src/.env.yaml:z
     - {{ profile.settings.qontract_api_path.expanduser().absolute() }}/.env:/opt/app-root/src/.env:z
     - {{ profile.settings.qontract_api_path.expanduser().absolute() }}/qontract_api:/opt/app-root/src/qontract_api/qontract_api:z
     - {{ profile.settings.qontract_reconcile_path.expanduser().absolute() }}/qontract_utils/qontract_utils:/opt/app-root/src/qontract_utils/qontract_utils:z

qontract_development_cli-0.17.0/qontract_development_cli/templates/subscriber.yml.j2

@@ -0,0 +1,31 @@
+services:
+  # qontract-api (Event Subscriber)
+  qontract-api-subscriber:
+    container_name: qontract-api-subscriber
+    platform: {{ profile.settings.qontract_api_subscriber_container_platform or env.settings.container_platform }}
+    {% if profile.settings.qontract_api_subscriber_build_image %}
+    build:
+      context: {{ profile.settings.qontract_reconcile_path.expanduser().absolute() }}
+      dockerfile: {{ profile.settings.qontract_api_path.expanduser().absolute() }}/Dockerfile
+      target: debug
+    {% else %}
+    image: {{ profile.settings.qontract_api_subscriber_image }}
+    {% endif %}
+
+    ports:
+    - 8081:8080
+    - {{ profile.settings.qontract_api_subscriber_debugger_port }}:5678  # debugpy port
+
+    environment:
+    - QAPI_START_MODE=subscriber
+    - QAPI_CACHE_BROKER_URL=redis://cache:6379/0
+    # Enable debugpy
+    - DEBUGGER_ENABLED={% if profile.settings.debugger %}true{% else %}false{% endif %}
+    # Hot reload for development
+    - AUTO_RELOAD=1
+
+    volumes:
+    - {{ profile.settings.qontract_api_path.expanduser().absolute() }}/app.sh:/opt/app-root/src/app.sh:z
+    - {{ profile.settings.qontract_api_path.expanduser().absolute() }}/.env:/opt/app-root/src/.env:z
+    - {{ profile.settings.qontract_api_path.expanduser().absolute() }}/qontract_api:/opt/app-root/src/qontract_api/qontract_api:z
+    - {{ profile.settings.qontract_reconcile_path.expanduser().absolute() }}/qontract_utils/qontract_utils:/opt/app-root/src/qontract_utils/qontract_utils:z

{qontract_development_cli-0.16.0 → qontract_development_cli-0.17.0}/qontract_development_cli/templates/worker.yml.j2

@@ -7,13 +7,13 @@ services:
     build:
       context: {{ profile.settings.qontract_reconcile_path.expanduser().absolute() }}
       dockerfile: {{ profile.settings.qontract_api_path.expanduser().absolute() }}/Dockerfile
-
       target: debug
     {% else %}
     image: {{ profile.settings.qontract_api_workerimage }}
     {% endif %}
 
     ports:
+    - 8000:8000
     - {{ profile.settings.qontract_api_worker_debugger_port }}:5678  # debugpy port
 
     environment:
@@ -26,7 +26,6 @@ services:
 
     volumes:
     - {{ profile.settings.qontract_api_path.expanduser().absolute() }}/app.sh:/opt/app-root/src/app.sh
-    - {{ profile.settings.qontract_api_path.expanduser().absolute() }}/.env.yaml:/opt/app-root/src/.env.yaml
     - {{ profile.settings.qontract_api_path.expanduser().absolute() }}/.env:/opt/app-root/src/.env
     - {{ profile.settings.qontract_api_path.expanduser().absolute() }}/qontract_api:/opt/app-root/src/qontract_api/qontract_api
     - {{ profile.settings.qontract_reconcile_path.expanduser().absolute() }}/qontract_utils/qontract_utils:/opt/app-root/src/qontract_utils/qontract_utils