remove HAS_VALUE conflict from the property

opsmill · Sep 5, 2024 · 24ad2c5 · 24ad2c5
1 parent 721d404
commit 24ad2c5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 16 deletions.
diff --git a/backend/infrahub/graphql/queries/diff/tree.py b/backend/infrahub/graphql/queries/diff/tree.py
@@ -213,6 +213,7 @@ def to_diff_attribute(
         for diff_prop in diff_properties:
             if diff_prop.property_type == DatabaseEdgeType.HAS_VALUE.value and diff_prop.conflict:
                 conflict = diff_prop.conflict
+                diff_prop.conflict = None
         return DiffAttribute(
             name=enriched_attribute.name,
             last_changed_at=enriched_attribute.changed_at.obj,

diff --git a/backend/tests/unit/graphql/test_diff_tree_query.py b/backend/tests/unit/graphql/test_diff_tree_query.py
@@ -386,22 +386,7 @@ async def test_diff_tree_one_attr_change(
                                 "previous_label": None,
                                 "new_label": None,
                                 "status": UPDATED_ACTION,
-                                "conflict": {
-                                    "uuid": enriched_conflict.uuid,
-                                    "base_branch_action": UPDATED_ACTION,
-                                    "base_branch_value": "#fedcba",
-                                    "base_branch_changed_at": enriched_conflict.base_branch_changed_at.to_string(
-                                        with_z=False
-                                    ),
-                                    "base_branch_label": None,
-                                    "diff_branch_action": UPDATED_ACTION,
-                                    "diff_branch_value": "#abcdef",
-                                    "diff_branch_changed_at": enriched_conflict.diff_branch_changed_at.to_string(
-                                        with_z=False
-                                    ),
-                                    "diff_branch_label": None,
-                                    "selected_branch": GraphQLConfictSelection.DIFF_BRANCH.name,
-                                },
+                                "conflict": None,
                             }
                         ],
                     }