infrahub-server 1.1.6__py3-none-any.whl → 1.2.0b1__py3-none-any.whl

infrahub/core/merge.py

@@ -19,6 +19,7 @@ if TYPE_CHECKING:
     from infrahub.core.branch import Branch
     from infrahub.core.diff.coordinator import DiffCoordinator
     from infrahub.core.diff.merger.merger import DiffMerger
+    from infrahub.core.diff.model.path import EnrichedDiffRoot
     from infrahub.core.diff.repository.repository import DiffRepository
     from infrahub.core.models import SchemaUpdateConstraintInfo, SchemaUpdateMigrationInfo
     from infrahub.core.schema.manager import SchemaDiff
@@ -26,6 +27,7 @@ if TYPE_CHECKING:
     from infrahub.database import InfrahubDatabase
     from infrahub.services import InfrahubServices
 
+
 log = get_logger()
 
 
@@ -172,7 +174,7 @@ class BranchMerger:
     async def merge(
         self,
         at: Optional[Union[str, Timestamp]] = None,
-    ) -> None:
+    ) -> EnrichedDiffRoot:
         """Merge the current branch into main."""
         if self.source_branch.name == registry.default_branch:
             raise ValidationError(f"Unable to merge the branch '{self.source_branch.name}' into itself")
@@ -198,8 +200,9 @@ class BranchMerger:
         # TODO need to find a way to properly communicate back to the user any issue that could come up during the merge
         # From the Graph or From the repositories
         self._merge_at = Timestamp(at)
-        await self.diff_merger.merge_graph(at=self._merge_at)
+        branch_diff = await self.diff_merger.merge_graph(at=self._merge_at)
         await self.merge_repositories()
+        return branch_diff
 
     async def rollback(self) -> None:
         await self.diff_merger.rollback(at=self._merge_at)

infrahub/core/migrations/graph/__init__.py

@@ -20,6 +20,8 @@ from .m015_diff_format_update import Migration015
 from .m016_diff_delete_bug_fix import Migration016
 from .m017_add_core_profile import Migration017
 from .m018_uniqueness_nulls import Migration018
+from .m019_restore_rels_to_time import Migration019
+from .m020_add_generate_template_attr import Migration020
 
 if TYPE_CHECKING:
     from infrahub.core.root import Root
@@ -45,6 +47,8 @@ MIGRATIONS: list[type[Union[GraphMigration, InternalSchemaMigration, ArbitraryMi
     Migration016,
     Migration017,
     Migration018,
+    Migration019,
+    Migration020,
 ]
 
 

infrahub/core/migrations/graph/m001_add_version_to_graph.py

@@ -16,7 +16,7 @@ class Migration001Query01(Query):
     name = "migration_001_01"
     type: QueryType = QueryType.WRITE
 
-    async def query_init(self, db: InfrahubDatabase, **kwargs: dict[str, Any]) -> None:
+    async def query_init(self, db: InfrahubDatabase, **kwargs: dict[str, Any]) -> None:  # noqa: ARG002
         query = """
         MATCH (root:Root)
         SET root.graph_version = 1

infrahub/core/migrations/graph/m002_attribute_is_default.py

@@ -15,7 +15,7 @@ class Migration002Query01(Query):
     name = "migration_002_01"
     type: QueryType = QueryType.WRITE
 
-    async def query_init(self, db: InfrahubDatabase, **kwargs: dict[str, Any]) -> None:
+    async def query_init(self, db: InfrahubDatabase, **kwargs: dict[str, Any]) -> None:  # noqa: ARG002
         query = """
         MATCH (a:AttributeValue)
         WHERE a.is_default IS NULL
@@ -30,7 +30,7 @@ class Migration002(GraphMigration):
     queries: Sequence[type[Query]] = [Migration002Query01]
     minimum_version: int = 1
 
-    async def validate_migration(self, db: InfrahubDatabase) -> MigrationResult:
+    async def validate_migration(self, db: InfrahubDatabase) -> MigrationResult:  # noqa: ARG002
         result = MigrationResult()
 
         return result

infrahub/core/migrations/graph/m003_relationship_parent_optional.py

@@ -16,7 +16,7 @@ class Migration003Query01(Query):
     name = "migration_003_01"
     type: QueryType = QueryType.WRITE
 
-    async def query_init(self, db: InfrahubDatabase, **kwargs: dict[str, Any]) -> None:
+    async def query_init(self, db: InfrahubDatabase, **kwargs: dict[str, Any]) -> None:  # noqa: ARG002
         at = Timestamp()
         filters, params = at.get_query_filter_path()
 
@@ -49,7 +49,7 @@ class Migration003(GraphMigration):
     queries: Sequence[type[Query]] = [Migration003Query01]
     minimum_version: int = 2
 
-    async def validate_migration(self, db: InfrahubDatabase) -> MigrationResult:
+    async def validate_migration(self, db: InfrahubDatabase) -> MigrationResult:  # noqa: ARG002
         result = MigrationResult()
 
         return result

infrahub/core/migrations/graph/m004_add_attr_documentation.py

@@ -43,6 +43,6 @@ class Migration004(InternalSchemaMigration):
         ]
         return cls(migrations=migrations, **kwargs)  # type: ignore[arg-type]
 
-    async def validate_migration(self, db: InfrahubDatabase) -> MigrationResult:
+    async def validate_migration(self, db: InfrahubDatabase) -> MigrationResult:  # noqa: ARG002
         result = MigrationResult()
         return result

infrahub/core/migrations/graph/m005_add_rel_read_only.py

@@ -35,6 +35,6 @@ class Migration005(InternalSchemaMigration):
         ]
         return cls(migrations=migrations, **kwargs)  # type: ignore[arg-type]
 
-    async def validate_migration(self, db: InfrahubDatabase) -> MigrationResult:
+    async def validate_migration(self, db: InfrahubDatabase) -> MigrationResult:  # noqa: ARG002
         result = MigrationResult()
         return result

infrahub/core/migrations/graph/m006_add_rel_on_delete.py

@@ -35,6 +35,6 @@ class Migration006(InternalSchemaMigration):
         ]
         return cls(migrations=migrations, **kwargs)  # type: ignore[arg-type]
 
-    async def validate_migration(self, db: InfrahubDatabase) -> MigrationResult:
+    async def validate_migration(self, db: InfrahubDatabase) -> MigrationResult:  # noqa: ARG002
         result = MigrationResult()
         return result

infrahub/core/migrations/graph/m007_add_rel_allow_override.py

@@ -43,6 +43,6 @@ class Migration007(InternalSchemaMigration):
         ]
         return cls(migrations=migrations, **kwargs)  # type: ignore[arg-type]
 
-    async def validate_migration(self, db: InfrahubDatabase) -> MigrationResult:
+    async def validate_migration(self, db: InfrahubDatabase) -> MigrationResult:  # noqa: ARG002
         result = MigrationResult()
         return result

infrahub/core/migrations/graph/m008_add_human_friendly_id.py

@@ -43,6 +43,6 @@ class Migration008(InternalSchemaMigration):
         ]
         return cls(migrations=migrations, **kwargs)  # type: ignore[arg-type]
 
-    async def validate_migration(self, db: InfrahubDatabase) -> MigrationResult:
+    async def validate_migration(self, db: InfrahubDatabase) -> MigrationResult:  # noqa: ARG002
         result = MigrationResult()
         return result

infrahub/core/migrations/graph/m009_add_generate_profile_attr.py

@@ -35,6 +35,6 @@ class Migration009(InternalSchemaMigration):
         ]
         return cls(migrations=migrations, **kwargs)  # type: ignore[arg-type]
 
-    async def validate_migration(self, db: InfrahubDatabase) -> MigrationResult:
+    async def validate_migration(self, db: InfrahubDatabase) -> MigrationResult:  # noqa: ARG002
         result = MigrationResult()
         return result

infrahub/core/migrations/graph/m010_add_generate_profile_attr_generic.py

@@ -35,6 +35,6 @@ class Migration010(InternalSchemaMigration):
         ]
         return cls(migrations=migrations, **kwargs)  # type: ignore[arg-type]
 
-    async def validate_migration(self, db: InfrahubDatabase) -> MigrationResult:
+    async def validate_migration(self, db: InfrahubDatabase) -> MigrationResult:  # noqa: ARG002
         result = MigrationResult()
         return result

infrahub/core/migrations/graph/m011_remove_profile_relationship_schema.py

@@ -16,7 +16,7 @@ class Migration011Query01(Query):
     type: QueryType = QueryType.WRITE
     insert_return = False
 
-    async def query_init(self, db: InfrahubDatabase, **kwargs: dict[str, Any]) -> None:
+    async def query_init(self, db: InfrahubDatabase, **kwargs: dict[str, Any]) -> None:  # noqa: ARG002
         query = """
         // get all the SchemaRelationship nodes for 'profiles' relationships
         MATCH (sr_to_delete:SchemaRelationship)-[HAS_ATTRIBUTE]->(:Attribute {name: "name"})-[HAS_VALUE]->(av:AttributeValue {value: "profiles"})
@@ -42,7 +42,7 @@ class Migration011(GraphMigration):
     queries: Sequence[type[Query]] = [Migration011Query01]
     minimum_version: int = 10
 
-    async def validate_migration(self, db: InfrahubDatabase) -> MigrationResult:
+    async def validate_migration(self, db: InfrahubDatabase) -> MigrationResult:  # noqa: ARG002
         result = MigrationResult()
 
         return result

infrahub/core/migrations/graph/m012_convert_account_generic.py

@@ -54,8 +54,7 @@ class Migration012RenameTypeAttributeData(AttributeRenameQuery):
             branch_support=BranchSupportType.AGNOSTIC.value,
         )
 
-        if "branch" in kwargs:
-            del kwargs["branch"]
+        kwargs.pop("branch", None)
 
         super().__init__(new_attr=new_attr, previous_attr=previous_attr, branch=global_branch, **kwargs)
 
@@ -113,8 +112,7 @@ class Migration012AddLabelData(NodeDuplicateQuery):
             sync_with_git=False,
         )
 
-        if "branch" in kwargs:
-            del kwargs["branch"]
+        kwargs.pop("branch", None)
 
         super().__init__(new_node=new_node, previous_node=previous_node, branch=branch, **kwargs)
 
@@ -165,8 +163,7 @@ class Migration012RenameRelationshipAccountTokenData(RelationshipDuplicateQuery)
             dst_peer=InfrahubKind.ACCOUNTTOKEN,
         )
 
-        if "branch" in kwargs:
-            del kwargs["branch"]
+        kwargs.pop("branch", None)
 
         super().__init__(new_rel=new_rel, previous_rel=previous_rel, branch=global_branch, **kwargs)
 
@@ -189,8 +186,7 @@ class Migration012RenameRelationshipRefreshTokenData(RelationshipDuplicateQuery)
             dst_peer=InfrahubKind.REFRESHTOKEN,
         )
 
-        if "branch" in kwargs:
-            del kwargs["branch"]
+        kwargs.pop("branch", None)
 
         super().__init__(new_rel=new_rel, previous_rel=previous_rel, branch=global_branch, **kwargs)
 
@@ -213,8 +209,7 @@ class Migration012RenameRelationshipThreadData(RelationshipDuplicateQuery):
             dst_peer=InfrahubKind.THREAD,
         )
 
-        if "branch" in kwargs:
-            del kwargs["branch"]
+        kwargs.pop("branch", None)
 
         super().__init__(new_rel=new_rel, previous_rel=previous_rel, branch=global_branch, **kwargs)
 
@@ -237,8 +232,7 @@ class Migration012RenameRelationshipCommentData(RelationshipDuplicateQuery):
             dst_peer=InfrahubKind.COMMENT,
         )
 
-        if "branch" in kwargs:
-            del kwargs["branch"]
+        kwargs.pop("branch", None)
 
         super().__init__(new_rel=new_rel, previous_rel=previous_rel, branch=default_branch, **kwargs)
 
@@ -249,8 +243,7 @@ class Migration012DeleteOldElementsSchema(DeleteElementInSchemaQuery):
     insert_return = False
 
     def __init__(self, **kwargs: Any):
-        if "branch" in kwargs:
-            del kwargs["branch"]
+        kwargs.pop("branch", None)
 
         super().__init__(
             element_names=["name", "password", "label", "description", "type", "role", "tokens"],
@@ -267,8 +260,7 @@ class Migration012UpdateDisplayLabels(SchemaAttributeUpdateQuery):
     insert_return = False
 
     def __init__(self, **kwargs: Any):
-        if "branch" in kwargs:
-            del kwargs["branch"]
+        kwargs.pop("branch", None)
 
         super().__init__(
             attribute_name="display_labels",
@@ -285,8 +277,7 @@ class Migration012UpdateOrderBy(SchemaAttributeUpdateQuery):
     insert_return = False
 
     def __init__(self, **kwargs: Any):
-        if "branch" in kwargs:
-            del kwargs["branch"]
+        kwargs.pop("branch", None)
 
         super().__init__(
             attribute_name="order_by",
@@ -303,8 +294,7 @@ class Migration012UpdateDefaultFilter(SchemaAttributeUpdateQuery):
     insert_return = False
 
     def __init__(self, **kwargs: Any):
-        if "branch" in kwargs:
-            del kwargs["branch"]
+        kwargs.pop("branch", None)
 
         super().__init__(
             attribute_name="default_filter",
@@ -321,8 +311,7 @@ class Migration012UpdateHFID(SchemaAttributeUpdateQuery):
     insert_return = False
 
     def __init__(self, **kwargs: Any):
-        if "branch" in kwargs:
-            del kwargs["branch"]
+        kwargs.pop("branch", None)
 
         super().__init__(
             attribute_name="human_friendly_id",
@@ -350,7 +339,7 @@ class Migration012(GraphMigration):
     ]
     minimum_version: int = 11
 
-    async def validate_migration(self, db: InfrahubDatabase) -> MigrationResult:
+    async def validate_migration(self, db: InfrahubDatabase) -> MigrationResult:  # noqa: ARG002
         result = MigrationResult()
 
         return result

infrahub/core/migrations/graph/m013_convert_git_password_credential.py

@@ -36,7 +36,7 @@ class Migration013ConvertCoreRepositoryWithCred(Query):
     name = "migration_013_convert_repository_with_cred"
     type = QueryType.WRITE
 
-    async def query_init(self, db: InfrahubDatabase, **kwargs: dict[str, Any]) -> None:
+    async def query_init(self, db: InfrahubDatabase, **kwargs: dict[str, Any]) -> None:  # noqa: ARG002
         at = Timestamp()
         filters, params = at.get_query_filter_path()
 
@@ -172,7 +172,7 @@ class Migration013ConvertCoreRepositoryWithoutCred(Query):
     name = "migration_013_convert_repository_without_cred"
     type = QueryType.WRITE
 
-    async def query_init(self, db: InfrahubDatabase, **kwargs: dict[str, Any]) -> None:
+    async def query_init(self, db: InfrahubDatabase, **kwargs: dict[str, Any]) -> None:  # noqa: ARG002
         at = Timestamp()
         filters, params = at.get_query_filter_path()
 
@@ -237,8 +237,7 @@ class Migration013DeleteUsernamePasswordGenericSchema(DeleteElementInSchemaQuery
     insert_return = False
 
     def __init__(self, **kwargs: Any):
-        if "branch" in kwargs:
-            del kwargs["branch"]
+        kwargs.pop("branch", None)
 
         super().__init__(
             element_names=["username", "password"],
@@ -255,8 +254,7 @@ class Migration013DeleteUsernamePasswordReadWriteSchema(DeleteElementInSchemaQue
     insert_return = False
 
     def __init__(self, **kwargs: Any):
-        if "branch" in kwargs:
-            del kwargs["branch"]
+        kwargs.pop("branch", None)
 
         super().__init__(
             element_names=["username", "password"],
@@ -273,8 +271,7 @@ class Migration013DeleteUsernamePasswordReadOnlySchema(DeleteElementInSchemaQuer
     insert_return = False
 
     def __init__(self, **kwargs: Any):
-        if "branch" in kwargs:
-            del kwargs["branch"]
+        kwargs.pop("branch", None)
 
         super().__init__(
             element_names=["username", "password"],
@@ -289,8 +286,7 @@ class Migration013AddInternalStatusData(AttributeAddQuery):
     type = QueryType.WRITE
 
     def __init__(self, **kwargs: Any):
-        if "branch" in kwargs:
-            del kwargs["branch"]
+        kwargs.pop("branch", None)
 
         super().__init__(
             node_kind="CoreGenericRepository",
@@ -315,7 +311,7 @@ class Migration013(GraphMigration):
     ]
     minimum_version: int = 12
 
-    async def validate_migration(self, db: InfrahubDatabase) -> MigrationResult:
+    async def validate_migration(self, db: InfrahubDatabase) -> MigrationResult:  # noqa: ARG002
         result = MigrationResult()
 
         return result

infrahub/core/migrations/graph/m014_remove_index_attr_value.py

@@ -33,12 +33,12 @@ class Migration014(GraphMigration):
             try:
                 ts.manager.index.init(nodes=[INDEX_TO_DELETE], rels=[])
                 await ts.manager.index.drop()
-            except Exception as exc:  # pylint: disable=broad-exception-caught
+            except Exception as exc:
                 result.errors.append(str(exc))
                 return result
 
         return result
 
-    async def validate_migration(self, db: InfrahubDatabase) -> MigrationResult:
+    async def validate_migration(self, db: InfrahubDatabase) -> MigrationResult:  # noqa: ARG002
         result = MigrationResult()
         return result

infrahub/core/migrations/graph/m015_diff_format_update.py

@@ -20,7 +20,7 @@ class Migration015(ArbitraryMigration):
     name: str = "015_diff_format_update"
     minimum_version: int = 14
 
-    async def validate_migration(self, db: InfrahubDatabase) -> MigrationResult:
+    async def validate_migration(self, db: InfrahubDatabase) -> MigrationResult:  # noqa: ARG002
         result = MigrationResult()
 
         return result

infrahub/core/migrations/graph/m016_diff_delete_bug_fix.py

@@ -20,7 +20,7 @@ class Migration016(ArbitraryMigration):
     name: str = "016_diff_delete_bug_fix_update"
     minimum_version: int = 15
 
-    async def validate_migration(self, db: InfrahubDatabase) -> MigrationResult:
+    async def validate_migration(self, db: InfrahubDatabase) -> MigrationResult:  # noqa: ARG002
         result = MigrationResult()
 
         return result

infrahub/core/migrations/graph/m017_add_core_profile.py

@@ -22,7 +22,7 @@ class Migration017(InternalSchemaMigration):
     minimum_version: int = 16
     migrations: Sequence[SchemaMigration] = []
 
-    async def validate_migration(self, db: InfrahubDatabase) -> MigrationResult:
+    async def validate_migration(self, db: InfrahubDatabase) -> MigrationResult:  # noqa: ARG002
         result = MigrationResult()
 
         return result

infrahub/core/migrations/graph/m018_uniqueness_nulls.py

@@ -26,7 +26,7 @@ class Migration018(InternalSchemaMigration):
     minimum_version: int = 17
     migrations: Sequence[SchemaMigration] = []
 
-    async def validate_migration(self, db: InfrahubDatabase) -> MigrationResult:
+    async def validate_migration(self, db: InfrahubDatabase) -> MigrationResult:  # noqa: ARG002
         result = MigrationResult()
 
         return result
@@ -52,7 +52,7 @@ class Migration018(InternalSchemaMigration):
 
         for schema_kind in schema_branch.node_names + schema_branch.generic_names:
             schema = schema_branch.get(name=schema_kind, duplicate=False)
-            if not isinstance(schema, (NodeSchema, GenericSchema)):
+            if not isinstance(schema, NodeSchema | GenericSchema):
                 continue
 
             schema_constraint_path_groups = schema.get_unique_constraint_schema_attribute_paths(