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

infrahub/menu/constants.py

@@ -8,3 +8,4 @@ class MenuSection(InfrahubStringEnum):
 
 DEFAULT_MENU = "Other"
 FULL_DEFAULT_MENU = "BuiltinOther"
+TEMPLATE_MENU = "Object templates"

infrahub/menu/generator.py

@@ -3,10 +3,11 @@ from __future__ import annotations
 from typing import TYPE_CHECKING
 
 from infrahub.core import registry
+from infrahub.core.constants import InfrahubKind
 from infrahub.core.protocols import CoreMenuItem
 from infrahub.log import get_logger
 
-from .constants import FULL_DEFAULT_MENU
+from .constants import FULL_DEFAULT_MENU, TEMPLATE_MENU
 from .models import MenuDict, MenuItemDict
 
 if TYPE_CHECKING:
@@ -39,7 +40,6 @@ async def generate_restricted_menu(
     return menu
 
 
-# pylint: disable=too-many-branches,too-many-statements
 async def generate_menu(db: InfrahubDatabase, branch: Branch, menu_items: list[CoreMenuItem]) -> MenuDict:
     structure = MenuDict()
     full_schema = registry.schema.get_full(branch=branch, duplicate=False)
@@ -82,6 +82,11 @@ async def generate_menu(db: InfrahubDatabase, branch: Branch, menu_items: list[C
 
     items_to_add = {schema.kind: False for schema in full_schema.values() if schema.include_in_menu is True}
 
+    # Object templates should go into a dedicated menu item
+    object_templates_menu = MenuItemDict(
+        identifier=InfrahubKind.OBJECTTEMPLATE, label=TEMPLATE_MENU.title(), icon="mdi:pencil-ruler", order_weight=20000
+    )
+
     nbr_remaining_items_last_round = len(items_to_add.values())
     nbr_remaining_items = len([value for value in items_to_add.values() if value is False])
     while not all(items_to_add.values()):
@@ -96,7 +101,10 @@ async def generate_menu(db: InfrahubDatabase, branch: Branch, menu_items: list[C
                 items_to_add[item_name] = True
                 continue
 
-            if not schema.menu_placement:
+            if schema.namespace == "Template":
+                object_templates_menu.children[menu_item.identifier] = menu_item
+                items_to_add[item_name] = True
+            elif not schema.menu_placement:
                 first_element = MenuItemDict.from_schema(model=schema)
                 first_element.identifier = f"{first_element.identifier}Sub"
                 first_element.order_weight = 1
@@ -113,6 +121,9 @@ async def generate_menu(db: InfrahubDatabase, branch: Branch, menu_items: list[C
             break
         nbr_remaining_items_last_round = nbr_remaining_items
 
+    if object_templates_menu.children:
+        structure.data[object_templates_menu.identifier] = object_templates_menu
+
     # ----------------------------------------------------------------------------
     # Assign the remaining items for which we couldn't find the menu_placement to the default menu
     # ----------------------------------------------------------------------------

infrahub/menu/menu.py

@@ -96,6 +96,16 @@ default_menu = [
         section=MenuSection.INTERNAL,
         order_weight=1000,
     ),
+    MenuItemDefinition(
+        namespace="Builtin",
+        name="Branches",
+        label="Branches",
+        path="/branches",
+        icon="mdi:layers-triple",
+        protected=True,
+        section=MenuSection.INTERNAL,
+        order_weight=1500,
+    ),
     MenuItemDefinition(
         namespace="Builtin",
         name="ObjectManagement",
@@ -103,7 +113,7 @@ default_menu = [
         icon="mdi:cube-outline",
         protected=True,
         section=MenuSection.INTERNAL,
-        order_weight=1500,
+        order_weight=2000,
         children=[
             MenuItemDefinition(
                 namespace="Builtin",
@@ -123,232 +133,211 @@ default_menu = [
                 icon=_extract_node_icon(infrahub_schema.get(InfrahubKind.PROFILE)),
                 protected=True,
                 section=MenuSection.INTERNAL,
-                order_weight=2000,
+                order_weight=1500,
             ),
             MenuItemDefinition(
                 namespace="Builtin",
                 name="ResourceManager",
-                label="Resource Manager",
+                label="Resource Managers",
                 path="/resource-manager",
                 icon=_extract_node_icon(infrahub_schema.get(InfrahubKind.RESOURCEPOOL)),
                 protected=True,
                 section=MenuSection.INTERNAL,
-                order_weight=3000,
+                order_weight=2000,
             ),
-        ],
-    ),
-    MenuItemDefinition(
-        namespace="Builtin",
-        name="ChangeControl",
-        label="Change Control",
-        icon="mdi:source-branch",
-        protected=True,
-        section=MenuSection.INTERNAL,
-        order_weight=2000,
-        children=[
             MenuItemDefinition(
                 namespace="Builtin",
-                name="Branches",
-                label="Branches",
-                path="/branches",
-                icon="mdi:layers-triple",
+                name="Artifact",
+                label="Artifacts",
+                kind=InfrahubKind.ARTIFACT,
+                icon=_extract_node_icon(infrahub_schema.get(InfrahubKind.ARTIFACT)),
                 protected=True,
                 section=MenuSection.INTERNAL,
-                order_weight=1000,
+                order_weight=2500,
             ),
             MenuItemDefinition(
                 namespace="Builtin",
-                name="CheckDefinition",
-                label="Check Definition",
-                kind=InfrahubKind.CHECKDEFINITION,
-                icon=_extract_node_icon(infrahub_schema.get(InfrahubKind.CHECKDEFINITION)),
+                name="Schema",
+                label="Schemas",
+                path="/schema",
+                icon="mdi:file-code",
                 protected=True,
                 section=MenuSection.INTERNAL,
-                order_weight=3000,
+                order_weight=2000,
             ),
             MenuItemDefinition(
                 namespace="Builtin",
-                name="Tasks",
-                label="Tasks",
-                path="/tasks",
-                icon="mdi:shield-check",
+                name="GraphqlQuery",
+                label="GraphQL Queries",
+                kind=InfrahubKind.GRAPHQLQUERY,
+                icon=_extract_node_icon(infrahub_schema.get(InfrahubKind.GRAPHQLQUERY)),
                 protected=True,
                 section=MenuSection.INTERNAL,
-                order_weight=3000,
+                order_weight=3500,
+            ),
+            MenuItemDefinition(
+                namespace="Builtin",
+                name="ActivityLogs",
+                label="Activity Logs",
+                path="/activities",
+                icon="mdi:format-list-bulleted",
+                protected=True,
+                section=MenuSection.INTERNAL,
+                order_weight=4000,
             ),
         ],
     ),
     MenuItemDefinition(
         namespace="Builtin",
-        name="UnifiedStorage",
-        label="Unified Storage",
-        icon="mdi:nas",
+        name="Actions",
+        label="Actions",
+        icon="mdi:rocket-launch",
         protected=True,
         section=MenuSection.INTERNAL,
         order_weight=2500,
         children=[
             MenuItemDefinition(
                 namespace="Builtin",
-                name="Schema",
-                label="Schema",
-                path="/schema",
-                icon="mdi:file-code",
+                name="CheckDefinition",
+                label="Check Definition",
+                kind=InfrahubKind.CHECKDEFINITION,
+                icon=_extract_node_icon(infrahub_schema.get(InfrahubKind.CHECKDEFINITION)),
+                protected=True,
+                section=MenuSection.INTERNAL,
+                order_weight=3000,
+            ),
+            MenuItemDefinition(
+                namespace="Builtin",
+                name="ArtifactDefinition",
+                label="Artifact Definitions",
+                kind=InfrahubKind.ARTIFACTDEFINITION,
+                icon=_extract_node_icon(infrahub_schema.get(InfrahubKind.ARTIFACTDEFINITION)),
                 protected=True,
                 section=MenuSection.INTERNAL,
                 order_weight=1000,
             ),
             MenuItemDefinition(
                 namespace="Builtin",
-                name="Git Repository",
-                label="Repository",
-                kind=InfrahubKind.GENERICREPOSITORY,
-                icon=_extract_node_icon(infrahub_schema.get(InfrahubKind.GENERICREPOSITORY)),
+                name="Transformation",
+                label="Transformations",
+                kind=InfrahubKind.TRANSFORM,
+                icon=_extract_node_icon(infrahub_schema.get(InfrahubKind.TRANSFORM)),
                 protected=True,
                 section=MenuSection.INTERNAL,
-                order_weight=2000,
+                order_weight=3000,
             ),
             MenuItemDefinition(
                 namespace="Builtin",
-                name="Credentials",
-                label="Credentials",
-                kind=InfrahubKind.CREDENTIAL,
-                icon=_extract_node_icon(infrahub_schema.get(InfrahubKind.CREDENTIAL)),
+                name="GeneratorInstance",
+                label="Generators",
+                kind=InfrahubKind.GENERATORINSTANCE,
+                icon=_extract_node_icon(infrahub_schema.get(InfrahubKind.GENERATORINSTANCE)),
                 protected=True,
                 section=MenuSection.INTERNAL,
-                order_weight=2000,
+                order_weight=1000,
             ),
             MenuItemDefinition(
                 namespace="Builtin",
-                name="GraphqlQuery",
-                label="GraphQL Query",
-                kind=InfrahubKind.GRAPHQLQUERY,
-                icon=_extract_node_icon(infrahub_schema.get(InfrahubKind.GRAPHQLQUERY)),
+                name="GeneratorDefinition",
+                label="Generator Definitions",
+                kind=InfrahubKind.GENERATORDEFINITION,
+                icon=_extract_node_icon(infrahub_schema.get(InfrahubKind.GENERATORDEFINITION)),
                 protected=True,
                 section=MenuSection.INTERNAL,
-                order_weight=3000,
+                order_weight=2000,
             ),
         ],
     ),
     MenuItemDefinition(
         namespace="Builtin",
-        name="Deployment",
-        label="Deployment",
-        icon="mdi:rocket-launch",
+        name="Integration",
+        label="Integrations",
+        icon="mdi:connection",
         protected=True,
         section=MenuSection.INTERNAL,
         order_weight=3000,
         children=[
             MenuItemDefinition(
                 namespace="Builtin",
-                name="ArtifactMenu",
-                label="Artifact",
+                name="Webhooks",
+                label="Webhooks",
+                icon=_extract_node_icon(infrahub_schema.get(InfrahubKind.CUSTOMWEBHOOK)),
                 protected=True,
                 section=MenuSection.INTERNAL,
-                order_weight=1000,
+                order_weight=3000,
                 children=[
                     MenuItemDefinition(
                         namespace="Builtin",
-                        name="Artifact",
-                        label="Artifact",
-                        kind=InfrahubKind.ARTIFACT,
-                        icon=_extract_node_icon(infrahub_schema.get(InfrahubKind.ARTIFACT)),
+                        name="WebhookStandard",
+                        label="Webhooks",
+                        kind=InfrahubKind.STANDARDWEBHOOK,
+                        icon=_extract_node_icon(infrahub_schema.get(InfrahubKind.STANDARDWEBHOOK)),
                         protected=True,
                         section=MenuSection.INTERNAL,
                         order_weight=1000,
                     ),
                     MenuItemDefinition(
                         namespace="Builtin",
-                        name="ArtifactDefinition",
-                        label="Artifact Definition",
-                        kind=InfrahubKind.ARTIFACTDEFINITION,
-                        icon=_extract_node_icon(infrahub_schema.get(InfrahubKind.ARTIFACTDEFINITION)),
+                        name="WebhookCustom",
+                        label="Custom Webhooks",
+                        kind=InfrahubKind.CUSTOMWEBHOOK,
+                        icon=_extract_node_icon(infrahub_schema.get(InfrahubKind.CUSTOMWEBHOOK)),
                         protected=True,
                         section=MenuSection.INTERNAL,
-                        order_weight=1000,
+                        order_weight=2000,
                     ),
                 ],
             ),
             MenuItemDefinition(
                 namespace="Builtin",
-                name="GeneratorMenu",
-                label="Generator",
+                name="Git Repository",
+                label="Git Repositories",
+                kind=InfrahubKind.GENERICREPOSITORY,
+                icon=_extract_node_icon(infrahub_schema.get(InfrahubKind.GENERICREPOSITORY)),
                 protected=True,
                 section=MenuSection.INTERNAL,
-                order_weight=1000,
-                children=[
-                    MenuItemDefinition(
-                        namespace="Builtin",
-                        name="GeneratorInstance",
-                        label="Generator Instance",
-                        kind=InfrahubKind.GENERATORINSTANCE,
-                        icon=_extract_node_icon(infrahub_schema.get(InfrahubKind.GENERATORINSTANCE)),
-                        protected=True,
-                        section=MenuSection.INTERNAL,
-                        order_weight=1000,
-                    ),
-                    MenuItemDefinition(
-                        namespace="Builtin",
-                        name="GeneratorDefinition",
-                        label="Generator Definition",
-                        kind=InfrahubKind.GENERATORDEFINITION,
-                        icon=_extract_node_icon(infrahub_schema.get(InfrahubKind.GENERATORDEFINITION)),
-                        protected=True,
-                        section=MenuSection.INTERNAL,
-                        order_weight=2000,
-                    ),
-                ],
+                order_weight=2000,
             ),
             MenuItemDefinition(
                 namespace="Builtin",
-                name="Transformation",
-                label="Transformation",
-                kind=InfrahubKind.TRANSFORM,
-                icon=_extract_node_icon(infrahub_schema.get(InfrahubKind.TRANSFORM)),
+                name="Credentials",
+                label="Credentials",
+                kind=InfrahubKind.CREDENTIAL,
+                icon=_extract_node_icon(infrahub_schema.get(InfrahubKind.CREDENTIAL)),
                 protected=True,
                 section=MenuSection.INTERNAL,
-                order_weight=3000,
+                order_weight=2000,
             ),
         ],
     ),
     MenuItemDefinition(
         namespace="Builtin",
-        name="Integration",
-        label="Integrations",
-        icon="mdi:connection",
+        name="Activity",
+        label="Activity",
+        icon="mdi:chart-bar-stacked",
         protected=True,
         section=MenuSection.INTERNAL,
-        order_weight=3500,
+        order_weight=4000,
         children=[
             MenuItemDefinition(
                 namespace="Builtin",
-                name="Webhooks",
-                label="Webhooks",
-                icon=_extract_node_icon(infrahub_schema.get(InfrahubKind.CUSTOMWEBHOOK)),
+                name="Tasks",
+                label="Tasks",
+                path="/tasks",
+                icon="mdi:shield-check",
                 protected=True,
                 section=MenuSection.INTERNAL,
-                order_weight=3000,
-                children=[
-                    MenuItemDefinition(
-                        namespace="Builtin",
-                        name="WebhookStandard",
-                        label="Webhook",
-                        kind=InfrahubKind.STANDARDWEBHOOK,
-                        icon=_extract_node_icon(infrahub_schema.get(InfrahubKind.STANDARDWEBHOOK)),
-                        protected=True,
-                        section=MenuSection.INTERNAL,
-                        order_weight=1000,
-                    ),
-                    MenuItemDefinition(
-                        namespace="Builtin",
-                        name="WebhookCustom",
-                        label="Custom Webhook",
-                        kind=InfrahubKind.CUSTOMWEBHOOK,
-                        icon=_extract_node_icon(infrahub_schema.get(InfrahubKind.CUSTOMWEBHOOK)),
-                        protected=True,
-                        section=MenuSection.INTERNAL,
-                        order_weight=2000,
-                    ),
-                ],
+                order_weight=1000,
+            ),
+            MenuItemDefinition(
+                namespace="Builtin",
+                name="ActivityLog",
+                label="Activity Log",
+                path="/activity-log",
+                icon="mdi:timeline-text",
+                protected=True,
+                section=MenuSection.INTERNAL,
+                order_weight=2000,
             ),
         ],
     ),

infrahub/menu/models.py

@@ -9,7 +9,7 @@ from typing_extensions import Self
 from infrahub.core.account import GlobalPermission
 from infrahub.core.node import Node
 from infrahub.core.protocols import CoreMenuItem
-from infrahub.core.schema import GenericSchema, MainSchemaTypes, NodeSchema, ProfileSchema
+from infrahub.core.schema import GenericSchema, MainSchemaTypes, NodeSchema, ProfileSchema, TemplateSchema
 
 from .constants import MenuSection
 
@@ -17,8 +17,8 @@ if TYPE_CHECKING:
     from infrahub.database import InfrahubDatabase
 
 
-def get_full_name(obj: CoreMenuItem | NodeSchema | GenericSchema | ProfileSchema) -> str:
-    if isinstance(obj, (NodeSchema, GenericSchema, ProfileSchema)):
+def get_full_name(obj: CoreMenuItem | NodeSchema | GenericSchema | ProfileSchema | TemplateSchema) -> str:
+    if isinstance(obj, NodeSchema | GenericSchema | ProfileSchema | TemplateSchema):
         return _get_full_name_schema(obj)
     return _get_full_name_node(obj)
 
@@ -97,7 +97,7 @@ class MenuItem(BaseModel):
         )
 
     @classmethod
-    def from_schema(cls, model: NodeSchema | GenericSchema | ProfileSchema) -> Self:
+    def from_schema(cls, model: NodeSchema | GenericSchema | ProfileSchema | TemplateSchema) -> Self:
         return cls(
             identifier=get_full_name(model),
             label=model.label or model.kind,

infrahub/message_bus/messages/__init__.py

@@ -1,6 +1,5 @@
 from infrahub.message_bus import InfrahubMessage, InfrahubResponse
 
-from .check_artifact_create import CheckArtifactCreate
 from .check_generator_run import CheckGeneratorRun
 from .check_repository_checkdefinition import CheckRepositoryCheckDefinition
 from .check_repository_mergeconflicts import CheckRepositoryMergeConflicts
@@ -19,7 +18,6 @@ from .proposed_change.request_proposedchange_refreshartifacts import RequestProp
 from .refresh_git_fetch import RefreshGitFetch
 from .refresh_registry_branches import RefreshRegistryBranches
 from .refresh_registry_rebasedbranch import RefreshRegistryRebasedBranch
-from .request_artifactdefinition_check import RequestArtifactDefinitionCheck
 from .request_generatordefinition_check import RequestGeneratorDefinitionCheck
 from .request_proposedchange_pipeline import RequestProposedChangePipeline
 from .request_repository_checks import RequestRepositoryChecks
@@ -27,7 +25,6 @@ from .request_repository_userchecks import RequestRepositoryUserChecks
 from .send_echo_request import SendEchoRequest, SendEchoRequestResponse
 
 MESSAGE_MAP: dict[str, type[InfrahubMessage]] = {
-    "check.artifact.create": CheckArtifactCreate,
     "check.generator.run": CheckGeneratorRun,
     "check.repository.check_definition": CheckRepositoryCheckDefinition,
     "check.repository.merge_conflicts": CheckRepositoryMergeConflicts,
@@ -45,7 +42,6 @@ MESSAGE_MAP: dict[str, type[InfrahubMessage]] = {
     "refresh.git.fetch": RefreshGitFetch,
     "refresh.registry.branches": RefreshRegistryBranches,
     "refresh.registry.rebased_branch": RefreshRegistryRebasedBranch,
-    "request.artifact_definition.check": RequestArtifactDefinitionCheck,
     "request.generator_definition.check": RequestGeneratorDefinitionCheck,
     "request.proposed_change.pipeline": RequestProposedChangePipeline,
     "request.proposed_change.refresh_artifacts": RequestProposedChangeRefreshArtifacts,

infrahub/message_bus/messages/event_branch_merge.py

@@ -1,5 +1,6 @@
 from pydantic import Field
 
+from infrahub.context import InfrahubContext
 from infrahub.message_bus import InfrahubMessage
 
 
@@ -8,3 +9,5 @@ class EventBranchMerge(InfrahubMessage):
 
     source_branch: str = Field(..., description="The source branch")
     target_branch: str = Field(..., description="The target branch")
+
+    context: InfrahubContext = Field(..., description="The context of the event")

infrahub/message_bus/messages/request_proposedchange_pipeline.py

@@ -1,5 +1,6 @@
 from pydantic import Field
 
+from infrahub.context import InfrahubContext
 from infrahub.core.constants import CheckType
 from infrahub.message_bus import InfrahubMessage
 
@@ -14,3 +15,4 @@ class RequestProposedChangePipeline(InfrahubMessage):
     check_type: CheckType = Field(
         default=CheckType.ALL, description="Can be used to restrict the pipeline to a specific type of job"
     )
+    context: InfrahubContext = Field(..., description="The context of the task")

infrahub/message_bus/operations/__init__.py

@@ -18,7 +18,6 @@ from infrahub.services import InfrahubServices
 from infrahub.tasks.check import set_check_status
 
 COMMAND_MAP = {
-    "check.artifact.create": check.artifact.create,
     "check.generator.run": check.generator.run,
     "check.repository.check_definition": check.repository.check_definition,
     "check.repository.merge_conflicts": check.repository.merge_conflicts,
@@ -34,7 +33,6 @@ COMMAND_MAP = {
     "refresh.registry.branches": refresh.registry.branches,
     "refresh.registry.rebased_branch": refresh.registry.rebased_branch,
     "request.generator_definition.check": requests.generator_definition.check,
-    "request.artifact_definition.check": requests.artifact_definition.check,
     "request.proposed_change.pipeline": requests.proposed_change.pipeline,
     "request.proposed_change.refresh_artifacts": requests.proposed_change.refresh_artifacts,
     "request.repository.checks": requests.repository.checks,
@@ -54,15 +52,15 @@ async def execute_message(
         if skip_flow and isinstance(func, Flow):
             func = func.fn
         await func(message=message, service=service)
-    except Exception as exc:  # pylint: disable=broad-except
+    except Exception as exc:
         if message.reply_requested:
             response = RPCErrorResponse(errors=[str(exc)], initial_message=message.model_dump())
-            await service.reply(message=response, initiator=message)
+            await service.message_bus.reply_if_initiator_meta(message=response, initiator=message)
             return None
         if message.reached_max_retries:
             service.log.exception("Message failed after maximum number of retries", error=exc)
             await set_check_status(message, conclusion="failure", service=service)
             return None
         message.increase_retry_count()
-        await service.send(message, delay=MessageTTL.FIVE, is_retry=True)
+        await service.message_bus.send(message, delay=MessageTTL.FIVE, is_retry=True)
         return MessageTTL.FIVE

infrahub/message_bus/operations/check/__init__.py

@@ -1,3 +1,3 @@
-from . import artifact, generator, repository
+from . import generator, repository
 
-__all__ = ["artifact", "generator", "repository"]
+__all__ = ["generator", "repository"]

infrahub/message_bus/operations/check/generator.py

@@ -14,8 +14,6 @@ from infrahub.services import InfrahubServices
 from infrahub.tasks.check import set_check_status
 from infrahub.workflows.utils import add_tags
 
-# pylint: disable=duplicate-code
-
 
 @flow(
     name="git-repository-check-generator-run",
@@ -81,7 +79,7 @@ async def run(message: messages.CheckGeneratorRun, service: InfrahubServices) ->
         generator_instance.status.value = GeneratorInstanceStatus.ERROR.value
         check_message = f"Failed to import generator: {exc.message}"
         log.exception(check_message, exc_info=exc)
-    except Exception as exc:  # pylint: disable=broad-exception-caught
+    except Exception as exc:
         conclusion = ValidatorConclusion.FAILURE
         generator_instance.status.value = GeneratorInstanceStatus.ERROR.value
         check_message = f"Failed to execute generator: {str(exc)}"

infrahub/message_bus/operations/check/repository.py

@@ -132,7 +132,7 @@ async def check_definition(message: messages.CheckRepositoryCheckDefinition, ser
 
     for event in events:
         event.assign_meta(parent=message)
-        await service.send(message=event)
+        await service.message_bus.send(message=event)
 
 
 @flow(

infrahub/message_bus/operations/event/branch.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from prefect import flow
 
 from infrahub.core import registry
@@ -7,7 +9,7 @@ from infrahub.core.diff.repository.repository import DiffRepository
 from infrahub.dependencies.registry import get_component_registry
 from infrahub.log import get_logger
 from infrahub.message_bus import InfrahubMessage, messages
-from infrahub.services import InfrahubServices
+from infrahub.services import InfrahubServices  # noqa: TC001  needed for prefect flow
 from infrahub.workflows.catalogue import (
     DIFF_UPDATE,
     TRIGGER_ARTIFACT_DEFINITION_GENERATE,
@@ -33,11 +35,13 @@ async def merge(message: messages.EventBranchMerge, service: InfrahubServices) -
 
         await service.workflow.submit_workflow(
             workflow=TRIGGER_ARTIFACT_DEFINITION_GENERATE,
+            context=message.context,
             parameters={"branch": message.target_branch},
         )
 
         await service.workflow.submit_workflow(
             workflow=TRIGGER_GENERATOR_DEFINITION_RUN,
+            context=message.context,
             parameters={"branch": message.target_branch},
         )
 
@@ -49,9 +53,9 @@ async def merge(message: messages.EventBranchMerge, service: InfrahubServices) -
             ):
                 request_diff_update_model = RequestDiffUpdate(branch_name=diff_root.diff_branch_name)
                 await service.workflow.submit_workflow(
-                    workflow=DIFF_UPDATE, parameters={"model": request_diff_update_model}
+                    workflow=DIFF_UPDATE, context=message.context, parameters={"model": request_diff_update_model}
                 )
 
         for event in events:
             event.assign_meta(parent=message)
-            await service.send(message=event)
+            await service.message_bus.send(message=event)

infrahub/message_bus/operations/event/schema.py

@@ -14,4 +14,4 @@ async def update(message: messages.EventSchemaUpdate, service: InfrahubServices)
     msg = messages.RefreshRegistryBranches()
 
     msg.assign_meta(parent=message)
-    await service.send(message=msg)
+    await service.message_bus.send(message=msg)

infrahub/message_bus/operations/finalize/validator.py

@@ -67,7 +67,7 @@ async def execution(message: messages.FinalizeValidatorExecution, service: Infra
                 validator_id=message.validator_id,
                 validator_execution_id=message.validator_execution_id,
             )
-            await service.send(message=message, delay=MessageTTL.FIVE)
+            await service.message_bus.send(message=message, delay=MessageTTL.FIVE)
             return
 
         log.info(

infrahub/message_bus/operations/git/file.py

@@ -27,8 +27,8 @@ async def get(message: messages.GitFileGet, service: InfrahubServices) -> None:
     except (FileOutOfRepositoryError, RepositoryFileNotFoundError) as e:
         if message.reply_requested:
             response = GitFileGetResponse(data=GitFileGetResponseData(error_message=e.message, http_code=e.HTTP_CODE))
-            await service.reply(message=response, initiator=message)
+            await service.message_bus.reply_if_initiator_meta(message=response, initiator=message)
     else:
         if message.reply_requested:
             response = GitFileGetResponse(data=GitFileGetResponseData(content=content))
-            await service.reply(message=response, initiator=message)
+            await service.message_bus.reply_if_initiator_meta(message=response, initiator=message)