infrahub-server 1.5.5__py3-none-any.whl → 1.6.0b0__py3-none-any.whl

infrahub/git/base.py

@@ -16,10 +16,12 @@ from prefect.logging import get_run_logger
 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
 from infrahub.exceptions import (
+    BranchNotFoundError,
     CommitNotFoundError,
     FileOutOfRepositoryError,
     RepositoryConnectionError,
@@ -31,6 +33,7 @@ from infrahub.exceptions import (
 )
 from infrahub.git.constants import BRANCHES_DIRECTORY_NAME, COMMITS_DIRECTORY_NAME, TEMPORARY_DIRECTORY_NAME
 from infrahub.git.directory import get_repositories_directory, initialize_repositories_directory
+from infrahub.git.utils import branch_name_in_import_sync_branches
 from infrahub.git.worktree import Worktree
 from infrahub.log import get_logger
 from infrahub.workers.dependencies import get_client
@@ -733,6 +736,45 @@ class InfrahubRepositoryBase(BaseModel, ABC):
 
         return True
 
+    async def get_filtered_remote_branches(self) -> dict[str, BranchInRemote]:
+        branches = self.get_branches_from_remote()
+
+        if not config.SETTINGS.git.import_sync_branch_names:
+            return branches
+
+        filtered_branches = {}
+        skipped_branch_names = []
+
+        for short_name, branch_data in branches.items():
+            branch = None
+
+            try:
+                branch = registry.get_branch_from_registry(branch=short_name)
+            except BranchNotFoundError:
+                ...
+
+            branch_exists_import_sync_condition = branch and (
+                branch.name not in {registry.default_branch, self.default_branch}
+                and not branch.sync_with_git
+                and not branch_name_in_import_sync_branches(branch_short_name=short_name)
+            )
+            branch_does_not_exist_import_sync_condition = not branch and not branch_name_in_import_sync_branches(
+                branch_short_name=short_name
+            )
+
+            if branch_exists_import_sync_condition or branch_does_not_exist_import_sync_condition:
+                skipped_branch_names.append(short_name)
+                continue
+
+            filtered_branches[short_name] = branch_data
+
+        if skipped_branch_names:
+            log.debug(
+                f"Skipped the following branches {skipped_branch_names} "
+                f"because no match was found in import_sync_branch_names {config.SETTINGS.git.import_sync_branch_names}"
+            )
+        return filtered_branches
+
     async def compare_local_remote(self) -> tuple[list[str], list[str]]:
         """
         Returns:
@@ -745,7 +787,7 @@ class InfrahubRepositoryBase(BaseModel, ABC):
         # TODO move this section into a dedicated function to compare and bring in sync the remote repo with the local one.
         # It can be useful just after a clone etc ...
         local_branches = self.get_branches_from_local()
-        remote_branches = self.get_branches_from_remote()
+        remote_branches = await self.get_filtered_remote_branches()
 
         new_branches = set(remote_branches.keys()) - set(local_branches.keys())
         existing_branches = set(local_branches.keys()) - new_branches

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):

infrahub/git/repository.py

@@ -11,6 +11,7 @@ from prefect import task
 from prefect.cache_policies import NONE
 from pydantic import Field
 
+from infrahub import config
 from infrahub.core.constants import InfrahubKind, RepositoryInternalStatus
 from infrahub.exceptions import RepositoryError
 from infrahub.git.integrator import InfrahubRepositoryIntegrator
@@ -170,7 +171,10 @@ class InfrahubRepository(InfrahubRepositoryIntegrator):
         commit = self.get_commit_value(branch_name=source_branch, remote=False)
 
         try:
-            repo.git.merge(commit)
+            if config.SETTINGS.git.use_explicit_merge_commit:
+                repo.git.merge(commit, "--no-ff", m="Merged by Infrahub")
+            else:
+                repo.git.merge(commit)
         except GitCommandError as exc:
             repo.git.merge("--abort")
             raise RepositoryError(identifier=self.name, message=exc.stderr) from exc

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)

infrahub/git/utils.py

@@ -1,3 +1,4 @@
+import re
 from collections import defaultdict
 from typing import TYPE_CHECKING, Any
 
@@ -12,6 +13,7 @@ from infrahub.core.manager import NodeManager
 from infrahub.database import InfrahubDatabase
 from infrahub.generators.models import ProposedChangeGeneratorDefinition
 
+from .. import config
 from .models import RepositoryBranchInfo, RepositoryData
 
 if TYPE_CHECKING:
@@ -168,3 +170,10 @@ async def fetch_proposed_change_generator_definition_targets(
     return await _fetch_definition_targets(
         client=client, branch=branch, group_id=definition.group_id, parameters=definition.parameters
     )
+
+
+def branch_name_in_import_sync_branches(branch_short_name: str) -> bool:
+    for branch_filter in config.SETTINGS.git.import_sync_branch_names:
+        if re.fullmatch(branch_filter, branch_short_name) or branch_filter == branch_short_name:
+            return True
+    return False

infrahub/graphql/analyzer.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from collections import deque
 from copy import deepcopy
 from dataclasses import dataclass, field
-from enum import Enum
+from enum import StrEnum
 from functools import cached_property
 from typing import TYPE_CHECKING, Any
 
@@ -49,13 +49,13 @@ if TYPE_CHECKING:
     from infrahub.core.schema.schema_branch import SchemaBranch
 
 
-class MutateAction(str, Enum):
+class MutateAction(StrEnum):
     CREATE = "create"
     DELETE = "delete"
     UPDATE = "update"
 
 
-class ContextType(str, Enum):
+class ContextType(StrEnum):
     EDGE = "edge"
     NODE = "node"
     DIRECT = "direct"
@@ -80,7 +80,7 @@ class ContextType(str, Enum):
                 return cls.NODE
 
 
-class GraphQLOperation(str, Enum):
+class GraphQLOperation(StrEnum):
     QUERY = "query"
     MUTATION = "mutation"
     SUBSCRIPTION = "subscription"

infrahub/graphql/mutations/computed_attribute.py

@@ -110,7 +110,7 @@ class UpdateComputedAttribute(Mutation):
             event = NodeUpdatedEvent(
                 kind=node_schema.kind,
                 node_id=target_node.get_id(),
-                changelog=target_node.node_changelog.model_dump(),
+                changelog=target_node.node_changelog,
                 fields=[str(data.attribute)],
                 meta=EventMeta(
                     context=graphql_context.get_context(),

infrahub/graphql/mutations/convert_object_type.py

@@ -76,7 +76,7 @@ class ConvertObjectType(Mutation):
 
         if target_schema.kind in [REPOSITORY, READONLYREPOSITORY]:
             new_node = await convert_repository_type(
-                repository=node_to_convert,
+                repository=node_to_convert,  # type: ignore[arg-type]
                 target_schema=target_schema,
                 mapping=fields_mapping,
                 branch=graphql_context.branch,

infrahub/graphql/mutations/display_label.py

@@ -101,7 +101,7 @@ class UpdateDisplayLabel(Mutation):
             event = NodeUpdatedEvent(
                 kind=node_schema.kind,
                 node_id=target_node.get_id(),
-                changelog=target_node.node_changelog.model_dump(),
+                changelog=target_node.node_changelog,
                 fields=["display_label"],
                 meta=EventMeta(
                     context=graphql_context.get_context(),

infrahub/graphql/mutations/hfid.py

@@ -108,7 +108,7 @@ class UpdateHFID(Mutation):
             event = NodeUpdatedEvent(
                 kind=node_schema.kind,
                 node_id=target_node.get_id(),
-                changelog=target_node.node_changelog.model_dump(),
+                changelog=target_node.node_changelog,
                 fields=["human_friendly_id"],
                 meta=EventMeta(
                     context=graphql_context.get_context(),

infrahub/graphql/mutations/ipam.py

@@ -48,7 +48,7 @@ async def validate_namespace(
         namespace_id = namespace.id
     elif "hfid" in data["ip_namespace"]:
         namespace = await registry.manager.get_one_by_hfid(
-            db=db, branch=branch, kind=InfrahubKind.IPNAMESPACE, hfid=data["ip_namespace"]["hfid"]
+            db=db, branch=branch, kind=InfrahubKind.IPNAMESPACE, hfid=data["ip_namespace"]["hfid"], raise_on_error=True
         )
         namespace_id = namespace.id
     else:

infrahub/graphql/mutations/profile.py

@@ -186,6 +186,7 @@ class InfrahubProfilesRefresh(Mutation):
             branch=branch,
             id=str(data.id),
             include_source=True,
+            raise_on_error=True,
         )
         node_profiles_applier = NodeProfilesApplier(db=db, branch=branch)
         updated_fields = await node_profiles_applier.apply_profiles(node=obj)

infrahub/graphql/mutations/relationship.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from enum import Enum
+from enum import StrEnum
 from typing import TYPE_CHECKING, Self
 
 from graphene import Boolean, InputField, InputObjectType, List, Mutation, String
@@ -48,7 +48,7 @@ if TYPE_CHECKING:
 RELATIONSHIP_PEERS_TO_IGNORE = [InfrahubKind.NODE]
 
 
-class GroupUpdateType(str, Enum):
+class GroupUpdateType(StrEnum):
     NONE = "none"
     MEMBERS = "members"
     MEMBER_OF_GROUPS = "member_of_groups"

infrahub/graphql/mutations/resource_manager.py

@@ -122,7 +122,7 @@ class IPAddressPoolGetResource(Mutation):
     ) -> Self:
         graphql_context: GraphqlContext = info.context
 
-        obj: CoreIPAddressPool = await registry.manager.find_object(
+        obj: CoreIPAddressPool = await registry.manager.find_object(  # type: ignore[assignment]
             db=graphql_context.db,
             kind=InfrahubKind.IPADDRESSPOOL,
             id=data.get("id"),

infrahub/graphql/queries/__init__.py

@@ -1,5 +1,5 @@
 from .account import AccountPermissions, AccountToken
-from .branch import BranchQueryList
+from .branch import BranchQueryList, InfrahubBranchQueryList
 from .internal import InfrahubInfo
 from .ipam import (
     DeprecatedIPAddressGetNextAvailable,
@@ -20,6 +20,7 @@ __all__ = [
     "BranchQueryList",
     "DeprecatedIPAddressGetNextAvailable",
     "DeprecatedIPPrefixGetNextAvailable",
+    "InfrahubBranchQueryList",
     "InfrahubIPAddressGetNextAvailable",
     "InfrahubIPPrefixGetNextAvailable",
     "InfrahubInfo",

infrahub/graphql/queries/branch.py

@@ -2,10 +2,12 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING, Any
 
-from graphene import ID, Field, List, NonNull, String
+from graphene import ID, Field, Int, List, NonNull, String
 
+from infrahub.core.registry import registry
+from infrahub.exceptions import ValidationError
 from infrahub.graphql.field_extractor import extract_graphql_fields
-from infrahub.graphql.types import BranchType
+from infrahub.graphql.types import BranchType, InfrahubBranch, InfrahubBranchType
 
 if TYPE_CHECKING:
     from graphql import GraphQLResolveInfo
@@ -17,7 +19,7 @@ async def branch_resolver(
     **kwargs: Any,
 ) -> list[dict[str, Any]]:
     fields = extract_graphql_fields(info)
-    return await BranchType.get_list(graphql_context=info.context, fields=fields, **kwargs)
+    return await BranchType.get_list(graphql_context=info.context, fields=fields, exclude_global=True, **kwargs)
 
 
 BranchQueryList = Field(
@@ -28,3 +30,56 @@ BranchQueryList = Field(
     resolver=branch_resolver,
     required=True,
 )
+
+
+async def infrahub_branch_resolver(
+    root: dict,  # noqa: ARG001
+    info: GraphQLResolveInfo,
+    limit: int | None = None,
+    offset: int | None = None,
+    name__value: str | None = None,
+    ids: list[str] | None = None,
+) -> dict[str, Any]:
+    if isinstance(limit, int) and limit < 1:
+        raise ValidationError("limit must be >= 1")
+    if isinstance(offset, int) and offset < 0:
+        raise ValidationError("offset must be >= 0")
+
+    fields = extract_graphql_fields(info)
+    result: dict[str, Any] = {}
+    if "edges" in fields:
+        branches = await InfrahubBranch.get_list(
+            graphql_context=info.context,
+            fields=fields.get("edges", {}).get("node", {}),
+            limit=limit,
+            offset=offset,
+            name=name__value,
+            ids=ids,
+            exclude_global=True,
+        )
+        result["edges"] = [{"node": branch} for branch in branches]
+    if "count" in fields:
+        result["count"] = await InfrahubBranchType.get_list_count(
+            graphql_context=info.context, name=name__value, ids=ids
+        )
+
+    if "default_branch" in fields:
+        result["default_branch"] = await InfrahubBranch.get_by_name(
+            graphql_context=info.context,
+            fields=fields["default_branch"],
+            name=registry.default_branch,
+        )
+
+    return result
+
+
+InfrahubBranchQueryList = Field(
+    InfrahubBranchType,
+    offset=Int(),
+    limit=Int(),
+    name__value=String(),
+    ids=List(ID),
+    description="Retrieve paginated information about active branches.",
+    resolver=infrahub_branch_resolver,
+    required=True,
+)

infrahub/graphql/queries/ipam.py

@@ -8,6 +8,7 @@ from netaddr import IPSet
 
 from infrahub.core.constants import InfrahubKind
 from infrahub.core.manager import NodeManager
+from infrahub.core.protocols import BuiltinIPPrefix
 from infrahub.core.query.ipam import get_ip_addresses, get_subnets
 from infrahub.exceptions import NodeNotFoundError, ValidationError
 from infrahub.pools.address import get_available
@@ -31,7 +32,9 @@ class IPAddressGetNextAvailable(ObjectType):
     ) -> dict[str, str]:
         graphql_context: GraphqlContext = info.context
 
-        prefix = await NodeManager.get_one(id=prefix_id, db=graphql_context.db, branch=graphql_context.branch)
+        prefix = await NodeManager.get_one(
+            id=prefix_id, kind=BuiltinIPPrefix, db=graphql_context.db, branch=graphql_context.branch
+        )
 
         if not prefix:
             raise NodeNotFoundError(
@@ -78,17 +81,19 @@ class IPPrefixGetNextAvailable(ObjectType):
     ) -> dict[str, str]:
         graphql_context: GraphqlContext = info.context
 
-        prefix = await NodeManager.get_one(id=prefix_id, db=graphql_context.db, branch=graphql_context.branch)
+        prefix = await NodeManager.get_one(
+            id=prefix_id, db=graphql_context.db, branch=graphql_context.branch, kind=BuiltinIPPrefix
+        )
 
         if not prefix:
             raise NodeNotFoundError(
                 branch_name=graphql_context.branch.name, node_type=InfrahubKind.IPPREFIX, identifier=prefix_id
             )
 
-        namespace = await prefix.ip_namespace.get_peer(db=graphql_context.db)  # type: ignore[attr-defined]
+        namespace = await prefix.ip_namespace.get_peer(db=graphql_context.db)
         subnets = await get_subnets(
             db=graphql_context.db,
-            ip_prefix=ipaddress.ip_network(prefix.prefix.value),  # type: ignore[attr-defined]
+            ip_prefix=ipaddress.ip_network(prefix.prefix.value),
             namespace=namespace,
             branch=graphql_context.branch,
         )

infrahub/graphql/queries/resource_manager.py

@@ -23,7 +23,6 @@ if TYPE_CHECKING:
 
     from infrahub.core.branch import Branch
     from infrahub.core.node import Node
-    from infrahub.core.protocols import CoreNode
     from infrahub.core.timestamp import Timestamp
     from infrahub.database import InfrahubDatabase
     from infrahub.graphql.initialization import GraphqlContext
@@ -59,7 +58,7 @@ class PoolAllocatedEdge(ObjectType):
     node = Field(PoolAllocatedNode, required=True)
 
 
-def _validate_pool_type(pool_id: str, pool: CoreNode | None = None) -> CoreNode:
+def _validate_pool_type(pool_id: str, pool: Node | None = None) -> Node:
     if not pool or pool.get_kind() not in [
         InfrahubKind.IPADDRESSPOOL,
         InfrahubKind.IPPREFIXPOOL,
@@ -83,9 +82,7 @@ class PoolAllocated(ObjectType):
         limit: int = 10,
     ) -> dict:
         graphql_context: GraphqlContext = info.context
-        pool: CoreNode | None = await NodeManager.get_one(
-            id=pool_id, db=graphql_context.db, branch=graphql_context.branch
-        )
+        pool = await NodeManager.get_one(id=pool_id, db=graphql_context.db, branch=graphql_context.branch)
 
         fields = extract_graphql_fields(info=info)
 
@@ -190,7 +187,7 @@ class PoolUtilization(ObjectType):
     ) -> dict:
         graphql_context: GraphqlContext = info.context
         db: InfrahubDatabase = graphql_context.db
-        pool: CoreNode | None = await NodeManager.get_one(id=pool_id, db=db, branch=graphql_context.branch)
+        pool = await NodeManager.get_one(id=pool_id, db=db, branch=graphql_context.branch)
         pool = _validate_pool_type(pool_id=pool_id, pool=pool)
         if pool.get_kind() == "CoreNumberPool":
             return await resolve_number_pool_utilization(
@@ -275,7 +272,7 @@ class PoolUtilization(ObjectType):
 
 
 async def resolve_number_pool_allocation(
-    db: InfrahubDatabase, graphql_context: GraphqlContext, pool: CoreNode, fields: dict, offset: int, limit: int
+    db: InfrahubDatabase, graphql_context: GraphqlContext, pool: Node, fields: dict, offset: int, limit: int
 ) -> dict:
     response: dict[str, Any] = {}
     query = await NumberPoolGetAllocated.init(
@@ -304,7 +301,7 @@ async def resolve_number_pool_allocation(
 
 
 async def resolve_number_pool_utilization(
-    db: InfrahubDatabase, pool: CoreNode, at: Timestamp | str | None, branch: Branch
+    db: InfrahubDatabase, pool: Node, at: Timestamp | str | None, branch: Branch
 ) -> dict:
     """
     Returns a mapping containg utilization info of a number pool.

infrahub/graphql/queries/search.py

@@ -13,7 +13,7 @@ from infrahub.graphql.field_extractor import extract_graphql_fields
 if TYPE_CHECKING:
     from graphql import GraphQLResolveInfo
 
-    from infrahub.core.protocols import CoreNode
+    from infrahub.core.node import Node as InfrahubNode
     from infrahub.graphql.initialization import GraphqlContext
 
 
@@ -106,12 +106,12 @@ async def search_resolver(
 ) -> dict[str, Any]:
     graphql_context: GraphqlContext = info.context
     response: dict[str, Any] = {}
-    results: list[CoreNode] = []
+    results: list[InfrahubNode] = []
 
     fields = extract_graphql_fields(info=info)
 
     if is_valid_uuid(q):
-        matching: CoreNode | None = await NodeManager.get_one(
+        matching = await NodeManager.get_one(
             db=graphql_context.db, branch=graphql_context.branch, at=graphql_context.at, id=q
         )
         if matching:

infrahub/graphql/schema.py

@@ -39,6 +39,7 @@ from .queries import (
     BranchQueryList,
     DeprecatedIPAddressGetNextAvailable,
     DeprecatedIPPrefixGetNextAvailable,
+    InfrahubBranchQueryList,
     InfrahubInfo,
     InfrahubIPAddressGetNextAvailable,
     InfrahubIPPrefixGetNextAvailable,
@@ -65,6 +66,7 @@ class InfrahubBaseQuery(ObjectType):
 
     Relationship = Relationship
 
+    InfrahubBranch = InfrahubBranchQueryList
     InfrahubInfo = InfrahubInfo
     InfrahubStatus = InfrahubStatus
 

infrahub/graphql/types/__init__.py

@@ -21,7 +21,7 @@ from .attribute import (
     StrAttributeType,
     TextAttributeType,
 )
-from .branch import BranchType
+from .branch import BranchType, InfrahubBranch, InfrahubBranchType
 from .interface import InfrahubInterface
 from .node import InfrahubObject
 from .permission import PaginatedObjectPermission
@@ -41,6 +41,8 @@ __all__ = [
     "DropdownType",
     "IPHostType",
     "IPNetworkType",
+    "InfrahubBranch",
+    "InfrahubBranchType",
     "InfrahubInterface",
     "InfrahubObject",
     "InfrahubObjectType",