fix(backend): fix resource pool allocation in update mutation

Signed-off-by: Fatih Acar <[email protected]>

Author: fatih-acar

backend/infrahub/core/attribute.py

@@ -578,7 +578,12 @@ def _filter_sensitive(self, value: str, filter_sensitive: bool) -> str:
 
         return value
 
-    async def from_graphql(self, data: dict, db: InfrahubDatabase) -> bool:
+    async def from_graphql(
+        self,
+        data: dict,
+        db: InfrahubDatabase,
+        process_pools: bool = True,
+    ) -> bool:
         """Update attr from GraphQL payload"""
 
         changed = False
@@ -592,7 +597,8 @@ async def from_graphql(self, data: dict, db: InfrahubDatabase) -> bool:
                 changed = True
         elif "from_pool" in data:
             self.from_pool = data["from_pool"]
-            await self.node.handle_pool(db=db, attribute=self, errors=[])
+            if process_pools:
+                await self.node.handle_pool(db=db, attribute=self, errors=[])
             changed = True
 
         if changed and self.is_from_profile:

backend/infrahub/core/node/__init__.py

@@ -963,15 +963,29 @@ async def to_graphql(
 
         return response
 
-    async def from_graphql(self, data: dict, db: InfrahubDatabase) -> bool:
-        """Update object from a GraphQL payload."""
+    async def from_graphql(
+        self,
+        data: dict,
+        db: InfrahubDatabase,
+        process_pools: bool = True,
+    ) -> bool:
+        """Update object from a GraphQL payload.
+
+        Args:
+            data: GraphQL payload to apply.
+            db: Database connection used for related lookups.
+            process_pools: Whether resource pool allocations should be performed.
+
+        Returns:
+            True if any field changed, otherwise False.
+        """
 
         changed = False
 
         for key, value in data.items():
             if key in self._attributes and isinstance(value, dict):
                 attribute = getattr(self, key)
-                changed |= await attribute.from_graphql(data=value, db=db)
+                changed |= await attribute.from_graphql(data=value, db=db, process_pools=process_pools)
 
             if key in self._relationships:
                 rel: RelationshipManager = getattr(self, key)

backend/infrahub/graphql/mutations/main.py

@@ -211,16 +211,26 @@ async def _call_mutate_update(
         Wrapper around mutate_update to potentially activate locking and call it within a database transaction.
         """
         before_mutate_profile_ids = await get_profile_ids(db=db, obj=obj)
-        await obj.from_graphql(db=db, data=data)
         fields_to_validate = list(data)
         fields = list(data.keys())
 
         for field_to_remove in ("id", "hfid"):
             if field_to_remove in fields:
                 fields.remove(field_to_remove)
 
+        # Prepare a clone to compute locks without triggering pool allocations
+        preview_obj = await NodeManager.get_one_by_id_or_default_filter(
+            db=db,
+            kind=obj.get_kind(),
+            id=obj.get_id(),
+            branch=branch,
+            include_owner=True,
+            include_source=True,
+        )
+        await preview_obj.from_graphql(db=db, data=data, process_pools=False)
+
         schema_branch = db.schema.get_schema_branch(name=branch.name)
-        lock_names = get_lock_names_on_object_mutation(node=obj, branch=branch, schema_branch=schema_branch)
+        lock_names = get_lock_names_on_object_mutation(node=preview_obj, branch=branch, schema_branch=schema_branch)
 
         async def _mutate(current_db: InfrahubDatabase) -> tuple[Node, Self]:
             updated_obj = await cls.mutate_update_object(
@@ -235,7 +245,7 @@ async def _mutate(current_db: InfrahubDatabase) -> tuple[Node, Self]:
                 previous_profile_ids=before_mutate_profile_ids,
                 lock_names=lock_names,
                 manage_lock=False,
-                apply_data=False,
+                apply_data=True,
             )
             result = await cls.mutate_update_to_graphql(db=current_db, info=info, obj=updated_obj)
             return updated_obj, result