qontract-reconcile 0.9.1rc274__py3-none-any.whl → 0.9.1rc275__py3-none-any.whl

{qontract_reconcile-0.9.1rc274.dist-info → qontract_reconcile-0.9.1rc275.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.9.1rc274
+Version: 0.9.1rc275
 Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
 Home-page: https://github.com/app-sre/qontract-reconcile
 Author: Red Hat App-SRE Team

{qontract_reconcile-0.9.1rc274.dist-info → qontract_reconcile-0.9.1rc275.dist-info}/RECORD

@@ -258,9 +258,9 @@ reconcile/jenkins/types.py,sha256=-WMs4TsCEcbJNF_n-615Fealk08boBYZcTzVUk3Wlns,26
 reconcile/ocm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/ocm/types.py,sha256=gCuVra66cIk2Wvoj8PQ-hvsZiozFDFXxUOilPdC0w-c,3138
 reconcile/saas_auto_promotions_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/saas_auto_promotions_manager/integration.py,sha256=EAQipdFjlwbKUENTlnd_UKoUYy3LHjRD9K-LXFOvFe0,6208
+reconcile/saas_auto_promotions_manager/integration.py,sha256=hmRWva3_ZEO845wMkttEt4X6Izl5p8ZKs09NXWp8mkY,5609
 reconcile/saas_auto_promotions_manager/publisher.py,sha256=gdzR7jNDKy130pO6J-UNwXI__EXgiREzdaXvNkE3Bhg,1845
-reconcile/saas_auto_promotions_manager/subscriber.py,sha256=JsS_wrCGZC3-86kHSUTq8veLpdGH6XFL_zqlXKx-eNk,5891
+reconcile/saas_auto_promotions_manager/subscriber.py,sha256=PAncXY973uGMAHZRkV7QqSYSHhyZO_SuLGhwCn0pukI,6177
 reconcile/saas_auto_promotions_manager/merge_request_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/saas_auto_promotions_manager/merge_request_manager/merge_request.py,sha256=diDb4BkErloZF6MfzQbMkqC1gx8tglYkw10Vuf_4_Ho,1147
 reconcile/saas_auto_promotions_manager/merge_request_manager/merge_request_manager.py,sha256=QVaaL0hQn0fy-NPmoKyJMp3NxNfE8umYjReaTztxCps,9763
@@ -406,12 +406,13 @@ reconcile/test/saas_auto_promotions_manager/merge_request_manager/renderer/test_
 reconcile/test/saas_auto_promotions_manager/merge_request_manager/renderer/test_content_single_namespace.py,sha256=lpMMllzRYzq-WI5JAyX6B9-VOK8N5IBFJn7KUMuvKxk,2008
 reconcile/test/saas_auto_promotions_manager/merge_request_manager/renderer/test_content_single_target.py,sha256=cwAPrQ_v3DR_CHU7Nt2xBGutC-1XslyJ5mXM8FXW-3o,1111
 reconcile/test/saas_auto_promotions_manager/subscriber/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/test/saas_auto_promotions_manager/subscriber/conftest.py,sha256=IShISmgW0FECL82wIy6wFUpCxIKlVIg2WngtpY5Dxxg,2843
+reconcile/test/saas_auto_promotions_manager/subscriber/conftest.py,sha256=R4xSKYtRDeCs2c2d5WTfRnqW9br8p54H8jtP0K-WMmg,2428
 reconcile/test/saas_auto_promotions_manager/subscriber/data_keys.py,sha256=0MPM188d-7kUcqFvOEsjMEhJpSlPZua8rQvlto_50PE,360
 reconcile/test/saas_auto_promotions_manager/subscriber/test_content_hash.py,sha256=6Nkyix3Uyf7Zd9t2C6RnYlQG_y3NsZ6v6zu3G-qF4to,5186
-reconcile/test/saas_auto_promotions_manager/subscriber/test_multiple_channels_config_hash.py,sha256=5D9EHJ83304sFZqIQqCFsXI8icAD1bVhhlHfLZfgBag,5805
-reconcile/test/saas_auto_promotions_manager/subscriber/test_multiple_channels_moving_ref.py,sha256=gB2u4DshlrbiD9r8zw5CNQhOP_bJw10VHu-sEoJudts,5567
-reconcile/test/saas_auto_promotions_manager/subscriber/test_single_channel_with_single_publisher.py,sha256=QPhzVw5dCMj0ZzjbkN8G-MF_39DefBaY9Zo_tLsnt6o,8040
+reconcile/test/saas_auto_promotions_manager/subscriber/test_diff.py,sha256=GoCl8m63ikzd0fqlqS0z5VwgSVAZSkKk8d0lDbOoS08,2521
+reconcile/test/saas_auto_promotions_manager/subscriber/test_multiple_channels_config_hash.py,sha256=1xdM2gJ4Q6ew1xeHijMrrZx_R7UYbIchlg-bSDLO_x4,6955
+reconcile/test/saas_auto_promotions_manager/subscriber/test_multiple_channels_moving_ref.py,sha256=Q0YLTz-tTyYcyS0OeDuy5EKwdbIwr2tcoaDK6YnXwWo,6717
+reconcile/test/saas_auto_promotions_manager/subscriber/test_single_channel_with_single_publisher.py,sha256=UaKEgI_yMaILEiD-f9sl7FmlEiTICptSC4roapwE8tY,8642
 reconcile/test/saas_auto_promotions_manager/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/test/saas_auto_promotions_manager/utils/saas_files_inventory/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/test/saas_auto_promotions_manager/utils/saas_files_inventory/test_multiple_publishers_for_single_channel.py,sha256=A2bw4U2jcwpQpTd8nab2Pe7QeF-__2CEJp8kWocVHVc,2414
@@ -563,8 +564,8 @@ tools/sre_checkpoints/util.py,sha256=zEDbGr18ZeHNQwW8pUsr2JRjuXIPz--WAGJxZo9sv_Y
 tools/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tools/test/test_qontract_cli.py,sha256=awwTHEc2DWlykuqGIYM0WOBoSL0KRnOraCLk3C7izis,1401
 tools/test/test_sre_checkpoints.py,sha256=SKqPPTl9ua0RFdSSofnoQX-JZE6dFLO3LRhfQzqtfh8,2607
-qontract_reconcile-0.9.1rc274.dist-info/METADATA,sha256=xthG7Wqcl1nyjbzY_r0nq6MIqEuaG0bJ0TsErFkHVfs,2287
-qontract_reconcile-0.9.1rc274.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-qontract_reconcile-0.9.1rc274.dist-info/entry_points.txt,sha256=aIVvB7OTCxYu0QkONzBPfFEyg68Pr8KUVKEEm4ChDVc,333
-qontract_reconcile-0.9.1rc274.dist-info/top_level.txt,sha256=j0CHPIc8TsVRB50wOz_jhxjjaRyCJB3NOQeXhuHS67c,34
-qontract_reconcile-0.9.1rc274.dist-info/RECORD,,
+qontract_reconcile-0.9.1rc275.dist-info/METADATA,sha256=_flJtRC5kagWx1H5IKnB2RlUXZWqepaSiNJnfWvtUbY,2287
+qontract_reconcile-0.9.1rc275.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+qontract_reconcile-0.9.1rc275.dist-info/entry_points.txt,sha256=aIVvB7OTCxYu0QkONzBPfFEyg68Pr8KUVKEEm4ChDVc,333
+qontract_reconcile-0.9.1rc275.dist-info/top_level.txt,sha256=j0CHPIc8TsVRB50wOz_jhxjjaRyCJB3NOQeXhuHS67c,34
+qontract_reconcile-0.9.1rc275.dist-info/RECORD,,

reconcile/saas_auto_promotions_manager/integration.py

@@ -13,10 +13,7 @@ from reconcile.saas_auto_promotions_manager.merge_request_manager.renderer impor
     Renderer,
 )
 from reconcile.saas_auto_promotions_manager.publisher import Publisher
-from reconcile.saas_auto_promotions_manager.subscriber import (
-    ConfigHash,
-    Subscriber,
-)
+from reconcile.saas_auto_promotions_manager.subscriber import Subscriber
 from reconcile.saas_auto_promotions_manager.utils.saas_files_inventory import (
     SaasFilesInventory,
 )
@@ -77,20 +74,7 @@ class SaasAutoPromotionsManager:
             subscriber.compute_desired_state()
 
     def _get_subscribers_with_diff(self) -> list[Subscriber]:
-        subscribers_with_diff: list[Subscriber] = []
-        for subscriber in self._saas_file_inventory.subscribers:
-            current_hashes: list[ConfigHash] = []
-            for s in subscriber.config_hashes_by_channel_name.values():
-                for el in s:
-                    current_hashes.append(el)
-            if (
-                set(subscriber.desired_hashes) == set(current_hashes)
-                and subscriber.desired_ref == subscriber.ref
-            ):
-                # There is no change that requires a promotion
-                continue
-            subscribers_with_diff.append(subscriber)
-        return subscribers_with_diff
+        return [s for s in self._saas_file_inventory.subscribers if s.has_diff()]
 
     def reconcile(self) -> None:
         self._deployment_state.cache_commit_shas_from_s3()

reconcile/saas_auto_promotions_manager/subscriber.py

@@ -45,6 +45,15 @@ class Subscriber:
         self.namespace_file_path = namespace_file_path
         self._content_hash = ""
 
+    def has_diff(self) -> bool:
+        current_hashes = {
+            el for s in self.config_hashes_by_channel_name.values() for el in s
+        }
+        return not (
+            set(self.desired_hashes) == set(current_hashes)
+            and self.desired_ref == self.ref
+        )
+
     def compute_desired_state(self) -> None:
         self._compute_desired_ref()
         self._compute_desired_config_hashes()

reconcile/test/saas_auto_promotions_manager/subscriber/conftest.py

@@ -1,7 +1,6 @@
 from collections import defaultdict
 from collections.abc import (
     Callable,
-    Iterable,
     Mapping,
 )
 from typing import Any
@@ -23,6 +22,8 @@ from .data_keys import (
     CONFIG_HASH,
     CUR_CONFIG_HASHES,
     CUR_SUBSCRIBER_REF,
+    DESIRED_REF,
+    DESIRED_TARGET_HASHES,
     NAMESPACE_REF,
     REAL_WORLD_SHA,
     SUCCESSFUL_DEPLOYMENT,
@@ -30,23 +31,6 @@ from .data_keys import (
 )
 
 
-@pytest.fixture
-def config_hashes_builder() -> Callable[
-    [Iterable[tuple[str, str, str]]], list[ConfigHash]
-]:
-    def builder(data: Iterable[tuple[str, str, str]]) -> list[ConfigHash]:
-        return [
-            ConfigHash(
-                channel=d[0],
-                parent_saas=d[1],
-                target_config_hash=d[2],
-            )
-            for d in data
-        ]
-
-    return builder
-
-
 @pytest.fixture
 def subscriber_builder() -> Callable[[Mapping[str, Any]], Subscriber]:
     def builder(data: Mapping[str, Any]) -> Subscriber:
@@ -69,12 +53,8 @@ def subscriber_builder() -> Callable[[Mapping[str, Any]], Subscriber]:
             channels.append(channel)
         cur_config_hashes_by_channel: dict[str, list[ConfigHash]] = defaultdict(list)
         for cur_config_hash in data.get(CUR_CONFIG_HASHES, []):
-            cur_config_hashes_by_channel[cur_config_hash[0]].append(
-                ConfigHash(
-                    channel=cur_config_hash[0],
-                    parent_saas=cur_config_hash[1],
-                    target_config_hash=cur_config_hash[2],
-                )
+            cur_config_hashes_by_channel[cur_config_hash.channel].append(
+                cur_config_hash
             )
         subscriber = Subscriber(
             namespace_file_path=data.get(NAMESPACE_REF, ""),
@@ -85,6 +65,8 @@ def subscriber_builder() -> Callable[[Mapping[str, Any]], Subscriber]:
         )
         subscriber.channels = channels
         subscriber.config_hashes_by_channel_name = cur_config_hashes_by_channel
+        subscriber.desired_ref = data.get(DESIRED_REF, "")
+        subscriber.desired_hashes = data.get(DESIRED_TARGET_HASHES, [])
         return subscriber
 
     return builder

reconcile/test/saas_auto_promotions_manager/subscriber/test_diff.py

@@ -0,0 +1,93 @@
+from collections.abc import (
+    Callable,
+    Mapping,
+)
+from typing import Any
+
+from reconcile.saas_auto_promotions_manager.subscriber import (
+    ConfigHash,
+    Subscriber,
+)
+
+from .data_keys import (
+    CUR_CONFIG_HASHES,
+    CUR_SUBSCRIBER_REF,
+    DESIRED_REF,
+    DESIRED_TARGET_HASHES,
+)
+
+
+def test_has_config_hash_diff(
+    subscriber_builder: Callable[[Mapping[str, Any]], Subscriber],
+) -> None:
+    subscriber = subscriber_builder(
+        {
+            CUR_SUBSCRIBER_REF: "current_sha",
+            CUR_CONFIG_HASHES: [
+                ConfigHash(
+                    channel="channel-a",
+                    parent_saas="publisher_a",
+                    target_config_hash="pub_a_hash",
+                ),
+                ConfigHash(
+                    channel="channel-b",
+                    parent_saas="publisher_b",
+                    target_config_hash="pub_b_hash",
+                ),
+            ],
+            DESIRED_REF: "current_sha",
+            DESIRED_TARGET_HASHES: [
+                ConfigHash(
+                    channel="channel-a",
+                    parent_saas="publisher_a",
+                    target_config_hash="pub_a_hash",
+                ),
+                ConfigHash(
+                    channel="channel-b",
+                    parent_saas="publisher_b",
+                    target_config_hash="new_hash",
+                ),
+            ],
+        }
+    )
+    assert subscriber.has_diff()
+
+
+def test_has_ref_diff(
+    subscriber_builder: Callable[[Mapping[str, Any]], Subscriber],
+) -> None:
+    subscriber = subscriber_builder(
+        {
+            CUR_SUBSCRIBER_REF: "current_sha",
+            CUR_CONFIG_HASHES: [],
+            DESIRED_REF: "new_sha",
+            DESIRED_TARGET_HASHES: [],
+        }
+    )
+    assert subscriber.has_diff()
+
+
+def test_no_diff(
+    subscriber_builder: Callable[[Mapping[str, Any]], Subscriber],
+) -> None:
+    config_hashes = [
+        ConfigHash(
+            channel="channel-a",
+            parent_saas="publisher_a",
+            target_config_hash="pub_a_hash",
+        ),
+        ConfigHash(
+            channel="channel-b",
+            parent_saas="publisher_b",
+            target_config_hash="pub_b_hash",
+        ),
+    ]
+    subscriber = subscriber_builder(
+        {
+            CUR_SUBSCRIBER_REF: "current_sha",
+            CUR_CONFIG_HASHES: config_hashes,
+            DESIRED_REF: "current_sha",
+            DESIRED_TARGET_HASHES: list(reversed(config_hashes)),
+        }
+    )
+    assert not subscriber.has_diff()

reconcile/test/saas_auto_promotions_manager/subscriber/test_multiple_channels_config_hash.py

@@ -1,6 +1,5 @@
 from collections.abc import (
     Callable,
-    Iterable,
     Mapping,
 )
 from typing import Any
@@ -22,16 +21,21 @@ from .data_keys import (
 
 def test_single_new_config_hash(
     subscriber_builder: Callable[[Mapping[str, Any]], Subscriber],
-    config_hashes_builder: Callable[
-        [Iterable[tuple[str, str, str]]], frozenset[ConfigHash]
-    ],
 ):
     subscriber = subscriber_builder(
         {
             CUR_SUBSCRIBER_REF: "current_sha",
             CUR_CONFIG_HASHES: [
-                ("channel-a", "publisher_a", "pub_a_hash"),
-                ("channel-b", "publisher_b", "pub_b_hash"),
+                ConfigHash(
+                    channel="channel-a",
+                    parent_saas="publisher_a",
+                    target_config_hash="pub_a_hash",
+                ),
+                ConfigHash(
+                    channel="channel-b",
+                    parent_saas="publisher_b",
+                    target_config_hash="pub_b_hash",
+                ),
             ],
             CHANNELS: {
                 "channel-a": {
@@ -50,28 +54,39 @@ def test_single_new_config_hash(
         }
     )
     subscriber.compute_desired_state()
-    expected_config_hashes = config_hashes_builder(
-        [
-            ("channel-a", "publisher_a", "new_pub_a_hash"),
-            ("channel-b", "publisher_b", "pub_b_hash"),
-        ]
-    )
+    expected_config_hashes = [
+        ConfigHash(
+            channel="channel-a",
+            parent_saas="publisher_a",
+            target_config_hash="new_pub_a_hash",
+        ),
+        ConfigHash(
+            channel="channel-b",
+            parent_saas="publisher_b",
+            target_config_hash="pub_b_hash",
+        ),
+    ]
     assert subscriber.desired_ref == "current_sha"
     assert subscriber.desired_hashes == expected_config_hashes
 
 
 def test_both_new_config_hashes(
     subscriber_builder: Callable[[Mapping[str, Any]], Subscriber],
-    config_hashes_builder: Callable[
-        [Iterable[tuple[str, str, str]]], frozenset[ConfigHash]
-    ],
 ):
     subscriber = subscriber_builder(
         {
             CUR_SUBSCRIBER_REF: "current_sha",
             CUR_CONFIG_HASHES: [
-                ("channel-a", "publisher_a", "pub_a_hash"),
-                ("channel-b", "publisher_b", "pub_b_hash"),
+                ConfigHash(
+                    channel="channel-a",
+                    parent_saas="publisher_a",
+                    target_config_hash="pub_a_hash",
+                ),
+                ConfigHash(
+                    channel="channel-b",
+                    parent_saas="publisher_b",
+                    target_config_hash="pub_b_hash",
+                ),
             ],
             CHANNELS: {
                 "channel-a": {
@@ -90,28 +105,39 @@ def test_both_new_config_hashes(
         }
     )
     subscriber.compute_desired_state()
-    expected_config_hashes = config_hashes_builder(
-        [
-            ("channel-a", "publisher_a", "new_pub_a_hash"),
-            ("channel-b", "publisher_b", "new_pub_b_hash"),
-        ]
-    )
+    expected_config_hashes = [
+        ConfigHash(
+            channel="channel-a",
+            parent_saas="publisher_a",
+            target_config_hash="new_pub_a_hash",
+        ),
+        ConfigHash(
+            channel="channel-b",
+            parent_saas="publisher_b",
+            target_config_hash="new_pub_b_hash",
+        ),
+    ]
     assert subscriber.desired_ref == "current_sha"
     assert subscriber.desired_hashes == expected_config_hashes
 
 
 def test_both_new_config_hashes_one_bad_deployment(
     subscriber_builder: Callable[[Mapping[str, Any]], Subscriber],
-    config_hashes_builder: Callable[
-        [Iterable[tuple[str, str, str]]], frozenset[ConfigHash]
-    ],
 ):
     subscriber = subscriber_builder(
         {
             CUR_SUBSCRIBER_REF: "current_sha",
             CUR_CONFIG_HASHES: [
-                ("channel-a", "publisher_a", "pub_a_hash"),
-                ("channel-b", "publisher_b", "pub_b_hash"),
+                ConfigHash(
+                    channel="channel-a",
+                    parent_saas="publisher_a",
+                    target_config_hash="pub_a_hash",
+                ),
+                ConfigHash(
+                    channel="channel-b",
+                    parent_saas="publisher_b",
+                    target_config_hash="pub_b_hash",
+                ),
             ],
             CHANNELS: {
                 "channel-a": {
@@ -131,28 +157,39 @@ def test_both_new_config_hashes_one_bad_deployment(
         }
     )
     subscriber.compute_desired_state()
-    expected_config_hashes = config_hashes_builder(
-        [
-            ("channel-a", "publisher_a", "pub_a_hash"),
-            ("channel-b", "publisher_b", "new_pub_b_hash"),
-        ]
-    )
+    expected_config_hashes = [
+        ConfigHash(
+            channel="channel-a",
+            parent_saas="publisher_a",
+            target_config_hash="pub_a_hash",
+        ),
+        ConfigHash(
+            channel="channel-b",
+            parent_saas="publisher_b",
+            target_config_hash="new_pub_b_hash",
+        ),
+    ]
     assert subscriber.desired_ref == "current_sha"
     assert subscriber.desired_hashes == expected_config_hashes
 
 
 def test_both_new_config_hashes_all_bad_deployments(
     subscriber_builder: Callable[[Mapping[str, Any]], Subscriber],
-    config_hashes_builder: Callable[
-        [Iterable[tuple[str, str, str]]], frozenset[ConfigHash]
-    ],
 ):
     subscriber = subscriber_builder(
         {
             CUR_SUBSCRIBER_REF: "current_sha",
             CUR_CONFIG_HASHES: [
-                ("channel-a", "publisher_a", "pub_a_hash"),
-                ("channel-b", "publisher_b", "pub_b_hash"),
+                ConfigHash(
+                    channel="channel-a",
+                    parent_saas="publisher_a",
+                    target_config_hash="pub_a_hash",
+                ),
+                ConfigHash(
+                    channel="channel-b",
+                    parent_saas="publisher_b",
+                    target_config_hash="pub_b_hash",
+                ),
             ],
             CHANNELS: {
                 "channel-a": {
@@ -173,11 +210,17 @@ def test_both_new_config_hashes_all_bad_deployments(
         }
     )
     subscriber.compute_desired_state()
-    expected_config_hashes = config_hashes_builder(
-        [
-            ("channel-a", "publisher_a", "pub_a_hash"),
-            ("channel-b", "publisher_b", "pub_b_hash"),
-        ]
-    )
+    expected_config_hashes = [
+        ConfigHash(
+            channel="channel-a",
+            parent_saas="publisher_a",
+            target_config_hash="pub_a_hash",
+        ),
+        ConfigHash(
+            channel="channel-b",
+            parent_saas="publisher_b",
+            target_config_hash="pub_b_hash",
+        ),
+    ]
     assert subscriber.desired_ref == "current_sha"
     assert subscriber.desired_hashes == expected_config_hashes

reconcile/test/saas_auto_promotions_manager/subscriber/test_multiple_channels_moving_ref.py

@@ -1,6 +1,5 @@
 from collections.abc import (
     Callable,
-    Iterable,
     Mapping,
 )
 from typing import Any
@@ -22,16 +21,21 @@ from .data_keys import (
 
 def test_no_change(
     subscriber_builder: Callable[[Mapping[str, Any]], Subscriber],
-    config_hashes_builder: Callable[
-        [Iterable[tuple[str, str, str]]], frozenset[ConfigHash]
-    ],
 ):
     subscriber = subscriber_builder(
         {
             CUR_SUBSCRIBER_REF: "current_sha",
             CUR_CONFIG_HASHES: [
-                ("channel-a", "publisher_a", "pub_a_hash"),
-                ("channel-b", "publisher_b", "pub_b_hash"),
+                ConfigHash(
+                    channel="channel-a",
+                    parent_saas="publisher_a",
+                    target_config_hash="pub_a_hash",
+                ),
+                ConfigHash(
+                    channel="channel-b",
+                    parent_saas="publisher_b",
+                    target_config_hash="pub_b_hash",
+                ),
             ],
             CHANNELS: {
                 "channel-a": {
@@ -50,28 +54,39 @@ def test_no_change(
         }
     )
     subscriber.compute_desired_state()
-    expected_config_hashes = config_hashes_builder(
-        [
-            ("channel-a", "publisher_a", "pub_a_hash"),
-            ("channel-b", "publisher_b", "pub_b_hash"),
-        ]
-    )
+    expected_config_hashes = [
+        ConfigHash(
+            channel="channel-a",
+            parent_saas="publisher_a",
+            target_config_hash="pub_a_hash",
+        ),
+        ConfigHash(
+            channel="channel-b",
+            parent_saas="publisher_b",
+            target_config_hash="pub_b_hash",
+        ),
+    ]
     assert subscriber.desired_ref == "current_sha"
     assert subscriber.desired_hashes == expected_config_hashes
 
 
 def test_moving_ref(
     subscriber_builder: Callable[[Mapping[str, Any]], Subscriber],
-    config_hashes_builder: Callable[
-        [Iterable[tuple[str, str, str]]], frozenset[ConfigHash]
-    ],
 ):
     subscriber = subscriber_builder(
         {
             CUR_SUBSCRIBER_REF: "current_sha",
             CUR_CONFIG_HASHES: [
-                ("channel-a", "publisher_a", "pub_a_hash"),
-                ("channel-b", "publisher_b", "pub_b_hash"),
+                ConfigHash(
+                    channel="channel-a",
+                    parent_saas="publisher_a",
+                    target_config_hash="pub_a_hash",
+                ),
+                ConfigHash(
+                    channel="channel-b",
+                    parent_saas="publisher_b",
+                    target_config_hash="pub_b_hash",
+                ),
             ],
             CHANNELS: {
                 "channel-a": {
@@ -90,28 +105,39 @@ def test_moving_ref(
         }
     )
     subscriber.compute_desired_state()
-    expected_config_hashes = config_hashes_builder(
-        [
-            ("channel-a", "publisher_a", "pub_a_hash"),
-            ("channel-b", "publisher_b", "pub_b_hash"),
-        ]
-    )
+    expected_config_hashes = [
+        ConfigHash(
+            channel="channel-a",
+            parent_saas="publisher_a",
+            target_config_hash="pub_a_hash",
+        ),
+        ConfigHash(
+            channel="channel-b",
+            parent_saas="publisher_b",
+            target_config_hash="pub_b_hash",
+        ),
+    ]
     assert subscriber.desired_ref == "new_sha"
     assert subscriber.desired_hashes == expected_config_hashes
 
 
 def test_moving_ref_mismatch(
     subscriber_builder: Callable[[Mapping[str, Any]], Subscriber],
-    config_hashes_builder: Callable[
-        [Iterable[tuple[str, str, str]]], frozenset[ConfigHash]
-    ],
 ):
     subscriber = subscriber_builder(
         {
             CUR_SUBSCRIBER_REF: "current_sha",
             CUR_CONFIG_HASHES: [
-                ("channel-a", "publisher_a", "pub_a_hash"),
-                ("channel-b", "publisher_b", "pub_b_hash"),
+                ConfigHash(
+                    channel="channel-a",
+                    parent_saas="publisher_a",
+                    target_config_hash="pub_a_hash",
+                ),
+                ConfigHash(
+                    channel="channel-b",
+                    parent_saas="publisher_b",
+                    target_config_hash="pub_b_hash",
+                ),
             ],
             CHANNELS: {
                 "channel-a": {
@@ -130,28 +156,39 @@ def test_moving_ref_mismatch(
         }
     )
     subscriber.compute_desired_state()
-    expected_config_hashes = config_hashes_builder(
-        [
-            ("channel-a", "publisher_a", "pub_a_hash"),
-            ("channel-b", "publisher_b", "pub_b_hash"),
-        ]
-    )
+    expected_config_hashes = [
+        ConfigHash(
+            channel="channel-a",
+            parent_saas="publisher_a",
+            target_config_hash="pub_a_hash",
+        ),
+        ConfigHash(
+            channel="channel-b",
+            parent_saas="publisher_b",
+            target_config_hash="pub_b_hash",
+        ),
+    ]
     assert subscriber.desired_ref == "current_sha"
     assert subscriber.desired_hashes == expected_config_hashes
 
 
 def test_moving_ref_bad_deployment(
     subscriber_builder: Callable[[Mapping[str, Any]], Subscriber],
-    config_hashes_builder: Callable[
-        [Iterable[tuple[str, str, str]]], frozenset[ConfigHash]
-    ],
 ):
     subscriber = subscriber_builder(
         {
             CUR_SUBSCRIBER_REF: "current_sha",
             CUR_CONFIG_HASHES: [
-                ("channel-a", "publisher_a", "pub_a_hash"),
-                ("channel-b", "publisher_b", "pub_b_hash"),
+                ConfigHash(
+                    channel="channel-a",
+                    parent_saas="publisher_a",
+                    target_config_hash="pub_a_hash",
+                ),
+                ConfigHash(
+                    channel="channel-b",
+                    parent_saas="publisher_b",
+                    target_config_hash="pub_b_hash",
+                ),
             ],
             CHANNELS: {
                 "channel-a": {
@@ -171,11 +208,17 @@ def test_moving_ref_bad_deployment(
         }
     )
     subscriber.compute_desired_state()
-    expected_config_hashes = config_hashes_builder(
-        [
-            ("channel-a", "publisher_a", "pub_a_hash"),
-            ("channel-b", "publisher_b", "pub_b_hash"),
-        ]
-    )
+    expected_config_hashes = [
+        ConfigHash(
+            channel="channel-a",
+            parent_saas="publisher_a",
+            target_config_hash="pub_a_hash",
+        ),
+        ConfigHash(
+            channel="channel-b",
+            parent_saas="publisher_b",
+            target_config_hash="pub_b_hash",
+        ),
+    ]
     assert subscriber.desired_ref == "current_sha"
     assert subscriber.desired_hashes == expected_config_hashes

reconcile/test/saas_auto_promotions_manager/subscriber/test_single_channel_with_single_publisher.py

@@ -1,6 +1,5 @@
 from collections.abc import (
     Callable,
-    Iterable,
     Mapping,
 )
 from typing import Any
@@ -22,15 +21,16 @@ from .data_keys import (
 
 def test_no_change(
     subscriber_builder: Callable[[Mapping[str, Any]], Subscriber],
-    config_hashes_builder: Callable[
-        [Iterable[tuple[str, str, str]]], frozenset[ConfigHash]
-    ],
 ):
     subscriber = subscriber_builder(
         {
             CUR_SUBSCRIBER_REF: "current_sha",
             CUR_CONFIG_HASHES: [
-                ("channel-a", "publisher_a", "current_hash"),
+                ConfigHash(
+                    channel="channel-a",
+                    parent_saas="publisher_a",
+                    target_config_hash="current_hash",
+                ),
             ],
             CHANNELS: {
                 "channel-a": {
@@ -43,24 +43,29 @@ def test_no_change(
         }
     )
     subscriber.compute_desired_state()
-    expected_config_hashes = config_hashes_builder(
-        [("channel-a", "publisher_a", "current_hash")]
-    )
+    expected_config_hashes = [
+        ConfigHash(
+            channel="channel-a",
+            parent_saas="publisher_a",
+            target_config_hash="current_hash",
+        )
+    ]
     assert subscriber.desired_ref == "current_sha"
     assert subscriber.desired_hashes == expected_config_hashes
 
 
 def test_moving_ref(
     subscriber_builder: Callable[[Mapping[str, Any]], Subscriber],
-    config_hashes_builder: Callable[
-        [Iterable[tuple[str, str, str]]], frozenset[ConfigHash]
-    ],
 ):
     subscriber = subscriber_builder(
         {
             CUR_SUBSCRIBER_REF: "current_sha",
             CUR_CONFIG_HASHES: [
-                ("channel-a", "publisher_a", "current_hash"),
+                ConfigHash(
+                    channel="channel-a",
+                    parent_saas="publisher_a",
+                    target_config_hash="current_hash",
+                ),
             ],
             CHANNELS: {
                 "channel-a": {
@@ -73,24 +78,29 @@ def test_moving_ref(
         }
     )
     subscriber.compute_desired_state()
-    expected_config_hashes = config_hashes_builder(
-        [("channel-a", "publisher_a", "current_hash")]
-    )
+    expected_config_hashes = [
+        ConfigHash(
+            channel="channel-a",
+            parent_saas="publisher_a",
+            target_config_hash="current_hash",
+        )
+    ]
     assert subscriber.desired_ref == "new_sha"
     assert subscriber.desired_hashes == expected_config_hashes
 
 
 def test_moving_ref_bad_deployment(
     subscriber_builder: Callable[[Mapping[str, Any]], Subscriber],
-    config_hashes_builder: Callable[
-        [Iterable[tuple[str, str, str]]], frozenset[ConfigHash]
-    ],
 ):
     subscriber = subscriber_builder(
         {
             CUR_SUBSCRIBER_REF: "current_sha",
             CUR_CONFIG_HASHES: [
-                ("channel-a", "publisher_a", "current_hash"),
+                ConfigHash(
+                    channel="channel-a",
+                    parent_saas="publisher_a",
+                    target_config_hash="current_hash",
+                ),
             ],
             CHANNELS: {
                 "channel-a": {
@@ -104,24 +114,29 @@ def test_moving_ref_bad_deployment(
         }
     )
     subscriber.compute_desired_state()
-    expected_config_hashes = config_hashes_builder(
-        [("channel-a", "publisher_a", "current_hash")]
-    )
+    expected_config_hashes = [
+        ConfigHash(
+            channel="channel-a",
+            parent_saas="publisher_a",
+            target_config_hash="current_hash",
+        )
+    ]
     assert subscriber.desired_ref == "current_sha"
     assert subscriber.desired_hashes == expected_config_hashes
 
 
 def test_new_config_hash(
     subscriber_builder: Callable[[Mapping[str, Any]], Subscriber],
-    config_hashes_builder: Callable[
-        [Iterable[tuple[str, str, str]]], frozenset[ConfigHash]
-    ],
 ):
     subscriber = subscriber_builder(
         {
             CUR_SUBSCRIBER_REF: "current_sha",
             CUR_CONFIG_HASHES: [
-                ("channel-a", "publisher_a", "current_hash"),
+                ConfigHash(
+                    channel="channel-a",
+                    parent_saas="publisher_a",
+                    target_config_hash="current_hash",
+                ),
             ],
             CHANNELS: {
                 "channel-a": {
@@ -134,24 +149,29 @@ def test_new_config_hash(
         }
     )
     subscriber.compute_desired_state()
-    expected_config_hashes = config_hashes_builder(
-        [("channel-a", "publisher_a", "new_hash")]
-    )
+    expected_config_hashes = [
+        ConfigHash(
+            channel="channel-a",
+            parent_saas="publisher_a",
+            target_config_hash="new_hash",
+        )
+    ]
     assert subscriber.desired_ref == "current_sha"
     assert subscriber.desired_hashes == expected_config_hashes
 
 
 def test_new_config_hash_bad_deployment(
     subscriber_builder: Callable[[Mapping[str, Any]], Subscriber],
-    config_hashes_builder: Callable[
-        [Iterable[tuple[str, str, str]]], frozenset[ConfigHash]
-    ],
 ):
     subscriber = subscriber_builder(
         {
             CUR_SUBSCRIBER_REF: "current_sha",
             CUR_CONFIG_HASHES: [
-                ("channel-a", "publisher_a", "current_hash"),
+                ConfigHash(
+                    channel="channel-a",
+                    parent_saas="publisher_a",
+                    target_config_hash="current_hash",
+                ),
             ],
             CHANNELS: {
                 "channel-a": {
@@ -165,24 +185,29 @@ def test_new_config_hash_bad_deployment(
         }
     )
     subscriber.compute_desired_state()
-    expected_config_hashes = config_hashes_builder(
-        [("channel-a", "publisher_a", "current_hash")]
-    )
+    expected_config_hashes = [
+        ConfigHash(
+            channel="channel-a",
+            parent_saas="publisher_a",
+            target_config_hash="current_hash",
+        )
+    ]
     assert subscriber.desired_ref == "current_sha"
     assert subscriber.desired_hashes == expected_config_hashes
 
 
 def test_new_config_hash_and_moving_ref(
     subscriber_builder: Callable[[Mapping[str, Any]], Subscriber],
-    config_hashes_builder: Callable[
-        [Iterable[tuple[str, str, str]]], frozenset[ConfigHash]
-    ],
 ):
     subscriber = subscriber_builder(
         {
             CUR_SUBSCRIBER_REF: "current_sha",
             CUR_CONFIG_HASHES: [
-                ("channel-a", "publisher_a", "current_hash"),
+                ConfigHash(
+                    channel="channel-a",
+                    parent_saas="publisher_a",
+                    target_config_hash="current_hash",
+                ),
             ],
             CHANNELS: {
                 "channel-a": {
@@ -195,24 +220,29 @@ def test_new_config_hash_and_moving_ref(
         }
     )
     subscriber.compute_desired_state()
-    expected_config_hashes = config_hashes_builder(
-        [("channel-a", "publisher_a", "new_hash")]
-    )
+    expected_config_hashes = [
+        ConfigHash(
+            channel="channel-a",
+            parent_saas="publisher_a",
+            target_config_hash="new_hash",
+        )
+    ]
     assert subscriber.desired_ref == "new_sha"
     assert subscriber.desired_hashes == expected_config_hashes
 
 
 def test_new_config_hash_and_moving_ref_and_bad_deployment(
     subscriber_builder: Callable[[Mapping[str, Any]], Subscriber],
-    config_hashes_builder: Callable[
-        [Iterable[tuple[str, str, str]]], frozenset[ConfigHash]
-    ],
 ):
     subscriber = subscriber_builder(
         {
             CUR_SUBSCRIBER_REF: "current_sha",
             CUR_CONFIG_HASHES: [
-                ("channel-a", "publisher_a", "current_hash"),
+                ConfigHash(
+                    channel="channel-a",
+                    parent_saas="publisher_a",
+                    target_config_hash="current_hash",
+                ),
             ],
             CHANNELS: {
                 "channel-a": {
@@ -226,18 +256,19 @@ def test_new_config_hash_and_moving_ref_and_bad_deployment(
         }
     )
     subscriber.compute_desired_state()
-    expected_config_hashes = config_hashes_builder(
-        [("channel-a", "publisher_a", "current_hash")]
-    )
+    expected_config_hashes = [
+        ConfigHash(
+            channel="channel-a",
+            parent_saas="publisher_a",
+            target_config_hash="current_hash",
+        )
+    ]
     assert subscriber.desired_ref == "current_sha"
     assert subscriber.desired_hashes == expected_config_hashes
 
 
 def test_cur_config_hash_did_not_exist(
     subscriber_builder: Callable[[Mapping[str, Any]], Subscriber],
-    config_hashes_builder: Callable[
-        [Iterable[tuple[str, str, str]]], frozenset[ConfigHash]
-    ],
 ):
     subscriber = subscriber_builder(
         {
@@ -254,8 +285,12 @@ def test_cur_config_hash_did_not_exist(
         }
     )
     subscriber.compute_desired_state()
-    expected_config_hashes = config_hashes_builder(
-        [("channel-a", "publisher_a", "new_hash")]
-    )
+    expected_config_hashes = [
+        ConfigHash(
+            channel="channel-a",
+            parent_saas="publisher_a",
+            target_config_hash="new_hash",
+        )
+    ]
     assert subscriber.desired_ref == "current_sha"
     assert subscriber.desired_hashes == expected_config_hashes