infrahub-server 1.6.1__tar.gz → 1.6.2__tar.gz

{infrahub_server-1.6.1 → infrahub_server-1.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: infrahub-server
-Version: 1.6.1
+Version: 1.6.2
 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.
 Project-URL: Homepage, https://opsmill.com
 Project-URL: Repository, https://github.com/opsmill/infrahub

{infrahub_server-1.6.1 → infrahub_server-1.6.2}/backend/infrahub/core/branch/tasks.py

@@ -157,7 +157,12 @@ async def rebase_branch(branch: str, context: InfrahubContext, send_events: bool
             responses = await schema_validate_migrations(
                 message=SchemaValidateMigrationData(branch=obj, schema_branch=candidate_schema, constraints=constraints)
             )
-            error_messages = [violation.message for response in responses for violation in response.violations]
+            error_messages = [
+                f"{violation.message} for constraint {response.constraint_name} {response.schema_path.field_name} {response.schema_path.property_name} and node {violation.node_id} {violation.node_kind}"  # noqa: E501
+                for response in responses
+                for violation in response.violations
+            ]
+
             if error_messages:
                 raise ValidationError(",\n".join(error_messages))
 

infrahub_server-1.6.2/backend/infrahub/core/graph/__init__.py

@@ -0,0 +1 @@
+GRAPH_VERSION = 48

{infrahub_server-1.6.1 → infrahub_server-1.6.2}/backend/infrahub/core/migrations/graph/__init__.py

@@ -49,6 +49,7 @@ from .m044_backfill_hfid_display_label_in_db import Migration044
 from .m045_backfill_hfid_display_label_in_db_profile_template import Migration045
 from .m046_fill_agnostic_hfid_display_labels import Migration046
 from .m047_backfill_or_null_display_label import Migration047
+from .m048_undelete_rel_props import Migration048
 
 if TYPE_CHECKING:
     from ..shared import MigrationTypes
@@ -102,6 +103,7 @@ MIGRATIONS: list[type[MigrationTypes]] = [
     Migration045,
     Migration046,
     Migration047,
+    Migration048,
 ]
 
 

{infrahub_server-1.6.1 → infrahub_server-1.6.2}/backend/infrahub/core/migrations/graph/m041_deleted_dup_edges.py

@@ -68,33 +68,49 @@ DELETE added_e
         self.add_to_query(query)
 
 
-class DeleteDuplicateEdgesForMigratedKindNodes(Query):
-    name = "delete_duplicate_edges_for_migrated_kind_nodes_query"
+class DeleteDuplicatedRelationshipEdges(Query):
+    name = "delete_duplicated_relationship_edges_query"
     type = QueryType.WRITE
     insert_return = False
 
+    def __init__(self, migrated_kind_nodes_only: bool = True, **kwargs: Any):
+        self.migrated_kind_nodes_only = migrated_kind_nodes_only
+        super().__init__(**kwargs)
+
     async def query_init(self, db: InfrahubDatabase, **kwargs: Any) -> None:  # noqa: ARG002
-        query = """
+        if not self.migrated_kind_nodes_only:
+            relationship_filter_query = """
+MATCH (rel:Relationship)
+            """
+
+        else:
+            relationship_filter_query = """
 // ------------
 // get UUIDs for migrated kind/inheritance nodes
 // ------------
 MATCH (n:Node)
 WITH n.uuid AS node_uuid, count(*) AS num_nodes_with_uuid
 WHERE num_nodes_with_uuid > 1
-CALL (node_uuid) {
-    // ------------
-    // find any Relationships for these nodes
-    // ------------
-    MATCH (n:Node {uuid: node_uuid})-[:IS_RELATED]-(rel:Relationship)
-    WITH DISTINCT rel
-    MATCH (rel)-[e]->(peer)
+// ------------
+// find any Relationships for these nodes
+// ------------
+MATCH (n:Node {uuid: node_uuid})-[:IS_RELATED]-(rel:Relationship)
+WITH DISTINCT rel
+
+            """
+        self.add_to_query(relationship_filter_query)
+
+        query = """
+CALL (rel) {
+    MATCH (rel)-[e]-(peer)
     WITH
+        elementId(rel) AS rel_element_id,
         type(e) AS e_type,
         e.branch AS e_branch,
         e.from AS e_from,
         e.to AS e_to,
         e.status AS e_status,
-        e.peer AS e_peer,
+        elementId(peer) AS peer_element_id,
         CASE
             WHEN startNode(e) = rel THEN "out" ELSE "in"
         END AS direction,
@@ -142,7 +158,9 @@ class Migration041(ArbitraryMigration):
         rprint("done")
 
         rprint("Deleting duplicate edges for migrated kind/inheritance nodes", end="...")
-        delete_duplicate_edges_query = await DeleteDuplicateEdgesForMigratedKindNodes.init(db=db)
+        delete_duplicate_edges_query = await DeleteDuplicatedRelationshipEdges.init(
+            db=db, migrated_kind_nodes_only=True
+        )
         await delete_duplicate_edges_query.execute(db=db)
         rprint("done")
 

infrahub_server-1.6.2/backend/infrahub/core/migrations/graph/m048_undelete_rel_props.py

@@ -0,0 +1,161 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any
+
+from infrahub.core.migrations.graph.m041_deleted_dup_edges import DeleteDuplicatedRelationshipEdges
+from infrahub.core.migrations.shared import ArbitraryMigration, MigrationResult, get_migration_console
+from infrahub.core.query import Query, QueryType
+
+if TYPE_CHECKING:
+    from infrahub.database import InfrahubDatabase
+
+
+class UndeleteRelationshipProperties(Query):
+    """
+    Find Relationship vertices that are missing IS_VISIBLE and/or IS_PROTECTED edges linking them to Boolean vertices
+
+    Use the existing IS_RELATED edges to determine when the IS_VISIBLE/IS_PROTECTED edges should exist on each branch
+    and add the missing edges
+
+    Sets IS_VISIBLE to TRUE and IS_PROTECTED to FALSE
+    """
+
+    name = "undelete_relationship_properties"
+    type = QueryType.WRITE
+    insert_return = False
+
+    async def query_init(self, db: InfrahubDatabase, **kwargs: Any) -> None:  # noqa: ARG002
+        query = """
+// --------------
+// find all Relationships that are missing IS_VISIBLE/IS_PROTECTED edges
+// --------------
+MATCH (rel:Relationship)-[:IS_RELATED]-()
+WHERE NOT exists((rel)-[:IS_VISIBLE]->())
+OR NOT exists((rel)-[:IS_PROTECTED]->())
+WITH DISTINCT rel
+WITH rel, exists((rel)-[:IS_VISIBLE]->()) AS has_visible, exists((rel)-[:IS_PROTECTED]->()) AS has_protected
+WHERE has_visible = FALSE OR has_protected = FALSE
+
+// --------------
+// one row for each branch the Relationship has changes on
+// --------------
+CALL (rel) {
+    MATCH (rel)-[e:IS_RELATED]-()
+    RETURN DISTINCT e.branch AS branch
+}
+
+// --------------
+// get the earliest from edge on this branch, if any
+// --------------
+CALL (rel, branch) {
+    OPTIONAL MATCH (rel)-[e:IS_RELATED {status: "active", branch: branch}]-()
+    // ignore schema kind/inheritance migration edges
+    WHERE NOT exists((rel)-[:IS_RELATED {status: "deleted", branch: branch, from: e.from}]-())
+    RETURN e AS earliest_from_edge
+    ORDER BY e.from ASC
+    LIMIT 1
+}
+
+// --------------
+// get the latest to time on this branch, if any
+// --------------
+CALL (rel, branch) {
+    OPTIONAL MATCH (rel)-[e:IS_RELATED {status: "active", branch: branch}]-()
+    // ignore schema kind/inheritance migration edges
+    WHERE NOT exists((rel)-[:IS_RELATED {status: "active", branch: branch, from: e.to}]-())
+    RETURN e.to AS latest_to_time
+    ORDER BY e.to DESC
+    LIMIT 1
+}
+
+// --------------
+// get the latest deleted edge on this branch, if any
+// --------------
+CALL (rel, branch) {
+    OPTIONAL MATCH (rel)-[deleted_e:IS_RELATED {status: "deleted", branch: branch}]-()
+    // ignore schema kind/inheritance migration edges
+    WHERE NOT exists((rel)-[:IS_RELATED {status: "active", branch: branch, from: deleted_e.from}]-())
+    RETURN deleted_e AS latest_deleted_edge
+    ORDER BY deleted_e.from DESC
+    LIMIT 1
+}
+
+// --------------
+// add active IS_VISIBLE edge on the branch, if necessary
+// --------------
+CALL (rel, earliest_from_edge, latest_to_time, has_visible) {
+    WITH *, has_visible
+    WHERE has_visible = FALSE
+    AND earliest_from_edge IS NOT NULL
+    MERGE (bool:Boolean {value: TRUE})
+    CREATE (rel)-[new_edge:IS_VISIBLE]->(bool)
+    SET new_edge = properties(earliest_from_edge)
+    SET new_edge.to = latest_to_time
+}
+// --------------
+// add deleted IS_VISIBLE edge on the branch, if necessary
+// --------------
+CALL (rel, latest_deleted_edge, has_visible) {
+    WITH *, has_visible
+    WHERE has_visible = FALSE
+    AND latest_deleted_edge IS NOT NULL
+    MERGE (bool:Boolean {value: TRUE})
+    CREATE (rel)-[new_edge:IS_VISIBLE]->(bool)
+    SET new_edge = properties(latest_deleted_edge)
+}
+// --------------
+// add active IS_PROTECTED edge on the branch, if necessary
+// --------------
+CALL (rel, earliest_from_edge, latest_to_time, has_protected) {
+    WITH *, has_protected
+    WHERE has_protected = FALSE
+    AND earliest_from_edge IS NOT NULL
+    MERGE (bool:Boolean {value: FALSE})
+    CREATE (rel)-[new_edge:IS_PROTECTED]->(bool)
+    SET new_edge = properties(earliest_from_edge)
+    SET new_edge.to = latest_to_time
+}
+// --------------
+// add deleted IS_PROTECTED edge on the branch, if necessary
+// --------------
+CALL (rel, latest_deleted_edge, has_protected) {
+    WITH *, has_protected
+    WHERE has_protected = FALSE
+    AND latest_deleted_edge IS NOT NULL
+    MERGE (bool:Boolean {value: FALSE})
+    CREATE (rel)-[new_edge:IS_PROTECTED]->(bool)
+    SET new_edge = properties(latest_deleted_edge)
+}
+        """
+        self.add_to_query(query)
+
+
+class Migration048(ArbitraryMigration):
+    """
+    Fix Relationship vertices that are missing IS_VISIBLE and/or IS_PROTECTED edges.
+
+    This can happen due to a bug in Migration041 that deleted these edges incorrectly.
+    """
+
+    name: str = "048_undelete_rel_props"
+    minimum_version: int = 47
+
+    async def validate_migration(self, db: InfrahubDatabase) -> MigrationResult:  # noqa: ARG002
+        return MigrationResult()
+
+    async def execute(self, db: InfrahubDatabase) -> MigrationResult:
+        console = get_migration_console()
+
+        console.log("Deleting duplicate edges for all Relationships", end="...")
+        delete_duplicate_edges_query = await DeleteDuplicatedRelationshipEdges.init(
+            db=db, migrated_kind_nodes_only=False
+        )
+        await delete_duplicate_edges_query.execute(db=db)
+        console.log("done")
+
+        console.log("Undeleting Relationship properties", end="...")
+        undelete_rel_props_query = await UndeleteRelationshipProperties.init(db=db)
+        await undelete_rel_props_query.execute(db=db)
+        console.log("done")
+
+        return MigrationResult()