move setting git global config to async worker

Author: dummyuser

backend/infrahub/git/base.py

@@ -16,7 +16,6 @@
 from pydantic import BaseModel, ConfigDict, Field
 from pydantic import ValidationError as PydanticValidationError
 
-from infrahub import config
 from infrahub.core.branch import Branch
 from infrahub.core.constants import InfrahubKind, RepositoryOperationalStatus, RepositorySyncStatus
 from infrahub.core.registry import registry
@@ -407,7 +406,6 @@ async def create_locally(
         except GitCommandError as exc:
             await self._raise_enriched_error(error=exc, branch_name=checkout_ref or self.default_branch)
 
-        self.create_repo_config(repo)
         self.has_origin = True
 
         # Create a worktree for the commit in the default branch
@@ -419,13 +417,6 @@ async def create_locally(
 
         return True
 
-    @staticmethod
-    def create_repo_config(repo: Repo) -> None:
-        if config.SETTINGS.git.user_name and config.SETTINGS.git.user_email:
-            with repo.config_writer() as git_config:
-                git_config.set_value("user", "name", config.SETTINGS.git.user_name)
-                git_config.set_value("user", "email", config.SETTINGS.git.user_email)
-
     def has_worktree(self, identifier: str) -> bool:
         """Return True if a worktree with a given identifier already exist."""
 

backend/infrahub/workers/infrahub_async.py

@@ -1,3 +1,4 @@
+import asyncio
 import logging
 import os
 from typing import Any
@@ -122,6 +123,7 @@ async def setup(
         )
 
         set_component_type(component_type=self.component_type)
+        await self.set_git_global_config()
         await self._init_services(client=client)
 
         if not registry.schema_has_been_initialized():
@@ -204,3 +206,30 @@ async def _init_services(self, client: InfrahubClient) -> None:
         )
 
         self.service = service
+
+    async def set_git_global_config(self) -> None:
+        if config.SETTINGS.git.user_name:
+            proc_name = await asyncio.create_subprocess_exec(
+                "git",
+                "config",
+                "--global",
+                "user.name",
+                config.SETTINGS.git.user_name,
+                stdout=asyncio.subprocess.PIPE,
+                stderr=asyncio.subprocess.PIPE,
+            )
+            await proc_name.wait()
+            self._logger.info("Git user name set")
+
+        if config.SETTINGS.git.user_email:
+            proc_email = await asyncio.create_subprocess_exec(
+                "git",
+                "config",
+                "--global",
+                "user.email",
+                config.SETTINGS.git.user_email,
+                stdout=asyncio.subprocess.PIPE,
+                stderr=asyncio.subprocess.PIPE,
+            )
+            await proc_email.wait()
+            self._logger.info("Git user email set")

backend/tests/integration/conftest.py

@@ -142,3 +142,14 @@ def prefect_test_fixture() -> Generator:
 def prefect_test(prefect_test_fixture) -> Generator:
     with disable_run_logger():
         yield
+
+
+@pytest.fixture
+def git_user_config():
+    initial_user_name = config.SETTINGS.git.user_name
+    initial_user_email = config.SETTINGS.git.user_email
+    config.SETTINGS.git.user_email = "[email protected]"
+    config.SETTINGS.git.user_name = "Test User"
+    yield
+    config.SETTINGS.git.user_email = initial_user_email
+    config.SETTINGS.git.user_name = initial_user_name

backend/tests/integration/workers/test_infrahubasync.py

@@ -1,3 +1,4 @@
+import asyncio
 from typing import TYPE_CHECKING
 
 import pytest
@@ -107,3 +108,30 @@ async def test_broken_flow(
             await flow_after.state.result(raise_on_failure=True)
 
         assert "validation error for DummyOutput" in str(exc.value)
+
+    async def test_worker_has_set_git_user_config(self, client, work_pool, git_user_config):
+        worker = InfrahubWorkerAsync(work_pool_name=work_pool.name)
+        await worker.setup(client=client, metric_port=0)
+        proc_name = await asyncio.create_subprocess_exec(
+            "git",
+            "config",
+            "--global",
+            "user.name",
+            stdout=asyncio.subprocess.PIPE,
+            stderr=asyncio.subprocess.PIPE,
+        )
+        stdout_name, _ = await proc_name.communicate()
+        user_name = stdout_name.decode().strip()
+        assert user_name == "Test User"
+
+        proc_email = await asyncio.create_subprocess_exec(
+            "git",
+            "config",
+            "--global",
+            "user.email",
+            stdout=asyncio.subprocess.PIPE,
+            stderr=asyncio.subprocess.PIPE,
+        )
+        stdout_email, _ = await proc_email.communicate()
+        user_email = stdout_email.decode().strip()
+        assert user_email == "[email protected]"

backend/tests/unit/git/conftest.py

@@ -1371,11 +1371,3 @@ async def mock_create_branch_git_repo_01(db: InfrahubDatabase, default_branch: B
 @pytest.fixture
 async def mock_create_branch_git_repo_03(db: InfrahubDatabase, default_branch: Branch) -> None:
     await create_branch(branch_name="branch01", db=db)
-
-
-def git_user_config():
-    config.SETTINGS.git.user_email = "[email protected]"
-    config.SETTINGS.git.user_name = "Test User"
-    yield
-    config.SETTINGS.git.user_email = None
-    config.SETTINGS.git.user_name = None

backend/tests/unit/git/test_git_repository.py

@@ -1104,22 +1104,3 @@ async def test_get_filtered_remote_branches__no_import_sync_branch_names(git_rep
     repo = git_repo_01
     filtered_remote_branches = await repo.get_filtered_remote_branches()
     assert sorted(filtered_remote_branches.keys()) == ["branch01", "branch02", "clean-branch", "main"]
-
-
-async def test_new_repo_has_config(git_upstream_repo_01: dict[str, str | Path], git_repos_dir: Path, git_user_config):
-    repo = await InfrahubRepository.new(
-        id=UUIDT.new(),
-        name=git_upstream_repo_01["name"],
-        location=str(git_upstream_repo_01["path"]),
-        client=InfrahubClient(config=Config(requester=dummy_async_request)),
-    )
-
-    # Check if all the directories are present
-    assert repo.directory_root.is_dir()
-    assert repo.directory_branches.is_dir()
-    assert repo.directory_commits.is_dir()
-    assert repo.directory_temp.is_dir()
-
-    with repo.get_git_repo_main().config_reader() as git_config:
-        assert git_config.get_value("user", "name") == "Test User"
-        assert git_config.get_value("user", "email") == "[email protected]"