infrahub-server 1.2.11__py3-none-any.whl → 1.3.0__py3-none-any.whl

infrahub/core/diff/query/all_conflicts.py

@@ -37,22 +37,18 @@ AND (
     ($diff_id IS NOT NULL AND root.uuid = $diff_id)
     OR ($tracking_id IS NOT NULL AND root.tracking_id = $tracking_id AND root.diff_branch = $diff_branch_name)
 )
-CALL {
-    WITH root
+CALL (root) {
     MATCH (root)-[:DIFF_HAS_NODE]->(node:DiffNode)-[:DIFF_HAS_CONFLICT]->(node_conflict:DiffConflict)
     RETURN node.path_identifier AS path_identifier, node_conflict AS conflict
     UNION
-    WITH root
     MATCH (root)-[:DIFF_HAS_NODE]->(node:DiffNode)-[:DIFF_HAS_ATTRIBUTE]->(:DiffAttribute)
         -[:DIFF_HAS_PROPERTY]->(property:DiffProperty)-[:DIFF_HAS_CONFLICT]->(attr_property_conflict:DiffConflict)
     RETURN property.path_identifier AS path_identifier, attr_property_conflict AS conflict
     UNION
-    WITH root
     MATCH (root)-[:DIFF_HAS_NODE]->(node:DiffNode)-[:DIFF_HAS_RELATIONSHIP]->(:DiffRelationship)
         -[:DIFF_HAS_ELEMENT]->(element:DiffRelationshipElement)-[:DIFF_HAS_CONFLICT]->(rel_element_conflict:DiffConflict)
     RETURN element.path_identifier AS path_identifier, rel_element_conflict AS conflict
     UNION
-    WITH root
     MATCH (root)-[:DIFF_HAS_NODE]->(node:DiffNode)-[:DIFF_HAS_RELATIONSHIP]->(:DiffRelationship)
         -[:DIFF_HAS_ELEMENT]->(:DiffRelationshipElement)-[:DIFF_HAS_PROPERTY]->(property:DiffProperty)
         -[:DIFF_HAS_CONFLICT]->(rel_property_conflict:DiffConflict)

infrahub/core/diff/query/artifact.py

@@ -40,8 +40,7 @@ class ArtifactDiffQuery(Query):
 // -----------------------
 MATCH (source_artifact:%(artifact_kind)s)-[r:IS_PART_OF]->(:Root)
 WHERE r.branch IN [$source_branch_name, $target_branch_name]
-CALL {
-    WITH source_artifact
+CALL (source_artifact) {
     MATCH (source_artifact)-[r:IS_PART_OF]->(:Root)
     WHERE %(source_branch_filter)s
     RETURN r AS root_rel
@@ -50,13 +49,11 @@ CALL {
 }
 WITH source_artifact, root_rel
 WHERE root_rel.status = "active"
-CALL {
-    WITH source_artifact
+CALL (source_artifact) {
     // -----------------------
     // get the artifact's target node
     // -----------------------
-    CALL {
-        WITH source_artifact
+    CALL (source_artifact) {
         OPTIONAL MATCH (source_artifact)-[rrel1:IS_RELATED]-(rel_node:Relationship)-[rrel2:IS_RELATED]-(target_node:Node)
         WHERE rel_node.name = $target_rel_identifier
         AND all(r IN [rrel1, rrel2] WHERE ( %(source_branch_filter)s ))
@@ -70,8 +67,7 @@ CALL {
     // -----------------------
     // get the artifact's definition node
     // -----------------------
-    CALL {
-        WITH source_artifact
+    CALL (source_artifact) {
         OPTIONAL MATCH (source_artifact)-[rrel1:IS_RELATED]-(rel_node:Relationship)-[rrel2:IS_RELATED]-(definition_node:Node)
         WHERE rel_node.name = $definition_rel_identifier
         AND all(r IN [rrel1, rrel2] WHERE ( %(source_branch_filter)s ))
@@ -85,8 +81,7 @@ CALL {
     // -----------------------
     // get the artifact's checksum
     // -----------------------
-    CALL {
-        WITH source_artifact
+    CALL (source_artifact) {
         OPTIONAL MATCH (source_artifact)-[attr_rel:HAS_ATTRIBUTE]->(attr:Attribute)-[value_rel:HAS_VALUE]->(attr_val:AttributeValue)
         WHERE attr.name = "checksum"
         AND all(r IN [attr_rel, value_rel] WHERE ( %(source_branch_filter)s ))
@@ -100,8 +95,7 @@ CALL {
     // -----------------------
     // get the artifact's storage_id
     // -----------------------
-    CALL {
-        WITH source_artifact
+    CALL (source_artifact) {
         OPTIONAL MATCH (source_artifact)-[attr_rel:HAS_ATTRIBUTE]->(attr:Attribute)-[value_rel:HAS_VALUE]->(attr_val:AttributeValue)
         WHERE attr.name = "storage_id"
         AND all(r IN [attr_rel, value_rel] WHERE ( %(source_branch_filter)s ))
@@ -137,13 +131,11 @@ CALL {
         ELSE NULL
     END AS source_storage_id
 }
-CALL {
+CALL (target_node, definition_node){
     // -----------------------
     // get the corresponding artifact on the target branch, if it exists
     // -----------------------
-    WITH target_node, definition_node
-    CALL {
-        WITH target_node, definition_node
+    CALL (target_node, definition_node) {
         OPTIONAL MATCH path = (target_node)-[trel1:IS_RELATED]-(trel_node:Relationship)-[trel2:IS_RELATED]-
         (target_artifact:%(artifact_kind)s)-[drel1:IS_RELATED]-(drel_node:Relationship)-[drel2:IS_RELATED]-(definition_node)
         WHERE trel_node.name = $target_rel_identifier
@@ -165,8 +157,7 @@ CALL {
     // -----------------------
     // get the artifact's checksum on target branch
     // -----------------------
-    CALL {
-        WITH target_artifact
+    CALL (target_artifact) {
         OPTIONAL MATCH (target_artifact)-[attr_rel:HAS_ATTRIBUTE]->(attr:Attribute)-[value_rel:HAS_VALUE]->(attr_val:AttributeValue)
         WHERE attr.name = "checksum"
         AND attr_rel.branch = $target_branch_name
@@ -178,8 +169,7 @@ CALL {
     // -----------------------
     // get the artifact's storage_id on target branch
     // -----------------------
-    CALL {
-        WITH target_artifact
+    CALL (target_artifact) {
         OPTIONAL MATCH (target_artifact)-[attr_rel:HAS_ATTRIBUTE]->(attr:Attribute)-[value_rel:HAS_VALUE]->(attr_val:AttributeValue)
         WHERE attr.name = "storage_id"
         AND attr_rel.branch = $target_branch_name

infrahub/core/diff/query/delete_query.py

@@ -9,17 +9,21 @@ class EnrichedDiffDeleteQuery(Query):
     type = QueryType.WRITE
     insert_return = False
 
-    def __init__(self, enriched_diff_root_uuids: list[str], **kwargs: Any) -> None:
+    def __init__(self, enriched_diff_root_uuids: list[str] | None = None, **kwargs: Any) -> None:
         super().__init__(**kwargs)
         self.enriched_diff_root_uuids = enriched_diff_root_uuids
 
     async def query_init(self, db: InfrahubDatabase, **kwargs: Any) -> None:  # noqa: ARG002
-        self.params = {"diff_root_uuids": self.enriched_diff_root_uuids}
+        diff_filter = ""
+        if self.enriched_diff_root_uuids:
+            self.params = {"diff_root_uuids": self.enriched_diff_root_uuids}
+            diff_filter = "WHERE d_root.uuid IN $diff_root_uuids"
+
         query = """
         MATCH (d_root:DiffRoot)
-        WHERE d_root.uuid IN $diff_root_uuids
+        %(diff_filter)s
         OPTIONAL MATCH (d_root)-[*]->(diff_thing)
         DETACH DELETE diff_thing
         DETACH DELETE d_root
-        """
+        """ % {"diff_filter": diff_filter}
         self.add_to_query(query=query)

infrahub/core/diff/query/diff_get.py

@@ -96,8 +96,7 @@ class EnrichedDiffGetQuery(Query):
         // -------------------------------------
         // Retrieve Parents
         // -------------------------------------
-        CALL {
-            WITH diff_node
+        CALL (diff_node) {
             OPTIONAL MATCH parents_path = (diff_node)-[:DIFF_HAS_RELATIONSHIP|DIFF_HAS_NODE*1..%(max_depth)s]->(:DiffNode)
             RETURN parents_path
             ORDER BY size(nodes(parents_path)) DESC
@@ -112,8 +111,7 @@ class EnrichedDiffGetQuery(Query):
         // -------------------------------------
         // Retrieve Attributes
         // -------------------------------------
-        CALL {
-            WITH diff_node
+        CALL (diff_node) {
             OPTIONAL MATCH (diff_node)-[:DIFF_HAS_ATTRIBUTE]->(diff_attribute:DiffAttribute)
             WITH diff_attribute
             OPTIONAL MATCH (diff_attribute)-[:DIFF_HAS_PROPERTY]->(diff_attr_property:DiffProperty)
@@ -126,8 +124,7 @@ class EnrichedDiffGetQuery(Query):
         // -------------------------------------
         // Retrieve Relationships
         // -------------------------------------
-        CALL {
-            WITH diff_node
+        CALL (diff_node) {
             OPTIONAL MATCH (diff_node)-[:DIFF_HAS_RELATIONSHIP]->(diff_relationship:DiffRelationship)
             WITH diff_relationship
             OPTIONAL MATCH (diff_relationship)-[:DIFF_HAS_ELEMENT]->(diff_rel_element:DiffRelationshipElement)

infrahub/core/diff/query/field_specifiers.py

@@ -15,7 +15,7 @@ class EnrichedDiffFieldSpecifiersQuery(Query):
     async def query_init(self, db: InfrahubDatabase, **kwargs: Any) -> None:  # noqa: ARG002
         self.params["diff_id"] = self.diff_id
         query = """
-CALL {
+CALL () {
     MATCH (root:DiffRoot {uuid: $diff_id})-[:DIFF_HAS_NODE]->(node:DiffNode)-[:DIFF_HAS_ATTRIBUTE]->(attr:DiffAttribute)
     WHERE (root.is_merged IS NULL OR root.is_merged <> TRUE)
     RETURN node.uuid AS node_uuid, node.kind AS node_kind, attr.name AS field_name

infrahub/core/diff/query/field_summary.py

@@ -45,8 +45,7 @@ class EnrichedDiffNodeFieldSummaryQuery(Query):
         OPTIONAL MATCH (diff_root)-[:DIFF_HAS_NODE]->(n:DiffNode)
         WHERE n.action <> $unchanged_str
         WITH DISTINCT n.kind AS kind
-        CALL {
-            WITH kind
+        CALL (kind) {
             OPTIONAL MATCH (n:DiffNode {kind: kind})-[:DIFF_HAS_ATTRIBUTE]->(a:DiffAttribute)
             WHERE n.action <> $unchanged_str
             AND a.action <> $unchanged_str
@@ -54,8 +53,7 @@ class EnrichedDiffNodeFieldSummaryQuery(Query):
             RETURN collect(attr_name) AS attr_names
         }
         WITH kind, attr_names
-        CALL {
-            WITH kind
+        CALL (kind) {
             OPTIONAL MATCH (n:DiffNode {kind: kind})-[:DIFF_HAS_RELATIONSHIP]->(r:DiffRelationship)
             WHERE n.action <> $unchanged_str
             AND r.action <> $unchanged_str