infrahub-server 1.5.3__py3-none-any.whl → 1.5.5__py3-none-any.whl

infrahub/core/migrations/graph/m041_deleted_dup_edges.py

@@ -87,14 +87,15 @@ CALL (node_uuid) {
     // ------------
     MATCH (n:Node {uuid: node_uuid})-[:IS_RELATED]-(rel:Relationship)
     WITH DISTINCT rel
-    MATCH (rel)-[e]->(peer)
+    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,

infrahub/core/node/__init__.py

@@ -1088,7 +1088,7 @@ class Node(BaseNode, metaclass=BaseNodeMeta):
 
             if key in self._relationships:
                 rel: RelationshipManager = getattr(self, key)
-                changed |= await rel.update(db=db, data=value)
+                changed |= await rel.update(db=db, data=value, process_delete=process_pools)
 
         return changed
 

infrahub/core/relationship/model.py

@@ -1061,7 +1061,12 @@ class RelationshipManager:
 
         return self._relationships.as_list()
 
-    async def update(self, data: list[str | Node] | dict[str, Any] | str | Node | None, db: InfrahubDatabase) -> bool:
+    async def update(
+        self,
+        data: list[str | Node] | dict[str, Any] | str | Node | None,
+        db: InfrahubDatabase,
+        process_delete: bool = True,
+    ) -> bool:
         """Replace and Update the list of relationships with this one."""
         if not isinstance(data, list):
             list_data: Sequence[str | Node | dict[str, Any] | None] = [data]
@@ -1087,8 +1092,9 @@ class RelationshipManager:
 
             if item is None:
                 if previous_relationships:
-                    for rel in previous_relationships.values():
-                        await rel.delete(db=db)
+                    if process_delete:
+                        for rel in previous_relationships.values():
+                            await rel.delete(db=db)
                     changed = True
                 continue
 

{infrahub_server-1.5.3.dist-info → infrahub_server-1.5.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: infrahub-server
-Version: 1.5.3
+Version: 1.5.5
 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

{infrahub_server-1.5.3.dist-info → infrahub_server-1.5.5.dist-info}/RECORD

@@ -205,7 +205,7 @@ infrahub/core/migrations/graph/m037_index_attr_vals.py,sha256=pc-223N-jhAglpPIeU
 infrahub/core/migrations/graph/m038_redo_0000_prefix_fix.py,sha256=8seWnXQhgEJDFLWxYHVcnMNDPcHq5C24c0RYrtn_WGE,2411
 infrahub/core/migrations/graph/m039_ipam_reconcile.py,sha256=yRWTE73Rq1Qh6tPLu98w60zJdx8cgdO7_DL-g10x87s,11112
 infrahub/core/migrations/graph/m040_duplicated_attributes.py,sha256=2LxsG-CfcZnBirwGhwYL4kU-g3oxl6lNSM12vZTZ7Gw,2930
-infrahub/core/migrations/graph/m041_deleted_dup_edges.py,sha256=eP2BqUfvwkjACJrKI5fVyBBmXxEDwxtAD9O_CcbwBMw,5409
+infrahub/core/migrations/graph/m041_deleted_dup_edges.py,sha256=GYcaKiVhiPogakMa_i-NiP9ImVShieNH6Juw1GQrosE,5468
 infrahub/core/migrations/graph/m042_profile_attrs_in_db.py,sha256=KdEaNPHovJxxiNL3CFRjWBnNzaMdidj1nmW5Jbhrt-4,6431
 infrahub/core/migrations/graph/m043_create_hfid_display_label_in_db.py,sha256=giICX6Dwd_z1GaWTWyX3KD5Va34LGth0Vv2uyaof044,7290
 infrahub/core/migrations/graph/m044_backfill_hfid_display_label_in_db.py,sha256=FuV3EBWS4lY4dtOn7-1Qgo6J7j4XDq4s5yIQjfCCVDM,39575
@@ -233,7 +233,7 @@ infrahub/core/migrations/schema/placeholder_dummy.py,sha256=YBGFUVPi57ARbWgAmbtK
 infrahub/core/migrations/schema/tasks.py,sha256=2J8gHGSP-WhxSi4GYhOc9xAJOg_S1ONm3YE4_ukLKxw,4164
 infrahub/core/migrations/shared.py,sha256=sQMdbx1gnht2G_-nb1MDbStwUso5YJkyyumjlKAJq3g,9592
 infrahub/core/models.py,sha256=xoodMSKLaHD5nOtBT35soRQnyHO_OrDlVRNdXuL51Ho,26679
-infrahub/core/node/__init__.py,sha256=yr6WFmh7pvL6XeFx6Hou0UoSc0DniZy09YPn84NGipg,50084
+infrahub/core/node/__init__.py,sha256=OihBPaPhEbgvSLKPdBOBBuh0EFWf2wt897LZ_jdWb_g,50114
 infrahub/core/node/base.py,sha256=BAowVRCK_WC50yXym1kCyUppJDJnrODGU5uoj1s0Yd4,2564
 infrahub/core/node/constraints/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 infrahub/core/node/constraints/attribute_uniqueness.py,sha256=lcHBk4d3bc12sywxRTnQs18VEm_S6pDcUhNnsXnb-uI,2162
@@ -278,7 +278,7 @@ infrahub/core/relationship/constraints/peer_kind.py,sha256=Bropiav4y6r0iU2KfWJ_k
 infrahub/core/relationship/constraints/peer_parent.py,sha256=z7elpC8xS_ovAF28Haq-RNpFtTEiUehzowiDgYGT68U,2343
 infrahub/core/relationship/constraints/peer_relatives.py,sha256=Ye79l7njaWxZkU2chTOaptIjvKBIawsNCl0IQxCTDtM,2737
 infrahub/core/relationship/constraints/profiles_kind.py,sha256=nEZPGtGcmelZ1Nb8EPcQ-7_zCLCNIYwwWbU6C9fLj5E,2464
-infrahub/core/relationship/model.py,sha256=ZaR6Rrp1CiS8vjbAcMTILpeI755ORj2_aj-3MYD-Q1E,48978
+infrahub/core/relationship/model.py,sha256=ocow8RLJWaR-DNHh7JqYhA0g0fe_elwNeOmuG9ywzII,49093
 infrahub/core/root.py,sha256=8ZLSOtnmjQcrjqX2vxNO-AGopEUArmBPo_X5NeZBdP0,416
 infrahub/core/schema/__init__.py,sha256=U1DWsadfu7Y3FUc51h9DNwXEq4Qa_yZ5w5Bip8pVpmw,6674
 infrahub/core/schema/attribute_parameters.py,sha256=ABL1GEsOl4_CcDvK9_NucGMaF6LUeOjAxbDQVm_G7eg,6516
@@ -889,8 +889,8 @@ infrahub_testcontainers/models.py,sha256=hT7WEX2o7gxTFPE9uhtP5yigKgP5YSsy2c3tFB-
 infrahub_testcontainers/performance_test.py,sha256=_nf7Uk15mHwqpN4y7XUfI4JI54-UaXW-Yu4uwMIx21w,6185
 infrahub_testcontainers/plugin.py,sha256=I3RuZQ0dARyKHuqCf0y1Yj731P2Mwf3BJUehRJKeWrs,5645
 infrahub_testcontainers/prometheus.yml,sha256=610xQEyj3xuVJMzPkC4m1fRnCrjGpiRBrXA2ytCLa54,599
-infrahub_server-1.5.3.dist-info/LICENSE.txt,sha256=7GQO7kxVoQYnZtFrjZBKLRXbrGwwwimHPPOJtqXsozQ,11340
-infrahub_server-1.5.3.dist-info/METADATA,sha256=N3mS99_tNsR4YvAunEMv0DeUknxjZJr6yDc_gfZMpQ4,6127
-infrahub_server-1.5.3.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-infrahub_server-1.5.3.dist-info/entry_points.txt,sha256=UXIeFWDsrV-4IllNvUEd6KieYGzQfn9paga2YyABOQI,393
-infrahub_server-1.5.3.dist-info/RECORD,,
+infrahub_server-1.5.5.dist-info/LICENSE.txt,sha256=7GQO7kxVoQYnZtFrjZBKLRXbrGwwwimHPPOJtqXsozQ,11340
+infrahub_server-1.5.5.dist-info/METADATA,sha256=V3eczPUgvwAgqFdnb3ZQiUltnkgPnzeABDjT4acfJaQ,6127
+infrahub_server-1.5.5.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+infrahub_server-1.5.5.dist-info/entry_points.txt,sha256=UXIeFWDsrV-4IllNvUEd6KieYGzQfn9paga2YyABOQI,393
+infrahub_server-1.5.5.dist-info/RECORD,,