infrahub-server 1.4.0b1__py3-none-any.whl → 1.4.1__py3-none-any.whl

infrahub/permissions/globals.py

@@ -1,7 +1,19 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
 from infrahub.core.account import GlobalPermission
 from infrahub.core.constants import GLOBAL_BRANCH_NAME, GlobalPermissions, PermissionDecision
+from infrahub.core.manager import NodeManager
+from infrahub.core.node import Node
+from infrahub.core.protocols import CoreGlobalPermission
 from infrahub.core.registry import registry
 
+from .constants import GLOBAL_PERMISSION_DESCRIPTION
+
+if TYPE_CHECKING:
+    from infrahub.database import InfrahubDatabase
+
 
 def define_global_permission_from_branch(permission: GlobalPermissions, branch_name: str) -> GlobalPermission:
     if branch_name in (GLOBAL_BRANCH_NAME, registry.default_branch):
@@ -10,3 +22,23 @@ def define_global_permission_from_branch(permission: GlobalPermissions, branch_n
         decision = PermissionDecision.ALLOW_OTHER
 
     return GlobalPermission(action=permission.value, decision=decision.value)
+
+
+async def get_or_create_global_permission(db: InfrahubDatabase, permission: GlobalPermissions) -> CoreGlobalPermission:
+    permissions = await NodeManager.query(
+        db=db, schema=CoreGlobalPermission, filters={"action__value": permission.value}, limit=1
+    )
+
+    if permissions:
+        return permissions[0]
+
+    p = await Node.init(db=db, schema=CoreGlobalPermission)
+    await p.new(
+        db=db,
+        action=permission.value,
+        decision=PermissionDecision.ALLOW_ALL.value,
+        description=GLOBAL_PERMISSION_DESCRIPTION[permission],
+    )
+    await p.save(db=db)
+
+    return p

infrahub/task_manager/event.py

@@ -242,7 +242,11 @@ class PrefectEventData(PrefectEventModel):
                     **self._return_proposed_change_event(),
                     **self._return_proposed_change_reviewer_former_decision(),
                 }
-            case "infrahub.proposed_change.review_requested" | "infrahub.proposed_change.merged":
+            case (
+                "infrahub.proposed_change.approvals_revoked"
+                | "infrahub.proposed_change.review_requested"
+                | "infrahub.proposed_change.merged"
+            ):
                 event_specifics = self._return_proposed_change_event()
 
         return event_specifics

infrahub_sdk/client.py

@@ -250,7 +250,7 @@ class BaseClient:
 
         return Mutation(
             name="AllocateIPAddress",
-            mutation="InfrahubIPAddressPoolGetResource",
+            mutation="IPAddressPoolGetResource",
             query={"ok": None, "node": {"id": None, "kind": None, "identifier": None, "display_label": None}},
             input_data={"data": input_data},
         )
@@ -281,7 +281,7 @@ class BaseClient:
 
         return Mutation(
             name="AllocateIPPrefix",
-            mutation="InfrahubIPPrefixPoolGetResource",
+            mutation="IPPrefixPoolGetResource",
             query={"ok": None, "node": {"id": None, "kind": None, "identifier": None, "display_label": None}},
             input_data={"data": input_data},
         )
@@ -790,7 +790,7 @@ class InfrahubClient(BaseClient):
         async def process_page(page_offset: int, page_number: int) -> tuple[dict, ProcessRelationsNode]:
             """Process a single page of results."""
             query_data = await InfrahubNode(client=self, schema=schema, branch=branch).generate_query_data(
-                offset=offset or page_offset,
+                offset=page_offset if offset is None else offset,
                 limit=limit or pagination_size,
                 filters=filters,
                 include=include,
@@ -1300,7 +1300,7 @@ class InfrahubClient(BaseClient):
             raise ValueError("resource_pool is not an IP address pool")
 
         branch = branch or self.default_branch
-        mutation_name = "InfrahubIPAddressPoolGetResource"
+        mutation_name = "IPAddressPoolGetResource"
 
         query = self._build_ip_address_allocation_query(
             resource_pool_id=resource_pool.id,
@@ -1452,7 +1452,7 @@ class InfrahubClient(BaseClient):
             raise ValueError("resource_pool is not an IP prefix pool")
 
         branch = branch or self.default_branch
-        mutation_name = "InfrahubIPPrefixPoolGetResource"
+        mutation_name = "IPPrefixPoolGetResource"
 
         query = self._build_ip_prefix_allocation_query(
             resource_pool_id=resource_pool.id,
@@ -1954,7 +1954,7 @@ class InfrahubClientSync(BaseClient):
         def process_page(page_offset: int, page_number: int) -> tuple[dict, ProcessRelationsNodeSync]:
             """Process a single page of results."""
             query_data = InfrahubNodeSync(client=self, schema=schema, branch=branch).generate_query_data(
-                offset=offset or page_offset,
+                offset=page_offset if offset is None else offset,
                 limit=limit or pagination_size,
                 filters=filters,
                 include=include,
@@ -2438,7 +2438,7 @@ class InfrahubClientSync(BaseClient):
             raise ValueError("resource_pool is not an IP address pool")
 
         branch = branch or self.default_branch
-        mutation_name = "InfrahubIPAddressPoolGetResource"
+        mutation_name = "IPAddressPoolGetResource"
 
         query = self._build_ip_address_allocation_query(
             resource_pool_id=resource_pool.id,
@@ -2586,7 +2586,7 @@ class InfrahubClientSync(BaseClient):
             raise ValueError("resource_pool is not an IP prefix pool")
 
         branch = branch or self.default_branch
-        mutation_name = "InfrahubIPPrefixPoolGetResource"
+        mutation_name = "IPPrefixPoolGetResource"
 
         query = self._build_ip_prefix_allocation_query(
             resource_pool_id=resource_pool.id,

infrahub_sdk/node/node.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from collections.abc import Iterable
-from copy import copy
+from copy import copy, deepcopy
 from typing import TYPE_CHECKING, Any
 
 from ..constants import InfrahubClientMode
@@ -397,7 +397,7 @@ class InfrahubNodeBase:
             "edges": {"node": {"id": None, "hfid": None, "display_label": None, "__typename": None}},
         }
 
-        data["@filters"] = filters or {}
+        data["@filters"] = deepcopy(filters) if filters is not None else {}
 
         if order:
             data["@filters"]["order"] = order

infrahub_sdk/protocols.py

@@ -233,10 +233,6 @@ class CoreWebhook(CoreNode):
     validate_certificates: BooleanOptional
 
 
-class CoreWeightedPoolResource(CoreNode):
-    allocation_weight: IntegerOptional
-
-
 class LineageOwner(CoreNode):
     pass
 
@@ -325,7 +321,6 @@ class CoreCheckDefinition(CoreTaskTarget):
 
 
 class CoreCustomWebhook(CoreWebhook, CoreTaskTarget):
-    shared_key: StringOptional
     transformation: RelatedNode
 
 
@@ -410,12 +405,12 @@ class CoreGraphQLQueryGroup(CoreGroup):
 
 
 class CoreGroupAction(CoreAction):
-    member_action: Dropdown
+    add_members: Boolean
     group: RelatedNode
 
 
 class CoreGroupTriggerRule(CoreTriggerRule):
-    member_update: Dropdown
+    members_added: Boolean
     group: RelatedNode
 
 
@@ -447,7 +442,7 @@ class CoreNodeTriggerAttributeMatch(CoreNodeTriggerMatch):
 
 class CoreNodeTriggerRelationshipMatch(CoreNodeTriggerMatch):
     relationship_name: String
-    modification_type: Dropdown
+    added: Boolean
     peer: StringOptional
 
 
@@ -462,7 +457,6 @@ class CoreNumberPool(CoreResourcePool, LineageSource):
     node_attribute: String
     start_range: Integer
     end_range: Integer
-    pool_type: Enum
 
 
 class CoreObjectPermission(CoreBasePermission):
@@ -487,10 +481,7 @@ class CoreProposedChange(CoreTaskTarget):
     source_branch: String
     destination_branch: String
     state: Enum
-    is_draft: Boolean
-    total_comments: IntegerOptional
     approved_by: RelationshipManager
-    rejected_by: RelationshipManager
     reviewers: RelationshipManager
     created_by: RelatedNode
     comments: RelationshipManager
@@ -564,14 +555,6 @@ class InternalAccountToken(CoreNode):
     account: RelatedNode
 
 
-class InternalIPPrefixAvailable(BuiltinIPPrefix):
-    pass
-
-
-class InternalIPRangeAvailable(BuiltinIPAddress):
-    last_address: IPHost
-
-
 class InternalRefreshToken(CoreNode):
     expiration: DateTime
     account: RelatedNode
@@ -783,10 +766,6 @@ class CoreWebhookSync(CoreNodeSync):
     validate_certificates: BooleanOptional
 
 
-class CoreWeightedPoolResourceSync(CoreNodeSync):
-    allocation_weight: IntegerOptional
-
-
 class LineageOwnerSync(CoreNodeSync):
     pass
 
@@ -875,7 +854,6 @@ class CoreCheckDefinitionSync(CoreTaskTargetSync):
 
 
 class CoreCustomWebhookSync(CoreWebhookSync, CoreTaskTargetSync):
-    shared_key: StringOptional
     transformation: RelatedNodeSync
 
 
@@ -960,12 +938,12 @@ class CoreGraphQLQueryGroupSync(CoreGroupSync):
 
 
 class CoreGroupActionSync(CoreActionSync):
-    member_action: Dropdown
+    add_members: Boolean
     group: RelatedNodeSync
 
 
 class CoreGroupTriggerRuleSync(CoreTriggerRuleSync):
-    member_update: Dropdown
+    members_added: Boolean
     group: RelatedNodeSync
 
 
@@ -997,7 +975,7 @@ class CoreNodeTriggerAttributeMatchSync(CoreNodeTriggerMatchSync):
 
 class CoreNodeTriggerRelationshipMatchSync(CoreNodeTriggerMatchSync):
     relationship_name: String
-    modification_type: Dropdown
+    added: Boolean
     peer: StringOptional
 
 
@@ -1012,7 +990,6 @@ class CoreNumberPoolSync(CoreResourcePoolSync, LineageSourceSync):
     node_attribute: String
     start_range: Integer
     end_range: Integer
-    pool_type: Enum
 
 
 class CoreObjectPermissionSync(CoreBasePermissionSync):
@@ -1037,10 +1014,7 @@ class CoreProposedChangeSync(CoreTaskTargetSync):
     source_branch: String
     destination_branch: String
     state: Enum
-    is_draft: Boolean
-    total_comments: IntegerOptional
     approved_by: RelationshipManagerSync
-    rejected_by: RelationshipManagerSync
     reviewers: RelationshipManagerSync
     created_by: RelatedNodeSync
     comments: RelationshipManagerSync
@@ -1114,14 +1088,6 @@ class InternalAccountTokenSync(CoreNodeSync):
     account: RelatedNodeSync
 
 
-class InternalIPPrefixAvailableSync(BuiltinIPPrefixSync):
-    pass
-
-
-class InternalIPRangeAvailableSync(BuiltinIPAddressSync):
-    last_address: IPHost
-
-
 class InternalRefreshTokenSync(CoreNodeSync):
     expiration: DateTime
     account: RelatedNodeSync

infrahub_sdk/pytest_plugin/items/graphql_query.py

@@ -16,7 +16,7 @@ if TYPE_CHECKING:
 
 class InfrahubGraphQLQueryItem(InfrahubItem):
     def validate_resource_config(self) -> None:
-        # Resource name does not need to match against infrahub repo config
+        # Resource name does not need to match against Infrahub repository configuration
         return
 
     def execute_query(self) -> Any:

infrahub_sdk/schema/repository.py

@@ -24,7 +24,7 @@ ResourceClass = TypeVar("ResourceClass")
 
 
 class InfrahubRepositoryConfigElement(BaseModel):
-    """Class to regroup all elements of the infrahub configuration for a repository for typing purpose."""
+    """Class to regroup all elements of the Infrahub configuration for a repository for typing purpose."""
 
 
 class InfrahubRepositoryArtifactDefinitionConfig(InfrahubRepositoryConfigElement):

infrahub_sdk/testing/docker.py

@@ -13,7 +13,7 @@ INFRAHUB_VERSION = os.getenv("INFRAHUB_TESTING_IMAGE_VER")
 
 def skip_version(min_infrahub_version: str | None = None, max_infrahub_version: str | None = None) -> bool:
     """
-    Check if a test should be skipped depending on infrahub version.
+    Check if a test should be skipped depending on Infrahub version.
     """
     if INFRAHUB_VERSION is None:
         return True

infrahub_sdk/utils.py

@@ -95,7 +95,7 @@ def decode_json(response: httpx.Response) -> dict:
     try:
         return response.json()
     except json.decoder.JSONDecodeError as exc:
-        raise JsonDecodeError(content=response.text, url=response.url) from exc
+        raise JsonDecodeError(content=response.text, url=str(response.url)) from exc
 
 
 def generate_uuid() -> str:
@@ -142,14 +142,18 @@ def deep_merge_dict(dicta: dict, dictb: dict, path: list | None = None) -> dict:
     if path is None:
         path = []
     for key in dictb:
+        b_val = dictb[key]
         if key in dicta:
-            if isinstance(dicta[key], dict) and isinstance(dictb[key], dict):
-                deep_merge_dict(dicta[key], dictb[key], path + [str(key)])
-            elif isinstance(dicta[key], list) and isinstance(dictb[key], list):
+            a_val = dicta[key]
+            if isinstance(a_val, dict) and isinstance(b_val, dict):
+                deep_merge_dict(a_val, b_val, path + [str(key)])
+            elif isinstance(a_val, list) and isinstance(b_val, list):
                 # Merge lists
                 # Cannot use compare_list because list of dicts won't work (dict not hashable)
-                dicta[key] = [i for i in dicta[key] if i not in dictb[key]] + dictb[key]
-            elif dicta[key] == dictb[key]:
+                dicta[key] = [i for i in a_val if i not in b_val] + b_val
+            elif a_val is None and b_val is not None:
+                dicta[key] = b_val
+            elif a_val == b_val or (a_val is not None and b_val is None):
                 continue
             else:
                 raise ValueError("Conflict at %s" % ".".join(path + [str(key)]))
@@ -228,7 +232,7 @@ def get_branch(branch: str | None = None, directory: str | Path = ".") -> str:
     if branch:
         return branch
 
-    repo = GitRepoManager(directory)
+    repo = GitRepoManager(root_directory=str(directory))
     return str(repo.active_branch)
 
 

{infrahub_server-1.4.0b1.dist-info → infrahub_server-1.4.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: infrahub-server
-Version: 1.4.0b1
+Version: 1.4.1
 Summary: Infrahub is taking a new approach to Infrastructure Management by providing a new generation of datastore to organize and control all the data that defines how an infrastructure should run.
 License: Apache-2.0
 Author: OpsMill
@@ -23,7 +23,7 @@ Requires-Dist: copier (>=9.8.0,<10.0.0)
 Requires-Dist: dulwich (>=0.22.7,<0.23.0)
 Requires-Dist: email-validator (>=2.1,<2.2)
 Requires-Dist: fast-depends (>=2.4.12,<3.0.0)
-Requires-Dist: fastapi (>=0.115,<0.116)
+Requires-Dist: fastapi (==0.116.1)
 Requires-Dist: fastapi-storages (>=0.3,<0.4)
 Requires-Dist: gitpython (>=3,<4)
 Requires-Dist: graphene (>=3.4,<3.5)
@@ -40,8 +40,8 @@ Requires-Dist: opentelemetry-exporter-otlp-proto-grpc (==1.28.1)
 Requires-Dist: opentelemetry-exporter-otlp-proto-http (==1.28.1)
 Requires-Dist: opentelemetry-instrumentation-aio-pika (==0.49b1)
 Requires-Dist: opentelemetry-instrumentation-fastapi (==0.49b1)
-Requires-Dist: prefect (==3.4.11)
-Requires-Dist: prefect-redis (==0.2.3)
+Requires-Dist: prefect (==3.4.13)
+Requires-Dist: prefect-redis (==0.2.4)
 Requires-Dist: pyarrow (>=14,<15)
 Requires-Dist: pydantic (>=2.10,<2.11)
 Requires-Dist: pydantic-settings (>=2.8,<2.9)