Merge stable into develop #6480

Merge stable into develop

Author: bilalabbad

.vale/styles/spelling-exceptions.txt

@@ -118,6 +118,8 @@ REST
 resources
 schema's
 schema_mapping
+scrollbar
+scrollable
 sdk
 subcommand
 subnet

CHANGELOG.md

@@ -11,6 +11,22 @@ This project uses [*towncrier*](https://towncrier.readthedocs.io/) and the chang
 
 <!-- towncrier release notes start -->
 
+## [Infrahub - v1.2.10](https://github.com/opsmill/infrahub/tree/infrahub-v1.2.10) - 2025-05-13
+
+### Added
+<!-- vale off -->
+- Added the ability to use alternative value types for all attribute types with computed attributes. For attributes of type IPHost or Dropdown you can now access the `ip` or `label` fields and not only the `value` field. ([#5769](https://github.com/opsmill/infrahub/issues/5769))
+- Computed Attribute of kind Jinja will only be recalculated during a schema update if the template itself has been updated.
+<!-- vale on -->
+
+### Fixed
+
+- Fixes an issue where the signature of a webhook event was calculated wrongly. ([#6323](https://github.com/opsmill/infrahub/issues/6323))
+- Display "dissociate" action only if possible on relationships table's row actions
+- Fixed an issue where it wasn't possible to have a high number of choices in the Dropdown schema kinds. Previously the payload was limited to 4096 characters.
+- Prevent creating duplicate edges on the database when adding a relationship to or deleting a relationship from a node that had its kind or inheritance updated
+- Update diff and merge logic to correctly support nodes that have had their kind migrated on a branch
+
 ## [Infrahub - v1.2.9](https://github.com/opsmill/infrahub/tree/infrahub-v1.2.9) - 2025-05-07
 
 ### Added

backend/infrahub/config.py

@@ -269,6 +269,7 @@ class DatabaseSettings(BaseSettings):
     address: str = "localhost"
     port: int = 7687
     database: str | None = Field(default=None, pattern=VALID_DATABASE_NAME_REGEX, description="Name of the database")
+    policy: str | None = Field(default=None, description="Routing policy for database connections")
     tls_enabled: bool = Field(default=False, description="Indicates if TLS is enabled for the connection")
     tls_insecure: bool = Field(default=False, description="Indicates if TLS certificates are verified")
     tls_ca_file: str | None = Field(default=None, description="File path to CA cert or bundle in PEM format")
@@ -293,6 +294,14 @@ class DatabaseSettings(BaseSettings):
         default=0.01, ge=0, description="Delay to add when max_concurrent_queries is reached."
     )
 
+    @property
+    def database_uri(self) -> str:
+        """Constructs the database URI based on the configuration settings."""
+        base_uri = f"{self.protocol}://{self.address}:{self.port}"
+        if self.policy is not None:
+            return f"{base_uri}?policy={self.policy}"
+        return base_uri
+
     @property
     def database_name(self) -> str:
         return self.database or self.db_type.value

backend/infrahub/core/constraint/node/runner.py

@@ -26,7 +26,7 @@ def __init__(
     async def check(
         self, node: Node, field_filters: list[str] | None = None, skip_uniqueness_check: bool = False
     ) -> None:
-        async with self.db.start_session() as db:
+        async with self.db.start_session(read_only=False) as db:
             await node.resolve_relationships(db=db)
 
             if not skip_uniqueness_check:

backend/infrahub/core/diff/tasks.py

@@ -20,7 +20,7 @@
 async def update_diff(model: RequestDiffUpdate, service: InfrahubServices) -> None:
     await add_tags(branches=[model.branch_name])
 
-    async with service.database.start_session() as db:
+    async with service.database.start_session(read_only=False) as db:
         component_registry = get_component_registry()
         base_branch = await registry.get_branch(db=db, branch=registry.default_branch)
         diff_branch = await registry.get_branch(db=db, branch=model.branch_name)
@@ -40,7 +40,7 @@ async def update_diff(model: RequestDiffUpdate, service: InfrahubServices) -> No
 async def refresh_diff(branch_name: str, diff_id: str, service: InfrahubServices) -> None:
     await add_tags(branches=[branch_name])
 
-    async with service.database.start_session() as db:
+    async with service.database.start_session(read_only=False) as db:
         component_registry = get_component_registry()
         base_branch = await registry.get_branch(db=db, branch=registry.default_branch)
         diff_branch = await registry.get_branch(db=db, branch=branch_name)
@@ -53,7 +53,7 @@ async def refresh_diff(branch_name: str, diff_id: str, service: InfrahubServices
 async def refresh_diff_all(branch_name: str, context: InfrahubContext, service: InfrahubServices) -> None:
     await add_tags(branches=[branch_name])
 
-    async with service.database.start_session() as db:
+    async with service.database.start_session(read_only=True) as db:
         component_registry = get_component_registry()
         default_branch = registry.get_branch_from_registry()
         diff_repository = await component_registry.get_component(DiffRepository, db=db, branch=default_branch)

backend/infrahub/core/validators/tasks.py

@@ -71,7 +71,7 @@ async def schema_path_validate(
     schema_branch: SchemaBranch,
     service: InfrahubServices,
 ) -> SchemaValidatorPathResponseData:
-    async with service.database.start_session() as db:
+    async with service.database.start_session(read_only=True) as db:
         constraint_request = SchemaConstraintValidatorRequest(
             branch=branch,
             constraint_name=constraint_name,

backend/infrahub/database/__init__.py

@@ -476,16 +476,14 @@ async def validate_database(
 
 
 async def get_db(retry: int = 0) -> AsyncDriver:
-    URI = f"{config.SETTINGS.database.protocol}://{config.SETTINGS.database.address}:{config.SETTINGS.database.port}"
-
     trusted_certificates = TrustSystemCAs()
     if config.SETTINGS.database.tls_insecure:
         trusted_certificates = TrustAll()
     elif config.SETTINGS.database.tls_ca_file:
         trusted_certificates = TrustCustomCAs(config.SETTINGS.database.tls_ca_file)
 
     driver = AsyncGraphDatabase.driver(
-        URI,
+        config.SETTINGS.database.database_uri,
         auth=(config.SETTINGS.database.username, config.SETTINGS.database.password),
         encrypted=config.SETTINGS.database.tls_enabled,
         trusted_certificates=trusted_certificates,

backend/infrahub/graphql/app.py

@@ -155,7 +155,7 @@ async def __call__(self, scope: Scope, receive: Receive, send: Send) -> None:
 
             db = websocket.app.state.db
 
-            async with db.start_session() as db:
+            async with db.start_session(read_only=True) as db:
                 branch_name = websocket.path_params.get("branch_name", registry.default_branch)
                 branch = await registry.get_branch(db=db, branch=branch_name)
 

backend/infrahub/graphql/loaders/node.py

@@ -53,7 +53,7 @@ def __init__(self, db: InfrahubDatabase, query_params: GetManyParams, *args: Any
         self.db = db
 
     async def batch_load_fn(self, keys: list[Any]) -> list[Node | None]:
-        async with self.db.start_session() as db:
+        async with self.db.start_session(read_only=True) as db:
             nodes_by_id = await NodeManager.get_many(
                 db=db,
                 ids=keys,

backend/infrahub/graphql/loaders/peers.py

@@ -51,7 +51,7 @@ def __init__(self, db: InfrahubDatabase, query_params: QueryPeerParams, *args: A
         self.db = db
 
     async def batch_load_fn(self, keys: list[Any]) -> list[list[Relationship]]:  # pylint: disable=method-hidden
-        async with self.db.start_session() as db:
+        async with self.db.start_session(read_only=True) as db:
             peer_rels = await NodeManager.query_peers(
                 db=db,
                 ids=keys,