Merge branch 'stable' into bkr-fix-semver-release-tasks

backend/infrahub/cli/db.py

@@ -42,7 +42,7 @@
 from infrahub.core.validators.models.validate_migration import SchemaValidateMigrationData
 from infrahub.database import DatabaseType
 from infrahub.log import get_logger
-from infrahub.services import InfrahubServices
+from infrahub.services import InfrahubServices, services
 from infrahub.services.adapters.message_bus.local import BusSimulator
 from infrahub.services.adapters.workflow.local import WorkflowLocalExecution
 from infrahub.workflows.catalogue import SCHEMA_APPLY_MIGRATION, SCHEMA_VALIDATE_MIGRATION
@@ -214,6 +214,7 @@ async def update_core_schema(  # pylint: disable=too-many-statements
             service = InfrahubServices(
                 database=db, message_bus=BusSimulator(database=db), workflow=WorkflowLocalExecution()
             )
+            services.prepare(service)
             await initialize_registry(db=db)
 
             default_branch = registry.get_branch_from_registry(branch=registry.default_branch)

backend/infrahub/core/attribute.py

@@ -555,7 +555,7 @@ 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.process_pool(db=db, attribute=self, errors=[])
+            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

@@ -215,7 +215,7 @@ async def init(
 
         return cls(**attrs)
 
-    async def process_pool(self, db: InfrahubDatabase, attribute: BaseAttribute, errors: list) -> None:
+    async def handle_pool(self, db: InfrahubDatabase, attribute: BaseAttribute, errors: list) -> None:
         """Evaluate if a resource has been requested from a pool and apply the resource
 
         This method only works on number pools, currently Integer is the only type that has the from_pool
@@ -336,7 +336,7 @@ async def _process_fields(self, fields: dict, db: InfrahubDatabase) -> None:
                 )
                 if not self._existing:
                     attribute: BaseAttribute = getattr(self, attr_schema.name)
-                    await self.process_pool(db=db, attribute=attribute, errors=errors)
+                    await self.handle_pool(db=db, attribute=attribute, errors=errors)
 
                     attribute.validate(value=attribute.value, name=attribute.name, schema=attribute.schema)
             except ValidationError as exc:

changelog/4807.fixed.md

@@ -0,0 +1 @@
+Fix error when `pool` was used a relationship name