infrahub-server 1.3.0b2__tar.gz → 1.3.0b5__tar.gz

{infrahub_server-1.3.0b2 → infrahub_server-1.3.0b5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: infrahub-server
-Version: 1.3.0b2
+Version: 1.3.0b5
 Summary: Infrahub is taking a new approach to Infrastructure Management by providing a new generation of datastore to organize and control all the data that defines how an infrastructure should run.
 License: AGPL-3.0-only
 Author: OpsMill

infrahub_server-1.3.0b5/backend/infrahub/actions/constants.py

@@ -0,0 +1,173 @@
+from __future__ import annotations
+
+from enum import Enum
+
+from infrahub.core.constants import InfrahubKind
+from infrahub.core.schema.dropdown import DropdownChoice
+from infrahub.utils import InfrahubStringEnum
+
+
+class NodeAction(InfrahubStringEnum):
+    CREATED = "created"
+    DELETED = "deleted"
+    UPDATED = "updated"
+
+
+class BranchScope(Enum):
+    ALL_BRANCHES = DropdownChoice(
+        name="all_branches",
+        label="All Branches",
+        description="All branches",
+        color="#fef08a",
+    )
+    DEFAULT_BRANCH = DropdownChoice(
+        name="default_branch",
+        label="Default Branch",
+        description="Only the default branch",
+        color="#86efac",
+    )
+    OTHER_BRANCHES = DropdownChoice(
+        name="other_branches",
+        label="Other Branches",
+        description="All branches except the default branch",
+        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) -> BranchScope:
+        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 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",
+        label="Value",
+        description="Match against the current value",
+        color="#fef08a",
+    )
+    VALUE_PREVIOUS = DropdownChoice(
+        name="value_previous",
+        label="Value Previous",
+        description="Match against the previous value",
+        color="#86efac",
+    )
+    VALUE_FULL = DropdownChoice(
+        name="value_full",
+        label="Full value match",
+        description="Match against both the current and previous values",
+        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) -> ValueMatch:
+        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 ValueMatch")
+
+
+NODES_THAT_TRIGGER_ACTION_RULES_SETUP = [
+    InfrahubKind.GROUPACTION,
+    InfrahubKind.GROUPTRIGGERRULE,
+    InfrahubKind.NODETRIGGERRULE,
+]

{infrahub_server-1.3.0b2 → infrahub_server-1.3.0b5}/backend/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_server-1.3.0b2 → infrahub_server-1.3.0b5}/backend/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_server-1.3.0b2 → infrahub_server-1.3.0b5}/backend/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_server-1.3.0b2 → infrahub_server-1.3.0b5}/backend/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_server-1.3.0b2 → infrahub_server-1.3.0b5}/backend/infrahub/core/protocols.py

@@ -403,12 +403,12 @@ class CoreGraphQLQueryGroup(CoreGroup):
 
 
 class CoreGroupAction(CoreAction):
-    add_members: Boolean
+    member_action: Dropdown
     group: RelationshipManager
 
 
 class CoreGroupTriggerRule(CoreTriggerRule):
-    members_added: Boolean
+    member_update: Dropdown
     group: RelationshipManager
 
 
@@ -440,7 +440,7 @@ class CoreNodeTriggerAttributeMatch(CoreNodeTriggerMatch):
 
 class CoreNodeTriggerRelationshipMatch(CoreNodeTriggerMatch):
     relationship_name: String
-    added: Boolean
+    modification_type: Dropdown
     peer: StringOptional
 
 

{infrahub_server-1.3.0b2 → infrahub_server-1.3.0b5}/backend/infrahub/git/integrator.py

@@ -188,22 +188,14 @@ class InfrahubRepositoryIntegrator(InfrahubRepositoryBase):
         try:
             if config_file:
                 await self.import_schema_files(branch_name=infrahub_branch_name, commit=commit, config_file=config_file)  # type: ignore[misc]
-
                 await self.import_all_graphql_query(
                     branch_name=infrahub_branch_name, commit=commit, config_file=config_file
                 )  # type: ignore[misc]
-
-                await self.import_objects(
-                    branch_name=infrahub_branch_name,
-                    commit=commit,
-                    config_file=config_file,
-                )  # type: ignore[misc]
                 await self.import_objects(
                     branch_name=infrahub_branch_name,
                     commit=commit,
                     config_file=config_file,
                 )  # type: ignore[misc]
-
                 await self.import_all_python_files(  # type: ignore[call-overload]
                     branch_name=infrahub_branch_name, commit=commit, config_file=config_file
                 )  # type: ignore[misc]

{infrahub_server-1.3.0b2 → infrahub_server-1.3.0b5}/backend/infrahub/graphql/mutations/resource_manager.py

@@ -7,7 +7,7 @@ from graphene.types.generic import GenericScalar
 from typing_extensions import Self
 
 from infrahub.core import protocols, registry
-from infrahub.core.constants import InfrahubKind
+from infrahub.core.constants import InfrahubKind, NumberPoolType
 from infrahub.core.ipam.constants import PrefixMemberType
 from infrahub.core.manager import NodeManager
 from infrahub.core.schema import NodeSchema
@@ -235,6 +235,14 @@ class InfrahubNumberPoolMutation(InfrahubMutationMixin, Mutation):
             number_pool, result = await super().mutate_update(
                 info=info, data=data, branch=branch, database=dbt, node=node
             )
+
+            if number_pool.pool_type.value.value == NumberPoolType.SCHEMA.value and (  # type: ignore[attr-defined]
+                "start_range" in data.keys() or "end_range" in data.keys()
+            ):
+                raise ValidationError(
+                    input_value="start_range or end_range can't be updated on schema defined pools, update the schema in the default branch instead"
+                )
+
             if number_pool.start_range.value > number_pool.end_range.value:  # type: ignore[attr-defined]
                 raise ValidationError(input_value="start_range can't be larger than end_range")
 

{infrahub_server-1.3.0b2 → infrahub_server-1.3.0b5}/backend/infrahub/proposed_change/tasks.py

@@ -254,12 +254,12 @@ async def run_proposed_change_data_integrity_check(
     """Triggers a data integrity validation check on the provided proposed change to start."""
     await add_tags(branches=[model.source_branch], nodes=[model.proposed_change])
 
-    async with service.database.start_transaction() as dbt:
-        destination_branch = await registry.get_branch(db=dbt, branch=model.destination_branch)
-        source_branch = await registry.get_branch(db=dbt, branch=model.source_branch)
+    async with service.database.start_session() as dbs:
+        destination_branch = await registry.get_branch(db=dbs, branch=model.destination_branch)
+        source_branch = await registry.get_branch(db=dbs, branch=model.source_branch)
         component_registry = get_component_registry()
 
-        diff_coordinator = await component_registry.get_component(DiffCoordinator, db=dbt, branch=source_branch)
+        diff_coordinator = await component_registry.get_component(DiffCoordinator, db=dbs, branch=source_branch)
         await diff_coordinator.update_branch_diff(base_branch=destination_branch, diff_branch=source_branch)
 
 
@@ -1006,11 +1006,11 @@ async def run_proposed_change_pipeline(
 
     await _gather_repository_repository_diffs(repositories=repositories, service=service)
 
-    async with service.database.start_transaction() as dbt:
-        destination_branch = await registry.get_branch(db=dbt, branch=model.destination_branch)
-        source_branch = await registry.get_branch(db=dbt, branch=model.source_branch)
+    async with service.database.start_session() as dbs:
+        destination_branch = await registry.get_branch(db=dbs, branch=model.destination_branch)
+        source_branch = await registry.get_branch(db=dbs, branch=model.source_branch)
         component_registry = get_component_registry()
-        diff_coordinator = await component_registry.get_component(DiffCoordinator, db=dbt, branch=source_branch)
+        diff_coordinator = await component_registry.get_component(DiffCoordinator, db=dbs, branch=source_branch)
         await diff_coordinator.update_branch_diff(base_branch=destination_branch, diff_branch=source_branch)
 
     diff_summary = await service.client.get_diff_summary(branch=model.source_branch)