qontract-reconcile 0.10.1rc514__py3-none-any.whl → 0.10.1rc515__py3-none-any.whl

reconcile/test/saas_auto_promotions_manager/merge_request_manager/merge_request_manager/conftest.py

@@ -11,16 +11,22 @@ from gitlab.v4.objects import ProjectMergeRequest
 from reconcile.gql_definitions.fragments.saas_target_namespace import (
     SaasTargetNamespace,
 )
+from reconcile.saas_auto_promotions_manager.merge_request_manager.merge_request_manager_v2 import (
+    SAPM_LABEL,
+)
 from reconcile.saas_auto_promotions_manager.merge_request_manager.mr_parser import (
     MRParser,
     OpenMergeRequest,
 )
+from reconcile.saas_auto_promotions_manager.merge_request_manager.reconciler import (
+    Diff,
+    Reconciler,
+)
 from reconcile.saas_auto_promotions_manager.merge_request_manager.renderer import (
     CHANNELS_REF,
     CONTENT_HASHES,
     IS_BATCHABLE,
     PROMOTION_DATA_SEPARATOR,
-    SAPM_LABEL,
     SAPM_VERSION,
     VERSION_REF,
     Renderer,
@@ -32,17 +38,16 @@ from reconcile.saas_auto_promotions_manager.subscriber import (
 from reconcile.utils.vcs import VCS, MRCheckStatus
 
 from .data_keys import (
+    CHANNEL,
     DESCRIPTION,
     HAS_CONFLICTS,
     LABELS,
     OPEN_MERGE_REQUESTS,
     PIPELINE_RESULTS,
+    REF,
     SUBSCRIBER_BATCHABLE,
     SUBSCRIBER_CHANNELS,
     SUBSCRIBER_CONTENT_HASH,
-    SUBSCRIBER_DESIRED_CONFIG_HASHES,
-    SUBSCRIBER_DESIRED_REF,
-    SUBSCRIBER_TARGET_NAMESPACE,
     SUBSCRIBER_TARGET_PATH,
 )
 
@@ -96,7 +101,7 @@ def vcs_builder(
 
 
 @pytest.fixture
-def mr_parser_builder() -> Callable[[Mapping], MRParser]:
+def mr_parser_builder() -> Callable[[Iterable[OpenMergeRequest]], MRParser]:
     def builder(data: Iterable[OpenMergeRequest]) -> MRParser:
         mr_parser = create_autospec(spec=MRParser)
         mr_parser.retrieve_open_mrs.side_effect = [data]
@@ -105,24 +110,32 @@ def mr_parser_builder() -> Callable[[Mapping], MRParser]:
     return builder
 
 
+@pytest.fixture
+def reconciler_builder() -> Callable[[Diff], Reconciler]:
+    def builder(data: Diff) -> Reconciler:
+        reconciler = create_autospec(spec=Reconciler)
+        reconciler.reconcile.side_effect = [data]
+        return reconciler
+
+    return builder
+
+
 @pytest.fixture
 def subscriber_builder(
     saas_target_namespace_builder: Callable[..., SaasTargetNamespace],
-):
+) -> Callable[..., Subscriber]:
     def builder(data: Mapping) -> Subscriber:
         subscriber = Subscriber(
             saas_name="",
             template_name="",
-            target_namespace=saas_target_namespace_builder(
-                data.get(SUBSCRIBER_TARGET_NAMESPACE, {})
-            ),
+            target_namespace=saas_target_namespace_builder({}),
             ref="",
             target_file_path=data.get(SUBSCRIBER_TARGET_PATH, ""),
             use_target_config_hash=True,
         )
-        subscriber.desired_hashes = data.get(SUBSCRIBER_DESIRED_CONFIG_HASHES, [])
-        subscriber.desired_ref = data.get(SUBSCRIBER_DESIRED_REF, "")
-        for channel in data.get(SUBSCRIBER_CHANNELS, []):
+        subscriber.desired_hashes = []
+        subscriber.desired_ref = data.get(REF, "")
+        for channel in data.get(CHANNEL, []):
             subscriber.channels.append(
                 Channel(
                     name=channel,

reconcile/test/saas_auto_promotions_manager/merge_request_manager/merge_request_manager/data_keys.py

@@ -14,3 +14,6 @@ SUBSCRIBER_BATCHABLE = "sub_batchable"
 HAS_CONFLICTS = "has_conflicts"
 SUBSCRIBER_TARGET_NAMESPACE = "subscriber_target_namespace"
 PIPELINE_RESULTS = "pipeline_results"
+
+CHANNEL = "channel"
+REF = "ref"

reconcile/test/saas_auto_promotions_manager/merge_request_manager/merge_request_manager/test_merge_request_manager.py

@@ -1,185 +1,83 @@
-from collections.abc import (
-    Callable,
-    Iterable,
-    Mapping,
-)
-from unittest.mock import create_autospec
+from collections.abc import Callable
+from unittest.mock import call, create_autospec
 
-import pytest
 from gitlab.v4.objects import ProjectMergeRequest
 
-from reconcile.saas_auto_promotions_manager.merge_request_manager.merge_request_manager import (
-    MergeRequestManager,
+from reconcile.saas_auto_promotions_manager.merge_request_manager.merge_request_manager_v2 import (
+    MergeRequestManagerV2,
 )
 from reconcile.saas_auto_promotions_manager.merge_request_manager.mr_parser import (
     MRParser,
     OpenMergeRequest,
 )
+from reconcile.saas_auto_promotions_manager.merge_request_manager.reconciler import (
+    Addition,
+    Deletion,
+    Diff,
+    Reconciler,
+)
 from reconcile.saas_auto_promotions_manager.merge_request_manager.renderer import (
     Renderer,
 )
 from reconcile.saas_auto_promotions_manager.subscriber import Subscriber
-from reconcile.utils.vcs import VCS
-
-from .data_keys import (
-    SUBSCRIBER_CHANNELS,
-    SUBSCRIBER_DESIRED_CONFIG_HASHES,
-    SUBSCRIBER_DESIRED_REF,
-    SUBSCRIBER_TARGET_NAMESPACE,
-    SUBSCRIBER_TARGET_PATH,
+from reconcile.test.saas_auto_promotions_manager.merge_request_manager.merge_request_manager.data_keys import (
+    CHANNEL,
+    REF,
 )
+from reconcile.utils.vcs import VCS
 
 
-def test_close_old_content(
-    mr_parser_builder: Callable[[Iterable], MRParser],
-    renderer: Renderer,
-    subscriber_builder: Callable[[Mapping], Subscriber],
-):
-    subscribers = [
-        subscriber_builder({
-            SUBSCRIBER_TARGET_NAMESPACE: {"path": "namespace1"},
-            SUBSCRIBER_TARGET_PATH: "target1",
-            SUBSCRIBER_DESIRED_REF: "new_sha",
-            SUBSCRIBER_DESIRED_CONFIG_HASHES: [],
-            SUBSCRIBER_CHANNELS: ["channel-a", "channel-b"],
-        })
-    ]
-
-    open_mrs = [
-        OpenMergeRequest(
-            raw=create_autospec(ProjectMergeRequest),
-            content_hashes="oldcontent",
-            channels="channel-a,channel-b",
-            failed_mr_check=False,
-            is_batchable=True,
-        )
-    ]
-    mr_parser = mr_parser_builder(open_mrs)
+def test_reconcile(
+    reconciler_builder: Callable[[Diff], Reconciler],
+    subscriber_builder: Callable[..., Subscriber],
+) -> None:
     vcs = create_autospec(spec=VCS)
-    merge_request_manager = MergeRequestManager(
-        vcs=vcs,
-        mr_parser=mr_parser,
-        renderer=renderer,
-    )
-    merge_request_manager.housekeeping()
-    merge_request_manager.create_promotion_merge_requests(subscribers=subscribers)
-
-    # There is an open MR with old content for that subscriber
-    # Close old content and open new MR with new content
-    vcs.close_app_interface_mr.assert_called_once()
-    vcs.open_app_interface_merge_request.assert_called_once()
-
-
-@pytest.mark.parametrize(
-    "hash_prefix, hash_suffix, channel_prefix, channel_suffix",
-    [
-        ("", "", "", ""),
-        ("hashprefix,", "", "", ""),
-        ("", ",hashsuffix", "", ""),
-        ("", "", "channelprefix,", ""),
-        ("", "", "", ",channelsuffix"),
-        ("a,", ",b", "c,", ",d"),
-    ],
-)
-def test_merge_request_already_opened(
-    mr_parser_builder: Callable[[Iterable], MRParser],
-    renderer: Renderer,
-    subscriber_builder: Callable[[Mapping], Subscriber],
-    hash_prefix: str,
-    hash_suffix: str,
-    channel_prefix: str,
-    channel_suffix: str,
-):
-    subscriber_channel = "channel-a"
+    mr_parser = create_autospec(spec=MRParser)
+    renderer = create_autospec(spec=Renderer)
     subscribers = [
         subscriber_builder({
-            SUBSCRIBER_TARGET_NAMESPACE: {"path": "namespace1"},
-            SUBSCRIBER_TARGET_PATH: "target1",
-            SUBSCRIBER_DESIRED_REF: "new_sha",
-            SUBSCRIBER_DESIRED_CONFIG_HASHES: [],
-            SUBSCRIBER_CHANNELS: [subscriber_channel],
+            CHANNEL: ["chan1,chan2"],
+            REF: "hash1",
         })
     ]
-    content_hash = Subscriber.combined_content_hash(subscribers=subscribers)
-
-    open_mrs = [
-        OpenMergeRequest(
+    deletion = Deletion(
+        mr=OpenMergeRequest(
             raw=create_autospec(spec=ProjectMergeRequest),
-            content_hashes=f"{hash_prefix}{content_hash}{hash_suffix}",
-            channels=f"{channel_prefix}{subscriber_channel}{channel_suffix}",
-            is_batchable=True,
+            channels=set(),
+            content_hashes=set(),
             failed_mr_check=False,
-        )
-    ]
-    mr_parser = mr_parser_builder(open_mrs)
-
-    vcs = create_autospec(spec=VCS)
-    merge_request_manager = MergeRequestManager(
-        vcs=vcs,
-        mr_parser=mr_parser,
-        renderer=renderer,
+            is_batchable=True,
+        ),
+        reason="some reason.",
     )
-    merge_request_manager.housekeeping()
-    merge_request_manager.create_promotion_merge_requests(subscribers=subscribers)
-
-    # There is already an open merge request for this subscriber content
-    # Do not open another one
-    vcs.close_app_interface_mr.assert_not_called()
-    vcs.open_app_interface_merge_request.assert_not_called()
 
-
-@pytest.mark.parametrize(
-    "hash_prefix, hash_suffix, channel_prefix, channel_suffix",
-    [
-        ("", "", "", ""),
-        ("hashprefix,", "", "", ""),
-        ("", ",hashsuffix", "", ""),
-        ("", "", "channelprefix,", ""),
-        ("", "", "", ",channelsuffix"),
-        ("a,", ",b", "c,", ",d"),
-    ],
-)
-def test_ignore_unrelated_channels(
-    mr_parser_builder: Callable[[Iterable], MRParser],
-    renderer: Renderer,
-    subscriber_builder: Callable[[Mapping], Subscriber],
-    hash_prefix: str,
-    hash_suffix: str,
-    channel_prefix: str,
-    channel_suffix: str,
-):
-    subscribers = [
-        subscriber_builder({
-            SUBSCRIBER_TARGET_NAMESPACE: {"path": "namespace1"},
-            SUBSCRIBER_TARGET_PATH: "target1",
-            SUBSCRIBER_DESIRED_REF: "new_sha",
-            SUBSCRIBER_DESIRED_CONFIG_HASHES: [],
-            SUBSCRIBER_CHANNELS: ["channel-a"],
-        })
-    ]
-    content_hash = Subscriber.combined_content_hash(subscribers=subscribers)
-
-    open_mrs = [
-        OpenMergeRequest(
-            raw=create_autospec(spec=ProjectMergeRequest),
-            content_hashes=f"{hash_prefix}{content_hash}{hash_suffix}",
-            channels=f"{channel_prefix}other-channel{channel_suffix}",
-            is_batchable=True,
-            failed_mr_check=False,
+    additions = [
+        Addition(
+            content_hashes={Subscriber.combined_content_hash(subscribers=subscribers)},
+            channels={"chan1,chan2"},
+            batchable=True,
         )
     ]
-    mr_parser = mr_parser_builder(open_mrs)
 
-    vcs = create_autospec(spec=VCS)
-    merge_request_manager = MergeRequestManager(
+    reconciler = reconciler_builder(
+        Diff(
+            deletions=[deletion],
+            additions=additions,
+        )
+    )
+    manager = MergeRequestManagerV2(
         vcs=vcs,
         mr_parser=mr_parser,
+        reconciler=reconciler,
         renderer=renderer,
     )
-    merge_request_manager.housekeeping()
-    merge_request_manager.create_promotion_merge_requests(subscribers=subscribers)
 
-    # There is already an open merge request for this subscriber content
-    # Do not open another one, because the channels do not match
-    vcs.close_app_interface_mr.assert_not_called()
-    vcs.open_app_interface_merge_request.assert_called_once()
+    manager.reconcile(subscribers=subscribers)
+
+    assert len(manager._sapm_mrs) == len(additions)
+    vcs.close_app_interface_mr.assert_has_calls([
+        call(deletion.mr.raw, deletion.reason),
+    ])
+    vcs.open_app_interface_merge_request.assert_has_calls([
+        call(mr) for mr in manager._sapm_mrs
+    ])

reconcile/test/saas_auto_promotions_manager/merge_request_manager/merge_request_manager/test_mr_parser.py

@@ -6,6 +6,9 @@ from unittest.mock import call
 
 from gitlab.v4.objects import ProjectMergeRequest
 
+from reconcile.saas_auto_promotions_manager.merge_request_manager.merge_request_manager_v2 import (
+    SAPM_LABEL,
+)
 from reconcile.saas_auto_promotions_manager.merge_request_manager.mr_parser import (
     MRParser,
 )
@@ -14,7 +17,6 @@ from reconcile.saas_auto_promotions_manager.merge_request_manager.renderer impor
     CONTENT_HASHES,
     IS_BATCHABLE,
     PROMOTION_DATA_SEPARATOR,
-    SAPM_LABEL,
     SAPM_VERSION,
     VERSION_REF,
 )
@@ -60,17 +62,17 @@ def test_valid_parsing(
     mr_parser = MRParser(
         vcs=vcs,
     )
-    open_mrs = mr_parser.retrieve_open_mrs()
+    open_mrs = mr_parser.retrieve_open_mrs(label=SAPM_LABEL)
     assert len(open_mrs) == 2
 
     assert open_mrs[0].raw == expectd_mrs[0]
-    assert open_mrs[0].channels == "channel0"
-    assert open_mrs[0].content_hashes == "hash0"
+    assert open_mrs[0].channels == {"channel0"}
+    assert open_mrs[0].content_hashes == {"hash0"}
     assert open_mrs[0].is_batchable
 
     assert open_mrs[1].raw == expectd_mrs[1]
-    assert open_mrs[1].channels == "channel1"
-    assert open_mrs[1].content_hashes == "hash1"
+    assert open_mrs[1].channels == {"channel1"}
+    assert open_mrs[1].content_hashes == {"hash1"}
     assert not open_mrs[1].is_batchable
 
 
@@ -107,7 +109,7 @@ def test_labels_filter(
     mr_parser = MRParser(
         vcs=vcs,
     )
-    open_mrs = mr_parser.retrieve_open_mrs()
+    open_mrs = mr_parser.retrieve_open_mrs(label=SAPM_LABEL)
     assert len(open_mrs) == 1
     assert open_mrs[0].raw == expectd_mrs[0]
 
@@ -261,7 +263,7 @@ def test_bad_mrs(
         ),
     ]
 
-    open_mrs = mr_parser.retrieve_open_mrs()
+    open_mrs = mr_parser.retrieve_open_mrs(label=SAPM_LABEL)
     assert len(open_mrs) == 0
     vcs.close_app_interface_mr.assert_has_calls(expected_calls)  # type: ignore[attr-defined]
     assert vcs.close_app_interface_mr.call_count == len(expected_calls)  # type: ignore[attr-defined]
@@ -299,7 +301,7 @@ def test_remove_duplicates(
     mr_parser = MRParser(
         vcs=vcs,
     )
-    open_mrs = mr_parser.retrieve_open_mrs()
+    open_mrs = mr_parser.retrieve_open_mrs(label=SAPM_LABEL)
     vcs.close_app_interface_mr.assert_has_calls([  # type: ignore[attr-defined]
         call(
             expected_mrs[1],