infrahub-server 1.3.0b1__py3-none-any.whl → 1.3.0b3__py3-none-any.whl

infrahub/actions/constants.py

@@ -46,6 +46,93 @@ class BranchScope(Enum):
         raise NotImplementedError(f"The defined value {value} doesn't match a branch scope")
 
 
+class MemberAction(Enum):
+    ADD_MEMBER = DropdownChoice(
+        name="add_member",
+        label="Add member",
+        description="Add impacted member to the selected group",
+        color="#86efac",
+    )
+    REMOVE_MEMBER = DropdownChoice(
+        name="remove_member",
+        label="Remove member",
+        description="Remove impacted member from the selected group",
+        color="#fef08a",
+    )
+
+    @classmethod
+    def available_types(cls) -> list[DropdownChoice]:
+        return [cls.__members__[member].value for member in list(cls.__members__)]
+
+    @classmethod
+    def from_value(cls, value: str) -> MemberAction:
+        for member in cls.__members__:
+            if value == cls.__members__[member].value.name:
+                return cls.__members__[member]
+
+        raise NotImplementedError(f"The defined value {value} doesn't match a member action")
+
+
+class MemberUpdate(Enum):
+    ADDED = DropdownChoice(
+        name="added",
+        label="Added",
+        description="Trigger when members are added to this group",
+        color="#86efac",
+    )
+    REMOVED = DropdownChoice(
+        name="removed",
+        label="Removed",
+        description="Trigger when members are removed from this group",
+        color="#fef08a",
+    )
+
+    @classmethod
+    def available_types(cls) -> list[DropdownChoice]:
+        return [cls.__members__[member].value for member in list(cls.__members__)]
+
+    @classmethod
+    def from_value(cls, value: str) -> MemberUpdate:
+        for member in cls.__members__:
+            if value == cls.__members__[member].value.name:
+                return cls.__members__[member]
+
+        raise NotImplementedError(f"The defined value {value} doesn't match a MemberUpdate")
+
+
+class RelationshipMatch(Enum):
+    ADDED = DropdownChoice(
+        name="added",
+        label="Added",
+        description="Check if the selected relationship was added",
+        color="#86efac",
+    )
+    REMOVED = DropdownChoice(
+        name="removed",
+        label="Removed",
+        description="Check if the selected relationship was removed",
+        color="#fef08a",
+    )
+    UPDATED = DropdownChoice(
+        name="updated",
+        label="Updated",
+        description="Check if the selected relationship was updated, added or removed.",
+        color="#e5e7eb",
+    )
+
+    @classmethod
+    def available_types(cls) -> list[DropdownChoice]:
+        return [cls.__members__[member].value for member in list(cls.__members__)]
+
+    @classmethod
+    def from_value(cls, value: str) -> RelationshipMatch:
+        for member in cls.__members__:
+            if value == cls.__members__[member].value.name:
+                return cls.__members__[member]
+
+        raise NotImplementedError(f"The defined value {value} doesn't match a RelationshipMatch")
+
+
 class ValueMatch(Enum):
     VALUE = DropdownChoice(
         name="value",

infrahub/actions/gather.py

@@ -46,7 +46,7 @@ async def gather_trigger_action_rules(db: InfrahubDatabase) -> list[ActionTrigge
                                         },
                                         "... on CoreNodeTriggerRelationshipMatch": {
                                             "relationship_name": {"value": None},
-                                            "added": {"value": None},
+                                            "modification_type": {"value": None},
                                             "peer": {"value": None},
                                         },
                                     }
@@ -54,7 +54,7 @@ async def gather_trigger_action_rules(db: InfrahubDatabase) -> list[ActionTrigge
                             },
                         },
                         "... on CoreGroupTriggerRule": {
-                            "members_added": {"value": None},
+                            "member_update": {"value": None},
                             "group": {
                                 "node": {
                                     "id": None,
@@ -68,7 +68,7 @@ async def gather_trigger_action_rules(db: InfrahubDatabase) -> list[ActionTrigge
                                 "id": None,
                                 "name": {"value": None},
                                 "... on CoreGroupAction": {
-                                    "add_members": {"value": None},
+                                    "member_action": {"value": None},
                                     "group": {
                                         "node": {
                                             "id": None,

infrahub/actions/models.py

@@ -23,7 +23,7 @@ from infrahub.workflows.catalogue import (
     REMOVE_ADD_NODE_FROM_GROUP,
 )
 
-from .constants import BranchScope, ValueMatch
+from .constants import BranchScope, MemberAction, MemberUpdate, RelationshipMatch, ValueMatch
 
 
 class EventGroupMember(BaseModel):
@@ -40,7 +40,7 @@ class CoreGeneratorAction(CoreAction):
 
 
 class CoreGroupAction(CoreAction):
-    add_members: bool
+    member_action: MemberAction
     group_id: str
 
 
@@ -52,7 +52,7 @@ class CoreTriggerRule(BaseModel):
 
 
 class CoreGroupTriggerRule(CoreTriggerRule):
-    members_added: bool
+    member_update: MemberUpdate
     group_id: str
     group_kind: str
 
@@ -70,7 +70,7 @@ class CoreNodeTriggerAttributeMatch(CoreNodeTriggerMatch):
 
 class CoreNodeTriggerRelationshipMatch(CoreNodeTriggerMatch):
     relationship_name: str
-    added: bool
+    modification_type: RelationshipMatch
     peer: str | None
 
 
@@ -135,14 +135,16 @@ class ActionTriggerRuleTriggerDefinition(TriggerDefinition):
                         match_related["infrahub.attribute.value_previous"] = match.value_previous or ""
 
             elif isinstance(match, CoreNodeTriggerRelationshipMatch):
-                peer_status = "added" if match.added else "removed"
                 match_related = {
                     "prefect.resource.role": "infrahub.node.relationship_update",
                     "infrahub.field.name": match.relationship_name,
-                    "infrahub.relationship.peer_status": peer_status,
                 }
                 if isinstance(match.peer, str):
                     match_related["infrahub.relationship.peer_id"] = match.peer
+
+                if match.modification_type != RelationshipMatch.UPDATED:
+                    match_related["infrahub.relationship.peer_status"] = match.modification_type.value.name
+
             related_matches.append(match_related)
 
         event_trigger.match_related = related_matches or {}
@@ -164,7 +166,7 @@ class ActionTriggerRuleTriggerDefinition(TriggerDefinition):
                 },
             )
         elif isinstance(trigger_rule.action, CoreGroupAction):
-            if trigger_rule.action.add_members:
+            if trigger_rule.action.member_action == MemberAction.ADD_MEMBER:
                 flow = ACTION_ADD_NODE_TO_GROUP
             else:
                 flow = REMOVE_ADD_NODE_FROM_GROUP
@@ -198,7 +200,7 @@ class ActionTriggerRuleTriggerDefinition(TriggerDefinition):
     ) -> Self:
         event_trigger = EventTrigger()
 
-        if trigger_rule.members_added:
+        if trigger_rule.member_update == MemberUpdate.ADDED:
             event_trigger.events.add(GroupMemberAddedEvent.event_name)
         else:
             event_trigger.events.add(GroupMemberRemovedEvent.event_name)

infrahub/actions/parsers.py

@@ -2,7 +2,7 @@ from typing import Any
 
 from infrahub.core.constants import InfrahubKind
 
-from .constants import BranchScope, ValueMatch
+from .constants import BranchScope, MemberAction, MemberUpdate, RelationshipMatch, ValueMatch
 from .models import (
     CoreAction,
     CoreGeneratorAction,
@@ -35,14 +35,14 @@ def _parse_graphql_node(data: dict[str, Any]) -> CoreTriggerRule | None:
     action = _parse_graphql_action_response(data=data["action"]["node"])
     match typename:
         case "CoreGroupTriggerRule":
-            members_added = data["members_added"]["value"]
+            member_update = MemberUpdate.from_value(data["member_update"]["value"])
             group_id = data["group"]["node"]["id"]
             group_kind = data["group"]["node"]["__typename"]
             return CoreGroupTriggerRule(
                 name=name,
                 branch_scope=branch_scope,
                 action=action,
-                members_added=members_added,
+                member_update=member_update,
                 group_id=group_id,
                 group_kind=group_kind,
                 active=active,
@@ -70,9 +70,9 @@ def _parse_graphql_action_response(data: dict[str, Any]) -> CoreAction:
             generator_id = data["generator"]["node"]["id"]
             return CoreGeneratorAction(generator_id=generator_id)
         case "CoreGroupAction":
-            add_members = data["add_members"]["value"]
+            member_action = MemberAction.from_value(data["member_action"]["value"])
             group_id = data["group"]["node"]["id"]
-            return CoreGroupAction(add_members=add_members, group_id=group_id)
+            return CoreGroupAction(member_action=member_action, group_id=group_id)
 
     raise NotImplementedError(f"{typename} is not a valid CoreAction")
 
@@ -96,7 +96,7 @@ def _parse_node_trigger_matches(data: list[dict[str, Any]]) -> list[CoreNodeTrig
                 matches.append(
                     CoreNodeTriggerRelationshipMatch(
                         relationship_name=node["relationship_name"]["value"],
-                        added=node["added"]["value"],
+                        modification_type=RelationshipMatch.from_value(node["modification_type"]["value"]),
                         peer=node["peer"]["value"],
                     )
                 )

infrahub/actions/schema.py

@@ -1,4 +1,11 @@
-from infrahub.actions.constants import BranchScope, NodeAction, ValueMatch
+from infrahub.actions.constants import (
+    BranchScope,
+    MemberAction,
+    MemberUpdate,
+    NodeAction,
+    RelationshipMatch,
+    ValueMatch,
+)
 from infrahub.core.constants import AllowOverrideType, BranchSupportType, InfrahubKind
 from infrahub.core.constants import RelationshipCardinality as Cardinality
 from infrahub.core.constants import RelationshipKind as RelKind
@@ -28,14 +35,14 @@ core_trigger_rule = GenericSchema(
             kind="Text",
             description="The name of the trigger rule",
             unique=True,
-            order_weight=1000,
+            order_weight=100,
         ),
         Attr(
             name="description",
             kind="Text",
             description="A longer description to define the purpose of this trigger",
             optional=True,
-            order_weight=2000,
+            order_weight=200,
         ),
         Attr(
             name="active",
@@ -43,7 +50,7 @@ core_trigger_rule = GenericSchema(
             description="Indicates if this trigger is enabled or if it's just prepared, could be useful as you are setting up a trigger",
             optional=False,
             default_value=True,
-            order_weight=2000,
+            order_weight=200,
         ),
         Attr(
             name="branch_scope",
@@ -52,7 +59,7 @@ core_trigger_rule = GenericSchema(
             choices=BranchScope.available_types(),
             default_value=BranchScope.DEFAULT_BRANCH.value.name,
             optional=False,
-            order_weight=2000,
+            order_weight=200,
             allow_override=AllowOverrideType.NONE,
         ),
     ],
@@ -65,7 +72,7 @@ core_trigger_rule = GenericSchema(
             kind=RelKind.ATTRIBUTE,
             cardinality=Cardinality.ONE,
             optional=False,
-            order_weight=10000,
+            order_weight=1000,
         ),
     ],
 )
@@ -89,14 +96,14 @@ core_action = GenericSchema(
             description="Short descriptive name",
             kind="Text",
             unique=True,
-            order_weight=1000,
+            order_weight=100,
         ),
         Attr(
             name="description",
             description="A detailed description of the action",
             kind="Text",
             optional=True,
-            order_weight=2000,
+            order_weight=200,
         ),
     ],
     relationships=[
@@ -108,7 +115,7 @@ core_action = GenericSchema(
             cardinality=Cardinality.MANY,
             identifier="core_action__core_triggerrule",
             optional=True,
-            order_weight=10000,
+            order_weight=1000,
         ),
     ],
 )
@@ -132,7 +139,7 @@ core_node_trigger_match = GenericSchema(
             cardinality=Cardinality.ONE,
             optional=False,
             identifier="core_node_trigger_match__core_trigger_rule",
-            order_weight=10000,
+            order_weight=1000,
         ),
     ],
 )
@@ -161,7 +168,7 @@ core_generator_action = NodeSchema(
             cardinality=Cardinality.ONE,
             identifier="core_generator_action__generator_definition",
             optional=False,
-            order_weight=4000,
+            order_weight=400,
         ),
     ],
 )
@@ -182,13 +189,14 @@ core_group_action = NodeSchema(
     inherit_from=[InfrahubKind.ACTION],
     attributes=[
         Attr(
-            name="add_members",
-            kind="Boolean",
+            name="member_action",
+            kind="Dropdown",
             description="Defines if the action should add or remove members from a group when triggered",
+            choices=MemberAction.available_types(),
+            default_value=MemberAction.ADD_MEMBER.value.name,
             unique=False,
             optional=False,
-            default_value=True,
-            order_weight=3000,
+            order_weight=300,
         ),
     ],
     relationships=[
@@ -200,7 +208,7 @@ core_group_action = NodeSchema(
             cardinality=Cardinality.ONE,
             identifier="core_action__group",
             optional=False,
-            order_weight=4000,
+            order_weight=400,
         ),
     ],
 )
@@ -227,7 +235,7 @@ core_node_trigger_rule = NodeSchema(
             description="The kind of node to match against",
             unique=False,
             optional=False,
-            order_weight=3000,
+            order_weight=300,
         ),
         Attr(
             name="mutation_action",
@@ -236,7 +244,7 @@ core_node_trigger_rule = NodeSchema(
             enum=NodeAction.available_types(),
             unique=False,
             optional=False,
-            order_weight=4000,
+            order_weight=400,
         ),
     ],
     relationships=[
@@ -248,7 +256,7 @@ core_node_trigger_rule = NodeSchema(
             cardinality=Cardinality.MANY,
             optional=True,
             identifier="core_node_trigger_match__core_trigger_rule",
-            order_weight=8000,
+            order_weight=800,
         ),
     ],
 )
@@ -270,7 +278,7 @@ core_node_trigger_attribute_match = NodeSchema(
             description="The attribue to match against",
             unique=False,
             optional=False,
-            order_weight=1000,
+            order_weight=100,
         ),
         Attr(
             name="value",
@@ -278,7 +286,7 @@ core_node_trigger_attribute_match = NodeSchema(
             description="The value the attribute is updated to",
             unique=False,
             optional=True,
-            order_weight=2000,
+            order_weight=200,
         ),
         Attr(
             name="value_previous",
@@ -286,7 +294,7 @@ core_node_trigger_attribute_match = NodeSchema(
             description="The previous value of the targeted attribute",
             unique=False,
             optional=True,
-            order_weight=3000,
+            order_weight=300,
         ),
         Attr(
             name="value_match",
@@ -295,7 +303,7 @@ core_node_trigger_attribute_match = NodeSchema(
             choices=ValueMatch.available_types(),
             default_value=ValueMatch.VALUE.value.name,
             optional=False,
-            order_weight=5000,
+            order_weight=500,
         ),
     ],
     relationships=[],
@@ -318,16 +326,17 @@ core_node_trigger_relationship_match = NodeSchema(
             description="The name of the relationship to match against",
             unique=False,
             optional=False,
-            order_weight=1000,
+            order_weight=100,
         ),
         Attr(
-            name="added",
-            kind="Boolean",
-            description="Indicates if the relationship was added or removed",
-            unique=False,
+            name="modification_type",
+            kind="Dropdown",
+            description="Indicates if the relationship was added or removed or just updated in any way",
+            choices=RelationshipMatch.available_types(),
+            default_value=RelationshipMatch.ADDED.value.name,
             optional=False,
-            default_value=True,
-            order_weight=2000,
+            order_weight=200,
+            allow_override=AllowOverrideType.NONE,
         ),
         Attr(
             name="peer",
@@ -335,7 +344,7 @@ core_node_trigger_relationship_match = NodeSchema(
             description="The node_id of the relationship peer to match against",
             unique=False,
             optional=True,
-            order_weight=3000,
+            order_weight=300,
         ),
     ],
     relationships=[],
@@ -358,13 +367,13 @@ core_group_trigger_rule = NodeSchema(
     inherit_from=[InfrahubKind.TRIGGERRULE],
     attributes=[
         Attr(
-            name="members_added",
-            kind="Boolean",
+            name="member_update",
+            kind="Dropdown",
             description="Indicate if the match should be for when members are added or removed",
-            unique=False,
+            choices=MemberUpdate.available_types(),
+            default_value=MemberUpdate.ADDED.value.name,
             optional=False,
-            default_value=True,
-            order_weight=3000,
+            order_weight=300,
         ),
     ],
     relationships=[
@@ -376,7 +385,7 @@ core_group_trigger_rule = NodeSchema(
             cardinality=Cardinality.ONE,
             identifier="core_group_trigger__group",
             optional=False,
-            order_weight=4000,
+            order_weight=400,
         ),
     ],
 )

infrahub/actions/tasks.py

@@ -2,13 +2,11 @@ from __future__ import annotations
 
 from infrahub_sdk.graphql import Mutation
 from prefect import flow
-from prefect.client.orchestration import get_client
 
-from infrahub import lock
 from infrahub.context import InfrahubContext  # noqa: TC001  needed for prefect flow
 from infrahub.services import InfrahubServices  # noqa: TC001  needed for prefect flow
 from infrahub.trigger.models import TriggerType
-from infrahub.trigger.setup import setup_triggers
+from infrahub.trigger.setup import setup_triggers_specific
 from infrahub.workflows.utils import add_tags
 
 from .gather import gather_trigger_action_rules
@@ -101,14 +99,9 @@ async def run_generator_group_event(
 async def configure_action_rules(
     service: InfrahubServices,
 ) -> None:
-    async with lock.registry.get(name="configure-action-rules", namespace="trigger-rules", local=False):
-        triggers = await gather_trigger_action_rules(db=service.database)
-        async with get_client(sync_client=False) as prefect_client:
-            await setup_triggers(
-                client=prefect_client,
-                triggers=triggers,
-                trigger_type=TriggerType.ACTION_TRIGGER_RULE,
-            )  # type: ignore[misc]
+    await setup_triggers_specific(
+        gatherer=gather_trigger_action_rules, trigger_type=TriggerType.ACTION_TRIGGER_RULE, db=service.database
+    )  # type: ignore[misc]
 
 
 async def _run_generator(

infrahub/branch/tasks.py

@@ -0,0 +1,29 @@
+from __future__ import annotations
+
+from prefect import flow
+from prefect.logging import get_run_logger
+
+from infrahub.context import InfrahubContext  # noqa: TC001  needed for prefect flow
+from infrahub.core.registry import registry
+from infrahub.pools.tasks import validate_schema_number_pools
+from infrahub.services import InfrahubServices  # noqa: TC001  needed for prefect flow
+from infrahub.workflows.utils import wait_for_schema_to_converge
+
+
+@flow(
+    name="branch-merged",
+    flow_run_name="Running actions after '{source_branch}' was merged",
+)
+async def branch_merged(
+    source_branch: str,  # noqa: ARG001
+    context: InfrahubContext,
+    service: InfrahubServices,
+    target_branch: str | None = None,
+) -> None:
+    target_branch = target_branch or registry.default_branch
+    log = get_run_logger()
+    await wait_for_schema_to_converge(
+        branch_name=target_branch, component=service.component, db=service.database, log=log
+    )
+
+    await validate_schema_number_pools(branch_name=target_branch, context=context, service=service)

infrahub/branch/triggers.py

@@ -0,0 +1,22 @@
+from infrahub.events.branch_action import BranchMergedEvent
+from infrahub.trigger.models import BuiltinTriggerDefinition, EventTrigger, ExecuteWorkflow
+from infrahub.workflows.catalogue import BRANCH_MERGED
+
+TRIGGER_BRANCH_MERGED = BuiltinTriggerDefinition(
+    name="branch-merged-trigger",
+    trigger=EventTrigger(
+        events={BranchMergedEvent.event_name},
+    ),
+    actions=[
+        ExecuteWorkflow(
+            workflow=BRANCH_MERGED,
+            parameters={
+                "source_branch": "{{ event.payload['data']['branch_name'] }}",
+                "context": {
+                    "__prefect_kind": "json",
+                    "value": {"__prefect_kind": "jinja", "template": "{{ event.payload['context'] | tojson }}"},
+                },
+            },
+        ),
+    ],
+)

infrahub/cli/db.py

@@ -326,7 +326,7 @@ async def migrate_database(db: InfrahubDatabase, initialize: bool = False, check
                 root_node.graph_version = migration.minimum_version + 1
                 await root_node.save(db=db)
 
-        if not execution_result.success or validation_result and not validation_result.success:
+        if not execution_result.success or (validation_result and not validation_result.success):
             rprint(f"Migration: {migration.name} {FAILED_BADGE}")
             for error in execution_result.errors:
                 rprint(f"  {error}")
@@ -449,7 +449,7 @@ async def selected_export_cmd(
     ctx: typer.Context,
     kinds: list[str] = typer.Option([], help="Node kinds to export"),  # noqa: B008
     uuids: list[str] = typer.Option([], help="UUIDs of nodes to export"),  # noqa: B008
-    query_limit: int = typer.Option(1000, help="Maximum batch size of export query"),  # noqa: B008
+    query_limit: int = typer.Option(1000, help="Maximum batch size of export query"),
     export_dir: Path = typer.Option(Path("infrahub-exports"), help="Path of directory to save exports"),  # noqa: B008
     config_file: str = typer.Argument("infrahub.toml", envvar="INFRAHUB_CONFIG"),
 ) -> None:

infrahub/computed_attribute/gather.py

@@ -100,7 +100,9 @@ async def gather_python_transform_attributes(
     name="gather-trigger-computed-attribute-jinja2",
     cache_policy=NONE,
 )
-async def gather_trigger_computed_attribute_jinja2() -> list[ComputedAttrJinja2TriggerDefinition]:
+async def gather_trigger_computed_attribute_jinja2(
+    db: InfrahubDatabase | None = None,  # noqa: ARG001 Needed to have a common function signature for gathering functions
+) -> list[ComputedAttrJinja2TriggerDefinition]:
     log = get_run_logger()
 
     # Build a list of all branches to process based on which branch is different from main