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

infrahub/graphql/mutations/artifact_definition.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Optional
+from typing import TYPE_CHECKING, Any
 
 from graphene import InputObjectType, Mutation
 from typing_extensions import Self
@@ -28,7 +28,7 @@ class InfrahubArtifactDefinitionMutation(InfrahubMutationMixin, Mutation):
     def __init_subclass_with_meta__(
         cls,
         schema: NodeSchema,
-        _meta: Optional[Any] = None,
+        _meta: Any | None = None,
         **options: dict[str, Any],
     ) -> None:
         # Make sure schema is a valid NodeSchema Node Class
@@ -48,7 +48,7 @@ class InfrahubArtifactDefinitionMutation(InfrahubMutationMixin, Mutation):
         info: GraphQLResolveInfo,
         data: InputObjectType,
         branch: Branch,
-        database: Optional[InfrahubDatabase] = None,  # noqa: ARG003
+        database: InfrahubDatabase | None = None,  # noqa: ARG003
     ) -> tuple[Node, Self]:
         graphql_context: GraphqlContext = info.context
 
@@ -74,8 +74,8 @@ class InfrahubArtifactDefinitionMutation(InfrahubMutationMixin, Mutation):
         info: GraphQLResolveInfo,
         data: InputObjectType,
         branch: Branch,
-        database: Optional[InfrahubDatabase] = None,  # noqa: ARG003
-        node: Optional[Node] = None,  # noqa: ARG003
+        database: InfrahubDatabase | None = None,  # noqa: ARG003
+        node: Node | None = None,  # noqa: ARG003
     ) -> tuple[Node, Self]:
         graphql_context: GraphqlContext = info.context
 

infrahub/graphql/mutations/computed_attribute.py

@@ -5,12 +5,12 @@ from typing import TYPE_CHECKING, Any
 from graphene import Boolean, InputObjectType, Mutation, String
 
 from infrahub.core.account import ObjectPermission
-from infrahub.core.constants import ComputedAttributeKind, MutationAction, PermissionAction, PermissionDecision
+from infrahub.core.constants import ComputedAttributeKind, PermissionAction, PermissionDecision
 from infrahub.core.manager import NodeManager
 from infrahub.core.registry import registry
 from infrahub.database import retry_db_transaction
 from infrahub.events import EventMeta
-from infrahub.events.node_action import NodeMutatedEvent
+from infrahub.events.node_action import NodeUpdatedEvent
 from infrahub.exceptions import NodeNotFoundError, ValidationError
 from infrahub.graphql.context import apply_external_context
 from infrahub.graphql.types.context import ContextInput
@@ -95,12 +95,11 @@ class UpdateComputedAttribute(Mutation):
             log_data = get_log_data()
             request_id = log_data.get("request_id", "")
 
-            event = NodeMutatedEvent(
+            event = NodeUpdatedEvent(
                 kind=node_schema.kind,
                 node_id=target_node.get_id(),
-                data=target_node.node_changelog.model_dump(),
+                changelog=target_node.node_changelog.model_dump(),
                 fields=[str(data.attribute)],
-                action=MutationAction.UPDATED,
                 meta=EventMeta(
                     context=graphql_context.get_context(),
                     initiator_id=WORKER_IDENTITY,

infrahub/graphql/mutations/graphql_query.py

@@ -1,4 +1,4 @@
-from typing import TYPE_CHECKING, Any, Optional
+from typing import TYPE_CHECKING, Any
 
 from graphene import InputObjectType, Mutation
 from graphql import GraphQLResolveInfo
@@ -20,7 +20,7 @@ if TYPE_CHECKING:
 class InfrahubGraphQLQueryMutation(InfrahubMutationMixin, Mutation):
     @classmethod
     def __init_subclass_with_meta__(
-        cls, schema: NodeSchema, _meta: Optional[Any] = None, **options: dict[str, Any]
+        cls, schema: NodeSchema, _meta: Any | None = None, **options: dict[str, Any]
     ) -> None:
         # Make sure schema is a valid NodeSchema Node Class
         if not isinstance(schema, NodeSchema):
@@ -67,7 +67,7 @@ class InfrahubGraphQLQueryMutation(InfrahubMutationMixin, Mutation):
         info: GraphQLResolveInfo,
         data: InputObjectType,
         branch: Branch,
-        database: Optional[InfrahubDatabase] = None,  # noqa: ARG003
+        database: InfrahubDatabase | None = None,  # noqa: ARG003
     ) -> tuple[Node, Self]:
         graphql_context: GraphqlContext = info.context
 
@@ -85,8 +85,8 @@ class InfrahubGraphQLQueryMutation(InfrahubMutationMixin, Mutation):
         info: GraphQLResolveInfo,
         data: InputObjectType,
         branch: Branch,
-        database: Optional[InfrahubDatabase] = None,  # noqa: ARG003
-        node: Optional[Node] = None,  # noqa: ARG003
+        database: InfrahubDatabase | None = None,  # noqa: ARG003
+        node: Node | None = None,  # noqa: ARG003
     ) -> tuple[Node, Self]:
         graphql_context: GraphqlContext = info.context
 

infrahub/graphql/mutations/ipam.py

@@ -1,6 +1,6 @@
 import ipaddress
 from ipaddress import IPv4Interface
-from typing import TYPE_CHECKING, Any, Optional
+from typing import TYPE_CHECKING, Any
 
 from graphene import InputObjectType, Mutation
 from graphql import GraphQLResolveInfo
@@ -16,11 +16,11 @@ from infrahub.core.node import Node
 from infrahub.core.schema import NodeSchema
 from infrahub.database import InfrahubDatabase, retry_db_transaction
 from infrahub.exceptions import NodeNotFoundError, ValidationError
-from infrahub.graphql.mutations.node_getter.interface import MutationNodeGetterInterface
 from infrahub.lock import InfrahubMultiLock, build_object_lock_name
 from infrahub.log import get_logger
 
 from .main import DeleteResult, InfrahubMutationMixin, InfrahubMutationOptions
+from .node_getter.by_default_filter import MutationNodeGetterByDefaultFilter
 
 if TYPE_CHECKING:
     from infrahub.graphql.initialization import GraphqlContext
@@ -32,10 +32,10 @@ async def validate_namespace(
     db: InfrahubDatabase,
     branch: Branch | str | None,
     data: InputObjectType,
-    existing_namespace_id: Optional[str] = None,
+    existing_namespace_id: str | None = None,
 ) -> str:
     """Validate or set (if not present) the namespace to pass to the mutation and return its ID."""
-    namespace_id: Optional[str] = None
+    namespace_id: str | None = None
     if "ip_namespace" not in data or not data["ip_namespace"]:
         namespace_id = existing_namespace_id or registry.default_ipnamespace
         data["ip_namespace"] = {"id": namespace_id}
@@ -56,7 +56,7 @@ class InfrahubIPNamespaceMutation(InfrahubMutationMixin, Mutation):
     def __init_subclass_with_meta__(
         cls,
         schema: NodeSchema,
-        _meta: Optional[Any] = None,
+        _meta: Any | None = None,
         **options: dict[str, Any],
     ) -> None:
         # Make sure schema is a valid NodeSchema Node Class
@@ -75,7 +75,7 @@ class InfrahubIPNamespaceMutation(InfrahubMutationMixin, Mutation):
         info: GraphQLResolveInfo,
         data: InputObjectType,
         branch: Branch,
-    ):
+    ) -> DeleteResult:
         if data["id"] == registry.default_ipnamespace:
             raise ValueError("Cannot delete default IPAM namespace")
 
@@ -87,7 +87,7 @@ class InfrahubIPAddressMutation(InfrahubMutationMixin, Mutation):
     def __init_subclass_with_meta__(
         cls,
         schema: NodeSchema,
-        _meta: Optional[Any] = None,
+        _meta: Any | None = None,
         **options: dict[str, Any],
     ) -> None:
         # Make sure schema is a valid NodeSchema Node Class
@@ -130,7 +130,7 @@ class InfrahubIPAddressMutation(InfrahubMutationMixin, Mutation):
         info: GraphQLResolveInfo,
         data: InputObjectType,
         branch: Branch,
-        database: Optional[InfrahubDatabase] = None,
+        database: InfrahubDatabase | None = None,
     ) -> tuple[Node, Self]:
         graphql_context: GraphqlContext = info.context
         db = database or graphql_context.db
@@ -176,8 +176,8 @@ class InfrahubIPAddressMutation(InfrahubMutationMixin, Mutation):
         info: GraphQLResolveInfo,
         data: InputObjectType,
         branch: Branch,
-        database: Optional[InfrahubDatabase] = None,
-        node: Optional[Node] = None,
+        database: InfrahubDatabase | None = None,
+        node: Node | None = None,
     ) -> tuple[Node, Self]:
         graphql_context: GraphqlContext = info.context
         db = database or graphql_context.db
@@ -192,21 +192,19 @@ class InfrahubIPAddressMutation(InfrahubMutationMixin, Mutation):
         )
         namespace = await address.ip_namespace.get_peer(db)
         namespace_id = await validate_namespace(db=db, branch=branch, data=data, existing_namespace_id=namespace.id)
-        try:
-            async with db.start_transaction() as dbt:
-                if lock_name := cls._get_lock_name(namespace_id, branch):
-                    async with InfrahubMultiLock(lock_registry=lock.registry, locks=[lock_name]):
-                        reconciled_address = await cls._mutate_update_object_and_reconcile(
-                            info=info, data=data, branch=branch, address=address, namespace_id=namespace_id, db=dbt
-                        )
-                else:
+
+        async with db.start_transaction() as dbt:
+            if lock_name := cls._get_lock_name(namespace_id, branch):
+                async with InfrahubMultiLock(lock_registry=lock.registry, locks=[lock_name]):
                     reconciled_address = await cls._mutate_update_object_and_reconcile(
                         info=info, data=data, branch=branch, address=address, namespace_id=namespace_id, db=dbt
                     )
+            else:
+                reconciled_address = await cls._mutate_update_object_and_reconcile(
+                    info=info, data=data, branch=branch, address=address, namespace_id=namespace_id, db=dbt
+                )
 
-                result = await cls.mutate_update_to_graphql(db=dbt, info=info, obj=reconciled_address)
-        except ValidationError as exc:
-            raise ValueError(str(exc)) from exc
+            result = await cls.mutate_update_to_graphql(db=dbt, info=info, obj=reconciled_address)
 
         return address, result
 
@@ -216,15 +214,15 @@ class InfrahubIPAddressMutation(InfrahubMutationMixin, Mutation):
         info: GraphQLResolveInfo,
         data: InputObjectType,
         branch: Branch,
-        node_getters: list[MutationNodeGetterInterface],
-        database: Optional[InfrahubDatabase] = None,
+        node_getter_default_filter: MutationNodeGetterByDefaultFilter,
+        database: InfrahubDatabase | None = None,
     ) -> tuple[Node, Self, bool]:
         graphql_context: GraphqlContext = info.context
         db = database or graphql_context.db
 
         await validate_namespace(db=db, branch=branch, data=data)
         prefix, result, created = await super().mutate_upsert(
-            info=info, data=data, branch=branch, node_getters=node_getters, database=db
+            info=info, data=data, branch=branch, node_getter_default_filter=node_getter_default_filter, database=db
         )
 
         return prefix, result, created
@@ -244,7 +242,7 @@ class InfrahubIPPrefixMutation(InfrahubMutationMixin, Mutation):
     def __init_subclass_with_meta__(
         cls,
         schema: NodeSchema,
-        _meta: Optional[Any] = None,
+        _meta: Any | None = None,
         **options: dict[str, Any],
     ) -> None:
         # Make sure schema is a valid NodeSchema Node Class
@@ -258,10 +256,10 @@ class InfrahubIPPrefixMutation(InfrahubMutationMixin, Mutation):
         super().__init_subclass_with_meta__(_meta=_meta, **options)
 
     @staticmethod
-    def _get_lock_name(namespace_id: str, branch: Branch) -> str | None:
-        if not branch.is_default:
-            # Do not lock on other branches as reconciliation will be performed at least when merging in main branch.
-            return None
+    def _get_lock_name(namespace_id: str) -> str | None:
+        # IPPrefix has some cardinality-one relationships involved (parent/child/ip_address),
+        # so we need to lock on any branch to avoid creating multiple peers for these relationships
+        # during concurrent ipam reconciliations.
         return build_object_lock_name(InfrahubKind.IPPREFIX + "_" + namespace_id)
 
     @classmethod
@@ -284,19 +282,15 @@ class InfrahubIPPrefixMutation(InfrahubMutationMixin, Mutation):
         info: GraphQLResolveInfo,
         data: InputObjectType,
         branch: Branch,
-        database: Optional[InfrahubDatabase] = None,
+        database: InfrahubDatabase | None = None,
     ) -> tuple[Node, Self]:
         graphql_context: GraphqlContext = info.context
         db = database or graphql_context.db
         namespace_id = await validate_namespace(db=db, branch=branch, data=data)
 
         async with db.start_transaction() as dbt:
-            if lock_name := cls._get_lock_name(namespace_id, branch):
-                async with InfrahubMultiLock(lock_registry=lock.registry, locks=[lock_name]):
-                    reconciled_prefix = await cls._mutate_create_object_and_reconcile(
-                        data=data, branch=branch, db=dbt, namespace_id=namespace_id
-                    )
-            else:
+            lock_name = cls._get_lock_name(namespace_id)
+            async with InfrahubMultiLock(lock_registry=lock.registry, locks=[lock_name]):
                 reconciled_prefix = await cls._mutate_create_object_and_reconcile(
                     data=data, branch=branch, db=dbt, namespace_id=namespace_id
                 )
@@ -327,8 +321,8 @@ class InfrahubIPPrefixMutation(InfrahubMutationMixin, Mutation):
         info: GraphQLResolveInfo,
         data: InputObjectType,
         branch: Branch,
-        database: Optional[InfrahubDatabase] = None,
-        node: Optional[Node] = None,
+        database: InfrahubDatabase | None = None,
+        node: Node | None = None,
     ) -> tuple[Node, Self]:
         graphql_context: GraphqlContext = info.context
         db = database or graphql_context.db
@@ -343,20 +337,14 @@ class InfrahubIPPrefixMutation(InfrahubMutationMixin, Mutation):
         )
         namespace = await prefix.ip_namespace.get_peer(db)
         namespace_id = await validate_namespace(db=db, branch=branch, data=data, existing_namespace_id=namespace.id)
-        try:
-            async with db.start_transaction() as dbt:
-                if lock_name := cls._get_lock_name(namespace_id, branch):
-                    async with InfrahubMultiLock(lock_registry=lock.registry, locks=[lock_name]):
-                        reconciled_prefix = await cls._mutate_update_object_and_reconcile(
-                            info=info, data=data, prefix=prefix, db=dbt, namespace_id=namespace_id, branch=branch
-                        )
-                else:
-                    reconciled_prefix = await cls._mutate_update_object_and_reconcile(
-                        info=info, data=data, prefix=prefix, db=dbt, namespace_id=namespace_id, branch=branch
-                    )
-                result = await cls.mutate_update_to_graphql(db=dbt, info=info, obj=reconciled_prefix)
-        except ValidationError as exc:
-            raise ValueError(str(exc)) from exc
+
+        async with db.start_transaction() as dbt:
+            lock_name = cls._get_lock_name(namespace_id)
+            async with InfrahubMultiLock(lock_registry=lock.registry, locks=[lock_name]):
+                reconciled_prefix = await cls._mutate_update_object_and_reconcile(
+                    info=info, data=data, prefix=prefix, db=dbt, namespace_id=namespace_id, branch=branch
+                )
+            result = await cls.mutate_update_to_graphql(db=dbt, info=info, obj=reconciled_prefix)
 
         return prefix, result
 
@@ -366,15 +354,15 @@ class InfrahubIPPrefixMutation(InfrahubMutationMixin, Mutation):
         info: GraphQLResolveInfo,
         data: InputObjectType,
         branch: Branch,
-        node_getters: list[MutationNodeGetterInterface],
-        database: Optional[InfrahubDatabase] = None,
-    ):
+        node_getter_default_filter: MutationNodeGetterByDefaultFilter,
+        database: InfrahubDatabase | None = None,
+    ) -> tuple[Node, Self, bool]:
         graphql_context: GraphqlContext = info.context
         db = database or graphql_context.db
 
         await validate_namespace(db=db, branch=branch, data=data)
         prefix, result, created = await super().mutate_upsert(
-            info=info, data=data, branch=branch, node_getters=node_getters, database=db
+            info=info, data=data, branch=branch, node_getter_default_filter=node_getter_default_filter, database=db
         )
 
         return prefix, result, created
@@ -414,21 +402,13 @@ class InfrahubIPPrefixMutation(InfrahubMutationMixin, Mutation):
 
         namespace_rels = await prefix.ip_namespace.get_relationships(db=db)
         namespace_id = namespace_rels[0].peer_id
-        try:
-            async with graphql_context.db.start_transaction() as dbt:
-                if lock_name := cls._get_lock_name(namespace_id, branch):
-                    async with InfrahubMultiLock(lock_registry=lock.registry, locks=[lock_name]):
-                        reconciled_prefix = await cls._reconcile_prefix(
-                            branch=branch, db=dbt, prefix=prefix, namespace_id=namespace_id, is_delete=True
-                        )
-                else:
-                    reconciled_prefix = await cls._reconcile_prefix(
-                        branch=branch, db=dbt, prefix=prefix, namespace_id=namespace_id, is_delete=True
-                    )
-
-        except ValidationError as exc:
-            raise ValueError(str(exc)) from exc
 
+        async with graphql_context.db.start_transaction() as dbt:
+            lock_name = cls._get_lock_name(namespace_id)
+            async with InfrahubMultiLock(lock_registry=lock.registry, locks=[lock_name]):
+                reconciled_prefix = await cls._reconcile_prefix(
+                    branch=branch, db=dbt, prefix=prefix, namespace_id=namespace_id, is_delete=True
+                )
         ok = True
 
         return DeleteResult(node=reconciled_prefix, mutation=cls(ok=ok))