infrahub-server 1.1.6__py3-none-any.whl → 1.2.0b1__py3-none-any.whl

infrahub_testcontainers/container.py

@@ -3,7 +3,6 @@ import uuid
 from dataclasses import dataclass
 from functools import cached_property
 from pathlib import Path
-from typing import Optional
 
 from testcontainers.compose import DockerCompose
 from typing_extensions import Self
@@ -18,7 +17,7 @@ class ContainerService:
 
 
 INFRAHUB_SERVICES: dict[str, ContainerService] = {
-    "server": ContainerService(container="infrahub-server", port=8000),
+    "server": ContainerService(container="infrahub-server-lb", port=8000),
     "task-manager": ContainerService(container="task-manager", port=4200),
 }
 
@@ -33,8 +32,8 @@ PROJECT_ENV_VARIABLES: dict[str, str] = {
     "INFRAHUB_TESTING_INITIAL_ADMIN_TOKEN": "06438eb2-8019-4776-878c-0941b1f1d1ec",
     "INFRAHUB_TESTING_INITIAL_AGENT_TOKEN": "44af444d-3b26-410d-9546-b758657e026c",
     "INFRAHUB_TESTING_SECURITY_SECRET_KEY": "327f747f-efac-42be-9e73-999f08f86b92",
-    "INFRAHUB_TESTING_ADDRESS": "http://infrahub-server:8000",
-    "INFRAHUB_TESTING_INTERNAL_ADDRESS": "http://infrahub-server:8000",
+    "INFRAHUB_TESTING_ADDRESS": "http://infrahub-server-lb:8000",
+    "INFRAHUB_TESTING_INTERNAL_ADDRESS": "http://infrahub-server-lb:8000",
     "INFRAHUB_TESTING_BROKER_ADDRESS": "message-queue",
     "INFRAHUB_TESTING_CACHE_ADDRESS": "cache",
     "INFRAHUB_TESTING_WORKFLOW_ADDRESS": "task-manager",
@@ -43,15 +42,19 @@ PROJECT_ENV_VARIABLES: dict[str, str] = {
     "INFRAHUB_TESTING_LOCAL_REMOTE_GIT_DIRECTORY": "repos",
     "INFRAHUB_TESTING_INTERNAL_REMOTE_GIT_DIRECTORY": "/remote",
     "INFRAHUB_TESTING_WEB_CONCURRENCY": "4",
+    "INFRAHUB_TESTING_LOCAL_DB_BACKUP_DIRECTORY": "backups",
+    "INFRAHUB_TESTING_INTERNAL_DB_BACKUP_DIRECTORY": "/backups",
+    "INFRAHUB_TESTING_API_SERVER_COUNT": "2",
+    "INFRAHUB_TESTING_TASK_WORKER_COUNT": "2",
 }
 
 
 @dataclass
 class InfrahubDockerCompose(DockerCompose):
-    project_name: Optional[str] = None
+    project_name: str | None = None
 
     @classmethod
-    def init(cls, directory: Optional[Path] = None, version: Optional[str] = None) -> Self:
+    def init(cls, directory: Path | None = None, version: str | None = None) -> Self:
         if not directory:
             directory = Path.cwd()
 
@@ -80,6 +83,11 @@ class InfrahubDockerCompose(DockerCompose):
         test_compose_file = directory / "docker-compose.yml"
         test_compose_file.write_bytes(compose_file.read_bytes())
 
+        haproxy_config_file = current_directory / "haproxy.cfg"
+
+        test_haproxy_config_file = directory / "haproxy.cfg"
+        test_haproxy_config_file.write_bytes(haproxy_config_file.read_bytes())
+
         return test_compose_file
 
     @classmethod

infrahub_testcontainers/docker-compose.test.yml

@@ -28,6 +28,22 @@ services:
       timeout: 5s
       retries: 3
 
+  infrahub-server-lb:
+    image: haproxy:3.1-alpine
+    volumes:
+      - ./haproxy.cfg:/usr/local/etc/haproxy/haproxy.cfg
+    depends_on:
+      infrahub-server:
+        condition: service_started
+    healthcheck:
+      test: wget -O /dev/null http://127.0.0.1:8000/api/config || exit 1
+      interval: 5s
+      timeout: 5s
+      retries: 20
+      start_period: 10s
+    ports:
+      - ${INFRAHUB_TESTING_SERVER_PORT:-0}:8000
+
   database:
     image: ${NEO4J_DOCKER_IMAGE:-neo4j:5.20.0-community}
     restart: unless-stopped
@@ -35,9 +51,11 @@ services:
       NEO4J_AUTH: neo4j/admin
       NEO4J_dbms_security_procedures_unrestricted: "apoc.*"
       NEO4J_dbms_security_auth__minimum__password__length: 4
+      NEO4J_ACCEPT_LICENSE_AGREEMENT: "yes"
     volumes:
       - "database_data:/data"
       - "database_logs:/logs"
+      - "./${INFRAHUB_TESTING_LOCAL_DB_BACKUP_DIRECTORY}:${INFRAHUB_TESTING_INTERNAL_DB_BACKUP_DIRECTORY}"
     healthcheck:
       test: wget http://localhost:7474 || exit 1
       interval: 2s
@@ -49,8 +67,8 @@ services:
       - ${INFRAHUB_TESTING_DATABASE_UI_PORT:-0}:7474
 
   task-manager:
-    image: "${TASK_MANAGER_DOCKER_IMAGE:-prefecthq/prefect:3.0.11-python3.12}"
-    command: prefect server start --host 0.0.0.0 --ui
+    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
     depends_on:
       task-manager-db:
         condition: service_healthy
@@ -80,6 +98,9 @@ services:
       retries: 5
 
   infrahub-server:
+    deploy:
+      mode: replicated
+      replicas: ${INFRAHUB_TESTING_API_SERVER_COUNT}
     image: "${INFRAHUB_TESTING_DOCKER_IMAGE}:${INFRAHUB_TESTING_IMAGE_VERSION}"
     command: >
       gunicorn --config backend/infrahub/serve/gunicorn_config.py
@@ -106,8 +127,6 @@ services:
         condition: service_healthy
       task-manager:
         condition: service_healthy
-    ports:
-      - ${INFRAHUB_TESTING_SERVER_PORT:-0}:8000
     volumes:
       - "storage_data:/opt/infrahub/storage"
     tty: true
@@ -121,7 +140,7 @@ services:
   task-worker:
     deploy:
       mode: replicated
-      replicas: 2
+      replicas: ${INFRAHUB_TESTING_TASK_WORKER_COUNT}
     image: "${INFRAHUB_TESTING_DOCKER_IMAGE}:${INFRAHUB_TESTING_IMAGE_VERSION}"
     command: prefect worker start --type infrahubasync --pool infrahub-worker --with-healthcheck
     environment:

infrahub_testcontainers/haproxy.cfg

@@ -0,0 +1,43 @@
+global
+    log stdout local0
+    log stdout local1 notice
+    #chroot /var/lib/haproxy
+    #stats socket /run/haproxy/admin.sock mode 660 level admin
+    stats timeout 30s
+    user haproxy
+    group haproxy
+    daemon
+
+    # Default SSL material locations
+    ca-base /etc/ssl/certs
+    crt-base /etc/ssl/private
+
+    # See: https://ssl-config.mozilla.org/#server=haproxy&server-version=2.0.3&config=intermediate
+    ssl-default-bind-ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384
+    ssl-default-bind-ciphersuites TLS_AES_128_GCM_SHA256:TLS_AES_256_GCM_SHA384:TLS_CHACHA20_POLY1305_SHA256
+    ssl-default-bind-options ssl-min-ver TLSv1.2 no-tls-tickets
+
+defaults
+    log        global
+    mode       http
+    option     httplog
+    option     dontlognull
+    timeout connect 5000
+    timeout client  50000
+    timeout server  50000
+
+resolvers docker
+    parse-resolv-conf
+    accepted_payload_size 8192
+
+frontend fe
+    mode http
+    bind *:8000
+    option forwardfor
+
+    default_backend be
+
+backend be
+    mode http
+    balance roundrobin
+    server-template api 100 infrahub-server:8000 check resolvers docker init-addr none

infrahub_testcontainers/helpers.py

@@ -1,4 +1,5 @@
 import os
+import shutil
 import subprocess  # noqa: S404
 from pathlib import Path
 
@@ -36,12 +37,25 @@ class TestInfrahubDocker:
 
         return directory
 
+    @pytest.fixture(scope="class")
+    def remote_backups_dir(self, tmp_directory: Path) -> Path:
+        directory = tmp_directory / PROJECT_ENV_VARIABLES["INFRAHUB_TESTING_LOCAL_DB_BACKUP_DIRECTORY"]
+        directory.mkdir(exist_ok=True)
+
+        return directory
+
     @pytest.fixture(scope="class")
     def default_branch(self) -> str:
         return "main"
 
     @pytest.fixture(scope="class")
-    def infrahub_compose(self, tmp_directory: Path, infrahub_version: str) -> InfrahubDockerCompose:
+    def infrahub_compose(
+        self,
+        tmp_directory: Path,
+        remote_repos_dir: Path,  # initialize repository before running docker compose to fix permissions issues # noqa: ARG002
+        remote_backups_dir: Path,  # noqa: ARG002
+        infrahub_version: str,
+    ) -> InfrahubDockerCompose:
         return InfrahubDockerCompose.init(directory=tmp_directory, version=infrahub_version)
 
     @pytest.fixture(scope="class")
@@ -62,3 +76,73 @@ class TestInfrahubDocker:
     @pytest.fixture(scope="class")
     def task_manager_port(self, infrahub_app: dict[str, int]) -> int:
         return infrahub_app["task-manager"]
+
+    def backup_database(self, request: pytest.FixtureRequest, dest_dir: Path | None = None) -> None:
+        assert "enterprise" in os.environ.get("NEO4J_DOCKER_IMAGE", "")
+
+        backup_dir: Path = request.getfixturevalue("remote_backups_dir")
+        infrahub_compose: InfrahubDockerCompose = request.getfixturevalue("infrahub_compose")
+
+        infrahub_compose.exec_in_container(
+            command=[
+                "neo4j-admin",
+                "database",
+                "backup",
+                "--to-path",
+                os.environ.get(
+                    "INFRAHUB_TESTING_INTERNAL_DB_BACKUP_DIRECTORY",
+                    PROJECT_ENV_VARIABLES["INFRAHUB_TESTING_INTERNAL_DB_BACKUP_DIRECTORY"],
+                ),
+            ],
+            service_name="database",
+        )
+
+        if dest_dir:
+            shutil.copytree(
+                str(backup_dir),
+                str(dest_dir),
+            )
+
+    def restore_database(self, request: pytest.FixtureRequest, backup_file: Path) -> None:
+        assert "enterprise" in os.environ.get("NEO4J_DOCKER_IMAGE", "")
+
+        backup_dir: Path = request.getfixturevalue("remote_backups_dir")
+        infrahub_compose: InfrahubDockerCompose = request.getfixturevalue("infrahub_compose")
+
+        shutil.copy(
+            str(backup_file),
+            str(backup_dir / backup_file.name),
+        )
+
+        infrahub_compose.exec_in_container(
+            command=["cypher-shell", "-u", "neo4j", "-p", "admin", "STOP DATABASE neo4j;"],
+            service_name="database",
+        )
+
+        infrahub_compose.exec_in_container(
+            command=[
+                "neo4j-admin",
+                "database",
+                "restore",
+                "--overwrite-destination",
+                "--from-path",
+                str(
+                    Path(
+                        os.environ.get(
+                            "INFRAHUB_TESTING_INTERNAL_DB_BACKUP_DIRECTORY",
+                            PROJECT_ENV_VARIABLES["INFRAHUB_TESTING_INTERNAL_DB_BACKUP_DIRECTORY"],
+                        )
+                    )
+                    / backup_file.name
+                ),
+            ],
+            service_name="database",
+        )
+
+        infrahub_compose.exec_in_container(
+            command=["cypher-shell", "-d", "system", "-u", "neo4j", "-p", "admin", "START DATABASE neo4j;"],
+            service_name="database",
+        )
+
+        infrahub_compose.stop(down=False)
+        infrahub_compose.start()

infrahub/core/branch/constants.py

@@ -1,2 +0,0 @@
-AUTOMATION_NAME_CREATE = "Trigger-branch-create-events"
-AUTOMATION_NAME_REMOVE = "Trigger-branch-remove-events"