Add group trackingé

Author: LucasG0

backend/infrahub/core/protocols.py

@@ -493,6 +493,11 @@ class CoreRepository(LineageOwner, LineageSource, CoreGenericRepository, CoreTas
     commit: StringOptional
 
 
+class CoreRepositoryGroup(CoreGroup):
+    content: Dropdown
+    repository: RelationshipManager
+
+
 class CoreRepositoryValidator(CoreValidator):
     repository: RelationshipManager
 

backend/infrahub/core/schema/definitions/core/__init__.py

@@ -28,7 +28,13 @@
 from .core import core_node, core_task_target
 from .generator import core_generator_definition, core_generator_instance
 from .graphql_query import core_graphql_query
-from .group import core_generator_group, core_graphql_query_group, core_group, core_standard_group
+from .group import (
+    core_generator_group,
+    core_graphql_query_group,
+    core_group,
+    core_repository_group,
+    core_standard_group,
+)
 from .ipam import builtin_ip_address, builtin_ip_prefix, builtin_ipam, core_ipam_namespace
 from .lineage import lineage_owner, lineage_source
 from .menu import generic_menu_item, menu_item
@@ -109,6 +115,7 @@
         core_standard_group,
         core_generator_group,
         core_graphql_query_group,
+        core_repository_group,
         builtin_tag,
         core_account,
         core_account_token,

backend/infrahub/core/schema/definitions/core/group.py

@@ -4,6 +4,7 @@
 )
 from infrahub.core.constants import RelationshipCardinality as Cardinality
 from infrahub.core.constants import RelationshipKind as RelKind
+from infrahub.core.schema.dropdown import DropdownChoice
 
 from ...attribute_schema import AttributeSchema as Attr
 from ...generic_schema import GenericSchema
@@ -80,6 +81,10 @@
     generate_profile=False,
 )
 
+# TODO add a CoreRepositoryObjectsGroup, attriute: kind="Objects" or "Menu", relationship: repository
+# TODO s'assurer que le client.log.... log bien dans infrahub.tasks
+
+
 core_graphql_query_group = NodeSchema(
     name="GraphQLQueryGroup",
     namespace="Core",
@@ -106,3 +111,47 @@
         ),
     ],
 )
+
+
+core_repository_group = NodeSchema(
+    name="RepositoryGroup",
+    namespace="Core",
+    description="Group of nodes associated with a given repository.",
+    include_in_menu=False,
+    icon="mdi:account-group",
+    label="Repository Group",
+    default_filter="name__value",
+    order_by=["name__value"],
+    display_labels=["name__value"],
+    branch=BranchSupportType.AGNOSTIC,
+    inherit_from=[InfrahubKind.GENERICGROUP],
+    generate_profile=False,
+    attributes=[
+        Attr(
+            name="content",
+            kind="Dropdown",
+            description="The value_match defines how the update will be evaluated, if it has to match the new value, the previous value or both",
+            choices=[
+                DropdownChoice(
+                    name="Objects",
+                    label="Objects",
+                    description="Objects",
+                ),
+                DropdownChoice(
+                    name="Menu",
+                    label="Menu",
+                    description="Menu",
+                ),
+            ],
+            optional=False,
+        ),
+    ],
+    relationships=[
+        Rel(
+            name="repository",
+            peer=InfrahubKind.GENERICREPOSITORY,
+            optional=False,
+            cardinality=Cardinality.ONE,
+        ),
+    ],
+)

backend/infrahub/git/integrator.py

@@ -191,6 +191,8 @@ async def import_objects_from_files(
                     branch_name=infrahub_branch_name, commit=commit, config_file=config_file
                 )  # type: ignore[misc]
 
+                await self.import_objects(branch_name=infrahub_branch_name, commit=commit, config_file=config_file)  # type: ignore[misc]
+
                 await self.import_all_python_files(  # type: ignore[call-overload]
                     branch_name=infrahub_branch_name, commit=commit, config_file=config_file
                 )  # type: ignore[misc]
@@ -200,7 +202,9 @@ async def import_objects_from_files(
                 await self.import_artifact_definitions(
                     branch_name=infrahub_branch_name, commit=commit, config_file=config_file
                 )  # type: ignore[misc]
-                await self.import_objects(branch_name=infrahub_branch_name, commit=commit, config_file=config_file)  # type: ignore[misc]
+
+                # TODO: import menu, check def load() in menu.^y + add a deidcated group for menu, work as for objects
+                # "CoreRepositoryMenuGroup"
 
         except Exception as exc:
             sync_status = RepositorySyncStatus.ERROR_IMPORT
@@ -838,16 +842,35 @@ async def _load_objects(
         for file in files:
             await file.validate_format(client=self.client, branch=branch)
         for file in files:
+            # check if we log by default otherwise log
+
+            # TODO: do not create if no hfid/default_filter
             await file.process(client=self.client, branch=branch)
 
     @task(name="import-objects", task_run_name="Import Objects", cache_policy=NONE)  # type: ignore[arg-type]
     async def import_objects(self, branch_name: str, commit: str, config_file: InfrahubRepositoryConfig) -> None:
         branch_wt = self.get_worktree(identifier=commit or branch_name)
 
         file_pathes = [branch_wt.directory / obj.file_path for obj in config_file.objects]
-        await self._load_objects(paths=file_pathes, branch=branch_name)
 
-        # TODO attach to a group?
+        # do not clone for now, assume only one import at a time
+        if self.client is None:
+            raise ValueError("Client is not set")
+
+        if self.is_read_only:
+            sdk_repo_obj = await self.client.get(
+                kind=InfrahubKind.READONLYREPOSITORY, id=str(self.id), raise_when_missing=True
+            )
+        else:
+            sdk_repo_obj = await self.client.get(kind=InfrahubKind.REPOSITORY, id=str(self.id), raise_when_missing=True)
+
+        async with self.client.start_tracking(
+            identifier=f"group-repo-{self.id}",
+            delete_unused_nodes=True,
+            group_type="CoreRepositoryGroup",
+            group_params={"content": "Objects", "repository": sdk_repo_obj},
+        ):
+            await self._load_objects(paths=file_pathes, branch=branch_name)
 
     @task(name="check-definition-get", task_run_name="Get Check Definition", cache_policy=NONE)  # type: ignore[arg-type]
     async def get_check_definition(

backend/tests/integration/git/test_repository.py

@@ -83,6 +83,19 @@ async def test_create_repository(
         assert manufacturer_mercedes.name.value == "Mercedes"
         assert list((await manufacturer_mercedes.customers.get_peers(db=db)).values())[0].name.value == "Ethan Carter"
 
+        repository_group = await NodeManager.get_one_by_default_filter(
+            db=db,
+            id=f"group-repo-{repository.id}",
+            kind="CoreRepositoryGroup",
+            raise_on_error=True,
+            prefetch_relationships=True,
+        )
+        assert repository_group.content.value == "Objects"
+        members = (await repository_group.members.get_peers(db=db)).values()
+        assert len(members) == 4
+        assert manufacturer_mercedes.id in {m.id for m in members}
+        assert person_ethan.id in {m.id for m in members}
+
     # TODO add a test with invalid yml file OR invalid order of objects in the yml file, and make sure the repository ends
     # up in error import state