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

infrahub/graphql/mutations/node_getter/by_default_filter.py

@@ -1,4 +1,4 @@
-from typing import Optional
+from copy import copy
 
 from graphene import InputObjectType
 
@@ -21,21 +21,21 @@ class MutationNodeGetterByDefaultFilter(MutationNodeGetterInterface):
         node_schema: MainSchemaTypes,
         data: InputObjectType,
         branch: Branch,
-    ) -> Optional[Node]:
-        node = None
-        default_filter_value = None
+    ) -> Node | None:
         if not node_schema.default_filter:
-            return node
-        this_datum = data
+            return None
+
+        data = copy(data)
 
         for filter_key in node_schema.default_filter.split("__"):
-            if filter_key not in this_datum:
+            if filter_key not in data:
                 break
-            this_datum = this_datum[filter_key]
-        default_filter_value = this_datum
+            data = data[filter_key]
+
+        default_filter_value = data
 
         if not default_filter_value:
-            return node
+            return None
 
         return await self.node_manager.get_one_by_default_filter(
             db=self.db,

infrahub/graphql/mutations/node_getter/by_hfid.py

@@ -1,5 +1,3 @@
-from typing import Optional
-
 from graphene import InputObjectType
 
 from infrahub.core.branch import Branch
@@ -22,7 +20,7 @@ class MutationNodeGetterByHfid(MutationNodeGetterInterface):
         node_schema: MainSchemaTypes,
         data: InputObjectType,
         branch: Branch,
-    ) -> Optional[Node]:
+    ) -> Node | None:
         if not node_schema.human_friendly_id:
             return None
 

infrahub/graphql/mutations/node_getter/by_id.py

@@ -1,5 +1,3 @@
-from typing import Optional
-
 from graphene import InputObjectType
 
 from infrahub.core.branch import Branch
@@ -21,7 +19,7 @@ class MutationNodeGetterById(MutationNodeGetterInterface):
         node_schema: MainSchemaTypes,
         data: InputObjectType,
         branch: Branch,
-    ) -> Optional[Node]:
+    ) -> Node | None:
         node = None
         if "id" not in data:
             return node

infrahub/graphql/mutations/node_getter/interface.py

@@ -1,5 +1,4 @@
 from abc import ABC, abstractmethod
-from typing import Optional
 
 from graphene import InputObjectType
 
@@ -15,4 +14,4 @@ class MutationNodeGetterInterface(ABC):
         node_schema: MainSchemaTypes,
         data: InputObjectType,
         branch: Branch,
-    ) -> Optional[Node]: ...
+    ) -> Node | None: ...

infrahub/graphql/mutations/proposed_change.py

@@ -1,4 +1,4 @@
-from typing import TYPE_CHECKING, Any, Optional
+from typing import TYPE_CHECKING, Any, Self
 
 from graphene import Boolean, Field, InputObjectType, Mutation, String
 from graphql import GraphQLResolveInfo
@@ -31,7 +31,7 @@ if TYPE_CHECKING:
 
 class InfrahubProposedChangeMutation(InfrahubMutationMixin, Mutation):
     @classmethod
-    def __init_subclass_with_meta__(cls, schema: NodeSchema = None, _meta=None, **options):
+    def __init_subclass_with_meta__(cls, schema: NodeSchema = None, _meta=None, **options) -> None:
         # Make sure schema is a valid NodeSchema Node Class
         if not isinstance(schema, NodeSchema):
             raise ValueError(f"You need to pass a valid NodeSchema in '{cls.__name__}.Meta', received '{schema}'")
@@ -49,8 +49,8 @@ class InfrahubProposedChangeMutation(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
 
         async with graphql_context.db.start_transaction() as dbt:
@@ -86,9 +86,9 @@ class InfrahubProposedChangeMutation(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
 
         obj = await NodeManager.get_one_by_id_or_default_filter(

infrahub/graphql/mutations/relationship.py

@@ -8,10 +8,9 @@ from infrahub_sdk.utils import compare_lists
 
 from infrahub import config
 from infrahub.core.account import GlobalPermission, ObjectPermission
-from infrahub.core.changelog.models import NodeChangelog
+from infrahub.core.changelog.models import NodeChangelog, RelationshipChangelogGetter
 from infrahub.core.constants import (
     InfrahubKind,
-    MutationAction,
     PermissionAction,
     PermissionDecision,
     RelationshipCardinality,
@@ -24,10 +23,14 @@ from infrahub.core.query.relationship import (
 )
 from infrahub.core.relationship import Relationship
 from infrahub.database import retry_db_transaction
-from infrahub.events import EventMeta, NodeMutatedEvent
+from infrahub.events import EventMeta
 from infrahub.events.group_action import GroupMemberAddedEvent, GroupMemberRemovedEvent
 from infrahub.events.models import EventNode
+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
+from infrahub.groups.ancestors import collect_ancestors
 from infrahub.permissions import get_global_permission_for_kind
 
 from ..types import RelatedNodeInput
@@ -62,6 +65,7 @@ class RelationshipNodesInput(InputObjectType):
 class RelationshipAdd(Mutation):
     class Arguments:
         data = RelationshipNodesInput(required=True)
+        context = ContextInput(required=False)
 
     ok = Boolean()
 
@@ -72,6 +76,7 @@ class RelationshipAdd(Mutation):
         root: dict,  # noqa: ARG003
         info: GraphQLResolveInfo,
         data: RelationshipNodesInput,
+        context: ContextInput | None = None,
     ) -> Self:
         graphql_context: GraphqlContext = info.context
         relationship_name = str(data.name)
@@ -81,6 +86,9 @@ class RelationshipAdd(Mutation):
         await _validate_permissions(info=info, source_node=source, peers=nodes)
         await _validate_peer_types(info=info, data=data, source_node=source, peers=nodes)
 
+        # This has to be done after validating the permissions
+        await apply_external_context(graphql_context=graphql_context, context_input=context)
+
         rel_schema = source.get_schema().get_relationship(name=relationship_name)
         display_label: str = await source.render_display_label(db=graphql_context.db)
         node_changelog = NodeChangelog(
@@ -89,6 +97,10 @@ class RelationshipAdd(Mutation):
 
         existing_peers = await _collect_current_peers(info=info, data=data, source_node=source)
 
+        group_event_type = _get_group_event_type(
+            node=source, relationship_schema=rel_schema, relationship_name=relationship_name
+        )
+
         async with graphql_context.db.start_transaction() as db:
             peers: list[EventNode] = []
             for node_data in data.get("nodes"):
@@ -99,19 +111,24 @@ class RelationshipAdd(Mutation):
                 await rel.resolve(db=db)
                 # Save it only if it does not exist
                 if rel.get_peer_id() not in existing_peers.keys():
-                    peers.append(EventNode(id=rel.get_peer_id(), kind=rel.get_peer_kind()))
+                    if group_event_type != GroupUpdateType.NONE:
+                        peers.append(EventNode(id=rel.get_peer_id(), kind=nodes[rel.get_peer_id()].get_kind()))
                     node_changelog.create_relationship(relationship=rel)
                     await rel.save(db=db)
 
         if config.SETTINGS.broker.enable and graphql_context.background and node_changelog.has_changes:
-            group_event_type = _get_group_event_type(
-                node=source, relationship_schema=rel_schema, relationship_name=relationship_name
-            )
             if group_event_type == GroupUpdateType.MEMBERS:
+                ancestors = await collect_ancestors(
+                    db=graphql_context.db,
+                    branch=graphql_context.branch,
+                    node_kind=source.get_schema().kind,
+                    node_id=source.id,
+                )
                 group_add_event = GroupMemberAddedEvent(
                     node_id=source.id,
                     kind=source.get_schema().kind,
                     members=peers,
+                    ancestors=ancestors,
                     meta=EventMeta(branch=graphql_context.branch, context=graphql_context.get_context()),
                 )
                 graphql_context.background.add_task(graphql_context.active_service.event.send, group_add_event)
@@ -124,24 +141,46 @@ class RelationshipAdd(Mutation):
                     node_kind_map = await node_kind_query.get_node_kind_map()
 
                     for node_id, node_kind in node_kind_map.items():
+                        ancestors = await collect_ancestors(
+                            db=graphql_context.db, branch=graphql_context.branch, node_kind=node_kind, node_id=node_id
+                        )
                         group_add_event = GroupMemberAddedEvent(
                             node_id=node_id,
                             kind=node_kind,
+                            ancestors=ancestors,
                             members=[EventNode(id=source.get_id(), kind=source.get_kind())],
                             meta=EventMeta(branch=graphql_context.branch, context=graphql_context.get_context()),
                         )
                         graphql_context.background.add_task(graphql_context.active_service.event.send, group_add_event)
 
             else:
-                event = NodeMutatedEvent(
+                main_event = NodeUpdatedEvent(
                     kind=source.get_schema().kind,
                     node_id=source.id,
-                    data=node_changelog,
-                    action=MutationAction.UPDATED,
+                    changelog=node_changelog,
                     fields=[relationship_name],
                     meta=EventMeta(branch=graphql_context.branch, context=graphql_context.get_context()),
                 )
-                graphql_context.background.add_task(graphql_context.active_service.event.send, event)
+                relationship_changelogs = RelationshipChangelogGetter(
+                    db=graphql_context.db, branch=graphql_context.branch
+                )
+                node_changelogs = await relationship_changelogs.get_changelogs(primary_changelog=node_changelog)
+
+                events = [main_event]
+
+                for node_changelog in node_changelogs:
+                    meta = EventMeta.from_parent(parent=main_event)
+                    event = NodeUpdatedEvent(
+                        kind=node_changelog.node_kind,
+                        node_id=node_changelog.node_id,
+                        changelog=node_changelog,
+                        fields=node_changelog.updated_fields,
+                        meta=meta,
+                    )
+                    events.append(event)
+
+                for event in events:
+                    graphql_context.background.add_task(graphql_context.active_service.event.send, event)
 
         return cls(ok=True)
 
@@ -149,6 +188,7 @@ class RelationshipAdd(Mutation):
 class RelationshipRemove(Mutation):
     class Arguments:
         data = RelationshipNodesInput(required=True)
+        context = ContextInput(required=False)
 
     ok = Boolean()
 
@@ -159,6 +199,7 @@ class RelationshipRemove(Mutation):
         root: dict,  # noqa: ARG003
         info: GraphQLResolveInfo,
         data: RelationshipNodesInput,
+        context: ContextInput | None = None,
     ) -> Self:
         graphql_context: GraphqlContext = info.context
         relationship_name = str(data.name)
@@ -168,6 +209,9 @@ class RelationshipRemove(Mutation):
         await _validate_permissions(info=info, source_node=source, peers=nodes)
         await _validate_peer_types(info=info, data=data, source_node=source, peers=nodes)
 
+        # This has to be done after validating the permissions
+        await apply_external_context(graphql_context=graphql_context, context_input=context)
+
         rel_schema = source.get_schema().get_relationship(name=relationship_name)
         display_label: str = await source.render_display_label(db=graphql_context.db)
         node_changelog = NodeChangelog(
@@ -175,6 +219,9 @@ class RelationshipRemove(Mutation):
         )
 
         existing_peers = await _collect_current_peers(info=info, data=data, source_node=source)
+        group_event_type = _get_group_event_type(
+            node=source, relationship_schema=rel_schema, relationship_name=relationship_name
+        )
 
         async with graphql_context.db.start_transaction() as db:
             peers: list[EventNode] = []
@@ -186,19 +233,24 @@ class RelationshipRemove(Mutation):
                     # it would be more query efficient
                     rel = Relationship(schema=rel_schema, branch=graphql_context.branch, node=source)
                     await rel.load(db=db, data=existing_peers[node_data.get("id")])
-                    peers.append(EventNode(id=rel.get_peer_id(), kind=rel.get_peer_kind()))
+                    if group_event_type != GroupUpdateType.NONE:
+                        peers.append(EventNode(id=rel.get_peer_id(), kind=nodes[rel.get_peer_id()].get_kind()))
                     node_changelog.delete_relationship(relationship=rel)
                     await rel.delete(db=db)
 
         if config.SETTINGS.broker.enable and graphql_context.background and node_changelog.has_changes:
-            group_event_type = _get_group_event_type(
-                node=source, relationship_schema=rel_schema, relationship_name=relationship_name
-            )
             if group_event_type == GroupUpdateType.MEMBERS:
+                ancestors = await collect_ancestors(
+                    db=graphql_context.db,
+                    branch=graphql_context.branch,
+                    node_kind=source.get_schema().kind,
+                    node_id=source.id,
+                )
                 group_remove_event = GroupMemberRemovedEvent(
                     node_id=source.id,
                     kind=source.get_schema().kind,
                     members=peers,
+                    ancestors=ancestors,
                     meta=EventMeta(branch=graphql_context.branch, context=graphql_context.get_context()),
                 )
                 graphql_context.background.add_task(graphql_context.active_service.event.send, group_remove_event)
@@ -210,6 +262,9 @@ class RelationshipRemove(Mutation):
                     node_kind_map = await node_kind_query.get_node_kind_map()
 
                     for node_id, node_kind in node_kind_map.items():
+                        ancestors = await collect_ancestors(
+                            db=graphql_context.db, branch=graphql_context.branch, node_kind=node_kind, node_id=node_id
+                        )
                         group_remove_event = GroupMemberRemovedEvent(
                             node_id=node_id,
                             kind=node_kind,
@@ -220,15 +275,34 @@ class RelationshipRemove(Mutation):
                             graphql_context.active_service.event.send, group_remove_event
                         )
             else:
-                event = NodeMutatedEvent(
+                main_event = NodeUpdatedEvent(
                     kind=source.get_schema().kind,
                     node_id=source.id,
-                    data=node_changelog,
-                    action=MutationAction.UPDATED,
+                    changelog=node_changelog,
                     fields=[relationship_name],
                     meta=EventMeta(branch=graphql_context.branch, context=graphql_context.get_context()),
                 )
-                graphql_context.background.add_task(graphql_context.active_service.event.send, event)
+
+                relationship_changelogs = RelationshipChangelogGetter(
+                    db=graphql_context.db, branch=graphql_context.branch
+                )
+                node_changelogs = await relationship_changelogs.get_changelogs(primary_changelog=node_changelog)
+
+                events = [main_event]
+
+                for node_changelog in node_changelogs:
+                    meta = EventMeta.from_parent(parent=main_event)
+                    event = NodeUpdatedEvent(
+                        kind=node_changelog.node_kind,
+                        node_id=node_changelog.node_id,
+                        changelog=node_changelog,
+                        fields=node_changelog.updated_fields,
+                        meta=meta,
+                    )
+                    events.append(event)
+
+                for event in events:
+                    graphql_context.background.add_task(graphql_context.active_service.event.send, event)
 
         return cls(ok=True)
 

infrahub/graphql/mutations/repository.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import re
-from typing import TYPE_CHECKING, Any, Optional, cast
+from typing import TYPE_CHECKING, Any, Self, cast
 
 import httpx
 from graphene import Boolean, Field, InputObjectType, Mutation, String
@@ -45,7 +45,7 @@ log = get_logger()
 
 class InfrahubRepositoryMutation(InfrahubMutationMixin, Mutation):
     @classmethod
-    def __init_subclass_with_meta__(cls, schema: Optional[NodeSchema] = None, _meta=None, **options):
+    def __init_subclass_with_meta__(cls, schema: NodeSchema | None = None, _meta=None, **options) -> None:
         # Make sure schema is a valid NodeSchema Node Class
         if not isinstance(schema, NodeSchema):
             raise ValueError(f"You need to pass a valid NodeSchema in '{cls.__name__}.Meta', received '{schema}'")
@@ -63,8 +63,8 @@ class InfrahubRepositoryMutation(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
 
         cleanup_payload(data)
@@ -149,9 +149,9 @@ class InfrahubRepositoryMutation(InfrahubMutationMixin, Mutation):
         info: GraphQLResolveInfo,
         data: InputObjectType,
         branch: Branch,
-        database: Optional[InfrahubDatabase] = None,  # noqa: ARG003
-        node: Optional[Node] = None,
-    ):
+        database: InfrahubDatabase | None = None,  # noqa: ARG003
+        node: Node | None = None,
+    ) -> tuple[Node, Self]:
         graphql_context: GraphqlContext = info.context
 
         cleanup_payload(data)
@@ -219,7 +219,7 @@ def cleanup_payload(data: InputObjectType | dict[str, Any]) -> None:
     ):
         url = httpx.URL(data["location"]["value"])
         if url.host in config.SETTINGS.git.append_git_suffix:
-            data["location"]["value"] = f'{data["location"]["value"]}.git'
+            data["location"]["value"] = f"{data['location']['value']}.git"
 
 
 class ProcessRepository(Mutation):

infrahub/graphql/mutations/resource_manager.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING, Any
 
-from graphene import Boolean, Field, InputField, InputObjectType, Int, Mutation, String
+from graphene import Boolean, Field, InputField, InputObjectType, Int, List, Mutation, String
 from graphene.types.generic import GenericScalar
 from typing_extensions import Self
 
@@ -30,7 +30,7 @@ if TYPE_CHECKING:
 
 class IPPrefixPoolGetResourceInput(InputObjectType):
     id = InputField(String(required=False), description="ID of the pool to allocate from")
-    hfid = InputField(String(required=False), description="HFID of the pool to allocate from")
+    hfid = InputField(List(of_type=String, required=False), description="HFID of the pool to allocate from")
     identifier = InputField(String(required=False), description="Identifier for the allocated resource")
     prefix_length = InputField(Int(required=False), description="Size of the prefix to allocate")
     member_type = InputField(String(required=False), description="Type of members for the newly created prefix")
@@ -40,7 +40,7 @@ class IPPrefixPoolGetResourceInput(InputObjectType):
 
 class IPAddressPoolGetResourceInput(InputObjectType):
     id = InputField(String(required=False), description="ID of the pool to allocate from")
-    hfid = InputField(String(required=False), description="HFID of the pool to allocate from")
+    hfid = InputField(List(of_type=String, required=False), description="HFID of the pool to allocate from")
     identifier = InputField(String(required=False), description="Identifier for the allocated resource")
     prefix_length = InputField(
         Int(required=False), description="Size of the prefix mask to allocate on the new IP address"

infrahub/graphql/mutations/schema.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Self, Union
+from typing import TYPE_CHECKING, Self
 
 from graphene import Boolean, Field, InputObjectType, Mutation, String
 
@@ -13,6 +13,8 @@ from infrahub.database import InfrahubDatabase, retry_db_transaction
 from infrahub.events import EventMeta
 from infrahub.events.schema_action import SchemaUpdatedEvent
 from infrahub.exceptions import ValidationError
+from infrahub.graphql.context import apply_external_context
+from infrahub.graphql.types.context import ContextInput
 from infrahub.log import get_log_data, get_logger
 from infrahub.worker import WORKER_IDENTITY
 
@@ -51,6 +53,7 @@ class SchemaDropdownAddInput(SchemaDropdownRemoveInput):
 class SchemaDropdownAdd(Mutation):
     class Arguments:
         data = SchemaDropdownAddInput(required=True)
+        context = ContextInput(required=False)
 
     ok = Boolean()
     object = Field(DropdownFields)
@@ -62,9 +65,12 @@ class SchemaDropdownAdd(Mutation):
         root: dict,  # noqa: ARG003
         info: GraphQLResolveInfo,
         data: SchemaDropdownAddInput,
+        context: ContextInput | None = None,
     ) -> Self:
         graphql_context: GraphqlContext = info.context
 
+        await apply_external_context(graphql_context=graphql_context, context_input=context)
+
         kind = graphql_context.db.schema.get(name=str(data.kind), branch=graphql_context.branch.name)
         attribute = str(data.attribute)
         validate_kind_dropdown(kind=kind, attribute=attribute)
@@ -109,6 +115,7 @@ class SchemaDropdownAdd(Mutation):
 class SchemaDropdownRemove(Mutation):
     class Arguments:
         data = SchemaDropdownRemoveInput(required=True)
+        context = ContextInput(required=False)
 
     ok = Boolean()
 
@@ -119,10 +126,12 @@ class SchemaDropdownRemove(Mutation):
         root: dict,  # noqa: ARG003
         info: GraphQLResolveInfo,
         data: SchemaDropdownRemoveInput,
+        context: ContextInput | None = None,
     ) -> dict[str, bool]:
         graphql_context: GraphqlContext = info.context
 
         kind = graphql_context.db.schema.get(name=str(data.kind), branch=graphql_context.branch.name)
+        await apply_external_context(graphql_context=graphql_context, context_input=context)
 
         attribute = str(data.attribute)
         validate_kind_dropdown(kind=kind, attribute=attribute)
@@ -161,6 +170,7 @@ class SchemaDropdownRemove(Mutation):
 class SchemaEnumAdd(Mutation):
     class Arguments:
         data = SchemaEnumInput(required=True)
+        context = ContextInput(required=False)
 
     ok = Boolean()
 
@@ -171,10 +181,12 @@ class SchemaEnumAdd(Mutation):
         root: dict,  # noqa: ARG003
         info: GraphQLResolveInfo,
         data: SchemaEnumInput,
+        context: ContextInput | None = None,
     ) -> dict[str, bool]:
         graphql_context: GraphqlContext = info.context
 
         kind = graphql_context.db.schema.get(name=str(data.kind), branch=graphql_context.branch.name)
+        await apply_external_context(graphql_context=graphql_context, context_input=context)
 
         attribute = str(data.attribute)
         enum = str(data.enum)
@@ -203,6 +215,7 @@ class SchemaEnumAdd(Mutation):
 class SchemaEnumRemove(Mutation):
     class Arguments:
         data = SchemaEnumInput(required=True)
+        context = ContextInput(required=False)
 
     ok = Boolean()
 
@@ -213,10 +226,12 @@ class SchemaEnumRemove(Mutation):
         root: dict,  # noqa: ARG003
         info: GraphQLResolveInfo,
         data: SchemaEnumInput,
+        context: ContextInput | None = None,
     ) -> dict[str, bool]:
         graphql_context: GraphqlContext = info.context
 
         kind = graphql_context.db.schema.get(name=str(data.kind), branch=graphql_context.branch.name)
+        await apply_external_context(graphql_context=graphql_context, context_input=context)
 
         attribute = str(data.attribute)
         enum = str(data.enum)
@@ -252,21 +267,21 @@ class SchemaEnumRemove(Mutation):
         return {"ok": True}
 
 
-def validate_kind_dropdown(kind: Union[GenericSchema, NodeSchema], attribute: str) -> None:
+def validate_kind_dropdown(kind: GenericSchema | NodeSchema, attribute: str) -> None:
     validate_kind(kind=kind, attribute=attribute)
     matching_attribute = [attrib for attrib in kind.attributes if attrib.name == attribute]
     if matching_attribute and matching_attribute[0].kind != "Dropdown":
         raise ValidationError(f"Attribute {attribute} on {kind.kind} is not a Dropdown")
 
 
-def validate_kind_enum(kind: Union[GenericSchema, NodeSchema], attribute: str) -> None:
+def validate_kind_enum(kind: GenericSchema | NodeSchema, attribute: str) -> None:
     validate_kind(kind=kind, attribute=attribute)
     matching_attribute = [attrib for attrib in kind.attributes if attrib.name == attribute]
     if not matching_attribute[0].enum:
         raise ValidationError(f"Attribute {attribute} on {kind.kind} is not an enum")
 
 
-def validate_kind(kind: Union[GenericSchema, NodeSchema], attribute: str) -> None:
+def validate_kind(kind: GenericSchema | NodeSchema, attribute: str) -> None:
     if kind.namespace in RESTRICTED_NAMESPACES:
         raise ValidationError(f"Operation not allowed for {kind.kind} in restricted namespace {kind.namespace}")
     if attribute not in kind.attribute_names: