fix lock initialization for upgrades (#7556)

Author: ajtmccarty

backend/infrahub/cli/upgrade.py

@@ -20,6 +20,7 @@
 from infrahub.core.manager import NodeManager
 from infrahub.core.protocols import CoreAccount, CoreObjectPermission
 from infrahub.dependencies.registry import build_component_registry
+from infrahub.lock import initialize_lock
 from infrahub.menu.menu import default_menu
 from infrahub.menu.models import MenuDict
 from infrahub.menu.repository import MenuRepository
@@ -66,6 +67,7 @@ async def upgrade_cmd(
     dbdriver = await context.init_db(retry=1)
 
     await initialize_registry(db=dbdriver)
+    initialize_lock()
 
     build_component_registry()
 

backend/infrahub/core/migrations/graph/load_schema_branch.py

@@ -16,4 +16,6 @@ async def get_or_load_schema_branch(db: InfrahubDatabase, branch: Branch) -> Sch
         registry.schema = schema_manager
         internal_schema_root = SchemaRoot(**internal_schema)
         registry.schema.register_schema(schema=internal_schema_root)
-    return await registry.schema.load_schema_from_db(db=db, branch=branch)
+    schema_branch = await registry.schema.load_schema_from_db(db=db, branch=branch)
+    registry.schema.set_schema_branch(name=branch.name, schema=schema_branch)
+    return schema_branch

backend/infrahub/core/migrations/graph/m041_profile_attrs_in_db.py

@@ -112,7 +112,7 @@ async def _do_execute_for_branch(self, db: InfrahubDatabase, branch: Branch) ->
         node_ids_to_update: set[str] = set()
         with Progress() as progress:
             gather_nodes_task = progress.add_task(
-                "Gathering affected objects for each profile on branch {branch.name}...", total=len(profiles_map)
+                f"Gathering affected objects for each profile on branch {branch.name}...", total=len(profiles_map)
             )
 
             for profile in profiles_map.values():

backend/infrahub/core/migrations/graph/m043_backfill_hfid_display_label_in_db.py

@@ -694,7 +694,7 @@ async def _do_one_schema_all(
                 )
                 await update_display_label_query.execute(db=db)
 
-            if progress and update_task:
+            if progress is not None and update_task is not None:
                 progress.update(update_task, advance=num_updates)
 
             if num_updates == 0: