IFC-1361: Merge core read only repositories on branch merge (#7459)

* IFC-1361: Merge core read only repositories on branch merge

* move logs

* fix tests, fix mypy

* add repository type to git merge repository

* replace repository_type with repository_kind

Author: solababs

backend/infrahub/core/merge.py

@@ -2,11 +2,11 @@
 
 from typing import TYPE_CHECKING
 
-from infrahub.core.constants import RepositoryInternalStatus
+from infrahub.core.constants import InfrahubKind, RepositoryInternalStatus
 from infrahub.core.diff.model.path import BranchTrackingId
 from infrahub.core.manager import NodeManager
 from infrahub.core.models import SchemaUpdateValidationResult
-from infrahub.core.protocols import CoreRepository
+from infrahub.core.protocols import CoreReadOnlyRepository, CoreRepository
 from infrahub.core.registry import registry
 from infrahub.core.timestamp import Timestamp
 from infrahub.exceptions import MergeFailedError, ValidationError
@@ -223,6 +223,32 @@ async def rollback(self) -> None:
         await self.diff_merger.rollback(at=self._merge_at)
 
     async def merge_repositories(self) -> None:
+        await self.merge_core_read_only_repositories()
+        await self.merge_core_repositories()
+
+    async def merge_core_read_only_repositories(self) -> None:
+        repos_in_main_list = await NodeManager.query(schema=CoreReadOnlyRepository, db=self.db)
+        repos_in_main = {repo.id: repo for repo in repos_in_main_list}
+
+        repos_in_branch_list = await NodeManager.query(
+            schema=CoreReadOnlyRepository, db=self.db, branch=self.source_branch
+        )
+        for repo in repos_in_branch_list:
+            if repo.id not in repos_in_main:
+                continue
+
+            model = GitRepositoryMerge(
+                repository_id=repo.id,
+                repository_name=repo.name.value,
+                source_branch=self.source_branch.name,
+                destination_branch=self.destination_branch.name,
+                destination_branch_id=str(self.destination_branch.get_uuid()),
+                internal_status=repo.internal_status.value,
+                repository_kind=InfrahubKind.READONLYREPOSITORY,
+            )
+            await self.workflow.submit_workflow(workflow=GIT_REPOSITORIES_MERGE, parameters={"model": model})
+
+    async def merge_core_repositories(self) -> None:
         # Collect all Repositories in Main because we'll need the commit in Main for each one.
         repos_in_main_list = await NodeManager.query(schema=CoreRepository, db=self.db)
         repos_in_main = {repo.id: repo for repo in repos_in_main_list}
@@ -245,5 +271,6 @@ async def merge_repositories(self) -> None:
                     destination_branch=self.destination_branch.name,
                     destination_branch_id=str(self.destination_branch.get_uuid()),
                     default_branch=repo.default_branch.value,
+                    repository_kind=InfrahubKind.REPOSITORY,
                 )
                 await self.workflow.submit_workflow(workflow=GIT_REPOSITORIES_MERGE, parameters={"model": model})

backend/infrahub/git/models.py

@@ -92,7 +92,8 @@ class GitRepositoryMerge(BaseModel):
     source_branch: str = Field(..., description="The source branch")
     destination_branch: str = Field(..., description="The destination branch")
     destination_branch_id: str = Field(..., description="The ID of the destination branch")
-    default_branch: str = Field(..., description="The default branch in Git")
+    default_branch: str | None = Field(default=None, description="The default branch in Git")
+    repository_kind: str = Field(..., description="The kind of the repository.")
 
 
 class GitRepositoryImportObjects(BaseModel):

backend/infrahub/git/tasks.py

@@ -502,6 +502,7 @@ async def pull_read_only(model: GitRepositoryPullReadOnly) -> None:
     flow_run_name="Merge {model.source_branch} > {model.destination_branch} in git repository",
 )
 async def merge_git_repository(model: GitRepositoryMerge) -> None:
+    log = get_run_logger()
     await add_tags(branches=[model.source_branch, model.destination_branch], nodes=[model.repository_id])
 
     client = get_client()
@@ -510,7 +511,11 @@ async def merge_git_repository(model: GitRepositoryMerge) -> None:
         id=model.repository_id, name=model.repository_name, client=client, default_branch_name=model.default_branch
     )
 
-    if model.internal_status == RepositoryInternalStatus.STAGING.value:
+    if (
+        model.internal_status == RepositoryInternalStatus.STAGING.value
+        and model.repository_kind == InfrahubKind.REPOSITORY
+    ):
+        log.info(f"Merging {model.repository_kind}")
         repo_source = await client.get(
             kind=InfrahubKind.GENERICREPOSITORY, id=model.repository_id, branch=model.source_branch
         )
@@ -522,6 +527,28 @@ async def merge_git_repository(model: GitRepositoryMerge) -> None:
         repo_main.commit.value = commit
 
         await repo_main.save()
+        log.info(f"Finished merging {model.repository_kind}")
+
+    elif model.repository_kind == InfrahubKind.READONLYREPOSITORY:
+        repo_source = await client.get(
+            kind=InfrahubKind.READONLYREPOSITORY, id=model.repository_id, branch=model.source_branch
+        )
+        repo_destination = await client.get(
+            kind=InfrahubKind.READONLYREPOSITORY, id=model.repository_id, branch=model.destination_branch
+        )
+
+        if (
+            repo_destination.ref.value != repo_source.ref.value
+            or repo_destination.commit.value != repo_source.commit.value
+        ):
+            log.info(f"Merging {model.repository_kind}")
+
+            repo_destination.ref.value = repo_source.ref.value
+            repo_destination.commit.value = repo_source.commit.value
+            await repo_destination.save()
+
+            log.info(f"Finished merging {model.repository_kind}")
+
     else:
         async with lock.registry.get(name=model.repository_name, namespace="repository"):
             await repo.merge(source_branch=model.source_branch, dest_branch=model.destination_branch)

backend/tests/unit/core/diff/test_coordinator_lock.py

@@ -16,7 +16,7 @@
 from infrahub.core.merge import BranchMerger
 from infrahub.core.node import Node
 from infrahub.core.schema import SchemaRoot
-from infrahub.core.schema.definitions.core.repository import core_repository
+from infrahub.core.schema.definitions.core.repository import core_read_only_repository, core_repository
 from infrahub.core.schema.node_schema import NodeSchema
 from infrahub.core.timestamp import Timestamp
 from infrahub.database import InfrahubDatabase, get_db
@@ -55,6 +55,15 @@ async def dummy_repository_schema(self, db: InfrahubDatabase, default_branch: Br
         default_branch.update_schema_hash()
         await default_branch.save(db=db)
 
+        dummy_repository = NodeSchema(
+            name=core_read_only_repository.name,
+            namespace=core_read_only_repository.namespace,
+        )
+        schema = SchemaRoot(nodes=[dummy_repository])
+        registry.schema.register_schema(schema=schema, branch=default_branch.name)
+        default_branch.update_schema_hash()
+        await default_branch.save(db=db)
+
     async def get_diff_coordinator(self, db: InfrahubDatabase, diff_branch: Branch) -> DiffCoordinator:
         config.SETTINGS.database.max_depth_search_hierarchy = 10
         component_registry = get_component_registry()

backend/tests/unit/git/test_git_rpc.py

@@ -143,6 +143,7 @@ async def test_git_rpc_merge(
         destination_branch_id="469cd407-0a8f-4d4e-9629-84fa435cf5ad",
         internal_status=RepositoryInternalStatus.ACTIVE.value,
         default_branch="main",
+        repository_kind=InfrahubKind.REPOSITORY,
     )
 
     client = InfrahubClient(config=Config(requester=dummy_async_request))

changelog/5978.added.md

@@ -0,0 +1 @@
+Merge core read only repositories on branch merge