infrahub-server 1.4.7__py3-none-any.whl → 1.4.9__py3-none-any.whl

infrahub/actions/schema.py

@@ -50,7 +50,7 @@ core_trigger_rule = GenericSchema(
             description="Indicates if this trigger is enabled or if it's just prepared, could be useful as you are setting up a trigger",
             optional=False,
             default_value=True,
-            order_weight=200,
+            order_weight=250,
         ),
         Attr(
             name="branch_scope",
@@ -59,7 +59,7 @@ core_trigger_rule = GenericSchema(
             choices=BranchScope.available_types(),
             default_value=BranchScope.DEFAULT_BRANCH.value.name,
             optional=False,
-            order_weight=200,
+            order_weight=260,
             allow_override=AllowOverrideType.NONE,
         ),
     ],
@@ -270,8 +270,10 @@ core_node_trigger_attribute_match = NodeSchema(
     label="Node Trigger Attribute Match",
     branch=BranchSupportType.AGNOSTIC,
     generate_profile=False,
-    inherit_from=["CoreNodeTriggerMatch"],
+    inherit_from=[core_node_trigger_match.kind],
     display_labels=["attribute_name__value"],
+    uniqueness_constraints=[["trigger", "attribute_name__value"]],
+    human_friendly_id=["trigger__name__value", "attribute_name__value"],
     attributes=[
         Attr(
             name="attribute_name",
@@ -319,8 +321,10 @@ core_node_trigger_relationship_match = NodeSchema(
     label="Node Trigger Relationship Match",
     branch=BranchSupportType.AGNOSTIC,
     generate_profile=False,
-    inherit_from=["CoreNodeTriggerMatch"],
+    inherit_from=[core_node_trigger_match.kind],
     display_labels=["relationship_name__value", "modification_type__value"],
+    uniqueness_constraints=[["trigger", "relationship_name__value"]],
+    human_friendly_id=["trigger__name__value", "relationship_name__value"],
     attributes=[
         Attr(
             name="relationship_name",

infrahub/config.py

@@ -281,7 +281,6 @@ class DatabaseSettings(BaseSettings):
     query_size_limit: int = Field(
         default=5_000,
         ge=1,
-        le=20_000,
         description="The max number of records to fetch in a single query before performing internal pagination.",
     )
     max_depth_search_hierarchy: int = Field(

infrahub/core/graph/__init__.py

@@ -1 +1 @@
-GRAPH_VERSION = 38
+GRAPH_VERSION = 39

infrahub/core/migrations/graph/__init__.py

@@ -40,6 +40,7 @@ from .m035_orphan_relationships import Migration035
 from .m036_drop_attr_value_index import Migration036
 from .m037_index_attr_vals import Migration037
 from .m038_redo_0000_prefix_fix import Migration038
+from .m039_ipam_reconcile import Migration039
 
 if TYPE_CHECKING:
     from infrahub.core.root import Root
@@ -85,6 +86,7 @@ MIGRATIONS: list[type[GraphMigration | InternalSchemaMigration | ArbitraryMigrat
     Migration036,
     Migration037,
     Migration038,
+    Migration039,
 ]
 
 

infrahub/core/migrations/graph/m039_ipam_reconcile.py

@@ -0,0 +1,274 @@
+from __future__ import annotations
+
+import ipaddress
+from dataclasses import dataclass
+from typing import TYPE_CHECKING, Any
+
+from rich.console import Console
+from rich.progress import Progress
+
+from infrahub.core.branch.models import Branch
+from infrahub.core.constants import InfrahubKind
+from infrahub.core.initialization import initialization
+from infrahub.core.ipam.reconciler import IpamReconciler
+from infrahub.core.migrations.shared import MigrationResult
+from infrahub.core.query import Query, QueryType
+from infrahub.lock import initialize_lock
+from infrahub.log import get_logger
+
+from ..shared import ArbitraryMigration
+
+if TYPE_CHECKING:
+    from infrahub.core.ipam.constants import AllIPTypes
+    from infrahub.database import InfrahubDatabase
+
+log = get_logger()
+
+
+@dataclass
+class IpNodeDetails:
+    branch: str
+    ip_value: AllIPTypes
+    namespace: str
+    node_uuid: str
+
+
+class FindNodesToReconcileQuery(Query):
+    name = "find_nodes_to_reconcile_query"
+    type = QueryType.READ
+    insert_return = False
+
+    async def query_init(self, db: InfrahubDatabase, **kwargs: dict[str, Any]) -> None:  # noqa: ARG002
+        self.params.update(
+            {
+                "prefix_kind": InfrahubKind.IPPREFIX,
+                "address_kind": InfrahubKind.IPADDRESS,
+                "prefix_attribute_name": "prefix",
+                "address_attribute_name": "address",
+                "attr_names": ["prefix", "address"],
+                "namespace_relationship_names": ["ip_namespace__ip_prefix", "ip_namespace__ip_address"],
+            }
+        )
+        query = """
+MATCH (root:Root)
+LIMIT 1
+WITH root.default_branch AS default_branch
+// ------------------
+// find prefixes and addresses that exist on the default branch
+// ------------------
+MATCH (ip_node:%(prefix_kind)s|%(address_kind)s)-[e:IS_PART_OF {branch: default_branch, status: "active"}]->(:Root)
+WHERE e.to IS NULL
+AND NOT exists((ip_node)-[:IS_PART_OF {branch: default_branch, status: "deleted"}]->(:Root))
+// ------------------
+// check if this node has its prefix/address updated on a branch (or branches)
+// ------------------
+CALL (ip_node, default_branch) {
+    OPTIONAL MATCH (ip_node)-[:HAS_ATTRIBUTE {branch: default_branch, status: "active"}]->
+        (attr:Attribute)-[has_value_e:HAS_VALUE {status: "active"}]->(attr_val)
+    WHERE attr.name IN $attr_names
+    AND has_value_e.branch_level = 2
+    AND (
+        ($prefix_kind IN labels(ip_node) AND attr.name = $prefix_attribute_name)
+        OR ($address_kind IN labels(ip_node) AND attr.name = $address_attribute_name)
+    )
+    RETURN collect(DISTINCT has_value_e.branch) AS attr_update_branches
+}
+CALL (ip_node, default_branch) {
+    OPTIONAL MATCH (ip_node)-[:IS_RELATED {status: "active"}]-
+        (rel:Relationship)-[e2:IS_RELATED {status: "active"}]-(peer:Node)
+    WHERE rel.name IN $namespace_relationship_names
+    AND e2.branch_level = 2
+    RETURN collect(DISTINCT e2.branch) AS namespace_update_branches
+}
+// ------------------
+// filter to only those prefixes/addresses with an update that we care about on a branch
+// ------------------
+WITH DISTINCT ip_node, default_branch, attr_update_branches, namespace_update_branches
+WHERE size(attr_update_branches) > 0 OR size(namespace_update_branches) > 0
+// ------------------
+// deduplicate branch lists and return one row for each branch
+// ------------------
+CALL (attr_update_branches, namespace_update_branches) {
+    UNWIND attr_update_branches + namespace_update_branches AS branch
+    RETURN DISTINCT branch
+}
+WITH default_branch, branch, ip_node
+// ------------------
+// confirm node is still active on this branch
+// ------------------
+MATCH (ip_node)
+WHERE NOT exists((ip_node)-[:IS_PART_OF {branch: branch, status: "deleted"}]->(:Root))
+// ------------------
+// get branched_from time for each branch
+// ------------------
+CALL (branch) {
+    MATCH (b:Branch {name: branch})
+    RETURN b.branched_from AS branched_from
+}
+// ------------------
+// get latest namespace on this branch
+// ------------------
+CALL (default_branch, branch, branched_from, ip_node) {
+    MATCH (ip_node)-[e1:IS_RELATED]-(rel:Relationship)-[e2:IS_RELATED]-(peer:%(namespace_kind)s)
+    WHERE rel.name IN $namespace_relationship_names
+    AND (
+        e1.branch = branch
+        OR (e1.branch = default_branch AND e1.from < branched_from)
+    )
+    AND e1.to IS NULL
+    AND (
+        e2.branch = branch
+        OR (e2.branch = default_branch AND e2.from < branched_from)
+    )
+    AND e2.to IS NULL
+    WITH peer, e1.status = "active" AND e2.status = "active" AS is_active
+    ORDER BY e2.branch_level DESC, e2.from DESC, e2.status ASC, e1.branch_level DESC, e1.from DESC, e1.status ASC
+    LIMIT 1
+    WITH peer
+    WHERE is_active = TRUE
+    RETURN peer.uuid AS namespace_uuid
+}
+// ------------------
+// get latest prefix/address value on this branch
+// ------------------
+CALL (default_branch, branch, branched_from, ip_node) {
+    MATCH (ip_node)-[e1:HAS_ATTRIBUTE]->(attr:Attribute)-[e2:HAS_VALUE]->(av)
+    WHERE attr.name IN $attr_names
+    AND (
+        ($prefix_kind IN labels(ip_node) AND attr.name = $prefix_attribute_name)
+        OR ($address_kind IN labels(ip_node) AND attr.name = $address_attribute_name)
+    )
+    AND (
+        e1.branch = branch
+        OR (e1.branch = default_branch AND e1.from < branched_from)
+    )
+    AND e1.to IS NULL
+    AND (
+        e2.branch = branch
+        OR (e2.branch = default_branch AND e2.from < branched_from)
+    )
+    AND e2.to IS NULL
+    WITH attr, av, e1.status = "active" AND e2.status = "active" AS is_active
+    ORDER BY e2.branch_level DESC, e2.from DESC, e2.status ASC, e1.branch_level DESC, e1.from DESC, e1.status ASC
+    LIMIT 1
+    WITH attr, av
+    WHERE is_active = TRUE
+    RETURN CASE
+        WHEN attr.name = $prefix_attribute_name THEN av.value
+        ELSE NULL
+    END AS prefix_value,
+    CASE
+        WHEN attr.name = $address_attribute_name THEN av.value
+        ELSE NULL
+    END AS address_value
+}
+RETURN branch, namespace_uuid, ip_node.uuid AS node_uuid, prefix_value, address_value
+        """ % {
+            "prefix_kind": InfrahubKind.IPPREFIX,
+            "address_kind": InfrahubKind.IPADDRESS,
+            "namespace_kind": InfrahubKind.IPNAMESPACE,
+        }
+        self.add_to_query(query)
+        self.return_labels = ["branch", "namespace_uuid", "node_uuid", "prefix_value", "address_value"]
+
+    def get_nodes_to_reconcile(self) -> list[IpNodeDetails]:
+        ip_node_details = []
+        for result in self.get_results():
+            prefix_value = result.get_as_str("prefix_value")
+            address_value = result.get_as_str("address_value")
+            if prefix_value:
+                ip_value: AllIPTypes = ipaddress.ip_network(address=prefix_value)
+            elif address_value:
+                ip_value = ipaddress.ip_interface(address=address_value)
+            else:
+                continue
+            ip_node_details.append(
+                IpNodeDetails(
+                    branch=result.get_as_type("branch", str),
+                    ip_value=ip_value,
+                    namespace=result.get_as_type("namespace_uuid", str),
+                    node_uuid=result.get_as_type("node_uuid", str),
+                )
+            )
+        return ip_node_details
+
+
+class DeleteSelfParentRelationshipsQuery(Query):
+    name = "delete_self_parent_relationships"
+    type = QueryType.WRITE
+    insert_return = False
+
+    def __init__(self, uuids_to_check: list[str], **kwargs: Any) -> None:
+        super().__init__(**kwargs)
+        self.uuids_to_check = uuids_to_check
+
+    async def query_init(self, db: InfrahubDatabase, **kwargs: dict[str, Any]) -> None:  # noqa: ARG002
+        self.params["uuids_to_check"] = self.uuids_to_check
+        query = """
+MATCH (n:Node)-[e1:IS_RELATED]->(:Relationship {name: "parent__child"})-[e2:IS_RELATED {branch: e1.branch, status: e1.status, from: e1.from}]->(n)
+WHERE n.uuid IN $uuids_to_check
+DELETE e1, e2
+        """
+        self.add_to_query(query)
+
+
+class Migration039(ArbitraryMigration):
+    """
+    Identify all IP prefixes/addresses that have been updated on a branch and reconcile them on that branch
+    If any of the identified IP prefixes/addresses are their own parent/child, delete those illegal edges before reconciling.
+    """
+
+    name: str = "039_ipam_reconcile_updated"
+    minimum_version: int = 38
+
+    def __init__(self, *args: Any, **kwargs: Any) -> None:
+        super().__init__(*args, **kwargs)
+        self._reconcilers_by_branch: dict[str, IpamReconciler] = {}
+
+    async def _get_reconciler(self, db: InfrahubDatabase, branch_name: str) -> IpamReconciler:
+        if branch_name not in self._reconcilers_by_branch:
+            branch = await Branch.get_by_name(db=db, name=branch_name)
+            self._reconcilers_by_branch[branch_name] = IpamReconciler(db=db, branch=branch)
+        return self._reconcilers_by_branch[branch_name]
+
+    async def validate_migration(self, db: InfrahubDatabase) -> MigrationResult:  # noqa: ARG002
+        return MigrationResult()
+
+    async def execute(self, db: InfrahubDatabase) -> MigrationResult:
+        console = Console()
+        result = MigrationResult()
+        # load schemas from database into registry
+        initialize_lock()
+        await initialization(db=db)
+
+        console.print("Identifying IP prefixes/addresses to reconcile...", end="")
+        find_nodes_query = await FindNodesToReconcileQuery.init(db=db)
+        await find_nodes_query.execute(db=db)
+        console.print("done")
+
+        # we need to delete the self-parent relationships before reconciling b/c the
+        # reconciler cannot correctly handle a prefix that is its own parent
+        ip_node_details_list = find_nodes_query.get_nodes_to_reconcile()
+        uuids_to_check = {ip_node_details.node_uuid for ip_node_details in ip_node_details_list}
+        console.print(f"{len(ip_node_details_list)} IP prefixes/addresses will be reconciled")
+
+        console.print("Deleting any self-parent relationships...", end="")
+        delete_self_parent_relationships_query = await DeleteSelfParentRelationshipsQuery.init(
+            db=db, uuids_to_check=list(uuids_to_check)
+        )
+        await delete_self_parent_relationships_query.execute(db=db)
+        console.print("done")
+
+        with Progress() as progress:
+            reconcile_task = progress.add_task("Reconciling IP prefixes/addresses...", total=len(ip_node_details_list))
+
+            for ip_node_details in ip_node_details_list:
+                reconciler = await self._get_reconciler(db=db, branch_name=ip_node_details.branch)
+                await reconciler.reconcile(
+                    ip_value=ip_node_details.ip_value,
+                    namespace=ip_node_details.namespace,
+                    node_uuid=ip_node_details.node_uuid,
+                )
+                progress.update(reconcile_task, advance=1)
+
+        return result

infrahub/core/query/branch.py

@@ -31,7 +31,7 @@ WHERE e.branch = $branch_name
 CALL (n) {
     OPTIONAL MATCH (n)-[:IS_RELATED {branch: $global_branch_name}]-(rel:Relationship)
     DETACH DELETE rel
-} IN TRANSACTIONS
+} IN TRANSACTIONS OF 500 ROWS
 
 // reduce the results to a single row
 WITH 1 AS one
@@ -44,7 +44,7 @@ MATCH (s)-[r]->(d)
 WHERE r.branch = $branch_name
 CALL (r) {
     DELETE r
-} IN TRANSACTIONS
+} IN TRANSACTIONS OF 500 ROWS
 
 // --------------
 // get the database IDs of every vertex linked to a deleted edge
@@ -61,7 +61,7 @@ CALL (vertex_id) {
     WHERE elementId(n) = vertex_id
     AND NOT exists((n)--())
     DELETE n
-} IN TRANSACTIONS
+} IN TRANSACTIONS OF 500 ROWS
         """
         self.params["branch_name"] = self.branch_name
         self.params["global_branch_name"] = GLOBAL_BRANCH_NAME

infrahub/core/query/relationship.py

@@ -871,6 +871,9 @@ class RelationshipGetQuery(RelationshipQuery):
         query = """
         MATCH (s)%s(rl:Relationship { name: $name })%s(d)
         WHERE %s
+        ORDER BY r1.branch_level DESC, r1.from DESC, r1.status ASC, r2.branch_level DESC, r2.from DESC, r2.status ASC
+        WITH *, r1.status = "active" AND r2.status = "active" AS is_active
+        LIMIT 1
         """ % (
             r1,
             r2,
@@ -880,7 +883,20 @@ class RelationshipGetQuery(RelationshipQuery):
         self.params["at"] = self.at.to_string()
 
         self.add_to_query(query)
-        self.return_labels = ["s", "d", "rl", "r1", "r2"]
+        self.return_labels = ["s", "d", "rl", "r2", "is_active"]
+
+    def is_already_deleted(self) -> bool:
+        result = self.get_result()
+        if not result:
+            return False
+        return result.get("is_active") is False
+
+    def get_relationships_ids_for_branch(self, branch_name: str) -> list[str] | None:
+        result = self.get_result()
+        if not result:
+            return None
+
+        return [rel.element_id for rel in result.get_rels() if rel.get("branch") == branch_name]
 
 
 class RelationshipGetByIdentifierQuery(Query):

infrahub/core/query/subquery.py

@@ -90,7 +90,7 @@ async def build_subquery_filter(
         {branch_level_str} AS branch_level,
         {froms_str} AS froms,
         all(r IN relationships(path) WHERE r.status = "active") AS is_active{with_extra}
-    ORDER BY branch_level DESC, froms[-1] DESC, froms[-2] DESC
+    ORDER BY branch_level DESC, froms[-1] DESC, froms[-2] DESC, is_active DESC
     WITH head(collect([is_active, {node_alias}{with_extra}])) AS latest_node_details
     WHERE {is_active_filter}
     WITH latest_node_details[1] AS {prefix}{final_with_extra}
@@ -176,7 +176,7 @@ async def build_subquery_order(
     OPTIONAL MATCH path = {filter_str}
     WHERE {where_str}
     WITH {with_str_to_alias}
-    ORDER BY branch_level DESC, froms[-1] DESC, froms[-2] DESC
+    ORDER BY branch_level DESC, froms[-1] DESC, froms[-2] DESC, is_active DESC
     WITH head(collect([is_active, {with_str_alias}])) AS latest_node_details
     WITH {with_str_from_list}
     RETURN {to_return_str}

infrahub/core/relationship/model.py

@@ -404,17 +404,21 @@ class Relationship(FlagPropertyMixin, NodePropertyMixin):
             db=db, source=node, destination=peer, rel=self, branch=self.branch, at=delete_at
         )
         await get_query.execute(db=db)
-        result = get_query.get_result()
-        if not result:
+
+        rel_ids_to_update = get_query.get_relationships_ids_for_branch(branch_name=branch.name)
+        if rel_ids_to_update is None:
             raise Error(
                 f"Unable to find the relationship to delete. id: {self.id}, source: {node.id}, destination: {peer.id}"
             )
 
+        if get_query.is_already_deleted():
+            return
+
         # when we remove a relationship we need to :
         # - Update the existing relationship if we are on the same branch
         # - Create a new rel of type DELETED in the right branch
 
-        if rel_ids_to_update := [rel.element_id for rel in result.get_rels() if rel.get("branch") == branch.name]:
+        if rel_ids_to_update:
             await update_relationships_to(rel_ids_to_update, to=delete_at, db=db)
 
         delete_query = await RelationshipDeleteQuery.init(

infrahub/database/__init__.py

@@ -28,6 +28,9 @@ from typing_extensions import Self
 from infrahub import config, lock
 from infrahub.constants.database import DatabaseType, Neo4jRuntime
 from infrahub.core import registry
+from infrahub.core.constants import (
+    GLOBAL_BRANCH_NAME,
+)
 from infrahub.core.query import QueryType
 from infrahub.exceptions import DatabaseError
 from infrahub.log import get_logger
@@ -125,9 +128,14 @@ class DatabaseSchemaManager:
         return self.get_full(branch=branch, duplicate=duplicate)
 
     def get_schema_branch(self, name: str) -> SchemaBranch:
-        if name not in self._db._schemas:
-            return registry.schema.get_schema_branch(name=name)
-        return self._db._schemas[name]
+        """Return a schema branch object based on its name.
+
+        If the branch is the global one, the default branch will be returned.
+        """
+        branch_name = registry.default_branch if name == GLOBAL_BRANCH_NAME else name
+        if branch_name not in self._db._schemas:
+            return registry.schema.get_schema_branch(name=branch_name)
+        return self._db._schemas[branch_name]
 
 
 class InfrahubDatabase:

infrahub/git/base.py

@@ -716,7 +716,7 @@ class InfrahubRepositoryBase(BaseModel, ABC):
 
         repo = self.get_git_repo_main()
         try:
-            repo.remotes.origin.fetch()
+            repo.remotes.origin.fetch(prune=True)
         except GitCommandError as exc:
             await self._raise_enriched_error(error=exc)
 

infrahub/graphql/mutations/ipam.py

@@ -44,6 +44,11 @@ async def validate_namespace(
             db=db, branch=branch, kind=InfrahubKind.IPNAMESPACE, id=data["ip_namespace"]["id"]
         )
         namespace_id = namespace.id
+    elif "hfid" in data["ip_namespace"]:
+        namespace = await registry.manager.get_one_by_hfid(
+            db=db, branch=branch, kind=InfrahubKind.IPNAMESPACE, hfid=data["ip_namespace"]["hfid"]
+        )
+        namespace_id = namespace.id
     else:
         raise ValidationError(
             "A valid ip_namespace must be provided or ip_namespace should be left empty in order to use the default value."

infrahub/proposed_change/tasks.py

@@ -441,9 +441,6 @@ async def run_proposed_change_schema_integrity_check(model: RequestProposedChang
                 )
             )
 
-    if not conflicts:
-        return
-
     database = await get_database()
     async with database.start_transaction() as db:
         object_conflict_validator_recorder = ObjectConflictValidatorRecorder(

infrahub/worker.py

@@ -1,3 +1,14 @@
 import uuid
 
+from prometheus_client import Gauge
+
+from infrahub import __version__ as infrahub_version
+
 WORKER_IDENTITY = str(uuid.uuid4())
+
+INFO_METRIC = Gauge(
+    "infrahub_info",
+    "Information about this Infrahub instance",
+    labelnames=["version", "worker_id"],
+)
+INFO_METRIC.labels(version=infrahub_version, worker_id=WORKER_IDENTITY).set(1)

infrahub/workflows/catalogue.py

@@ -299,7 +299,7 @@ PROPOSED_CHANGE_MERGE = WorkflowDefinition(
 
 GRAPHQL_QUERY_GROUP_UPDATE = WorkflowDefinition(
     name="graphql-query-group-update",
-    type=WorkflowType.CORE,
+    type=WorkflowType.INTERNAL,
     module="infrahub.groups.tasks",
     function="update_graphql_query_group",
 )

{infrahub_server-1.4.7.dist-info → infrahub_server-1.4.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: infrahub-server
-Version: 1.4.7
+Version: 1.4.9
 Summary: Infrahub is taking a new approach to Infrastructure Management by providing a new generation of datastore to organize and control all the data that defines how an infrastructure should run.
 License: Apache-2.0
 Author: OpsMill

{infrahub_server-1.4.7.dist-info → infrahub_server-1.4.9.dist-info}/RECORD

@@ -4,7 +4,7 @@ infrahub/actions/constants.py,sha256=xrVNdwBwCzG20eXfowV3bia3LW8Kwx-DazS6vALPbEg
 infrahub/actions/gather.py,sha256=s6RaegkD9zx7WL8ePS6eGam8TlUA3TH38tarLmQeT98,4746
 infrahub/actions/models.py,sha256=7EVJuGLqEy71sop1XEDLpuAZfLc9ei3hxXPy2FeyY4U,8558
 infrahub/actions/parsers.py,sha256=L0ZE2gvhSoBZHuHok0wO4UeWo8fyhbnpuMTHHZX_W7c,3997
-infrahub/actions/schema.py,sha256=rWZL7TXoPAwQr6olIRs_3G63DHpjIwTTxgSgyl2AAVU,12813
+infrahub/actions/schema.py,sha256=tFLVFEOckxIdtrNqZVdVGuhf7UVACG6CIM6QG-Nj3ks,13111
 infrahub/actions/tasks.py,sha256=Oaz6sku7E_2aadh4fFIjDeZn9YUGIY6zhzVlctQ3xbw,3820
 infrahub/actions/triggers.py,sha256=5BKt8NkafArs8tdSQUb2uBtJVXfZrYUePByOn9d7-1Y,772
 infrahub/api/__init__.py,sha256=dtRtBRpEgt7Y9Zdwy85jpSr8qfO_2xNTgTQLCJPQiZI,2182
@@ -55,7 +55,7 @@ infrahub/computed_attribute/gather.py,sha256=xhH4dsgCjRFyFshns4Iu3sloe5m1bVMRdeQ
 infrahub/computed_attribute/models.py,sha256=P_MijLwCVd7394oyTTfYQ3HmX5wIF966jdchuZaLRbs,17361
 infrahub/computed_attribute/tasks.py,sha256=FMNJYPuLp2tBKP-ENNUlZhc6nkq78yl7817mCKTBt2g,17415
 infrahub/computed_attribute/triggers.py,sha256=ve1cUj0CZ7dU1VtZkxET9LD8StszKIL9mCkTZpCeUaI,2304
-infrahub/config.py,sha256=nRGw9pTxRnfDgXh54tRTdHbatiOF8CuX-_MP2fpAuOI,38976
+infrahub/config.py,sha256=XV_dLvHnpb5zvgi_jkVZdsId481Jbs6VGWvNwYMkTTw,38957
 infrahub/constants/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 infrahub/constants/database.py,sha256=WmV1iuOk4xulxZHOVvO3sS_VF1eTf7fKh0TPe_RnfV4,507
 infrahub/constants/environment.py,sha256=ry-6qsBzSumOjjiq1D3XNoquf1LWqFKiQSJj8t6nET4,32
@@ -139,7 +139,7 @@ infrahub/core/diff/repository/deserializer.py,sha256=bhN9ao8HxqKyRz273QGLNV9z9_S
 infrahub/core/diff/repository/repository.py,sha256=u0QTMY1e2dknG_DuRAwzFt-Lp1_mdj5lqF2ymt77k9E,25581
 infrahub/core/diff/tasks.py,sha256=jSXlenTJ5Fc189Xvm971e3-gBDRnfN19cxNaWvEFwAE,3306
 infrahub/core/enums.py,sha256=qGbhRVoH43Xi0iDkUfWdQiKapJbLT9UKsCobFk_paIk,491
-infrahub/core/graph/__init__.py,sha256=O8Xci_50VdpSOWWUsegCGQvL7gUWJAJNc1ompQbvhf0,19
+infrahub/core/graph/__init__.py,sha256=pqEHefyIWiA492sH7qk0HW4SxWc4ugXBFIhpI4DyvFY,19
 infrahub/core/graph/constraints.py,sha256=lmuzrKDFoeSKRiLtycB9PXi6zhMYghczKrPYvfWyy90,10396
 infrahub/core/graph/index.py,sha256=A9jzEE_wldBJsEsflODeMt4GM8sPmmbHAJRNdFioR1k,1736
 infrahub/core/graph/schema.py,sha256=o50Jcy6GBRk55RkDJSMIDDwHhLD7y_RWOirI9rCex4A,10776
@@ -158,7 +158,7 @@ infrahub/core/ipam/utilization.py,sha256=d-zpXCaWsHgJxBLopCDd7y4sJYvHcIzzpYhbTMI
 infrahub/core/manager.py,sha256=xMXPwlaGNnghkRUW0ILwJAUlBQJZqo9cGp9GVyqkqYk,47564
 infrahub/core/merge.py,sha256=TNZpxjNYcl3dnvE8eYXaWSXFDYeEa8DDsS9XbR2XKlA,11217
 infrahub/core/migrations/__init__.py,sha256=dIExw90CrdTByeJqpiWkaZBclpAfzatG2H6fXx54su0,1305
-infrahub/core/migrations/graph/__init__.py,sha256=8NNpXMWWxKbuliktUJg7JllIePGERZxOnumC-UmkpX0,4161
+infrahub/core/migrations/graph/__init__.py,sha256=nCm3XHpKwSrekrOU0WFMVJlnIdJmf9KayjjERIYGx7Q,4225
 infrahub/core/migrations/graph/m001_add_version_to_graph.py,sha256=YcLN6cFjE6IGheXR4Ujb6CcyY8bJ7WE289hcKJaENOc,1515
 infrahub/core/migrations/graph/m002_attribute_is_default.py,sha256=wB6f2N_ChTvGajqHD-OWCG5ahRMDhhXZuwo79ieq_II,1036
 infrahub/core/migrations/graph/m003_relationship_parent_optional.py,sha256=Aya-s98XfE9C7YluOwEjilwgnjaBnZxp27w_Xdv_NmU,2330
@@ -197,6 +197,7 @@ infrahub/core/migrations/graph/m035_orphan_relationships.py,sha256=K0J5gzFF5gY-Q
 infrahub/core/migrations/graph/m036_drop_attr_value_index.py,sha256=z2BplzX0mue3lOxrM7xnWDNrs7N3TGdFKHZR-u0wDDY,1439
 infrahub/core/migrations/graph/m037_index_attr_vals.py,sha256=bJB4yPWE73XA_ErUcnY90CR09_jbtA0jW6tE5U0GvQ4,22730
 infrahub/core/migrations/graph/m038_redo_0000_prefix_fix.py,sha256=8seWnXQhgEJDFLWxYHVcnMNDPcHq5C24c0RYrtn_WGE,2411
+infrahub/core/migrations/graph/m039_ipam_reconcile.py,sha256=gUf4Fo3CrzJ2hwbaKlQclripTDrI7cVk_GHsBlBNMKE,10916
 infrahub/core/migrations/query/__init__.py,sha256=JoWOUWlV6IzwxWxObsfCnAAKUOHJkE7dZlOsfB64ZEo,876
 infrahub/core/migrations/query/attribute_add.py,sha256=oitzB-PPAclfyNtcwCWJY3RdI5Zi4oEnR62BDzn1UQk,4835
 infrahub/core/migrations/query/attribute_rename.py,sha256=onb9Nanht1Tz47JgneAcFsuhqqvPS6dvI2nNjRupLLo,6892
@@ -238,15 +239,15 @@ infrahub/core/protocols.py,sha256=CXwYfHHUgJIFMZvsv9Fc8VBAfvXDzy7Bu4RJvQNj6no,12
 infrahub/core/protocols_base.py,sha256=cEi6giHtEUmaD0JWfDfWHJhEv_6wjaBA3oJRJCbvc6Q,3411
 infrahub/core/query/__init__.py,sha256=2qIMaODLwJ6pK6BUd5vODTlA15Aecf5I8_-J44UlCso,23089
 infrahub/core/query/attribute.py,sha256=xojZIHX-XfXlN_jgM1TQ1Bp4dXr4oLEWlr2A7igTvIg,12658
-infrahub/core/query/branch.py,sha256=7gj83jDWPWjFUZud7lMQ0xwl9ag3FL-ZOlmY5Kuq7UU,4307
+infrahub/core/query/branch.py,sha256=aIYyDxpnw_Zw2lqTnMEVlhPUaYckZtJJJU1SFUht1o0,4343
 infrahub/core/query/delete.py,sha256=7tPP1qtNV6QGYtmgE1RKsuQ9oxENnMTVkttLvJ2PiKg,1927
 infrahub/core/query/diff.py,sha256=jJCkZRo5jGaf-yPAnQ_5ju6sCnknDK0E7vGpqEnaU_k,36881
 infrahub/core/query/ipam.py,sha256=dOs_LZr-DONrCPw6t5Ug9mBPn8a-S2NKja3Vr-zIeaM,34523
 infrahub/core/query/node.py,sha256=OfWS9PfltP89aU4n0KhEjrvAkhAGj9Vl4hcfKcE9LD8,70969
-infrahub/core/query/relationship.py,sha256=KmS9zrcr-RViXxiITXOjq1t0s-AfsICHk3wyyirZBfA,47817
+infrahub/core/query/relationship.py,sha256=GpaEcf8YRiVpqTxrp10NFOUCHeyE7SqhOFyf3F44eNo,48474
 infrahub/core/query/resource_manager.py,sha256=uSvs1WZmdbyt_PjaUi9lXnYdPt-lhJV1RjYoUHYjQdk,16620
 infrahub/core/query/standard_node.py,sha256=mPBXyqk4RzoWRUX4NoojoVi8zk-sJ03GmzmUaWqOgSI,4825
-infrahub/core/query/subquery.py,sha256=UE071w3wccdU_dtKLV-7mdeQ53DKXjPmNxDV0zd5Tpg,7588
+infrahub/core/query/subquery.py,sha256=5ckxREMrlrELWKCcN_JqwmSHRRE7U3ry2iT_WKI7ARE,7620
 infrahub/core/query/task.py,sha256=tLgn8S_KaLYLuOB66D1YM155teHZIHNThkt2iUiKKD4,3137
 infrahub/core/query/task_log.py,sha256=2RdthOAQrmpKZU8uhV_dJCPqwdsSA_1CYSKpL_eZ_yk,1120
 infrahub/core/query/utils.py,sha256=t9LMvZWdmi10c3E0HAU_5m7x5zMHhYXsUjX7ZBl2RpU,1091
@@ -259,7 +260,7 @@ infrahub/core/relationship/constraints/peer_kind.py,sha256=Bropiav4y6r0iU2KfWJ_k
 infrahub/core/relationship/constraints/peer_parent.py,sha256=z7elpC8xS_ovAF28Haq-RNpFtTEiUehzowiDgYGT68U,2343
 infrahub/core/relationship/constraints/peer_relatives.py,sha256=Ye79l7njaWxZkU2chTOaptIjvKBIawsNCl0IQxCTDtM,2737
 infrahub/core/relationship/constraints/profiles_kind.py,sha256=nEZPGtGcmelZ1Nb8EPcQ-7_zCLCNIYwwWbU6C9fLj5E,2464
-infrahub/core/relationship/model.py,sha256=mVptkvzEQJXORagSPK-FUjIWito1Sx6BlIMskp_EgxY,47173
+infrahub/core/relationship/model.py,sha256=pfx6BXu3OG_Ew0mk5U3F1VuXBRjGlAqYhaQ9aUwdhLQ,47223
 infrahub/core/root.py,sha256=8ZLSOtnmjQcrjqX2vxNO-AGopEUArmBPo_X5NeZBdP0,416
 infrahub/core/schema/__init__.py,sha256=Tif-BUwYWVQ0PJGZHFog6lFgnwZevXk3iBcr3zK__BU,4192
 infrahub/core/schema/attribute_parameters.py,sha256=ABL1GEsOl4_CcDvK9_NucGMaF6LUeOjAxbDQVm_G7eg,6516
@@ -351,7 +352,7 @@ infrahub/core/validators/uniqueness/checker.py,sha256=5WbYjS4yfezsK0Ez35Vp9soJ9K
 infrahub/core/validators/uniqueness/index.py,sha256=Jw1o-UVinQquNduZ5vCCzt8GUfIEdVzBo-1XyRti8F8,5068
 infrahub/core/validators/uniqueness/model.py,sha256=Z5CyYOQfhyAnwNIev4AFjfXnfOoUWc4uR04Wz3C6Cy4,5617
 infrahub/core/validators/uniqueness/query.py,sha256=0LXhPqRpV4Ho2CLxHP2fDs8AFvKJPKpUfHiW4SwFccg,22254
-infrahub/database/__init__.py,sha256=EFr0jC-PB-TKo4LkDXjW2rvN_PMWyQYKBneJ-g79wnk,20848
+infrahub/database/__init__.py,sha256=8d-SCvRddc0pszhr2NxBOdv-NjvC3TxxuB6GZKnySws,21170
 infrahub/database/index.py,sha256=ATLqw9Grqbq7haGGm14VSEPmcPniid--YATiffo4sA0,1676
 infrahub/database/memgraph.py,sha256=Fg3xHP9s0MiBBmMvcEmsJvuIUSq8U_XCS362HDE9d1s,1742
 infrahub/database/metrics.py,sha256=xU4OSKFbsxcw_yZlt_39PmGtF7S7yPbPuOIlSCu5sI0,739
@@ -436,7 +437,7 @@ infrahub/generators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 infrahub/generators/models.py,sha256=9qhSfsoG-uYux35HClAxSq7TRfkosqN3i_eQkeTokLs,1916
 infrahub/generators/tasks.py,sha256=Ci6lIbnUS6faGzbUjw1ggROpv17guZ-Z9HH9f6cAZv4,9563
 infrahub/git/__init__.py,sha256=KeQ9U8UI5jDj6KB6j00Oal7MZmtOD9vKqVgiezG_EQA,281
-infrahub/git/base.py,sha256=5zfBUDY9s7nZJsSw0LOFItVDZBep9Z0LmIsbvd_47IE,38706
+infrahub/git/base.py,sha256=tEfhxYNc8bAcq1Pld7ZSK41w1fm48eMsF5QnMSKz50E,38716
 infrahub/git/constants.py,sha256=XpzcAkXbsgXZgrXey74id1sXV8Q6EHb_4FNw7BndxyY,106
 infrahub/git/directory.py,sha256=fozxLXXJPweHG95yQwQkR5yy3sfTdmHiczCAJnsUX54,861
 infrahub/git/integrator.py,sha256=fpeOC1ycVYZixPcrR-TwmZXHgaAvXpPd50ys04GFXdg,62889
@@ -488,7 +489,7 @@ infrahub/graphql/mutations/diff.py,sha256=UfEkgIeKsxr79U0_ih7mhl0986rFITM_GDXevs
 infrahub/graphql/mutations/diff_conflict.py,sha256=JngQfyKXCVlmtlqQ_VyabmrOEDOEKYsoWbyYSc9TT5c,3147
 infrahub/graphql/mutations/generator.py,sha256=Ulw4whZm8Gc8lJjwfUFoFSsR0cOUliFKl87Oca4B9O0,3579
 infrahub/graphql/mutations/graphql_query.py,sha256=a8tCTrjJipwIghmxlcUkH1Hx_7tem5QhzrTczcwpuZM,3644
-infrahub/graphql/mutations/ipam.py,sha256=wIN8OcTNCHVy32YgatWZi2Of-snFYBd4wlxOAJvE-AY,15961
+infrahub/graphql/mutations/ipam.py,sha256=KnfIq6TD9Q649T8BI-pvUmtH5P7GX4UEsz0P22et0MI,16207
 infrahub/graphql/mutations/main.py,sha256=Zqq2zi24ZR8S8ikZ21F2_3kIqYc8tXtvDyit1Xz27vw,21938
 infrahub/graphql/mutations/menu.py,sha256=NSdtUobZ-5dsQdBFfD1xyoE9dKw9FS62T_6UQM0cEUY,3790
 infrahub/graphql/mutations/models.py,sha256=ilkSLr8OxVO9v3Ra_uDyUTJT9qPOmdPMqQbuWIydJMo,264
@@ -622,7 +623,7 @@ infrahub/proposed_change/branch_diff.py,sha256=IdMxf5zPmhybQKPPz7AlruNmLCKf5VISP
 infrahub/proposed_change/checker.py,sha256=ZhNEVJKsQbHH2UE1O35MfOVa8cK1QGEqGyn6MsOuqSQ,1558
 infrahub/proposed_change/constants.py,sha256=auifG94Oo2cJ4RwZx4P-XDPDpKYPtEVxh013KPfiEdU,2080
 infrahub/proposed_change/models.py,sha256=ivWJmEAihprKmwgaBGDJ4Koq4ETciE5GfDp86KHDnns,5892
-infrahub/proposed_change/tasks.py,sha256=8KCZ33DZFESfCVOlLzTiK5DY7SiPtWn4AU1lzN0_MyM,64075
+infrahub/proposed_change/tasks.py,sha256=-jAIhul4RCqx5MRWM1ITHoa1S7CEmQC06vsBKXfvTLk,64037
 infrahub/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 infrahub/pytest_plugin.py,sha256=u3t0WgLMo9XmuQYeb28mccQ3xbnyv2Fv173YWl1zBiM,6678
 infrahub/schema/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -693,13 +694,13 @@ infrahub/webhook/gather.py,sha256=XNaIGiHDiMjjtSjsVbswOze7cLaL0MKJmvSbZBS-WT0,69
 infrahub/webhook/models.py,sha256=6oiwCV4iayTWDKmSTpcFx83WA23paMXLsw4fFw15KHM,10477
 infrahub/webhook/tasks.py,sha256=2msOOqqFStQbNje7Eq0glAdlprs-ASHii3qQXFIEyzE,7255
 infrahub/webhook/triggers.py,sha256=v1dzFV4wX0GO2n5hft_qzp-oJOA2P_9Q2eTcSP-i0pk,1574
-infrahub/worker.py,sha256=JtTM-temURUbpEy-bkKJuTt-GKoiHFDrOe9SyVTIXEM,49
+infrahub/worker.py,sha256=zV9vLXtJzyqeTGtVolwZEHlLaBvGiUZv00qWpE-lnOM,353
 infrahub/workers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 infrahub/workers/dependencies.py,sha256=byuliu9WrOGtQ-Zws8NSTq3LJwnqxIqQ7dcWP3KNlAg,4850
 infrahub/workers/infrahub_async.py,sha256=9itLnky6BuqWR92fuU-SShaSI-33eoSRfhOEZy0TH0g,7973
 infrahub/workers/utils.py,sha256=m6FOKrYo53Aoj-JcEyQ7-J4Dc20R9JtHMDzTcqXiRpg,2407
 infrahub/workflows/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-infrahub/workflows/catalogue.py,sha256=n25f3MCHxpbpepQbTejL87kIbxXod_mYRJYqsYgKof0,18279
+infrahub/workflows/catalogue.py,sha256=cHV51ZQXQhyoEgCahppv--vyDYbjo-Duu2LemeRho_k,18283
 infrahub/workflows/constants.py,sha256=7je2FF7tJH6x_ZNqHKZfQX91X7I5gmD8OECN3dE_eqI,651
 infrahub/workflows/initialization.py,sha256=Aj3tTD4tL9qhNgSnzFIMkTHab8FWWgL0JINaON9wjj0,3224
 infrahub/workflows/models.py,sha256=eCra3PFbX-GpiNLDG6WyqVXvSqRTz1eF4REm0doJFDY,3534
@@ -827,8 +828,8 @@ infrahub_testcontainers/models.py,sha256=ASYyvl7d_WQz_i7y8-3iab9hwwmCl3OCJavqVbe
 infrahub_testcontainers/performance_test.py,sha256=hvwiy6tc_lWniYqGkqfOXVGAmA_IV15VOZqbiD9ezno,6149
 infrahub_testcontainers/plugin.py,sha256=I3RuZQ0dARyKHuqCf0y1Yj731P2Mwf3BJUehRJKeWrs,5645
 infrahub_testcontainers/prometheus.yml,sha256=610xQEyj3xuVJMzPkC4m1fRnCrjGpiRBrXA2ytCLa54,599
-infrahub_server-1.4.7.dist-info/LICENSE.txt,sha256=7GQO7kxVoQYnZtFrjZBKLRXbrGwwwimHPPOJtqXsozQ,11340
-infrahub_server-1.4.7.dist-info/METADATA,sha256=JDolBgNRWQnhM2j2I-v1sINa1PVuDN3YUX58Zd6PB1A,8277
-infrahub_server-1.4.7.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-infrahub_server-1.4.7.dist-info/entry_points.txt,sha256=UXIeFWDsrV-4IllNvUEd6KieYGzQfn9paga2YyABOQI,393
-infrahub_server-1.4.7.dist-info/RECORD,,
+infrahub_server-1.4.9.dist-info/LICENSE.txt,sha256=7GQO7kxVoQYnZtFrjZBKLRXbrGwwwimHPPOJtqXsozQ,11340
+infrahub_server-1.4.9.dist-info/METADATA,sha256=8IccC-o3SIdkcjcI9izHZN10hsoSgLlqhquqpG5y26g,8277
+infrahub_server-1.4.9.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+infrahub_server-1.4.9.dist-info/entry_points.txt,sha256=UXIeFWDsrV-4IllNvUEd6KieYGzQfn9paga2YyABOQI,393
+infrahub_server-1.4.9.dist-info/RECORD,,