infrahub-server 1.7.0rc0__py3-none-any.whl → 1.7.1__py3-none-any.whl

infrahub/core/migrations/graph/m036_drop_attr_value_index.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from typing import TYPE_CHECKING, Sequence
 
 from infrahub.constants.database import IndexType
-from infrahub.core.migrations.shared import MigrationResult
+from infrahub.core.migrations.shared import MigrationInput, MigrationResult
 from infrahub.core.query import Query  # noqa: TC001
 from infrahub.database import DatabaseType
 from infrahub.database.index import IndexItem
@@ -23,7 +23,8 @@ class Migration036(GraphMigration):
     queries: Sequence[type[Query]] = []
     minimum_version: int = 35
 
-    async def execute(self, db: InfrahubDatabase) -> MigrationResult:
+    async def execute(self, migration_input: MigrationInput) -> MigrationResult:
+        db = migration_input.db
         result = MigrationResult()
 
         # Only execute this migration for Neo4j

infrahub/core/migrations/graph/m037_index_attr_vals.py

@@ -5,7 +5,7 @@ from typing import TYPE_CHECKING, Any
 
 from infrahub.constants.database import IndexType
 from infrahub.core.attribute import MAX_STRING_LENGTH
-from infrahub.core.migrations.shared import MigrationResult, get_migration_console
+from infrahub.core.migrations.shared import MigrationInput, MigrationResult, get_migration_console
 from infrahub.core.query import Query, QueryType
 from infrahub.database.index import IndexItem
 from infrahub.database.neo4j import IndexManagerNeo4j
@@ -463,8 +463,9 @@ class Migration037(ArbitraryMigration):
 
         return result
 
-    async def execute(self, db: InfrahubDatabase) -> MigrationResult:  # noqa: PLR0915
+    async def execute(self, migration_input: MigrationInput) -> MigrationResult:  # noqa: PLR0915
         console = get_migration_console()
+        db = migration_input.db
         result = MigrationResult()
 
         # find the active schema attributes that have a LARGE_ATTRIBUTE_TYPE kind on all branches

infrahub/core/migrations/graph/m038_redo_0000_prefix_fix.py

@@ -4,12 +4,10 @@ import ipaddress
 from typing import TYPE_CHECKING, Sequence
 
 from infrahub.core.branch.models import Branch
-from infrahub.core.constants import SYSTEM_USER_ID
 from infrahub.core.initialization import initialization
 from infrahub.core.ipam.reconciler import IpamReconciler
 from infrahub.core.manager import NodeManager
-from infrahub.core.migrations.shared import MigrationResult
-from infrahub.core.timestamp import Timestamp
+from infrahub.core.migrations.shared import MigrationInput, MigrationResult
 from infrahub.lock import initialize_lock
 from infrahub.log import get_logger
 
@@ -38,12 +36,13 @@ class Migration038(InternalSchemaMigration):
     async def validate_migration(self, db: InfrahubDatabase) -> MigrationResult:  # noqa: ARG002
         return MigrationResult()
 
-    async def execute(self, db: InfrahubDatabase, user_id: str = SYSTEM_USER_ID) -> MigrationResult:  # noqa: ARG002
+    async def execute(self, migration_input: MigrationInput) -> MigrationResult:
+        db = migration_input.db
+        at = migration_input.at
         # load schemas from database into registry
         initialize_lock()
         await initialization(db=db)
 
-        at = Timestamp()
         for branch in await Branch.get_list(db=db):
             prefix_0000s = await NodeManager.query(
                 db=db, schema="BuiltinIPPrefix", branch=branch, filters={"prefix__values": ["0.0.0.0/0", "::/0"]}

infrahub/core/migrations/graph/m039_ipam_reconcile.py

@@ -10,7 +10,7 @@ from infrahub.core.branch.models import Branch
 from infrahub.core.constants import InfrahubKind
 from infrahub.core.initialization import initialization
 from infrahub.core.ipam.reconciler import IpamReconciler
-from infrahub.core.migrations.shared import MigrationResult, get_migration_console
+from infrahub.core.migrations.shared import MigrationInput, MigrationResult, get_migration_console
 from infrahub.core.query import Query, QueryType
 from infrahub.lock import initialize_lock
 from infrahub.log import get_logger
@@ -233,7 +233,8 @@ class Migration039(ArbitraryMigration):
     async def validate_migration(self, db: InfrahubDatabase) -> MigrationResult:  # noqa: ARG002
         return MigrationResult()
 
-    async def execute(self, db: InfrahubDatabase) -> MigrationResult:
+    async def execute(self, migration_input: MigrationInput) -> MigrationResult:
+        db = migration_input.db
         console = get_migration_console()
         result = MigrationResult()
         # load schemas from database into registry

infrahub/core/migrations/graph/m041_deleted_dup_edges.py

@@ -7,7 +7,7 @@ from rich import print as rprint
 from infrahub.core.branch import Branch
 from infrahub.core.diff.repository.repository import DiffRepository
 from infrahub.core.initialization import get_root_node
-from infrahub.core.migrations.shared import MigrationResult
+from infrahub.core.migrations.shared import MigrationInput, MigrationResult
 from infrahub.core.query import Query, QueryType
 from infrahub.dependencies.registry import build_component_registry, get_component_registry
 from infrahub.log import get_logger
@@ -140,7 +140,8 @@ class Migration041(ArbitraryMigration):
 
         return result
 
-    async def execute(self, db: InfrahubDatabase) -> MigrationResult:
+    async def execute(self, migration_input: MigrationInput) -> MigrationResult:
+        db = migration_input.db
         root_node = await get_root_node(db=db)
         default_branch_name = root_node.default_branch
         default_branch = await Branch.get_by_name(db=db, name=default_branch_name)

infrahub/core/migrations/graph/m042_profile_attrs_in_db.py

@@ -7,7 +7,7 @@ from rich.progress import Progress
 from infrahub.core.branch.models import Branch
 from infrahub.core.initialization import get_root_node
 from infrahub.core.manager import NodeManager
-from infrahub.core.migrations.shared import MigrationResult, get_migration_console
+from infrahub.core.migrations.shared import MigrationInput, MigrationResult, get_migration_console
 from infrahub.core.query import Query, QueryType
 from infrahub.core.timestamp import Timestamp
 from infrahub.log import get_logger
@@ -87,14 +87,15 @@ class Migration042(MigrationRequiringRebase):
     async def validate_migration(self, db: InfrahubDatabase) -> MigrationResult:  # noqa: ARG002
         return MigrationResult()
 
-    async def execute(self, db: InfrahubDatabase) -> MigrationResult:
+    async def execute(self, migration_input: MigrationInput) -> MigrationResult:
+        db = migration_input.db
         root_node = await get_root_node(db=db, initialize=False)
         default_branch_name = root_node.default_branch
         default_branch = await Branch.get_by_name(db=db, name=default_branch_name)
         return await self._do_execute_for_branch(db=db, branch=default_branch)
 
-    async def execute_against_branch(self, db: InfrahubDatabase, branch: Branch) -> MigrationResult:
-        return await self._do_execute_for_branch(db=db, branch=branch)
+    async def execute_against_branch(self, migration_input: MigrationInput, branch: Branch) -> MigrationResult:
+        return await self._do_execute_for_branch(db=migration_input.db, branch=branch)
 
     async def _do_execute_for_branch(self, db: InfrahubDatabase, branch: Branch) -> MigrationResult:
         console = get_migration_console()

infrahub/core/migrations/graph/m043_create_hfid_display_label_in_db.py

@@ -9,7 +9,12 @@ from infrahub.core.branch import Branch
 from infrahub.core.constants import BranchSupportType, SchemaPathType
 from infrahub.core.initialization import get_root_node
 from infrahub.core.migrations.schema.node_attribute_add import NodeAttributeAddMigration
-from infrahub.core.migrations.shared import MigrationRequiringRebase, MigrationResult, get_migration_console
+from infrahub.core.migrations.shared import (
+    MigrationInput,
+    MigrationRequiringRebase,
+    MigrationResult,
+    get_migration_console,
+)
 from infrahub.core.path import SchemaPath
 from infrahub.core.query import Query, QueryType
 
@@ -48,7 +53,8 @@ class Migration043(MigrationRequiringRebase):
     name: str = "043_create_hfid_display_label_in_db"
     minimum_version: int = 42
 
-    async def execute(self, db: InfrahubDatabase) -> MigrationResult:
+    async def execute(self, migration_input: MigrationInput) -> MigrationResult:
+        db = migration_input.db
         result = MigrationResult()
 
         root_node = await get_root_node(db=db, initialize=False)
@@ -104,7 +110,7 @@ class Migration043(MigrationRequiringRebase):
 
             for migration in migrations:
                 try:
-                    execution_result = await migration.execute(db=db, branch=default_branch)
+                    execution_result = await migration.execute(migration_input=migration_input, branch=default_branch)
                     result.errors.extend(execution_result.errors)
                     progress.update(update_task, advance=1)
                 except Exception as exc:
@@ -113,7 +119,8 @@ class Migration043(MigrationRequiringRebase):
 
         return result
 
-    async def execute_against_branch(self, db: InfrahubDatabase, branch: Branch) -> MigrationResult:
+    async def execute_against_branch(self, migration_input: MigrationInput, branch: Branch) -> MigrationResult:
+        db = migration_input.db
         result = MigrationResult()
 
         schema_branch = await registry.schema.load_schema_from_db(db=db, branch=branch)
@@ -155,7 +162,7 @@ class Migration043(MigrationRequiringRebase):
 
             for migration in migrations:
                 try:
-                    execution_result = await migration.execute(db=db, branch=branch)
+                    execution_result = await migration.execute(migration_input=migration_input, branch=branch)
                     result.errors.extend(execution_result.errors)
                     progress.update(update_task, advance=1)
                 except Exception as exc:

infrahub/core/migrations/graph/m044_backfill_hfid_display_label_in_db.py

@@ -11,7 +11,7 @@ from infrahub.core import registry
 from infrahub.core.branch import Branch
 from infrahub.core.constants import GLOBAL_BRANCH_NAME, BranchSupportType, RelationshipDirection
 from infrahub.core.initialization import get_root_node
-from infrahub.core.migrations.shared import MigrationResult, get_migration_console
+from infrahub.core.migrations.shared import MigrationInput, MigrationResult, get_migration_console
 from infrahub.core.query import Query, QueryType
 from infrahub.core.schema import NodeSchema
 from infrahub.exceptions import SchemaNotFoundError
@@ -24,9 +24,9 @@ if TYPE_CHECKING:
     from infrahub.core.schema import AttributeSchema, NodeSchema, ProfileSchema, TemplateSchema
     from infrahub.core.schema.basenode_schema import SchemaAttributePath
     from infrahub.core.schema.schema_branch import SchemaBranch
+    from infrahub.core.timestamp import Timestamp
     from infrahub.database import InfrahubDatabase
 
-
 console = get_migration_console()
 
 
@@ -631,6 +631,7 @@ class Migration044(MigrationRequiringRebase):
         schema: NodeSchema | ProfileSchema | TemplateSchema,
         schema_branch: SchemaBranch,
         attribute_schema_map: dict[AttributeSchema, AttributeSchema],
+        at: Timestamp,
         progress: Progress | None = None,
         update_task: TaskID | None = None,
     ) -> None:
@@ -696,6 +697,7 @@ class Migration044(MigrationRequiringRebase):
                     branch=branch,
                     attribute_schema=destination_attribute_schema,
                     values_by_id_map=formatted_schema_path_values_map,
+                    at=at,
                 )
                 await update_display_label_query.execute(db=db)
 
@@ -709,7 +711,9 @@ class Migration044(MigrationRequiringRebase):
 
         print("done")
 
-    async def execute(self, db: InfrahubDatabase) -> MigrationResult:
+    async def execute(self, migration_input: MigrationInput) -> MigrationResult:
+        db = migration_input.db
+        at = migration_input.at
         root_node = await get_root_node(db=db, initialize=False)
         default_branch_name = root_node.default_branch
         default_branch = await Branch.get_by_name(db=db, name=default_branch_name)
@@ -754,6 +758,7 @@ class Migration044(MigrationRequiringRebase):
                         schema=node_schema,
                         schema_branch=main_schema_branch,
                         attribute_schema_map=attribute_schema_map,
+                        at=at,
                         progress=progress,
                         update_task=update_task,
                     )
@@ -770,6 +775,7 @@ class Migration044(MigrationRequiringRebase):
         schema_branch: SchemaBranch,
         source_attribute_schema: AttributeSchema,
         destination_attribute_schema: AttributeSchema,
+        at: Timestamp,
     ) -> None:
         print(f"Processing {schema.kind}.{destination_attribute_schema.name} for {branch.name}...", end="")
 
@@ -814,12 +820,15 @@ class Migration044(MigrationRequiringRebase):
                 branch=branch,
                 attribute_schema=destination_attribute_schema,
                 values_by_id_map=formatted_schema_path_values_map,
+                at=at,
             )
             await update_attr_values_query.execute(db=db)
 
             offset += self.update_batch_size
 
-    async def execute_against_branch(self, db: InfrahubDatabase, branch: Branch) -> MigrationResult:
+    async def execute_against_branch(self, migration_input: MigrationInput, branch: Branch) -> MigrationResult:
+        db = migration_input.db
+        at = migration_input.at
         default_branch = await Branch.get_by_name(db=db, name=registry.default_branch)
         main_schema_branch = await get_or_load_schema_branch(db=db, branch=default_branch)
         schema_branch = await get_or_load_schema_branch(db=db, branch=branch)
@@ -869,6 +878,7 @@ class Migration044(MigrationRequiringRebase):
                         schema=node_schema,
                         schema_branch=schema_branch,
                         attribute_schema_map=schemas_for_universal_update_map,
+                        at=at,
                     )
 
                 if not schemas_for_targeted_update_map:
@@ -882,6 +892,7 @@ class Migration044(MigrationRequiringRebase):
                         schema_branch=schema_branch,
                         source_attribute_schema=source_attribute_schema,
                         destination_attribute_schema=destination_attribute_schema,
+                        at=at,
                     )
 
         except Exception as exc:

infrahub/core/migrations/graph/m045_backfill_hfid_display_label_in_db_profile_template.py

@@ -8,14 +8,13 @@ from infrahub.core import registry
 from infrahub.core.branch import Branch
 from infrahub.core.initialization import get_root_node
 from infrahub.core.migrations.graph.m044_backfill_hfid_display_label_in_db import DefaultBranchNodeCount, Migration044
-from infrahub.core.migrations.shared import MigrationResult, get_migration_console
+from infrahub.core.migrations.shared import MigrationInput, MigrationResult, get_migration_console
 from infrahub.exceptions import SchemaNotFoundError
 
 from .load_schema_branch import get_or_load_schema_branch
 
 if TYPE_CHECKING:
     from infrahub.core.schema import ProfileSchema, TemplateSchema
-    from infrahub.database import InfrahubDatabase
 
 
 console = get_migration_console()
@@ -30,7 +29,9 @@ class Migration045(Migration044):
     minimum_version: int = 44
     update_batch_size: int = 1000
 
-    async def execute(self, db: InfrahubDatabase) -> MigrationResult:
+    async def execute(self, migration_input: MigrationInput) -> MigrationResult:
+        db = migration_input.db
+        at = migration_input.at
         root_node = await get_root_node(db=db, initialize=False)
         default_branch_name = root_node.default_branch
         default_branch = await Branch.get_by_name(db=db, name=default_branch_name)
@@ -77,6 +78,7 @@ class Migration045(Migration044):
                         schema=node_schema,
                         schema_branch=main_schema_branch,
                         attribute_schema_map=attribute_schema_map,
+                        at=at,
                         progress=progress,
                         update_task=update_task,
                     )
@@ -85,7 +87,9 @@ class Migration045(Migration044):
             return MigrationResult(errors=[str(exc)])
         return MigrationResult()
 
-    async def execute_against_branch(self, db: InfrahubDatabase, branch: Branch) -> MigrationResult:
+    async def execute_against_branch(self, migration_input: MigrationInput, branch: Branch) -> MigrationResult:
+        db = migration_input.db
+        at = migration_input.at
         default_branch = await Branch.get_by_name(db=db, name=registry.default_branch)
         main_schema_branch = await get_or_load_schema_branch(db=db, branch=default_branch)
         schema_branch = await get_or_load_schema_branch(db=db, branch=branch)
@@ -143,6 +147,7 @@ class Migration045(Migration044):
                         schema=node_schema,
                         schema_branch=schema_branch,
                         attribute_schema_map=schemas_for_universal_update_map,
+                        at=at,
                     )
 
                 if not schemas_for_targeted_update_map:
@@ -156,6 +161,7 @@ class Migration045(Migration044):
                         schema_branch=schema_branch,
                         source_attribute_schema=source_attribute_schema,
                         destination_attribute_schema=destination_attribute_schema,
+                        at=at,
                     )
 
         except Exception as exc:

infrahub/core/migrations/graph/m046_fill_agnostic_hfid_display_labels.py

@@ -16,7 +16,7 @@ from infrahub.core.migrations.graph.m044_backfill_hfid_display_label_in_db impor
     UpdateAttributeValuesQuery,
 )
 from infrahub.core.migrations.schema.node_attribute_add import NodeAttributeAddMigration
-from infrahub.core.migrations.shared import ArbitraryMigration, MigrationResult, get_migration_console
+from infrahub.core.migrations.shared import ArbitraryMigration, MigrationInput, MigrationResult, get_migration_console
 from infrahub.core.path import SchemaPath
 from infrahub.core.query import Query, QueryType
 
@@ -134,13 +134,14 @@ class Migration046(ArbitraryMigration):
 
         print("done")
 
-    async def execute(self, db: InfrahubDatabase) -> MigrationResult:
+    async def execute(self, migration_input: MigrationInput) -> MigrationResult:
         try:
-            return await self._do_execute(db=db)
+            return await self._do_execute(migration_input=migration_input)
         except Exception as exc:
             return MigrationResult(errors=[str(exc)])
 
-    async def _do_execute(self, db: InfrahubDatabase) -> MigrationResult:
+    async def _do_execute(self, migration_input: MigrationInput) -> MigrationResult:
+        db = migration_input.db
         console = get_migration_console()
         result = MigrationResult()
 
@@ -188,7 +189,7 @@ class Migration046(ArbitraryMigration):
 
             for migration in migrations:
                 try:
-                    execution_result = await migration.execute(db=db, branch=global_branch)
+                    execution_result = await migration.execute(migration_input=migration_input, branch=global_branch)
                     result.errors.extend(execution_result.errors)
                     progress.update(update_task, advance=1)
                 except Exception as exc:

infrahub/core/migrations/graph/m047_backfill_or_null_display_label.py

@@ -9,7 +9,12 @@ from infrahub.core import registry
 from infrahub.core.branch import Branch
 from infrahub.core.constants import GLOBAL_BRANCH_NAME, NULL_VALUE, BranchSupportType
 from infrahub.core.initialization import get_root_node
-from infrahub.core.migrations.shared import MigrationRequiringRebase, MigrationResult, get_migration_console
+from infrahub.core.migrations.shared import (
+    MigrationInput,
+    MigrationRequiringRebase,
+    MigrationResult,
+    get_migration_console,
+)
 from infrahub.core.query import Query, QueryType
 
 from .load_schema_branch import get_or_load_schema_branch
@@ -24,6 +29,7 @@ if TYPE_CHECKING:
     from infrahub.core.schema import AttributeSchema, MainSchemaTypes
     from infrahub.core.schema.basenode_schema import SchemaAttributePath
     from infrahub.core.schema.schema_branch import SchemaBranch
+    from infrahub.core.timestamp import Timestamp
     from infrahub.database import InfrahubDatabase
 
 
@@ -409,6 +415,7 @@ class Migration047(MigrationRequiringRebase):
         schema: MainSchemaTypes,
         schema_branch: SchemaBranch,
         attribute_schema: AttributeSchema,
+        at: Timestamp,
         progress: Progress | None = None,
         update_task: TaskID | None = None,
     ) -> None:
@@ -466,6 +473,7 @@ class Migration047(MigrationRequiringRebase):
                     branch=branch,
                     attribute_schema=attribute_schema,
                     values_by_id_map=formatted_schema_path_values_map,
+                    at=at,
                 )
                 await update_display_label_query.execute(db=db)
 
@@ -477,7 +485,9 @@ class Migration047(MigrationRequiringRebase):
 
             offset += self.update_batch_size
 
-    async def execute(self, db: InfrahubDatabase) -> MigrationResult:
+    async def execute(self, migration_input: MigrationInput) -> MigrationResult:
+        db = migration_input.db
+        at = migration_input.at
         root_node = await get_root_node(db=db, initialize=False)
         default_branch_name = root_node.default_branch
         default_branch = await Branch.get_by_name(db=db, name=default_branch_name)
@@ -531,7 +541,7 @@ class Migration047(MigrationRequiringRebase):
                             break
 
                         create_display_label_query = await CreateDisplayLabelNullQuery.init(
-                            db=db, branch=default_branch, node_uuids=batch_uuids
+                            db=db, branch=default_branch, node_uuids=batch_uuids, at=at
                         )
                         await create_display_label_query.execute(db=db)
 
@@ -551,6 +561,7 @@ class Migration047(MigrationRequiringRebase):
                             schema=main_schema_branch.get(name=node_schema_name, duplicate=False),
                             schema_branch=main_schema_branch,
                             attribute_schema=display_label_attribute_schema,
+                            at=at,
                             progress=progress,
                             update_task=backfill_task,
                         )
@@ -559,7 +570,9 @@ class Migration047(MigrationRequiringRebase):
             return MigrationResult(errors=[str(exc)])
         return MigrationResult()
 
-    async def execute_against_branch(self, db: InfrahubDatabase, branch: Branch) -> MigrationResult:
+    async def execute_against_branch(self, migration_input: MigrationInput, branch: Branch) -> MigrationResult:
+        db = migration_input.db
+        at = migration_input.at
         schema_branch = await get_or_load_schema_branch(db=db, branch=branch)
 
         base_node_schema = schema_branch.get("SchemaNode", duplicate=False)
@@ -579,7 +592,7 @@ class Migration047(MigrationRequiringRebase):
                         break
 
                     create_display_label_query = await CreateDisplayLabelNullQuery.init(
-                        db=db, branch=branch, node_uuids=batch_uuids
+                        db=db, branch=branch, node_uuids=batch_uuids, at=at
                     )
                     await create_display_label_query.execute(db=db)
 
@@ -599,6 +612,7 @@ class Migration047(MigrationRequiringRebase):
                     schema=node_schema,
                     schema_branch=schema_branch,
                     attribute_schema=display_label_attribute_schema,
+                    at=at,
                 )
 
         except Exception as exc:

infrahub/core/migrations/graph/m048_undelete_rel_props.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from typing import TYPE_CHECKING, Any
 
 from infrahub.core.migrations.graph.m041_deleted_dup_edges import DeleteDuplicatedRelationshipEdges
-from infrahub.core.migrations.shared import ArbitraryMigration, MigrationResult, get_migration_console
+from infrahub.core.migrations.shared import ArbitraryMigration, MigrationInput, MigrationResult, get_migration_console
 from infrahub.core.query import Query, QueryType
 
 if TYPE_CHECKING:
@@ -143,18 +143,20 @@ class Migration048(ArbitraryMigration):
     async def validate_migration(self, db: InfrahubDatabase) -> MigrationResult:  # noqa: ARG002
         return MigrationResult()
 
-    async def execute(self, db: InfrahubDatabase) -> MigrationResult:
+    async def execute(self, migration_input: MigrationInput) -> MigrationResult:
+        db = migration_input.db
+        at = migration_input.at
         console = get_migration_console()
 
         console.log("Deleting duplicate edges for all Relationships", end="...")
         delete_duplicate_edges_query = await DeleteDuplicatedRelationshipEdges.init(
-            db=db, migrated_kind_nodes_only=False
+            db=db, migrated_kind_nodes_only=False, at=at
         )
         await delete_duplicate_edges_query.execute(db=db)
         console.log("done")
 
         console.log("Undeleting Relationship properties", end="...")
-        undelete_rel_props_query = await UndeleteRelationshipProperties.init(db=db)
+        undelete_rel_props_query = await UndeleteRelationshipProperties.init(db=db, at=at)
         await undelete_rel_props_query.execute(db=db)
         console.log("done")
 

infrahub/core/migrations/graph/m049_remove_is_visible_relationship.py

@@ -5,7 +5,7 @@ from typing import TYPE_CHECKING, Any, Sequence
 from infrahub.core.migrations.shared import MigrationResult
 from infrahub.core.query import Query, QueryType
 
-from ..shared import GraphMigration
+from ..shared import GraphMigration, MigrationInput
 
 if TYPE_CHECKING:
     from infrahub.database import InfrahubDatabase
@@ -49,5 +49,5 @@ class Migration049(GraphMigration):
     async def validate_migration(self, db: InfrahubDatabase) -> MigrationResult:  # noqa: ARG002
         return MigrationResult()
 
-    async def execute(self, db: InfrahubDatabase) -> MigrationResult:
-        return await self.do_execute(db=db)
+    async def execute(self, migration_input: MigrationInput) -> MigrationResult:
+        return await self.do_execute(migration_input=migration_input)

infrahub/core/migrations/graph/m050_backfill_vertex_metadata.py

@@ -5,7 +5,7 @@ from typing import TYPE_CHECKING, Any, Sequence
 from infrahub.core.migrations.shared import MigrationResult
 from infrahub.core.query import Query, QueryType
 
-from ..shared import GraphMigration
+from ..shared import GraphMigration, MigrationInput
 
 if TYPE_CHECKING:
     from infrahub.database import InfrahubDatabase
@@ -164,5 +164,5 @@ class Migration050(GraphMigration):
     async def validate_migration(self, db: InfrahubDatabase) -> MigrationResult:  # noqa: ARG002
         return MigrationResult()
 
-    async def execute(self, db: InfrahubDatabase) -> MigrationResult:
-        return await self.do_execute(db=db)
+    async def execute(self, migration_input: MigrationInput) -> MigrationResult:
+        return await self.do_execute(migration_input=migration_input)

infrahub/core/migrations/graph/m051_subtract_branched_from_microsecond.py

@@ -0,0 +1,39 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from infrahub.core.branch import Branch
+from infrahub.core.migrations.shared import ArbitraryMigration, MigrationInput, MigrationResult
+from infrahub.core.timestamp import Timestamp
+
+if TYPE_CHECKING:
+    from infrahub.database import InfrahubDatabase
+
+
+class Migration051(ArbitraryMigration):
+    name: str = "051_subtract_branched_from_microsecond"
+    minimum_version: int = 50
+
+    async def validate_migration(self, db: InfrahubDatabase) -> MigrationResult:  # noqa: ARG002
+        return MigrationResult()
+
+    async def execute(self, migration_input: MigrationInput) -> MigrationResult:
+        db = migration_input.db
+        result = MigrationResult()
+
+        branches = await Branch.get_list(db=db)
+
+        for branch in branches:
+            if branch.is_default or branch.is_global:
+                continue
+
+            if not branch.branched_from:
+                continue
+
+            original_ts = Timestamp(branch.branched_from)
+            new_ts = original_ts.subtract(microseconds=1)
+            branch.branched_from = new_ts.to_string()
+
+            await branch.save(db=db)
+
+        return result

infrahub/core/migrations/runner.py

@@ -7,10 +7,11 @@ from infrahub.core.constants import GLOBAL_BRANCH_NAME
 from infrahub.core.migrations.graph import MIGRATIONS
 
 from .exceptions import MigrationFailureError
-from .shared import MigrationRequiringRebase
+from .shared import MigrationInput, MigrationRequiringRebase
 
 if TYPE_CHECKING:
     from infrahub.core.branch import Branch
+    from infrahub.core.timestamp import Timestamp
     from infrahub.database import InfrahubDatabase
 
 
@@ -35,12 +36,14 @@ class MigrationRunner:
     def has_migrations(self) -> bool:
         return bool(self.applicable_migrations)
 
-    async def run(self, db: InfrahubDatabase) -> None:
+    async def run(self, db: InfrahubDatabase, at: Timestamp) -> None:
         if not self.has_migrations():
             return
 
         for migration in self.applicable_migrations:
-            execution_result = await migration.execute_against_branch(db=db, branch=self.branch)
+            execution_result = await migration.execute_against_branch(
+                migration_input=MigrationInput(db=db, at=at), branch=self.branch
+            )
             validation_result = None
 
             if execution_result.success: