merge origin/release-1.2

Author: BeArchiTek

.devcontainer/Dockerfile

@@ -38,3 +38,5 @@ RUN pip install toml invoke
 
 RUN curl -sSL https://install.python-poetry.org | POETRY_VERSION=1.8.5 python3 - \
     && echo "export PATH=\"$HOME/.local/bin:$PATH\"" >> $HOME/.bashrc
+
+RUN bash -c "$(curl -sL https://get.containerlab.dev)"

.github/CODEOWNERS

@@ -0,0 +1,4 @@
+/backend/ @opsmill/backend
+/frontend/ @opsmill/frontend
+/docs/ @opsmill/customer-success @opsmill/backend @opsmill/frontend
+/docker-compose.yml @opsmill/cloud

.github/file-filters.yml

@@ -17,8 +17,8 @@ sdk_files: &sdk_files
   - "python_sdk" # Catch updates to the submodule commit
 
 infrahub_poetry_files: &infrahub_poetry_files
-  - "pyproject.toml"
-  - "poetry.lock"
+  - "**/pyproject.toml"
+  - "**/poetry.lock"
 
 frontend_files: &frontend_files
   - "frontend/app/**"

.github/workflows/ci.yml

@@ -122,7 +122,7 @@ jobs:
         with:
           submodules: true
       - name: "Linting: markdownlint"
-        uses: DavidAnson/markdownlint-cli2-action@v18
+        uses: DavidAnson/markdownlint-cli2-action@v19
         with:
           config: .markdownlint.yaml
           globs: |
@@ -157,6 +157,45 @@ jobs:
     with:
       directory: "./"
 
+  infrahub-testcontainers-check:
+    if: needs.files-changed.outputs.infrahub_poetry_files == 'true'
+    needs: ["files-changed"]
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    steps:
+      - name: "Check out repository code"
+        uses: "actions/checkout@v4"
+        with:
+          submodules: true
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+
+      - name: "Setup Python environment"
+        run: |
+          pipx install poetry==1.8.5
+          poetry config virtualenvs.create true --local
+          poetry env use 3.12
+
+      - name: Compare package versions
+        run: |
+          INFRAHUB_VERSION=$(poetry version --short)
+          echo "Infrahub version: $INFRAHUB_VERSION"
+
+          cd python_testcontainers
+          TESTCONTAINERS_VERSION=$(poetry version --short)
+          echo "Testcontainers version: $TESTCONTAINERS_VERSION"
+
+          if [ "$INFRAHUB_VERSION" != "$TESTCONTAINERS_VERSION" ]; then
+            echo "Error: Version mismatch!"
+            echo "infrahub version: $INFRAHUB_VERSION"
+            echo "infrahub-testcontainers version: $TESTCONTAINERS_VERSION"
+            echo "The version of infrahub-testcontainers must match the version of infrahub"
+            exit 1
+          fi
+
   # TODO NEED TO REVISIT THIS ONE
   # python-sdk-poetry-check:
   #   if: |
@@ -217,7 +256,7 @@ jobs:
       !contains(needs.*.result, 'failure') &&
       !contains(needs.*.result, 'cancelled') &&
       needs.files-changed.outputs.backend == 'true'
-    needs: ["files-changed", "yaml-lint", "python-lint"]
+    needs: ["files-changed", "yaml-lint", "python-lint", "infrahub-testcontainers-check"]
     runs-on:
       group: huge-runners
     timeout-minutes: 45
@@ -270,7 +309,7 @@ jobs:
       !contains(needs.*.result, 'failure') &&
       !contains(needs.*.result, 'cancelled') &&
       needs.files-changed.outputs.backend == 'true'
-    needs: ["files-changed", "yaml-lint", "python-lint"]
+    needs: ["files-changed", "yaml-lint", "python-lint", "infrahub-testcontainers-check"]
     runs-on:
       group: "huge-runners"
     timeout-minutes: 30
@@ -316,7 +355,7 @@ jobs:
       !contains(needs.*.result, 'failure') &&
       !contains(needs.*.result, 'cancelled') &&
       needs.files-changed.outputs.backend == 'true'
-    needs: ["files-changed", "yaml-lint", "python-lint"]
+    needs: ["files-changed", "yaml-lint", "python-lint", "infrahub-testcontainers-check"]
     runs-on:
       group: "huge-runners"
     timeout-minutes: 30
@@ -345,8 +384,6 @@ jobs:
         run: "poetry install --no-interaction --no-ansi"
       - name: "Mypy Tests"
         run: "poetry run invoke backend.mypy"
-      - name: "Pylint Tests"
-        run: "poetry run invoke backend.pylint"
       - name: "Functional Tests"
         run: "poetry run invoke backend.test-functional"
       - name: "Coveralls : Functional Tests"
@@ -466,7 +503,7 @@ jobs:
       !contains(needs.*.result, 'cancelled') &&
       (needs.files-changed.outputs.backend == 'true' ||
       needs.files-changed.outputs.documentation == 'true')
-    needs: ["files-changed", "yaml-lint", "python-lint"]
+    needs: ["files-changed", "yaml-lint", "python-lint", "infrahub-testcontainers-check"]
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository code
@@ -550,7 +587,7 @@ jobs:
       !contains(needs.*.result, 'failure') &&
       !contains(needs.*.result, 'cancelled') &&
       needs.files-changed.outputs.documentation == 'true'
-    needs: ["files-changed", "yaml-lint", "python-lint"]
+    needs: ["files-changed", "yaml-lint", "python-lint", "infrahub-testcontainers-check"]
     runs-on: "ubuntu-22.04"
     timeout-minutes: 5
     steps:
@@ -576,8 +613,8 @@ jobs:
       always() && !cancelled() &&
       !contains(needs.*.result, 'failure') &&
       !contains(needs.*.result, 'cancelled') &&
-      (needs.files-changed.outputs.python == 'true') || (needs.files-changed.outputs.documentation_generated == 'true')
-    needs: ["files-changed", "yaml-lint", "python-lint"]
+      (needs.files-changed.outputs.python == 'true') || (needs.files-changed.outputs.documentation == 'true')
+    needs: ["files-changed", "yaml-lint", "python-lint", "infrahub-testcontainers-check"]
     runs-on: "ubuntu-22.04"
     timeout-minutes: 5
     steps:
@@ -606,8 +643,8 @@ jobs:
       always() && !cancelled() &&
       !contains(needs.*.result, 'failure') &&
       !contains(needs.*.result, 'cancelled') &&
-      needs.files-changed.outputs.release == 'true'
-    needs: ["files-changed", "yaml-lint", "python-lint"]
+      (needs.files-changed.outputs.release == 'true') || (needs.files-changed.outputs.documentation == 'true')
+    needs: ["files-changed", "yaml-lint", "python-lint", "infrahub-testcontainers-check"]
     runs-on: "ubuntu-22.04"
     timeout-minutes: 5
     steps:
@@ -632,7 +669,7 @@ jobs:
       !contains(needs.*.result, 'failure') &&
       !contains(needs.*.result, 'cancelled') &&
       needs.files-changed.outputs.release == 'true'
-    needs: ["files-changed", "yaml-lint", "python-lint"]
+    needs: ["files-changed", "yaml-lint", "python-lint", "infrahub-testcontainers-check"]
     runs-on: "ubuntu-22.04"
     timeout-minutes: 5
     steps:
@@ -661,6 +698,7 @@ jobs:
       - files-changed
       - yaml-lint
       - python-lint
+      - infrahub-testcontainers-check
     if: |
       always() && !cancelled() &&
       !contains(needs.*.result, 'failure') &&
@@ -756,14 +794,6 @@ jobs:
       - name: Install Playwright Browsers
         run: npx playwright install chromium
 
-      # Make chromium ignore netlink messages by returning HandleMessage early
-      - name: Chrome path
-        run: echo CHROME_BIN_PATH="$(npx playwright install chromium --dry-run | grep Install | grep chromium- | awk '{print $3}')/chrome-linux/chrome" >> $GITHUB_ENV
-      - name: Chrome func offset
-        run: echo FUNC_OFFSET="$(objdump -C --file-offsets --disassemble='net::internal::AddressTrackerLinux::HandleMessage(char const*, int, bool*, bool*, bool*)' $CHROME_BIN_PATH | grep 'File Offset' | sed -n 1p | sed -E 's/.*File Offset. (.*)\).*/\1/')" >> $GITHUB_ENV
-      - name: Patch chromium
-        run: printf '\xc3' | dd of=$CHROME_BIN_PATH bs=1 seek=$(($FUNC_OFFSET)) conv=notrunc
-
       - name: Wait for artifacts to be generated before restarting infrahub
         if: needs.files-changed.outputs.e2e_tests == 'true'
         run: npx playwright test artifact
@@ -850,11 +880,12 @@ jobs:
       - files-changed
       - yaml-lint
       - python-lint
+      - infrahub-testcontainers-check
     if: |
       always() && !cancelled() &&
       !contains(needs.*.result, 'failure') &&
       !contains(needs.*.result, 'cancelled') &&
-      github.base_ref == 'develop'
+      github.base_ref == 'stable'
     runs-on:
       group: huge-runners
     steps:
@@ -876,7 +907,8 @@ jobs:
         run: echo JOB_NAME="$GITHUB_JOB" >> $GITHUB_ENV
 
       - name: "Set environment variables"
-        run: echo INFRAHUB_BUILD_NAME=infrahub-${{ runner.name }} >> $GITHUB_ENV
+        run: |
+          echo INFRAHUB_BUILD_NAME=infrahub-${{ runner.name }} >> $GITHUB_ENV
       - name: "Clear docker environment"
         run: docker compose -p $INFRAHUB_BUILD_NAME down -v --remove-orphans --rmi local
 
@@ -923,6 +955,7 @@ jobs:
       - files-changed
       - yaml-lint
       - python-lint
+      - infrahub-testcontainers-check
     if: |
       always() && !cancelled() &&
       !contains(needs.*.result, 'failure') &&
@@ -936,6 +969,7 @@ jobs:
       - files-changed
       - yaml-lint
       - python-lint
+      - infrahub-testcontainers-check
     if: |
       always() && !cancelled() &&
       !contains(needs.*.result, 'failure') &&

.github/workflows/version-upgrade.yml

@@ -71,16 +71,21 @@ jobs:
       - name: Initialize Demo
         id: init-demo
         run: invoke demo.start demo.load-infra-schema
+        env:
+          PREFECT_SERVER_COMMAND: "prefect server start --host 0.0.0.0 --ui"
       - name: Check Demo Status
         run: invoke demo.status
       - name: Load Data
         run: invoke demo.load-infra-data
+        env:
+          PREFECT_SERVER_COMMAND: "prefect server start --host 0.0.0.0 --ui"
       - name: Stop Demo
         run: invoke demo.stop
 
     # Build the local version and run the migrations
       - name: "Set environment variables"
-        run: echo INFRAHUB_IMAGE_VER=local-${{ runner.name }}-${{ github.sha }} >> $GITHUB_ENV
+        run: |
+          echo INFRAHUB_IMAGE_VER=local-${{ runner.name }}-${{ github.sha }} >> $GITHUB_ENV
 
       - name: Build Demo
         run: invoke dev.build
@@ -111,6 +116,10 @@ jobs:
         if: always()
         run: docker logs "${INFRAHUB_BUILD_NAME}-database-1"
 
+      - name: Display task-manager logs
+        if: always()
+        run: docker logs "${INFRAHUB_BUILD_NAME}-task-manager-1"
+
       - name: Display server status
         if: always()
         run: invoke demo.status

CHANGELOG.md

@@ -11,6 +11,42 @@ This project uses [*towncrier*](https://towncrier.readthedocs.io/) and the chang
 
 <!-- towncrier release notes start -->
 
+## [Infrahub - v1.2.0b1](https://github.com/opsmill/infrahub/tree/infrahub-v1.2.0b1) - 2025-03-03
+
+### Added
+
+- Added Containerlab to the GitHub Codespace base image. ([#458](https://github.com/opsmill/infrahub/issues/458))
+- Added validation to the UI for `min_count` and `max_count` in relationships fields. ([#5661](https://github.com/opsmill/infrahub/issues/5661))
+- Added a new feature to create object templates when setting `generate_template: true` in a schema on a node.
+- Added activities logs into the node details view.
+- Added icon support to sub-menu items in the sidebar.
+- Improved Infrahub app layout for a cleaner look. Made the top menu more compact.
+
+### Changed
+
+- Replaced `PrefixPool` with `netaddr.IPSet`. ([#3547](https://github.com/opsmill/infrahub/issues/3547))
+- Modified the query analyzer to not list all potential meta data models when only querying for "source" or "owner" ID. The full models will still show up if a fragment is used under the meta data properties. This change makes it easier to setup fine grained permissions and also speeds up the permission lookup as it doesn't require as many checks. ([#4644](https://github.com/opsmill/infrahub/issues/4644))
+- Improved the performance of the cypher query that saves a diff.
+- Improved typing of GraphQL schema by defining list as non-nullable and ensure that top level item are mandatory.
+- Made object list retrieval faster with an optimized query.
+- Reorganized builtin/default menu to provide a better user experience.
+- Updated Infrahub account tokens view:
+  - Redesigned for a faster, cleaner experience.
+  - Improved clarity and formatting of expiration dates.
+  - Resolved an issue where expiration data was not being sent to the API.
+- Updated the `DiffUpdate` mutation to return the id of the task when `wait_until_completion` is False. Also the argument `wait_for_completion` under data is deprecated and it has been replaced with `wait_until_completion` at the root of the mutation instead to align with the format of the other mutations.
+
+### Fixed
+
+- Fixed an event error in event state after merging a proposed change, they were incorrectly set as "merging" instead of "merged". ([#5600](https://github.com/opsmill/infrahub/issues/5600))
+- Fixed an error in the query to count the number of peers for a given cardinality-many relationship. Previous logic could have resulted in the count being multiplied by a power of 2 if changes were made to the relationship during a merge.
+
+### Housekeeping
+
+- Activated `ruff` B rules. ([#2193](https://github.com/opsmill/infrahub/issues/2193))
+- Activated `ruff` C4 rule. ([#2194](https://github.com/opsmill/infrahub/issues/2194))
+- Added a basic integration test for the HTTP service adapter. ([#5553](https://github.com/opsmill/infrahub/issues/5553))
+
 ## [Infrahub - v1.1.7](https://github.com/opsmill/infrahub/tree/infrahub-v1.1.7) - 2025-02-18
 
 ### Added

backend/infrahub/api/artifact.py

@@ -5,7 +5,14 @@
 from fastapi import APIRouter, Body, Depends, Request, Response
 from pydantic import BaseModel, Field
 
-from infrahub.api.dependencies import BranchParams, get_branch_params, get_current_user, get_db, get_permission_manager
+from infrahub.api.dependencies import (
+    BranchParams,
+    get_branch_params,
+    get_context,
+    get_current_user,
+    get_db,
+    get_permission_manager,
+)
 from infrahub.core import registry
 from infrahub.core.account import ObjectPermission
 from infrahub.core.constants import GLOBAL_BRANCH_NAME, InfrahubKind, PermissionAction
@@ -19,7 +26,9 @@
 
 if TYPE_CHECKING:
     from infrahub.auth import AccountSession
+    from infrahub.context import InfrahubContext
     from infrahub.permissions import PermissionManager
+    from infrahub.services import InfrahubServices
 
 log = get_logger()
 router = APIRouter(prefix="/artifact")
@@ -57,12 +66,13 @@ async def generate_artifact(
     request: Request,
     artifact_definition_id: str,
     payload: ArtifactGeneratePayload = Body(
-        ArtifactGeneratePayload(),
+        ArtifactGeneratePayload(),  # noqa: B008
         description="Payload of the request, can be used to limit the scope of the query to a specific list of hosts",
     ),
     db: InfrahubDatabase = Depends(get_db),
     branch_params: BranchParams = Depends(get_branch_params),
     permission_manager: PermissionManager = Depends(get_permission_manager),
+    context: InfrahubContext = Depends(get_context),
 ) -> None:
     permission_decision = (
         PermissionDecisionFlag.ALLOW_DEFAULT
@@ -83,12 +93,14 @@ async def generate_artifact(
         branch=branch_params.branch,
     )
 
-    service = request.app.state.service
+    service: InfrahubServices = request.app.state.service
     model = RequestArtifactDefinitionGenerate(
         artifact_definition_id=artifact_definition.id,
         artifact_definition_name=artifact_definition.name.value,
         branch=branch_params.branch.name,
         limit=payload.nodes,
     )
 
-    await service.workflow.submit_workflow(workflow=REQUEST_ARTIFACT_DEFINITION_GENERATE, parameters={"model": model})
+    await service.workflow.submit_workflow(
+        workflow=REQUEST_ARTIFACT_DEFINITION_GENERATE, context=context, parameters={"model": model}
+    )

backend/infrahub/api/dependencies.py

@@ -8,6 +8,7 @@
 
 from infrahub import config
 from infrahub.auth import AccountSession, authentication_token, validate_jwt_access_token, validate_jwt_refresh_token
+from infrahub.context import InfrahubContext
 from infrahub.core.branch import Branch  # noqa: TC001
 from infrahub.core.registry import registry
 from infrahub.core.timestamp import Timestamp
@@ -133,3 +134,10 @@ async def get_permission_manager(
     await permission_manager.load_permissions(db=db, branch=branch_params.branch)
 
     return permission_manager
+
+
+async def get_context(
+    branch: Branch = Depends(get_branch_dep),
+    account_session: AccountSession = Depends(get_current_user),
+) -> InfrahubContext:
+    return InfrahubContext.init(branch=branch, account=account_session)

backend/infrahub/api/oauth2.py

@@ -22,7 +22,6 @@
     from infrahub.database import InfrahubDatabase
     from infrahub.services import InfrahubServices
 
-# pylint: disable=R0801
 
 log = get_logger()
 router = APIRouter(prefix="/oauth2")

backend/infrahub/api/oidc.py

@@ -24,7 +24,6 @@
     from infrahub.database import InfrahubDatabase
     from infrahub.services import InfrahubServices
 
-# pylint: disable=R0801
 
 log = get_logger()
 router = APIRouter(prefix="/oidc")