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

infrahub/message_bus/__init__.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import Any, Optional, Union
+from typing import Any
 
 from pydantic import BaseModel, Field
 
@@ -11,21 +11,19 @@ from infrahub.log import set_log_data
 
 class Meta(BaseModel):
     request_id: str = ""
-    correlation_id: Optional[str] = Field(default=None)
-    reply_to: Optional[str] = Field(default=None)
-    initiator_id: Optional[str] = Field(
+    correlation_id: str | None = Field(default=None)
+    reply_to: str | None = Field(default=None)
+    initiator_id: str | None = Field(
         default=None, description="The worker identity of the initial sender of this message"
     )
-    retry_count: Optional[int] = Field(
-        default=None, description="Indicates how many times this message has been retried."
-    )
-    headers: Optional[dict[str, Any]] = Field(default=None)
-    validator_execution_id: Optional[str] = Field(
+    retry_count: int | None = Field(default=None, description="Indicates how many times this message has been retried.")
+    headers: dict[str, Any] | None = Field(default=None)
+    validator_execution_id: str | None = Field(
         default=None, description="Validator execution ID related to this message"
     )
-    check_execution_id: Optional[str] = Field(default=None, description="Check execution ID related to this message")
+    check_execution_id: str | None = Field(default=None, description="Check execution ID related to this message")
     priority: int = Field(default=3, description="Message Priority")
-    expiration: Optional[int] = Field(default=None, description="TTL before this message expires in seconds")
+    expiration: int | None = Field(default=None, description="TTL before this message expires in seconds")
 
     @classmethod
     def default(cls) -> Meta:
@@ -89,9 +87,9 @@ class InfrahubResponse(InfrahubMessage):
 
     passed: bool = True
     routing_key: str
-    data: Union[dict, InfrahubResponseData] = Field(default_factory=dict)
+    data: dict | InfrahubResponseData = Field(default_factory=dict)  # type: ignore[arg-type]
     errors: list[str] = Field(default_factory=list)
-    initial_message: Optional[dict] = Field(
+    initial_message: dict | None = Field(
         default=None,
         description="Initial message in dict format, the primary goal of this field is to provide additional context when there is an error",
     )

infrahub/message_bus/messages/__init__.py

@@ -1,15 +1,7 @@
 from infrahub.message_bus import InfrahubMessage, InfrahubResponse
 
 from .check_generator_run import CheckGeneratorRun
-from .check_repository_checkdefinition import CheckRepositoryCheckDefinition
-from .check_repository_mergeconflicts import CheckRepositoryMergeConflicts
-from .check_repository_usercheck import CheckRepositoryUserCheck
-from .event_branch_create import EventBranchCreate
-from .event_branch_delete import EventBranchDelete
 from .event_branch_merge import EventBranchMerge
-from .event_branch_rebased import EventBranchRebased
-from .event_node_mutated import EventNodeMutated
-from .event_schema_update import EventSchemaUpdate
 from .event_worker_newprimaryapi import EventWorkerNewPrimaryAPI
 from .finalize_validator_execution import FinalizeValidatorExecution
 from .git_file_get import GitFileGet, GitFileGetResponse
@@ -20,21 +12,11 @@ from .refresh_registry_branches import RefreshRegistryBranches
 from .refresh_registry_rebasedbranch import RefreshRegistryRebasedBranch
 from .request_generatordefinition_check import RequestGeneratorDefinitionCheck
 from .request_proposedchange_pipeline import RequestProposedChangePipeline
-from .request_repository_checks import RequestRepositoryChecks
-from .request_repository_userchecks import RequestRepositoryUserChecks
 from .send_echo_request import SendEchoRequest, SendEchoRequestResponse
 
 MESSAGE_MAP: dict[str, type[InfrahubMessage]] = {
     "check.generator.run": CheckGeneratorRun,
-    "check.repository.check_definition": CheckRepositoryCheckDefinition,
-    "check.repository.merge_conflicts": CheckRepositoryMergeConflicts,
-    "check.repository.user_check": CheckRepositoryUserCheck,
-    "event.branch.create": EventBranchCreate,
-    "event.branch.delete": EventBranchDelete,
     "event.branch.merge": EventBranchMerge,
-    "event.branch.rebased": EventBranchRebased,
-    "event.node.mutated": EventNodeMutated,
-    "event.schema.update": EventSchemaUpdate,
     "event.worker.new_primary_api": EventWorkerNewPrimaryAPI,
     "finalize.validator.execution": FinalizeValidatorExecution,
     "git.file.get": GitFileGet,
@@ -45,8 +27,6 @@ MESSAGE_MAP: dict[str, type[InfrahubMessage]] = {
     "request.generator_definition.check": RequestGeneratorDefinitionCheck,
     "request.proposed_change.pipeline": RequestProposedChangePipeline,
     "request.proposed_change.refresh_artifacts": RequestProposedChangeRefreshArtifacts,
-    "request.repository.checks": RequestRepositoryChecks,
-    "request.repository.user_checks": RequestRepositoryUserChecks,
     "send.echo.request": SendEchoRequest,
 }
 
@@ -59,7 +39,7 @@ PRIORITY_MAP = {
     "check.artifact.create": 2,
     "check.repository.check_definition": 2,
     "check.repository.merge_conflicts": 2,
-    "event.branch.create": 5,
+    "send.echo.request": 5,  # Currently only for testing purposes, will be removed once all message bus have been migrated to prefect
     "event.branch.delete": 5,
     "event.branch.merge": 5,
     "event.schema.update": 5,

infrahub/message_bus/messages/check_generator_run.py

@@ -1,7 +1,6 @@
-from typing import Optional
-
 from pydantic import Field
 
+from infrahub.context import InfrahubContext
 from infrahub.generators.models import ProposedChangeGeneratorDefinition
 from infrahub.message_bus import InfrahubMessage
 
@@ -10,7 +9,7 @@ class CheckGeneratorRun(InfrahubMessage):
     """A check that runs a generator."""
 
     generator_definition: ProposedChangeGeneratorDefinition = Field(..., description="The Generator definition")
-    generator_instance: Optional[str] = Field(
+    generator_instance: str | None = Field(
         default=None, description="The id of the generator instance if it previously existed"
     )
     commit: str = Field(..., description="The commit to target")
@@ -24,3 +23,4 @@ class CheckGeneratorRun(InfrahubMessage):
     variables: dict = Field(..., description="Input variables when running the generator")
     validator_id: str = Field(..., description="The ID of the validator")
     proposed_change: str | None = Field(None, description="The unique ID of the Proposed Change")
+    context: InfrahubContext = Field(..., description="The Infrahub context")

infrahub/message_bus/messages/finalize_validator_execution.py

@@ -1,5 +1,6 @@
 from pydantic import Field
 
+from infrahub.context import InfrahubContext
 from infrahub.message_bus import InfrahubMessage
 
 
@@ -10,3 +11,5 @@ class FinalizeValidatorExecution(InfrahubMessage):
     validator_execution_id: str = Field(..., description="The id of current execution of the associated validator")
     start_time: str = Field(..., description="Start time when the message was first created")
     validator_type: str = Field(..., description="The type of validator to complete")
+    context: InfrahubContext = Field(..., description="The Infrahub context")
+    proposed_change: str = Field(..., description="The ID of the proposed change")

infrahub/message_bus/messages/proposed_change/request_proposedchange_refreshartifacts.py

@@ -1,5 +1,11 @@
+from pydantic import Field
+
+from infrahub.context import InfrahubContext
+
 from .base_with_diff import BaseProposedChangeWithDiffMessage
 
 
 class RequestProposedChangeRefreshArtifacts(BaseProposedChangeWithDiffMessage):
     """Sent trigger the refresh of artifacts that are impacted by the proposed change."""
+
+    context: InfrahubContext = Field(..., description="The context of the task")

infrahub/message_bus/messages/request_generatordefinition_check.py

@@ -1,5 +1,6 @@
 from pydantic import ConfigDict, Field
 
+from infrahub.context import InfrahubContext
 from infrahub.generators.models import ProposedChangeGeneratorDefinition
 from infrahub.message_bus import InfrahubMessage
 from infrahub.message_bus.types import ProposedChangeBranchDiff
@@ -16,3 +17,4 @@ class RequestGeneratorDefinitionCheck(InfrahubMessage):
     source_branch: str = Field(..., description="The source branch")
     source_branch_sync_with_git: bool = Field(..., description="Indicates if the source branch should sync with git")
     destination_branch: str = Field(..., description="The target branch")
+    context: InfrahubContext = Field(..., description="The Infrahub context")

infrahub/message_bus/messages/send_echo_request.py

@@ -6,7 +6,7 @@ ROUTING_KEY = "send.echo.request"
 
 
 class SendEchoRequest(InfrahubMessage):
-    """Sent a echo request, i.e., ping message."""
+    """Sent a echo request, a ping message for example."""
 
     message: str = Field(..., description="The message to send")
 

infrahub/message_bus/operations/__init__.py

@@ -1,5 +1,3 @@
-from typing import Optional
-
 import ujson
 from prefect import Flow
 
@@ -19,12 +17,7 @@ from infrahub.tasks.check import set_check_status
 
 COMMAND_MAP = {
     "check.generator.run": check.generator.run,
-    "check.repository.check_definition": check.repository.check_definition,
-    "check.repository.merge_conflicts": check.repository.merge_conflicts,
-    "check.repository.user_check": check.repository.user_check,
     "event.branch.merge": event.branch.merge,
-    "event.node.mutated": event.node.mutated,
-    "event.schema.update": event.schema.update,
     "event.worker.new_primary_api": event.worker.new_primary_api,
     "finalize.validator.execution": finalize.validator.execution,
     "git.file.get": git.file.get,
@@ -35,15 +28,13 @@ COMMAND_MAP = {
     "request.generator_definition.check": requests.generator_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,
-    "request.repository.user_checks": requests.repository.user_checks,
     "send.echo.request": send.echo.request,
 }
 
 
 async def execute_message(
     routing_key: str, message_body: bytes, service: InfrahubServices, skip_flow: bool = False
-) -> Optional[MessageTTL]:
+) -> MessageTTL | None:
     message_data = ujson.loads(message_body)
     message = messages.MESSAGE_MAP[routing_key](**message_data)
     message.set_log_data(routing_key=routing_key)

infrahub/message_bus/operations/check/__init__.py

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

infrahub/message_bus/operations/check/generator.py

@@ -72,6 +72,7 @@ async def run(message: messages.CheckGeneratorRun, service: InfrahubServices) ->
             convert_query_response=generator_definition.convert_query_response,
             infrahub_node=InfrahubNode,
         )
+        generator._init_client.request_context = message.context.to_request_context()
         await generator.run(identifier=generator_definition.name)
         generator_instance.status.value = GeneratorInstanceStatus.READY.value
     except ModuleImportError as exc:

infrahub/message_bus/operations/event/__init__.py

@@ -1,3 +1,3 @@
-from . import branch, node, schema, worker
+from . import branch, worker
 
-__all__ = ["branch", "node", "schema", "worker"]
+__all__ = ["branch", "worker"]

infrahub/message_bus/operations/event/worker.py

@@ -2,11 +2,8 @@ from prefect import flow
 
 from infrahub.message_bus import messages
 from infrahub.services import InfrahubServices
-from infrahub.workflows.catalogue import WEBHOOK_CONFIGURE
 
 
 @flow(name="event-worker-newprimary-api")
 async def new_primary_api(message: messages.EventWorkerNewPrimaryAPI, service: InfrahubServices) -> None:
     service.log.info("api_worker promoted to primary", worker_id=message.worker_id)
-
-    await service.workflow.submit_workflow(workflow=WEBHOOK_CONFIGURE)

infrahub/message_bus/operations/finalize/validator.py

@@ -1,11 +1,22 @@
+from infrahub_sdk.protocols import (
+    CoreArtifactValidator,
+    CoreDataValidator,
+    CoreGeneratorValidator,
+    CoreRepositoryValidator,
+    CoreSchemaValidator,
+    CoreUserValidator,
+    CoreValidator,
+)
 from prefect import flow
 
 from infrahub import config
+from infrahub.core.constants import InfrahubKind, ValidatorConclusion
 from infrahub.core.timestamp import Timestamp
 from infrahub.log import get_logger
 from infrahub.message_bus import messages
 from infrahub.message_bus.types import KVTTL, MessageTTL
 from infrahub.services import InfrahubServices
+from infrahub.validators.events import send_failed_validator, send_passed_validator
 
 log = get_logger()
 
@@ -20,7 +31,8 @@ async def execution(message: messages.FinalizeValidatorExecution, service: Infra
 
     The message will get rescheduled until the timeout has exceeded or until all checks are accounted for.
     """
-    validator = await service.client.get(kind=message.validator_type, id=message.validator_id)
+    validator_type = get_validator_type(validator_type=message.validator_type)
+    validator = await service.client.get(kind=validator_type, id=message.validator_id)
     checks_key = f"validator_execution_id:{message.validator_execution_id}:checks"
     current_conclusion = validator.conclusion.value
     if validator.state.value != "in_progress":
@@ -81,3 +93,41 @@ async def execution(message: messages.FinalizeValidatorExecution, service: Infra
     validator.completed_at.value = Timestamp().to_string()
     validator.conclusion.value = conclusion
     await validator.save()
+    if validator.conclusion.value == ValidatorConclusion.SUCCESS.value:
+        await send_passed_validator(
+            service=service, validator=validator, proposed_change_id=message.proposed_change, context=message.context
+        )
+    else:
+        await send_failed_validator(
+            service=service, validator=validator, proposed_change_id=message.proposed_change, context=message.context
+        )
+
+
+def get_validator_type(
+    validator_type: str,
+) -> (
+    type[CoreArtifactValidator]
+    | type[CoreDataValidator]
+    | type[CoreGeneratorValidator]
+    | type[CoreRepositoryValidator]
+    | type[CoreSchemaValidator]
+    | type[CoreUserValidator]
+    | type[CoreValidator]
+):
+    match validator_type:
+        case InfrahubKind.USERVALIDATOR:
+            validator_kind = CoreUserValidator
+        case InfrahubKind.SCHEMAVALIDATOR:
+            validator_kind = CoreSchemaValidator
+        case InfrahubKind.GENERATORVALIDATOR:
+            validator_kind = CoreGeneratorValidator
+        case InfrahubKind.REPOSITORYVALIDATOR:
+            validator_kind = CoreRepositoryValidator
+        case InfrahubKind.DATAVALIDATOR:
+            validator_kind = CoreDataValidator
+        case InfrahubKind.ARTIFACTVALIDATOR:
+            validator_kind = CoreArtifactValidator
+        case _:
+            validator_kind = CoreValidator
+
+    return validator_kind

infrahub/message_bus/operations/requests/__init__.py

@@ -1,11 +1,9 @@
 from . import (
     generator_definition,
     proposed_change,
-    repository,
 )
 
 __all__ = [
     "generator_definition",
     "proposed_change",
-    "repository",
 ]

infrahub/message_bus/operations/requests/generator_definition.py

@@ -1,14 +1,14 @@
-from typing import Optional
-
+from infrahub_sdk.protocols import CoreGeneratorValidator
 from infrahub_sdk.uuidt import UUIDT
 from prefect import flow
 from prefect.logging import get_run_logger
 
-from infrahub.core.constants import InfrahubKind, ValidatorConclusion, ValidatorState
+from infrahub.core.constants import InfrahubKind
 from infrahub.core.timestamp import Timestamp
 from infrahub.message_bus import InfrahubMessage, Meta, messages
 from infrahub.message_bus.types import KVTTL
 from infrahub.services import InfrahubServices
+from infrahub.validators.tasks import start_validator
 from infrahub.workflows.utils import add_tags
 
 
@@ -29,31 +29,26 @@ async def check(message: messages.RequestGeneratorDefinitionCheck, service: Infr
 
     await proposed_change.validations.fetch()
 
-    validator = None
+    previous_validator: CoreGeneratorValidator | None = None
     for relationship in proposed_change.validations.peers:
         existing_validator = relationship.peer
         if (
             existing_validator.typename == InfrahubKind.GENERATORVALIDATOR
             and existing_validator.definition.id == message.generator_definition.definition_id
         ):
-            validator = existing_validator
-
-    if validator:
-        validator.conclusion.value = ValidatorConclusion.UNKNOWN.value
-        validator.state.value = ValidatorState.QUEUED.value
-        validator.started_at.value = ""
-        validator.completed_at.value = ""
-        await validator.save()
-    else:
-        validator = await service.client.create(
-            kind=InfrahubKind.GENERATORVALIDATOR,
-            data={
-                "label": validator_name,
-                "proposed_change": message.proposed_change,
-                "definition": message.generator_definition.definition_id,
-            },
-        )
-        await validator.save()
+            previous_validator = existing_validator
+
+    validator = await start_validator(
+        service=service,
+        validator=previous_validator,
+        validator_type=CoreGeneratorValidator,
+        proposed_change=message.proposed_change,
+        data={
+            "label": validator_name,
+            "definition": message.generator_definition.definition_id,
+        },
+        context=message.context,
+    )
 
     group = await service.client.get(
         kind=InfrahubKind.GENERICGROUP,
@@ -92,6 +87,7 @@ async def check(message: messages.RequestGeneratorDefinitionCheck, service: Infr
             log.info(f"Trigger execution of {message.generator_definition.definition_name} for {member.display_label}")
             events.append(
                 messages.CheckGeneratorRun(
+                    context=message.context,
                     generator_definition=message.generator_definition,
                     generator_instance=generator_instance,
                     commit=repository.source_commit,
@@ -121,6 +117,8 @@ async def check(message: messages.RequestGeneratorDefinitionCheck, service: Infr
             validator_id=validator.id,
             validator_execution_id=validator_execution_id,
             validator_type=InfrahubKind.GENERATORVALIDATOR,
+            context=message.context,
+            proposed_change=message.proposed_change,
         )
     )
     for event in events:
@@ -128,7 +126,7 @@ async def check(message: messages.RequestGeneratorDefinitionCheck, service: Infr
         await service.message_bus.send(message=event)
 
 
-def _run_generator(instance_id: Optional[str], managed_branch: bool, impacted_instances: list[str]) -> bool:
+def _run_generator(instance_id: str | None, managed_branch: bool, impacted_instances: list[str]) -> bool:
     """Returns a boolean to indicate if a generator instance needs to be executed
     Will return true if:
         * The instance_id wasn't set which could be that it's a new object that doesn't have a previous generator instance

infrahub/message_bus/operations/requests/proposed_change.py

@@ -11,6 +11,7 @@ from infrahub.core.constants import CheckType, InfrahubKind, RepositoryInternalS
 from infrahub.core.diff.coordinator import DiffCoordinator
 from infrahub.core.registry import registry
 from infrahub.dependencies.registry import get_component_registry
+from infrahub.git.models import TriggerRepositoryInternalChecks
 from infrahub.git.repository import InfrahubRepository
 from infrahub.message_bus import InfrahubMessage, messages
 from infrahub.message_bus.types import (
@@ -29,6 +30,7 @@ from infrahub.proposed_change.models import (
 )
 from infrahub.services import InfrahubServices  # noqa: TC001
 from infrahub.workflows.catalogue import (
+    GIT_REPOSITORY_INTERNAL_CHECKS_TRIGGER,
     REQUEST_ARTIFACT_DEFINITION_CHECK,
     REQUEST_PROPOSED_CHANGE_DATA_INTEGRITY,
     REQUEST_PROPOSED_CHANGE_REPOSITORY_CHECKS,
@@ -76,17 +78,17 @@ async def pipeline(message: messages.RequestProposedChangePipeline, service: Inf
     ):
         for repo in repositories:
             if not repo.read_only and repo.internal_status == RepositoryInternalStatus.ACTIVE.value:
-                events.append(
-                    messages.RequestRepositoryChecks(
-                        proposed_change=message.proposed_change,
-                        repository=repo.repository_id,
-                        source_branch=repo.source_branch,
-                        target_branch=repo.destination_branch,
-                    )
+                model = TriggerRepositoryInternalChecks(
+                    proposed_change=message.proposed_change,
+                    repository=repo.repository_id,
+                    source_branch=repo.source_branch,
+                    target_branch=repo.destination_branch,
+                )
+                await service.workflow.submit_workflow(
+                    workflow=GIT_REPOSITORY_INTERNAL_CHECKS_TRIGGER,
+                    context=message.context,
+                    parameters={"model": model},
                 )
-        for event in events:
-            event.assign_meta(parent=message)
-            await service.message_bus.send(message=event)
         return
 
     await _gather_repository_repository_diffs(repositories=repositories, service=service)
@@ -105,6 +107,7 @@ async def pipeline(message: messages.RequestProposedChangePipeline, service: Inf
     if message.check_type is CheckType.ARTIFACT:
         events.append(
             messages.RequestProposedChangeRefreshArtifacts(
+                context=message.context,
                 proposed_change=message.proposed_change,
                 source_branch=message.source_branch,
                 source_branch_sync_with_git=message.source_branch_sync_with_git,
@@ -243,6 +246,7 @@ async def refresh_artifacts(message: messages.RequestProposedChangeRefreshArtifa
         if select:
             log.info(f"Trigger processing of {artifact_definition.definition_name}")
             model = RequestArtifactDefinitionCheck(
+                context=message.context,
                 artifact_definition=artifact_definition,
                 branch_diff=message.branch_diff,
                 proposed_change=message.proposed_change,

infrahub/permissions/globals.py

@@ -0,0 +1,15 @@
+from infrahub.core.account import GlobalPermission
+from infrahub.core.constants import GLOBAL_BRANCH_NAME, GlobalPermissions, PermissionDecision
+from infrahub.core.registry import registry
+
+
+def define_global_permission_from_branch(permission: GlobalPermissions, branch_name: str) -> GlobalPermission:
+    if branch_name in (GLOBAL_BRANCH_NAME, registry.default_branch):
+        decision = PermissionDecision.ALLOW_DEFAULT
+    else:
+        decision = PermissionDecision.ALLOW_OTHER
+
+    return GlobalPermission(
+        action=permission.value,
+        decision=decision.value,
+    )

infrahub/pools/number.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
-from typing import TYPE_CHECKING, Optional, Union
+from typing import TYPE_CHECKING
 
 from infrahub.core.query.resource_manager import NumberPoolGetAllocated
 from infrahub.core.registry import registry
@@ -20,9 +20,7 @@ class UsedNumber:
 
 
 class NumberUtilizationGetter:
-    def __init__(
-        self, db: InfrahubDatabase, pool: CoreNode, branch: Branch, at: Optional[Union[Timestamp, str]] = None
-    ) -> None:
+    def __init__(self, db: InfrahubDatabase, pool: CoreNode, branch: Branch, at: Timestamp | str | None = None) -> None:
         self.db = db
         self.at = at
         self.pool = pool

infrahub/proposed_change/models.py

@@ -1,5 +1,6 @@
 from pydantic import BaseModel, ConfigDict, Field
 
+from infrahub.context import InfrahubContext
 from infrahub.message_bus.messages.proposed_change.base_with_diff import BaseProposedChangeWithDiffMessage
 from infrahub.message_bus.types import ProposedChangeArtifactDefinition, ProposedChangeBranchDiff
 
@@ -40,3 +41,5 @@ class RequestArtifactDefinitionCheck(BaseModel):
     source_branch: str = Field(..., description="The source branch")
     source_branch_sync_with_git: bool = Field(..., description="Indicates if the source branch should sync with git")
     destination_branch: str = Field(..., description="The target branch")
+
+    context: InfrahubContext = Field(..., description="The context of the task")