fix: make sure to lock on resource manager allocations

We should also lock regardless of the branch when allocating from a
resource manager.

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

Author: fatih-acar

backend/infrahub/lock_getter.py

@@ -1,4 +1,5 @@
 import hashlib
+from typing import TYPE_CHECKING
 
 from infrahub.core.branch import Branch
 from infrahub.core.constants import InfrahubKind
@@ -7,6 +8,9 @@
 from infrahub.core.schema.schema_branch import SchemaBranch
 from infrahub.lock import build_object_lock_name
 
+if TYPE_CHECKING:
+    from infrahub.core.relationship import RelationshipManager
+
 KINDS_CONCURRENT_MUTATIONS_NOT_ALLOWED = [InfrahubKind.GENERICGROUP]
 
 
@@ -75,11 +79,20 @@ def get_lock_names_on_object_mutation(node: Node, branch: Branch, schema_branch:
     Lock names include kind, some generic kinds, and values of attributes of corresponding uniqueness constraints.
     """
 
+    lock_names = []
+    # Check if node is using resource manager allocation
+    for rel_name in node._relationships:
+        rel_manager: RelationshipManager = getattr(node, rel_name)
+        for rel in rel_manager._relationships:
+            if rel.from_pool and "id" in rel.from_pool:
+                lock_names.append(
+                    f"resource_pool.{rel.from_pool['id']}"
+                )  # lock on resource manager using the same lock we have in get_resource()
+
     if not branch.is_default and not _should_kind_be_locked_on_any_branch(node.get_kind(), schema_branch):
-        return []
+        return lock_names
 
     lock_kinds = _get_kinds_to_lock_on_object_mutation(node.get_kind(), schema_branch)
-    lock_names = []
     for kind in lock_kinds:
         schema = schema_branch.get(name=kind)
         ucs = schema.uniqueness_constraints