infrahub-server 1.1.6__py3-none-any.whl → 1.1.7__py3-none-any.whl

infrahub/graphql/mutations/computed_attribute.py

@@ -87,7 +87,9 @@ class UpdateComputedAttribute(Mutation):
             log_data = get_log_data()
             request_id = log_data.get("request_id", "")
 
-            graphql_payload = await target_node.to_graphql(db=context.db, filter_sensitive=True)
+            graphql_payload = await target_node.to_graphql(
+                db=context.db, filter_sensitive=True, include_properties=False
+            )
 
             event = NodeMutatedEvent(
                 branch=context.branch.name,

infrahub/graphql/mutations/diff.py

@@ -5,9 +5,13 @@ from graphql import GraphQLResolveInfo
 
 from infrahub.core import registry
 from infrahub.core.diff.coordinator import DiffCoordinator
+from infrahub.core.diff.model.path import NameTrackingId
 from infrahub.core.diff.models import RequestDiffUpdate
+from infrahub.core.diff.repository.repository import DiffRepository
+from infrahub.core.timestamp import Timestamp
 from infrahub.database import retry_db_transaction
 from infrahub.dependencies.registry import get_component_registry
+from infrahub.exceptions import ValidationError
 from infrahub.workflows.catalogue import DIFF_UPDATE
 
 if TYPE_CHECKING:
@@ -40,11 +44,31 @@ class DiffUpdateMutation(Mutation):
 
         from_timestamp_str = DateTime.serialize(data.from_time) if data.from_time else None
         to_timestamp_str = DateTime.serialize(data.to_time) if data.to_time else None
-        if data.wait_for_completion is True:
-            component_registry = get_component_registry()
-            base_branch = await registry.get_branch(db=context.db, branch=registry.default_branch)
-            diff_branch = await registry.get_branch(db=context.db, branch=data.branch)
+        if (data.from_time or data.to_time) and not data.name:
+            raise ValidationError("diff with specified time range requires a name")
+
+        component_registry = get_component_registry()
+        base_branch = await registry.get_branch(db=context.db, branch=registry.default_branch)
+        diff_branch = await registry.get_branch(db=context.db, branch=data.branch)
+        diff_repository = await component_registry.get_component(DiffRepository, db=context.db, branch=diff_branch)
 
+        tracking_id = NameTrackingId(name=data.name)
+        existing_diffs_metatdatas = await diff_repository.get_roots_metadata(
+            diff_branch_names=[diff_branch.name], base_branch_names=[base_branch.name], tracking_id=tracking_id
+        )
+        if existing_diffs_metatdatas:
+            metadata = existing_diffs_metatdatas[0]
+            from_time = Timestamp(from_timestamp_str) if from_timestamp_str else None
+            to_time = Timestamp(to_timestamp_str) if to_timestamp_str else None
+            branched_from_timestamp = Timestamp(diff_branch.get_branched_from())
+            if from_time and from_time > metadata.from_time:
+                raise ValidationError(f"from_time must be null or less than or equal to {metadata.from_time}")
+            if from_time and from_time < branched_from_timestamp:
+                raise ValidationError(f"from_time must be null or greater than or equal to {branched_from_timestamp}")
+            if to_time and to_time < metadata.to_time:
+                raise ValidationError(f"to_time must be null or greater than or equal to {metadata.to_time}")
+
+        if data.wait_for_completion is True:
             diff_coordinator = await component_registry.get_component(
                 DiffCoordinator, db=context.db, branch=diff_branch
             )

infrahub/graphql/mutations/main.py

@@ -97,7 +97,7 @@ class InfrahubMutationMixin:
             log_data = get_log_data()
             request_id = log_data.get("request_id", "")
 
-            graphql_payload = await obj.to_graphql(db=context.db, filter_sensitive=True)
+            graphql_payload = await obj.to_graphql(db=context.db, filter_sensitive=True, include_properties=False)
             event = NodeMutatedEvent(
                 branch=context.branch.name,
                 kind=obj._schema.kind,
@@ -175,20 +175,25 @@ class InfrahubMutationMixin:
         branch: Branch,
     ) -> Node:
         component_registry = get_component_registry()
-        node_constraint_runner = await component_registry.get_component(NodeConstraintRunner, db=db, branch=branch)
+        node_constraint_runner = await component_registry.get_component(
+            NodeConstraintRunner, db=db.start_session(), branch=branch
+        )
         node_class = Node
         if cls._meta.schema.kind in registry.node:
             node_class = registry.node[cls._meta.schema.kind]
 
+        fields_to_validate = list(data)
         try:
-            obj = await node_class.init(db=db, schema=cls._meta.schema, branch=branch)
-            await obj.new(db=db, **data)
-            fields_to_validate = list(data)
-            await node_constraint_runner.check(node=obj, field_filters=fields_to_validate)
             if db.is_transaction:
+                obj = await node_class.init(db=db, schema=cls._meta.schema, branch=branch)
+                await obj.new(db=db, **data)
+                await node_constraint_runner.check(node=obj, field_filters=fields_to_validate)
                 await obj.save(db=db)
             else:
                 async with db.start_transaction() as dbt:
+                    obj = await node_class.init(db=dbt, schema=cls._meta.schema, branch=branch)
+                    await obj.new(db=dbt, **data)
+                    await node_constraint_runner.check(node=obj, field_filters=fields_to_validate)
                     await obj.save(db=dbt)
 
         except ValidationError as exc:

infrahub/graphql/mutations/relationship.py

@@ -5,7 +5,8 @@ from typing import TYPE_CHECKING
 from graphene import Boolean, InputField, InputObjectType, List, Mutation, String
 from infrahub_sdk.utils import compare_lists
 
-from infrahub.core.constants import InfrahubKind, RelationshipCardinality
+from infrahub.core.account import GlobalPermission, ObjectPermission
+from infrahub.core.constants import InfrahubKind, PermissionAction, PermissionDecision, RelationshipCardinality
 from infrahub.core.manager import NodeManager
 from infrahub.core.query.relationship import (
     RelationshipGetPeerQuery,
@@ -14,6 +15,7 @@ from infrahub.core.query.relationship import (
 from infrahub.core.relationship import Relationship
 from infrahub.database import retry_db_transaction
 from infrahub.exceptions import NodeNotFoundError, ValidationError
+from infrahub.permissions import get_global_permission_for_kind
 
 from ..types import RelatedNodeInput
 
@@ -76,6 +78,32 @@ class RelationshipMixin:
             db=context.db, ids=node_ids, fields={"display_label": None}, branch=context.branch
         )
 
+        if context.account_session:
+            impacted_schemas = {node.get_schema() for node in [source] + list(nodes.values())}
+            required_permissions: list[GlobalPermission | ObjectPermission] = []
+            decision = (
+                PermissionDecision.ALLOW_DEFAULT.value
+                if context.branch.is_default
+                else PermissionDecision.ALLOW_OTHER.value
+            )
+
+            for impacted_schema in impacted_schemas:
+                global_action = get_global_permission_for_kind(schema=impacted_schema)
+
+                if global_action:
+                    required_permissions.append(GlobalPermission(action=global_action, decision=decision))
+                else:
+                    required_permissions.append(
+                        ObjectPermission(
+                            namespace=impacted_schema.namespace,
+                            name=impacted_schema.name,
+                            action=PermissionAction.UPDATE.value,
+                            decision=decision,
+                        )
+                    )
+
+            context.active_permissions.raise_for_permissions(permissions=required_permissions)
+
         _, _, in_list2 = compare_lists(list1=list(nodes.keys()), list2=node_ids)
         if in_list2:
             for node_id in in_list2:

infrahub/graphql/mutations/tasks.py

@@ -31,14 +31,17 @@ async def merge_branch_mutation(branch: str) -> None:
         diff_coordinator = await component_registry.get_component(DiffCoordinator, db=db, branch=obj)
         diff_repository = await component_registry.get_component(DiffRepository, db=db, branch=obj)
         diff_merger = await component_registry.get_component(DiffMerger, db=db, branch=obj)
-        enriched_diff = await diff_coordinator.update_branch_diff_and_return(base_branch=base_branch, diff_branch=obj)
-        if enriched_diff.get_all_conflicts():
+        enriched_diff_metadata = await diff_coordinator.update_branch_diff(base_branch=base_branch, diff_branch=obj)
+        async for _ in diff_repository.get_all_conflicts_for_diff(
+            diff_branch_name=enriched_diff_metadata.diff_branch_name, diff_id=enriched_diff_metadata.uuid
+        ):
+            # if there are any conflicts, raise the error
             raise ValidationError(
                 f"Branch {obj.name} contains conflicts with the default branch."
                 " Please create a Proposed Change to resolve the conflicts or manually update them before merging."
             )
         node_diff_field_summaries = await diff_repository.get_node_field_summaries(
-            diff_branch_name=enriched_diff.diff_branch_name, diff_id=enriched_diff.uuid
+            diff_branch_name=enriched_diff_metadata.diff_branch_name, diff_id=enriched_diff_metadata.uuid
         )
 
         merger = BranchMerger(

infrahub/graphql/queries/resource_manager.py

@@ -21,8 +21,10 @@ from infrahub.pools.number import NumberUtilizationGetter
 if TYPE_CHECKING:
     from graphql import GraphQLResolveInfo
 
+    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
 
@@ -184,7 +186,7 @@ class PoolUtilization(ObjectType):
         pool: CoreNode | None = await NodeManager.get_one(id=pool_id, db=db, branch=context.branch)
         pool = _validate_pool_type(pool_id=pool_id, pool=pool)
         if pool.get_kind() == "CoreNumberPool":
-            return await resolve_number_pool_utilization(db=db, context=context, pool=pool)
+            return await resolve_number_pool_utilization(db=db, at=context.at, pool=pool, branch=context.branch)
 
         resources_map: dict[str, Node] = {}
 
@@ -290,8 +292,10 @@ async def resolve_number_pool_allocation(
     return response
 
 
-async def resolve_number_pool_utilization(db: InfrahubDatabase, context: GraphqlContext, pool: CoreNode) -> dict:
-    number_pool = NumberUtilizationGetter(db=db, pool=pool, at=context.at, branch=context.branch)
+async def resolve_number_pool_utilization(
+    db: InfrahubDatabase, pool: CoreNode, at: Timestamp | str | None, branch: Branch
+) -> dict:
+    number_pool = NumberUtilizationGetter(db=db, pool=pool, at=at, branch=branch)
     await number_pool.load_data()
 
     return {

infrahub/permissions/__init__.py

@@ -2,12 +2,13 @@ from infrahub.permissions.backend import PermissionBackend
 from infrahub.permissions.local_backend import LocalPermissionBackend
 from infrahub.permissions.manager import PermissionManager
 from infrahub.permissions.report import report_schema_permissions
-from infrahub.permissions.types import AssignedPermissions
+from infrahub.permissions.types import AssignedPermissions, get_global_permission_for_kind
 
 __all__ = [
     "AssignedPermissions",
     "LocalPermissionBackend",
     "PermissionBackend",
     "PermissionManager",
+    "get_global_permission_for_kind",
     "report_schema_permissions",
 ]

infrahub/permissions/types.py

@@ -2,8 +2,12 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING, TypedDict
 
+from infrahub.core.constants import GlobalPermissions, InfrahubKind
+from infrahub.core.schema import NodeSchema
+
 if TYPE_CHECKING:
     from infrahub.core.account import GlobalPermission, ObjectPermission
+    from infrahub.core.schema import MainSchemaTypes
     from infrahub.permissions.constants import BranchRelativePermissionDecision
 
 
@@ -18,3 +22,25 @@ class KindPermissions(TypedDict):
     delete: BranchRelativePermissionDecision
     update: BranchRelativePermissionDecision
     view: BranchRelativePermissionDecision
+
+
+def get_global_permission_for_kind(schema: MainSchemaTypes) -> GlobalPermissions | None:
+    kind_permission_map = {
+        InfrahubKind.GENERICACCOUNT: GlobalPermissions.MANAGE_ACCOUNTS,
+        InfrahubKind.ACCOUNTGROUP: GlobalPermissions.MANAGE_ACCOUNTS,
+        InfrahubKind.ACCOUNTROLE: GlobalPermissions.MANAGE_ACCOUNTS,
+        InfrahubKind.BASEPERMISSION: GlobalPermissions.MANAGE_PERMISSIONS,
+        InfrahubKind.GENERICREPOSITORY: GlobalPermissions.MANAGE_REPOSITORIES,
+    }
+
+    if schema.kind in kind_permission_map:
+        return kind_permission_map[schema.kind]
+
+    if isinstance(schema, NodeSchema):
+        for base in schema.inherit_from:
+            try:
+                return kind_permission_map[base]
+            except KeyError:
+                continue
+
+    return None

infrahub_sdk/batch.py

@@ -30,7 +30,7 @@ class BatchTaskSync:
         result = None
         try:
             result = self.task(*self.args, **self.kwargs)
-        except Exception as exc:
+        except Exception as exc:  # pylint: disable=broad-exception-caught
             if return_exceptions:
                 return self.node, exc
             raise exc
@@ -44,7 +44,7 @@ async def execute_batch_task_in_pool(
     async with semaphore:
         try:
             result = await task.task(*task.args, **task.kwargs)
-        except Exception as exc:
+        except Exception as exc:  # pylint: disable=broad-exception-caught
             if return_exceptions:
                 return (task.node, exc)
             raise exc

infrahub_sdk/config.py

@@ -113,7 +113,7 @@ class ConfigBase(BaseSettings):
 
     @model_validator(mode="after")
     def validate_proxy_config(self) -> Self:
-        if self.proxy and self.proxy_mounts.is_set:
+        if self.proxy and self.proxy_mounts.is_set:  # pylint: disable=no-member
             raise ValueError("'proxy' and 'proxy_mounts' are mutually exclusive")
         return self
 

infrahub_sdk/ctl/check.py

@@ -121,7 +121,7 @@ async def run_check(
     except QueryNotFoundError as exc:
         log.warning(f"{module_name}::{check}: unable to find query ({exc!s})")
         passed = False
-    except Exception as exc:
+    except Exception as exc:  # pylint: disable=broad-exception-caught
         log.warning(f"{module_name}::{check}: An error occurred during execution ({exc})")
         passed = False
 

infrahub_sdk/ctl/utils.py

@@ -88,7 +88,7 @@ def catch_exception(
             async def async_wrapper(*args: Any, **kwargs: Any) -> T:
                 try:
                     return await func(*args, **kwargs)
-                except (Error, Exception) as exc:
+                except (Error, Exception) as exc:  # pylint: disable=broad-exception-caught
                     return handle_exception(exc=exc, console=console, exit_code=exit_code)
 
             return async_wrapper
@@ -97,7 +97,7 @@ def catch_exception(
         def wrapper(*args: Any, **kwargs: Any) -> T:
             try:
                 return func(*args, **kwargs)
-            except (Error, Exception) as exc:
+            except (Error, Exception) as exc:  # pylint: disable=broad-exception-caught
                 return handle_exception(exc=exc, console=console, exit_code=exit_code)
 
         return wrapper

infrahub_sdk/data.py

@@ -20,7 +20,7 @@ class RepositoryData(BaseModel):
     branch_info: dict[str, RepositoryBranchInfo] = Field(default_factory=dict)
 
     def get_staging_branch(self) -> str | None:
-        for branch, info in self.branch_info.items():
+        for branch, info in self.branch_info.items():  # pylint: disable=no-member
             if info.internal_status == "staging":
                 return branch
         return None

infrahub_sdk/node.py

@@ -25,6 +25,7 @@ if TYPE_CHECKING:
     from .schema import AttributeSchemaAPI, MainSchemaTypesAPI, RelationshipSchemaAPI
     from .types import Order
 
+# pylint: disable=too-many-lines
 
 PROPERTIES_FLAG = ["is_visible", "is_protected"]
 PROPERTIES_OBJECT = ["source", "owner"]
@@ -800,7 +801,7 @@ class InfrahubNodeBase:
         Returns:
             dict[str, Dict]: Representation of an input data in dict format
         """
-
+        # pylint: disable=too-many-branches
         data = {}
         variables = {}
 
@@ -1250,6 +1251,7 @@ class InfrahubNode(InfrahubNodeBase):
         Returns:
             dict[str, Union[Any, Dict]]: GraphQL query in dictionary format
         """
+        # pylint: disable=too-many-branches
 
         data: dict[str, Any] = {}
 
@@ -1761,6 +1763,7 @@ class InfrahubNodeSync(InfrahubNodeBase):
         Returns:
             dict[str, Union[Any, Dict]]: GraphQL query in dictionary format
         """
+        # pylint: disable=too-many-branches
 
         data: dict[str, Any] = {}
 

infrahub_sdk/protocols.py

@@ -29,6 +29,7 @@ if TYPE_CHECKING:
         StringOptional,
     )
 
+# pylint: disable=too-many-ancestors
 
 # ---------------------------------------------
 # ASYNC

infrahub_sdk/schema/__init__.py

@@ -61,6 +61,9 @@ __all__ = [
 ]
 
 
+# pylint: disable=redefined-builtin
+
+
 class DropdownMutationOptionalArgs(TypedDict):
     color: str | None
     description: str | None

infrahub_sdk/testing/docker.py

@@ -1,40 +1,10 @@
-from __future__ import annotations
-
-import os
-
 import pytest
 from infrahub_testcontainers.helpers import TestInfrahubDocker
-from packaging.version import InvalidVersion, Version
 
 from .. import Config, InfrahubClient, InfrahubClientSync
 
-INFRAHUB_VERSION = os.getenv("INFRAHUB_TESTING_IMAGE_VER", "latest")
-
-
-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.
-    """
-    try:
-        version = Version(INFRAHUB_VERSION)
-    except InvalidVersion:
-        # We would typically end up here for development purpose while running a CI test against
-        # unreleased versions of infrahub, like `stable` or `develop` branch.
-        # For now, we consider this means we are testing against the most recent version of infrahub,
-        # so we skip if the test should not be ran against a maximum version.
-        return max_infrahub_version is None
-
-    if min_infrahub_version is not None and version < Version(min_infrahub_version):
-        return True
-
-    return max_infrahub_version is not None and version > Version(max_infrahub_version)
-
 
 class TestInfrahubDockerClient(TestInfrahubDocker):
-    @pytest.fixture(scope="class")
-    def infrahub_version(self) -> str:
-        return INFRAHUB_VERSION
-
     @pytest.fixture(scope="class")
     def client(self, infrahub_port: int) -> InfrahubClient:
         return InfrahubClient(

infrahub_sdk/transfer/exporter/json.py

@@ -98,7 +98,7 @@ class LineDelimitedJSONExporter(ExporterInterface):
         return many_relationships
 
     # FIXME: Split in smaller functions
-    async def export(
+    async def export(  # pylint: disable=too-many-branches
         self, export_directory: Path, namespaces: list[str], branch: str, exclude: list[str] | None = None
     ) -> None:
         illegal_namespaces = set(ILLEGAL_NAMESPACES)

{infrahub_server-1.1.6.dist-info → infrahub_server-1.1.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: infrahub-server
-Version: 1.1.6
+Version: 1.1.7
 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.
 Home-page: https://opsmill.com
 License: AGPL-3.0-only
@@ -58,16 +58,46 @@ Project-URL: Documentation, https://docs.infrahub.app/
 Project-URL: Repository, https://github.com/opsmill/infrahub
 Description-Content-Type: text/markdown
 
-<!-- markdownlint-disable -->
-![Infrahub Logo](docs/static/img/infrahub-hori.svg)
-<!-- markdownlint-restore -->
+<h1 align="center">
+  <a href=""><img src="docs/static/img/infrahub-hori.svg" alt="Infrahub" width="350"></a>
+</h1>
+<h3 align="center">Simplify Infrastructure Automation</h2>
 
-# Infrahub
+<p align="center">
+<a href="https://www.linkedin.com/company/opsmill">
+<img src="https://img.shields.io/badge/linkedin-blue?logo=linkedin"/>
+</a>
+<a href="https://discord.gg/opsmill">
+<img src="https://img.shields.io/badge/Discord-7289DA?&logo=discord&logoColor=white"/>
+</a>
+</p>
 
-Infrahub from [OpsMill](https://opsmill.com) 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. Infrahub offers a central hub to manage the data, templates and playbooks that powers your infrastructure by combining the version control and branch management capabilities of Git with the flexible data model and UI of a graph database.
+Infrahub from [OpsMill](https://opsmill.com) 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. Infrahub offers a central hub to manage the data, templates and playbooks that powers your infrastructure by combining the version control and branch management capabilities similar to Git with the flexible data model and UI of a graph database.
+
+If you just want to try Infrahub out, you can use our [Always-On Sandbox](https://demo.infrahub.app/) to get started.
 
 ![infrahub screenshot](docs/docs/media/infrahub-readme.gif)
 
+## Why Use Infrahub?
+
+**Unified Source of Truth** - Infrahub is a single source of truth for all your infrastructure and network data. It provides a unified view of your infrastructure, allowing you to manage your infrastructure in a more efficient and effective way. Infrahub allows unidirectional and bi-directional [data synchronization](https://docs.infrahub.app/sync/sync/) between other internal systems and Infrahub. The data can be accessed via WebUI, API and SDK, along with SSO and RBAC for access control.
+
+**Flexible Schema** - Infrahub provides a flexible schema for your infrastructure data and related business information, allowing you to define your own data model and customize it to your needs. Get started quickly with our [schema library](https://github.com/opsmill/schema-library) or build your own.
+
+**Version Control** - Infrahub provides a version control system for your infrastructure data, allowing you to track changes and revert to previous versions if needed. Immutable history of all changes to the data and artifacts is maintained, allowing you to audit and review changes to your infrastructure.
+
+**CI Pipeline and Validation** - Infrahub provides a CI pipeline and validation system for your infrastructure data, allowing you to ensure that your infrastructure is always in a valid state. Infrahub was designed with infrastructure-as-code workflows in mind, removing fragility and complexity of combining together multiple tools and projects to achieve the same goal.
+
+## Infrahub Use Cases
+
+**Service Catalog** - Infrahub acts as the underlying system to provide infrastructure-as-a-service, allowing you to manage your services and lifecycle them as the services evolve.
+
+**Infrastructure Automation** - Provide infrastructure and network automation workflows with Infrahub rendering configurations and artifacts via Jinja2 and python,then passing to deployment tools such as [Nornir](https://www.opsmill.com/simplifying-network-automation-workflows-with-infrahub-nornir-and-jinja2/), [Ansible](https://docs.infrahub.app/ansible/ansible/), Terraform, or vendor-specific tools.
+
+**Inventory Management** - Infrahub serves as a centralized inventory system for your infrastructure, allowing you to manage your inventory and track changes to your infrastructure. It provides a WebUI and API for other teams to self-service the information needed to allow the organization to operate.
+
+**DCIM and IPAM** - Infrahub provides centralized DCIM and IPAM systems for your infrastructure, capable of handling complex cases such as overlapping IP addresses and VLANs, automation-friendly, branch-aware allocation of resources via Infrahub's [Resource Manager](https://docs.infrahub.app/python-sdk/guides/resource-manager), and more.
+
 ## Quick Start
 
 [Always-On Sandbox](https://demo.infrahub.app/) - Instantly login to the UI of a demo environment of Infrahub with sample data pre-loaded.
@@ -94,7 +124,11 @@ If you need help, support for the community version of Infrahub is provided on [
 
 ## Contributing
 
-[View our CONTRIBUTING](./CONTRIBUTING.md) policy to get started on contributing to Infrahub.
+To help our community with the creation of contributions, please view our [CONTRIBUTING](./CONTRIBUTING.md) page.
+
+<a  href="https://github.com/opsmill/infrahub/graphs/contributors">
+<img  src="https://contrib.rocks/image?repo=opsmill/infrahub" />
+</a>
 
 ## Security