infrahub-testcontainers 1.3.0b6__tar.gz → 1.4.13__tar.gz

{infrahub_testcontainers-1.3.0b6 → infrahub_testcontainers-1.4.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: infrahub-testcontainers
-Version: 1.3.0b6
+Version: 1.4.13
 Summary: Testcontainers instance for Infrahub to easily build integration tests
 License: Apache-2.0
 Author: OpsMill
@@ -15,7 +15,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: httpx (>=0.28.1,<0.29.0)
-Requires-Dist: prefect (==3.4.1)
+Requires-Dist: prefect-client (==3.4.13)
 Requires-Dist: psutil
 Requires-Dist: pydantic (>=2.10.6,<3.0.0)
 Requires-Dist: pytest

{infrahub_testcontainers-1.3.0b6 → infrahub_testcontainers-1.4.13}/infrahub_testcontainers/container.py

@@ -29,7 +29,7 @@ INFRAHUB_SERVICES: dict[str, ContainerService] = {
 
 PROJECT_ENV_VARIABLES: dict[str, str] = {
     "MESSAGE_QUEUE_DOCKER_IMAGE": "rabbitmq:3.13.7-management",
-    "CACHE_DOCKER_IMAGE": "redis:7.2.4",
+    "CACHE_DOCKER_IMAGE": "redis:7.2.11",
     "INFRAHUB_TESTING_DOCKER_IMAGE": "registry.opsmill.io/opsmill/infrahub",
     "INFRAHUB_TESTING_DOCKER_ENTRYPOINT": f"gunicorn --config backend/infrahub/serve/gunicorn_config.py -w {os.environ.get('INFRAHUB_TESTING_WEB_CONCURRENCY', 4)} --logger-class infrahub.serve.log.GunicornLogger infrahub.server:app",  # noqa: E501
     "INFRAHUB_TESTING_IMAGE_VERSION": infrahub_version,
@@ -59,6 +59,8 @@ PROJECT_ENV_VARIABLES: dict[str, str] = {
     "INFRAHUB_TESTING_PREFECT_UI_ENABLED": "true",
     "INFRAHUB_TESTING_DOCKER_PULL": "true",
     "INFRAHUB_TESTING_SCHEMA_STRICT_MODE": "true",
+    "INFRAHUB_TESTING_TASKMGR_API_WORKERS": "1",
+    "INFRAHUB_TESTING_TASKMGR_BACKGROUND_SVC_REPLICAS": "0",
 }
 
 
@@ -141,7 +143,22 @@ class InfrahubDockerCompose(DockerCompose):
                     "INFRAHUB_TESTING_DOCKER_ENTRYPOINT": f"gunicorn --config community/backend/infrahub/serve/gunicorn_config.py -w {os.environ.get('INFRAHUB_TESTING_WEB_CONCURRENCY', 4)} --logger-class infrahub.serve.log.GunicornLogger infrahub_enterprise.server:app",  # noqa: E501
                     "INFRAHUB_TESTING_WORKFLOW_DEFAULT_WORKER_TYPE": "infrahubentasync",
                     "INFRAHUB_TESTING_PREFECT_UI_ENABLED": "false",
-                    "NEO4J_DOCKER_IMAGE": "neo4j:5.20.0-enterprise",
+                    "NEO4J_DOCKER_IMAGE": "neo4j:2025.03.0-enterprise",
+                }
+            )
+        if os.environ.get("INFRAHUB_TESTING_TASKMGR_SCALEOUT"):
+            PROJECT_ENV_VARIABLES.update(
+                {
+                    "INFRAHUB_TESTING_TASKMGR_BACKGROUND_SVC_REPLICAS": "1",
+                    "PREFECT_MESSAGING_BROKER": "prefect_redis.messaging",
+                    "PREFECT_MESSAGING_CACHE": "prefect_redis.messaging",
+                    "PREFECT__SERVER_WEBSERVER_ONLY": "true",
+                    "PREFECT_API_DATABASE_MIGRATE_ON_START": "false",
+                    "PREFECT_API_BLOCKS_REGISTER_ON_START": "false",
+                    "PREFECT_SERVER_SERVICES_EVENT_LOGGER_ENABLED": "false",
+                    "PREFECT_SERVER_SERVICES_EVENT_PERSISTER_ENABLED": "false",
+                    "PREFECT_SERVER_SERVICES_TRIGGERS_ENABLED": "false",
+                    "PREFECT_SERVER_SERVICES_TASK_RUN_RECORDER_ENABLED": "false",
                 }
             )
 

{infrahub_testcontainers-1.3.0b6 → infrahub_testcontainers-1.4.13}/infrahub_testcontainers/docker-compose-cluster.test.yml

@@ -37,7 +37,7 @@ services:
       - ${INFRAHUB_TESTING_MESSAGE_QUEUE_PORT:-0}:15692
 
   cache:
-    image: ${CACHE_DOCKER_IMAGE:-redis:7.2.4}
+    image: ${CACHE_DOCKER_IMAGE:-redis:7.2.11}
     restart: unless-stopped
     healthcheck:
       test: ["CMD-SHELL", "redis-cli ping | grep PONG"]
@@ -91,6 +91,7 @@ services:
       start_period: 3s
     ports:
       - ${INFRAHUB_TESTING_DATABASE_PORT:-0}:6362
+      - ${INFRAHUB_TESTING_DATABASE_BOLT_PORT:-0}:7687
       - ${INFRAHUB_TESTING_DATABASE_UI_PORT:-0}:7474
 
   database-core2:
@@ -126,6 +127,7 @@ services:
       com.github.job: "${JOB_NAME:-unknown}"
     ports:
       - "${INFRAHUB_TESTING_DATABASE_PORT:-0}:6363"
+      - ${INFRAHUB_TESTING_DATABASE_BOLT_PORT:-0}:7687
 
   database-core3:
     deploy:
@@ -160,16 +162,37 @@ services:
       com.github.job: "${JOB_NAME:-unknown}"
     ports:
       - "${INFRAHUB_TESTING_DATABASE_PORT:-0}:6364"
+      - ${INFRAHUB_TESTING_DATABASE_BOLT_PORT:-0}:7687
 
   task-manager:
     image: "${INFRAHUB_TESTING_DOCKER_IMAGE}:${INFRAHUB_TESTING_IMAGE_VERSION}"
-    command: uvicorn --host 0.0.0.0 --port 4200 --factory infrahub.prefect_server.app:create_infrahub_prefect
+    command: "${PREFECT_SERVER_COMMAND:-gunicorn -k uvicorn.workers.UvicornWorker -b 0.0.0.0:4200 'infrahub.prefect_server.app:create_infrahub_prefect()'}"
     depends_on:
       task-manager-db:
         condition: service_healthy
+      cache:
+        condition: service_healthy
     environment:
       PREFECT_UI_ENABLED: "${INFRAHUB_TESTING_PREFECT_UI_ENABLED}" # enabling UI requires permissions, run container as root to enable UI
       PREFECT_API_DATABASE_CONNECTION_URL: postgresql+asyncpg://postgres:postgres@task-manager-db:5432/prefect
+
+      INFRAHUB_CACHE_ADDRESS: ${INFRAHUB_TESTING_CACHE_ADDRESS}
+      PREFECT_REDIS_MESSAGING_HOST: "${INFRAHUB_TESTING_CACHE_ADDRESS:-cache}"
+      PREFECT_REDIS_MESSAGING_DB: "1"
+      PREFECT_REDIS_MESSAGING_CONSUMER_MIN_IDLE_TIME: "30"
+      PREFECT_REDIS_MESSAGING_PUBLISHER_BATCH_SIZE: "1"
+
+      PREFECT_MESSAGING_BROKER:
+      PREFECT_MESSAGING_CACHE:
+      PREFECT__SERVER_WEBSERVER_ONLY:
+      PREFECT_API_DATABASE_MIGRATE_ON_START:
+      PREFECT_API_BLOCKS_REGISTER_ON_START:
+      PREFECT_SERVER_SERVICES_EVENT_LOGGER_ENABLED:
+      PREFECT_SERVER_SERVICES_EVENT_PERSISTER_ENABLED:
+      PREFECT_SERVER_SERVICES_TRIGGERS_ENABLED:
+      PREFECT_SERVER_SERVICES_TASK_RUN_RECORDER_ENABLED:
+
+      WEB_CONCURRENCY: ${INFRAHUB_TESTING_TASKMGR_API_WORKERS:-1}
     healthcheck:
       test: /usr/local/bin/httpx http://localhost:4200/api/health || exit 1
       interval: 5s
@@ -179,8 +202,42 @@ services:
     ports:
       - ${INFRAHUB_TESTING_TASK_MANAGER_PORT:-0}:4200
 
+  task-manager-background-svc:
+    deploy:
+      mode: replicated
+      replicas: ${INFRAHUB_TESTING_TASKMGR_BACKGROUND_SVC_REPLICAS:-0}
+    image: "${INFRAHUB_TESTING_DOCKER_IMAGE}:${INFRAHUB_TESTING_IMAGE_VERSION}"
+    command: prefect server services start
+    restart: unless-stopped
+    depends_on:
+      task-manager:
+        condition: service_healthy
+      task-manager-db:
+        condition: service_healthy
+      cache:
+        condition: service_healthy
+    environment:
+      PREFECT_UI_ENABLED: "${INFRAHUB_TESTING_PREFECT_UI_ENABLED}" # This might be required because triggers actions service depends on an in-memory API server
+      PREFECT_API_DATABASE_CONNECTION_URL: postgresql+asyncpg://postgres:postgres@task-manager-db:5432/prefect
+
+      PREFECT_API_DATABASE_MIGRATE_ON_START: "false"
+      PREFECT_API_BLOCKS_REGISTER_ON_START: "false"
+      INFRAHUB_CACHE_ADDRESS: ${INFRAHUB_TESTING_CACHE_ADDRESS}
+      PREFECT_MESSAGING_BROKER: prefect_redis.messaging
+      PREFECT_MESSAGING_CACHE: prefect_redis.messaging
+      PREFECT_REDIS_MESSAGING_HOST: "${INFRAHUB_TESTING_CACHE_ADDRESS:-cache}"
+      PREFECT_REDIS_MESSAGING_DB: "1"
+      PREFECT_REDIS_MESSAGING_CONSUMER_MIN_IDLE_TIME: "30"
+      PREFECT_REDIS_MESSAGING_PUBLISHER_BATCH_SIZE: "1"
+
+      PREFECT_SERVER_SERVICES_EVENT_LOGGER_ENABLED: "true"
+      PREFECT_SERVER_SERVICES_EVENT_PERSISTER_ENABLED: "true"
+      PREFECT_SERVER_SERVICES_TRIGGERS_ENABLED: "true"
+      PREFECT_SERVER_SERVICES_TASK_RUN_RECORDER_ENABLED: "true"
+
   task-manager-db:
     image: "${POSTGRES_DOCKER_IMAGE:-postgres:16-alpine}"
+    command: postgres -c 'max_connections=${INFRAHUB_TESTING_TASK_MANAGER_DB_MAX_CONNECTIONS:-100}'
     environment:
       - POSTGRES_USER=postgres
       - POSTGRES_PASSWORD=postgres
@@ -262,6 +319,7 @@ services:
       INFRAHUB_DB_PROTOCOL: ${INFRAHUB_TESTING_DB_PROTOCOL:-neo4j}
       INFRAHUB_WORKFLOW_ADDRESS: ${INFRAHUB_TESTING_WORKFLOW_ADDRESS}
       INFRAHUB_TIMEOUT: ${INFRAHUB_TESTING_TIMEOUT}
+      INFRAHUB_PAGINATION_SIZE: ${INFRAHUB_TESTING_PAGINATION_SIZE:-50}
       PREFECT_API_URL: ${INFRAHUB_TESTING_PREFECT_API}
       # Tracing
       INFRAHUB_TRACE_ENABLE: ${INFRAHUB_TRACE_ENABLE:-false}

{infrahub_testcontainers-1.3.0b6 → infrahub_testcontainers-1.4.13}/infrahub_testcontainers/docker-compose.test.yml

@@ -20,7 +20,7 @@ services:
       - ${INFRAHUB_TESTING_MESSAGE_QUEUE_PORT:-0}:15692
 
   cache:
-    image: ${CACHE_DOCKER_IMAGE:-redis:7.2.4}
+    image: ${CACHE_DOCKER_IMAGE:-redis:7.2.11}
     restart: unless-stopped
     healthcheck:
       test: ["CMD-SHELL", "redis-cli ping | grep PONG"]
@@ -72,17 +72,38 @@ services:
       start_period: 3s
     ports:
       - ${INFRAHUB_TESTING_DATABASE_PORT:-0}:6362
+      - ${INFRAHUB_TESTING_DATABASE_BOLT_PORT:-0}:7687
       - ${INFRAHUB_TESTING_DATABASE_UI_PORT:-0}:7474
 
   task-manager:
     image: "${INFRAHUB_TESTING_DOCKER_IMAGE}:${INFRAHUB_TESTING_IMAGE_VERSION}"
-    command: uvicorn --host 0.0.0.0 --port 4200 --factory infrahub.prefect_server.app:create_infrahub_prefect
+    command: "${PREFECT_SERVER_COMMAND:-gunicorn -k uvicorn.workers.UvicornWorker -b 0.0.0.0:4200 'infrahub.prefect_server.app:create_infrahub_prefect()'}"
     depends_on:
       task-manager-db:
         condition: service_healthy
+      cache:
+        condition: service_healthy
     environment:
       PREFECT_UI_ENABLED: "${INFRAHUB_TESTING_PREFECT_UI_ENABLED}" # enabling UI requires permissions, run container as root to enable UI
       PREFECT_API_DATABASE_CONNECTION_URL: postgresql+asyncpg://postgres:postgres@task-manager-db:5432/prefect
+
+      INFRAHUB_CACHE_ADDRESS: ${INFRAHUB_TESTING_CACHE_ADDRESS}
+      PREFECT_REDIS_MESSAGING_HOST: "${INFRAHUB_TESTING_CACHE_ADDRESS:-cache}"
+      PREFECT_REDIS_MESSAGING_DB: "1"
+      PREFECT_REDIS_MESSAGING_CONSUMER_MIN_IDLE_TIME: "30"
+      PREFECT_REDIS_MESSAGING_PUBLISHER_BATCH_SIZE: "1"
+
+      PREFECT_MESSAGING_BROKER:
+      PREFECT_MESSAGING_CACHE:
+      PREFECT__SERVER_WEBSERVER_ONLY:
+      PREFECT_API_DATABASE_MIGRATE_ON_START:
+      PREFECT_API_BLOCKS_REGISTER_ON_START:
+      PREFECT_SERVER_SERVICES_EVENT_LOGGER_ENABLED:
+      PREFECT_SERVER_SERVICES_EVENT_PERSISTER_ENABLED:
+      PREFECT_SERVER_SERVICES_TRIGGERS_ENABLED:
+      PREFECT_SERVER_SERVICES_TASK_RUN_RECORDER_ENABLED:
+
+      WEB_CONCURRENCY: ${INFRAHUB_TESTING_TASKMGR_API_WORKERS:-1}
     healthcheck:
       test: /usr/local/bin/httpx http://localhost:4200/api/health || exit 1
       interval: 5s
@@ -92,8 +113,42 @@ services:
     ports:
       - ${INFRAHUB_TESTING_TASK_MANAGER_PORT:-0}:4200
 
+  task-manager-background-svc:
+    deploy:
+      mode: replicated
+      replicas: ${INFRAHUB_TESTING_TASKMGR_BACKGROUND_SVC_REPLICAS:-0}
+    image: "${INFRAHUB_TESTING_DOCKER_IMAGE}:${INFRAHUB_TESTING_IMAGE_VERSION}"
+    command: prefect server services start
+    restart: unless-stopped
+    depends_on:
+      task-manager:
+        condition: service_healthy
+      task-manager-db:
+        condition: service_healthy
+      cache:
+        condition: service_healthy
+    environment:
+      PREFECT_UI_ENABLED: "${INFRAHUB_TESTING_PREFECT_UI_ENABLED}" # This might be required because triggers actions service depends on an in-memory API server
+      PREFECT_API_DATABASE_CONNECTION_URL: postgresql+asyncpg://postgres:postgres@task-manager-db:5432/prefect
+
+      PREFECT_API_DATABASE_MIGRATE_ON_START: "false"
+      PREFECT_API_BLOCKS_REGISTER_ON_START: "false"
+      INFRAHUB_CACHE_ADDRESS: ${INFRAHUB_TESTING_CACHE_ADDRESS}
+      PREFECT_MESSAGING_BROKER: prefect_redis.messaging
+      PREFECT_MESSAGING_CACHE: prefect_redis.messaging
+      PREFECT_REDIS_MESSAGING_HOST: "${INFRAHUB_TESTING_CACHE_ADDRESS:-cache}"
+      PREFECT_REDIS_MESSAGING_DB: "1"
+      PREFECT_REDIS_MESSAGING_CONSUMER_MIN_IDLE_TIME: "30"
+      PREFECT_REDIS_MESSAGING_PUBLISHER_BATCH_SIZE: "1"
+
+      PREFECT_SERVER_SERVICES_EVENT_LOGGER_ENABLED: "true"
+      PREFECT_SERVER_SERVICES_EVENT_PERSISTER_ENABLED: "true"
+      PREFECT_SERVER_SERVICES_TRIGGERS_ENABLED: "true"
+      PREFECT_SERVER_SERVICES_TASK_RUN_RECORDER_ENABLED: "true"
+
   task-manager-db:
     image: "${POSTGRES_DOCKER_IMAGE:-postgres:16-alpine}"
+    command: postgres -c 'max_connections=${INFRAHUB_TESTING_TASK_MANAGER_DB_MAX_CONNECTIONS:-100}'
     environment:
       - POSTGRES_USER=postgres
       - POSTGRES_PASSWORD=postgres
@@ -171,6 +226,7 @@ services:
       INFRAHUB_DB_ADDRESS: ${INFRAHUB_TESTING_DB_ADDRESS:-database}
       INFRAHUB_WORKFLOW_ADDRESS: ${INFRAHUB_TESTING_WORKFLOW_ADDRESS}
       INFRAHUB_TIMEOUT: ${INFRAHUB_TESTING_TIMEOUT}
+      INFRAHUB_PAGINATION_SIZE: ${INFRAHUB_TESTING_PAGINATION_SIZE:-50}
       PREFECT_API_URL: ${INFRAHUB_TESTING_PREFECT_API}
       INFRAHUB_EXPERIMENTAL_VALUE_DB_INDEX:
       # Tracing

{infrahub_testcontainers-1.3.0b6 → infrahub_testcontainers-1.4.13}/infrahub_testcontainers/helpers.py

@@ -29,11 +29,14 @@ class TestInfrahubDocker:
         return result.stdout
 
     @staticmethod
-    def execute_command(command: str, address: str, concurrent_execution: int = 10) -> subprocess.CompletedProcess[str]:
+    def execute_command(
+        command: str, address: str, concurrent_execution: int = 10, pagination_size: int = 50
+    ) -> subprocess.CompletedProcess[str]:
         env = os.environ.copy()
         env["INFRAHUB_ADDRESS"] = address
         env["INFRAHUB_API_TOKEN"] = PROJECT_ENV_VARIABLES["INFRAHUB_TESTING_INITIAL_ADMIN_TOKEN"]
         env["INFRAHUB_MAX_CONCURRENT_EXECUTION"] = f"{concurrent_execution}"
+        env["INFRAHUB_PAGINATION_SIZE"] = f"{pagination_size}"
         result = subprocess.run(  # noqa: S602
             command, shell=True, capture_output=True, text=True, env=env, check=False
         )

{infrahub_testcontainers-1.3.0b6 → infrahub_testcontainers-1.4.13}/pyproject.toml

@@ -1,11 +1,11 @@
 [project]
 name = "infrahub-testcontainers"
-version =  "1.3.0b6"
+version = "1.4.13"
 requires-python = ">=3.9"
 
 [tool.poetry]
 name = "infrahub-testcontainers"
-version =  "1.3.0b6"
+version = "1.4.13"
 description = "Testcontainers instance for Infrahub to easily build integration tests"
 authors = ["OpsMill <info@opsmill.com>"]
 readme = "README.md"
@@ -39,7 +39,7 @@ psutil = "*"
 pytest = "*"
 httpx = "^0.28.1"
 pydantic = "^2.10.6"
-prefect = "3.4.1"
+prefect-client = "3.4.13"
 
 [tool.poetry.group.dev.dependencies]
 rich = "^13.9.4"