qontract-reconcile 0.10.1rc764__py3-none-any.whl → 0.10.1rc765__py3-none-any.whl

{qontract_reconcile-0.10.1rc764.dist-info → qontract_reconcile-0.10.1rc765.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.10.1rc764
+Version: 0.10.1rc765
 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.10.1rc764.dist-info → qontract_reconcile-0.10.1rc765.dist-info}/RECORD

@@ -407,10 +407,10 @@ reconcile/rhidp/sso_client/integration.py,sha256=kA8g7c38ZBSdrRtyfEqy_WgSreD1Pbw
 reconcile/rhidp/sso_client/metrics.py,sha256=Tq7tSOsqL3XdcPUdozxqzSPIodUeOV87UCTqpuuqqhw,1013
 reconcile/saas_auto_promotions_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/saas_auto_promotions_manager/integration.py,sha256=shWQ--FWfeh_1rHJUwOWDiZWnvzKxYJYuRUIGQv22RI,6759
-reconcile/saas_auto_promotions_manager/meta.py,sha256=2b44ik-qpACNtW72QlDa2YOQqxeN8FHZfLPDmKoH3Rg,161
+reconcile/saas_auto_promotions_manager/meta.py,sha256=jzqK6qM2JDdCE5kzkcj1e1TBMAL9f6lM2Hse8yFb8W8,161
 reconcile/saas_auto_promotions_manager/publisher.py,sha256=psrthZGgCQDUO3rwQjKSBMlwcTgfij6sxdebGuxkNv4,2739
 reconcile/saas_auto_promotions_manager/s3_exporter.py,sha256=IKlVWZmiPnvl7sKeF6JgAlhXZe5CovKTxQc0SNkNSx4,2583
-reconcile/saas_auto_promotions_manager/subscriber.py,sha256=cLhPlkT71J2LIice3SLmH1WpsqzV46gd0peMxrnqyRw,7452
+reconcile/saas_auto_promotions_manager/subscriber.py,sha256=NPhlagNF8om7ikrjRlYNSQ2Ra7wgW_3-OlEWapnjtW0,9405
 reconcile/saas_auto_promotions_manager/merge_request_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/saas_auto_promotions_manager/merge_request_manager/desired_state.py,sha256=jgfgKv4UTYFxtDao_JwNEGEKmu4GpeMm5vbaat0289c,1225
 reconcile/saas_auto_promotions_manager/merge_request_manager/merge_request.py,sha256=BeAJWLow7b4HQyZ9zz398sQkPeIz8chpMkCts2NU27c,1282
@@ -420,7 +420,7 @@ reconcile/saas_auto_promotions_manager/merge_request_manager/mr_parser.py,sha256
 reconcile/saas_auto_promotions_manager/merge_request_manager/reconciler.py,sha256=KZVAkFJR75Qu7-feV4mzg1S8ua-pkbuu1oC7PebSpDs,7801
 reconcile/saas_auto_promotions_manager/merge_request_manager/renderer.py,sha256=iu0wMyyEvro5r5SBJVN3HGmVSIcxTyLN0Xxx3mhbYXE,7066
 reconcile/saas_auto_promotions_manager/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/saas_auto_promotions_manager/utils/saas_files_inventory.py,sha256=ZNxwqp9kdUSoxb3kTdM4KrtPyd3V5O4jMfjrVT2IJfs,7605
+reconcile/saas_auto_promotions_manager/utils/saas_files_inventory.py,sha256=7LlTQCzYotWCbtYBaNQP81CFlLUOvsyGMBQE-Ha0cKY,7820
 reconcile/skupper_network/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/skupper_network/integration.py,sha256=178Q9RSYuZ9NmrCK4jRMLMekrewUaaRdclccI6zBsQ8,10786
 reconcile/skupper_network/models.py,sha256=DNTI7HZv-rqY42GIIxyRuvroHLvdH6rJerjIq9lj3RU,6663
@@ -534,38 +534,23 @@ reconcile/test/test_version_bump.py,sha256=q6-3Y1roriI6YWpFwaHOMN7emEP3yL33sh_0V
 reconcile/test/test_vpc_peerings_validator.py,sha256=dFSmjc_dMN2GqMbntCFpa7PUZmyYuQ9DKffh-T5wmxM,6639
 reconcile/test/test_wrong_region.py,sha256=7KzL7OaICQ9Z3DW27zt_ykMN7_87owAFC-2CYjvGoyA,2138
 reconcile/test/saas_auto_promotions_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/test/saas_auto_promotions_manager/conftest.py,sha256=tZNs35EuWulP53Cqt61RteOGY_uH4gfhtXfGQ8-awwM,3081
+reconcile/test/saas_auto_promotions_manager/conftest.py,sha256=4BtuxVZ0Lsmdp6AhG8kbtowkwG7e-pSjIKv35Wm1hI0,5803
 reconcile/test/saas_auto_promotions_manager/test_integration_test.py,sha256=x7QgHDMKIoPRY8k2SRSWa7qY3Z5Vabsyh9xWCtMXtfY,1857
 reconcile/test/saas_auto_promotions_manager/merge_request_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/test/saas_auto_promotions_manager/merge_request_manager/merge_request_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/test/saas_auto_promotions_manager/merge_request_manager/merge_request_manager/conftest.py,sha256=7O3lbk1EmEtUofqGncfiwMYvDPXrkQNPB59zlQ_zXkM,4588
+reconcile/test/saas_auto_promotions_manager/merge_request_manager/merge_request_manager/conftest.py,sha256=HikuDsdDxJ6HW48WY50s_7fmeGr07kcRdBZxgHzwc-0,3514
 reconcile/test/saas_auto_promotions_manager/merge_request_manager/merge_request_manager/data_keys.py,sha256=Z1IV51OUuzhd-3S8W-k7ixC-fkaglCokn0eakK0Z73s,606
-reconcile/test/saas_auto_promotions_manager/merge_request_manager/merge_request_manager/test_desired_state.py,sha256=x5DDZog0SA-Z8noxwalZniGtkovaPvR0V9Pqa5QaFFY,2302
+reconcile/test/saas_auto_promotions_manager/merge_request_manager/merge_request_manager/test_desired_state.py,sha256=OLtJ11SsznoT39_tudsozcksK0N3TVNv-JWhIrCVaQk,2356
 reconcile/test/saas_auto_promotions_manager/merge_request_manager/merge_request_manager/test_merge_request_manager.py,sha256=h8lnorFPZIxTtbaaXGLoiEsBbB4Qj-Mg9BKV62ZqEBQ,2389
 reconcile/test/saas_auto_promotions_manager/merge_request_manager/merge_request_manager/test_mr_parser.py,sha256=dcGHzxuafKSxmswSO1qF2WlKaqsmEvtERC6Lb8kDAN0,10019
 reconcile/test/saas_auto_promotions_manager/merge_request_manager/merge_request_manager/test_reconciler.py,sha256=_bzfJzjFJgubu--7wyXIiusUrdbmLtFbHmkbat4SX_M,17828
 reconcile/test/saas_auto_promotions_manager/merge_request_manager/renderer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/test/saas_auto_promotions_manager/merge_request_manager/renderer/conftest.py,sha256=2rCSstewp4LPoEJHm5N7dGJexEtY8ndLHvoGZYjmpsc,1678
-reconcile/test/saas_auto_promotions_manager/merge_request_manager/renderer/data_keys.py,sha256=beHYQ9kgDLeBZgC2FvxQA3tHx1PO-RAMN8_kVcSdikI,90
-reconcile/test/saas_auto_promotions_manager/merge_request_manager/renderer/test_content_multiple_namespaces.py,sha256=mlsSuTKHTPEMDFmDJnpeZ5j9R0eZOK2KMj8kAm4nvRU,1116
-reconcile/test/saas_auto_promotions_manager/merge_request_manager/renderer/test_content_single_namespace.py,sha256=tS57UbNsJGb4kTnHNCPTfUEpLWwxprhtCeJOnvIt8A0,2527
-reconcile/test/saas_auto_promotions_manager/merge_request_manager/renderer/test_content_single_target.py,sha256=6g4s2c--W4l_PMTcCA_8aNM85YejwDZttQOz5Iowido,1908
-reconcile/test/saas_auto_promotions_manager/merge_request_manager/renderer/test_json_path_selector.py,sha256=k_jA4x_9fRGGAT1T0aeAFiZwZ7zlDZpPPgqMDeuR7y8,2189
-reconcile/test/saas_auto_promotions_manager/subscriber/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/test/saas_auto_promotions_manager/subscriber/conftest.py,sha256=5hMe91UEp_GQm49OeTee4ALv_xq2KhWwF6NfzzQwpnc,3101
-reconcile/test/saas_auto_promotions_manager/subscriber/data_keys.py,sha256=2j4Ue-njmK53Xm4vJScT2MJJeKV7wk9xf_95pmNfLWE,402
-reconcile/test/saas_auto_promotions_manager/subscriber/test_content_hash.py,sha256=viw-p42vDOC2telE5lelssRBL7V35aNJ1qUg6D-QGWw,4546
-reconcile/test/saas_auto_promotions_manager/subscriber/test_diff.py,sha256=BkxCoWBlUahY5Vq36FX_t_UyIdzIc64CumzAd3imUAQ,4529
-reconcile/test/saas_auto_promotions_manager/subscriber/test_multiple_channels_config_hash.py,sha256=0MeFuJnKUHdMXGe8v2Fzge1mhihTcKqr2OAMLEAyHP4,6439
-reconcile/test/saas_auto_promotions_manager/subscriber/test_multiple_channels_moving_ref.py,sha256=rcF2tHltCsZiPQo23b-xjBuEqBHzVn4TMzHv_x0778o,6209
-reconcile/test/saas_auto_promotions_manager/subscriber/test_multiple_publishers_moving_ref.py,sha256=tGAjetYspWeevuuUCfbeU33noM-dP4lsb96UUAHkxWw,3588
-reconcile/test/saas_auto_promotions_manager/subscriber/test_single_channel_with_single_publisher.py,sha256=YDXCzrclRyKRW7qRBg9GB2HinJP_HPqzTcWMGD1rbFI,9452
+reconcile/test/saas_auto_promotions_manager/merge_request_manager/renderer/conftest.py,sha256=MjTLg7KwvdIYvxkCzgJG-gByD1fZxaq6c4SI6rWWUu8,552
+reconcile/test/saas_auto_promotions_manager/merge_request_manager/renderer/test_content_multiple_namespaces.py,sha256=6LMsnbPx5svTF1nL6oQGLTp1NgjLG_tO56c0hbA2Di4,1059
+reconcile/test/saas_auto_promotions_manager/merge_request_manager/renderer/test_content_single_namespace.py,sha256=dc7vMOiVLl5yRUEfjF4eE7HfMZTbtT2dz1CMGJVLUZA,2526
+reconcile/test/saas_auto_promotions_manager/merge_request_manager/renderer/test_content_single_target.py,sha256=FY9pzmvE8uXvvt_P_G3M7_br8Zt1s428H23FlAj9nuY,1881
+reconcile/test/saas_auto_promotions_manager/merge_request_manager/renderer/test_json_path_selector.py,sha256=jCtG0hVCqJ-A4XBjwexDww5LQUXJFRc44O5rEMA7_7E,2160
 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=jX8ade2615gRYiJ_Bui4F2kvv3rUyod5sdiMFhzcnsw,2168
-reconcile/test/saas_auto_promotions_manager/utils/saas_files_inventory/test_saas_files_use_target_config_hash.py,sha256=TThr7UeF8k7lNBeknknEcE4H9z-_K4jKdzNA_SqFKoY,1948
-reconcile/test/saas_auto_promotions_manager/utils/saas_files_inventory/test_saas_files_with_auto_promote.py,sha256=OSSdVEQ72npDRrbkx5JHhXus-0ku699wG7ecsco4axM,2545
-reconcile/test/saas_auto_promotions_manager/utils/saas_files_inventory/test_saas_files_without_auto_promote.py,sha256=6GoZ6ogpXBVYlRwag2wu9Z-1ES9LzyPxMqZkcX7oTA0,2040
 reconcile/typed_queries/__init__.py,sha256=rRk4CyslLsBr4vAh1pIPgt6s3P4R1M9NSEPLnyQgBpk,61
 reconcile/typed_queries/alerting_services_settings.py,sha256=sX6s8GY-BB0UHogMC1ICeREVab-IYrNm1c-hqMGEdYQ,864
 reconcile/typed_queries/app_interface_custom_messages.py,sha256=5HWr68_kb4bEL8pDCIH0ez6GOrdwdbGF6w88xV0_Ccs,718
@@ -797,8 +782,8 @@ tools/test/test_app_interface_metrics_exporter.py,sha256=SX7qL3D1SIRKFo95FoQztvf
 tools/test/test_qontract_cli.py,sha256=w2l4BHB09k1d-BGJ1jBUNCqDv7zkqYrMHojQXg-21kQ,4155
 tools/test/test_sd_app_sre_alert_report.py,sha256=v363r9zM7__0kR5K6mvJoGFcM9BvE33fWAayrqkpojA,2116
 tools/test/test_sre_checkpoints.py,sha256=SKqPPTl9ua0RFdSSofnoQX-JZE6dFLO3LRhfQzqtfh8,2607
-qontract_reconcile-0.10.1rc764.dist-info/METADATA,sha256=Eov5cvApy_dlSvDlyNdI1Uk8pAO7tJZfv4cOMjUfeEA,2382
-qontract_reconcile-0.10.1rc764.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc764.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
-qontract_reconcile-0.10.1rc764.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc764.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc765.dist-info/METADATA,sha256=jvfPojPDE35EHICj36iXRI8v0jcPR9pHsqy5dacJiVE,2382
+qontract_reconcile-0.10.1rc765.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc765.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
+qontract_reconcile-0.10.1rc765.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc765.dist-info/RECORD,,

reconcile/saas_auto_promotions_manager/meta.py

@@ -1,4 +1,4 @@
 from reconcile.utils.semver_helper import make_semver
 
 QONTRACT_INTEGRATION = "saas-auto-promotions-manager"
-QONTRACT_INTEGRATION_VERSION = make_semver(2, 1, 4)
+QONTRACT_INTEGRATION_VERSION = make_semver(2, 2, 0)

reconcile/saas_auto_promotions_manager/subscriber.py

@@ -1,8 +1,8 @@
 import hashlib
 import logging
-from collections.abc import Iterable
+from collections.abc import Iterable, Mapping
 from dataclasses import dataclass
-from typing import Optional
+from typing import Any, Optional
 
 from reconcile.gql_definitions.fragments.saas_target_namespace import (
     SaasTargetNamespace,
@@ -42,6 +42,7 @@ class Subscriber:
         target_file_path: str,
         target_namespace: SaasTargetNamespace,
         use_target_config_hash: bool,
+        uid: str,
     ):
         self.saas_name = saas_name
         self.template_name = template_name
@@ -52,6 +53,7 @@ class Subscriber:
         self.desired_ref = ""
         self.desired_hashes: list[ConfigHash] = []
         self.target_namespace = target_namespace
+        self.uid = uid
         self._content_hash = ""
         self._use_target_config_hash = use_target_config_hash
 
@@ -73,6 +75,54 @@ class Subscriber:
         self._compute_desired_ref()
         self._compute_desired_config_hashes()
 
+    @staticmethod
+    def from_exported_dict(data: Mapping[str, Any]) -> "Subscriber":
+        subscriber = Subscriber(
+            saas_name=data["1"],
+            template_name=data["2"],
+            ref=data["3"],
+            target_file_path=data["4"],
+            use_target_config_hash=data["5"],
+            target_namespace=SaasTargetNamespace(**data["6"]),
+            uid=data["7"],
+        )
+        subscriber.desired_hashes = data["8"]
+        subscriber.desired_ref = data["9"]
+        return subscriber
+
+    def to_exportable_dict(self) -> dict[str, Any]:
+        """
+        We will later persist subscriber data as json in MRs. We keep key size small to use less space.
+        Note, the data will be encoded and encrypted in another component.
+        """
+        data: dict[str, Any] = {}
+        data["1"] = self.saas_name
+        data["2"] = self.template_name
+        data["3"] = self.ref
+        data["4"] = self.target_file_path
+        data["5"] = self._use_target_config_hash
+        data["6"] = self.target_namespace.dict(by_alias=True)
+        data["7"] = self.uid
+        data["8"] = self.desired_hashes
+        data["9"] = self.desired_ref
+        return data
+
+    def __eq__(self, other: object) -> bool:
+        if not isinstance(other, Subscriber):
+            # don't attempt to compare against unrelated types
+            return False
+        return (
+            self.saas_name == other.saas_name
+            and self.template_name == other.template_name
+            and self.ref == other.ref
+            and self.target_file_path == other.target_file_path
+            and self._use_target_config_hash == other._use_target_config_hash
+            and self.desired_ref == other.desired_ref
+            and self.desired_hashes == other.desired_hashes
+            and self.target_namespace == other.target_namespace
+            and self.uid == other.uid
+        )
+
     def _validate_deployment(
         self, publisher: Publisher, channel: Channel
     ) -> Optional[DeploymentInfo]:

reconcile/saas_auto_promotions_manager/utils/saas_files_inventory.py

@@ -92,6 +92,10 @@ class SaasFilesInventory:
                     if not target.promotion.auto:
                         continue
                     subscriber = Subscriber(
+                        uid=target.uid(
+                            parent_saas_file_name=saas_file.name,
+                            parent_resource_template_name=resource_template.name,
+                        ),
                         saas_name=saas_file.name,
                         template_name=resource_template.name,
                         target_file_path=file_path,

reconcile/test/saas_auto_promotions_manager/conftest.py

@@ -1,9 +1,11 @@
+from collections import defaultdict
 from collections.abc import (
     Callable,
     Iterable,
     Mapping,
     MutableMapping,
 )
+from typing import Any
 from unittest.mock import (
     MagicMock,
     create_autospec,
@@ -14,6 +16,12 @@ import pytest
 from reconcile.gql_definitions.fragments.saas_target_namespace import (
     SaasTargetNamespace,
 )
+from reconcile.saas_auto_promotions_manager.publisher import DeploymentInfo, Publisher
+from reconcile.saas_auto_promotions_manager.subscriber import (
+    Channel,
+    ConfigHash,
+    Subscriber,
+)
 from reconcile.typed_queries.saas_files import SaasFile
 from reconcile.utils.gitlab_api import GitLabApi
 from reconcile.utils.promotion_state import (
@@ -100,3 +108,58 @@ def promotion_state_builder() -> Callable[..., PromotionState]:
         return promotion_state
 
     return builder
+
+
+@pytest.fixture
+def subscriber_builder(
+    saas_target_namespace_builder: Callable[..., SaasTargetNamespace],
+) -> Callable[[Mapping[str, Any]], Subscriber]:
+    def builder(data: Mapping[str, Any]) -> Subscriber:
+        channels: list[Channel] = []
+        for channel_name, channel_data in data.get("CHANNELS", {}).items():
+            channel = Channel(name=channel_name, publishers=[])
+            for publisher_name, publisher_data in channel_data.items():
+                publisher = Publisher(
+                    ref="",
+                    uid="",
+                    repo_url="",
+                    cluster_name="",
+                    namespace_name="",
+                    saas_name="",
+                    saas_file_path="",
+                    app_name="",
+                    resource_template_name="",
+                    target_name=None,
+                    publish_job_logs=True,
+                    has_subscriber=True,
+                    auth_code=None,
+                )
+                publisher.commit_sha = publisher_data["REAL_WORLD_SHA"]
+                publisher.deployment_info_by_channel[channel_name] = DeploymentInfo(
+                    success=publisher_data.get("SUCCESSFUL_DEPLOYMENT", True),
+                    target_config_hash=publisher_data.get("CONFIG_HASH", ""),
+                    saas_file=publisher_name,
+                )
+                channel.publishers.append(publisher)
+            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.channel].append(
+                cur_config_hash
+            )
+        subscriber = Subscriber(
+            uid=data.get("SUB_UID", "default"),
+            target_namespace=saas_target_namespace_builder(data.get("NAMESPACE", {})),
+            ref=data.get("CUR_SUBSCRIBER_REF", ""),
+            saas_name="",
+            target_file_path=data.get("TARGET_FILE_PATH", ""),
+            template_name="",
+            use_target_config_hash=data.get("USE_TARGET_CONFIG_HASH", True),
+        )
+        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/merge_request_manager/merge_request_manager/conftest.py

@@ -8,9 +8,6 @@ from unittest.mock import create_autospec
 import pytest
 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,
 )
@@ -31,24 +28,17 @@ from reconcile.saas_auto_promotions_manager.merge_request_manager.renderer impor
     VERSION_REF,
     Renderer,
 )
-from reconcile.saas_auto_promotions_manager.subscriber import (
-    Channel,
-    Subscriber,
-)
 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_TARGET_PATH,
 )
 
 
@@ -120,33 +110,6 @@ def reconciler_builder() -> Callable[[Diff], 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({}),
-            ref="",
-            target_file_path=data.get(SUBSCRIBER_TARGET_PATH, ""),
-            use_target_config_hash=True,
-        )
-        subscriber.desired_hashes = []
-        subscriber.desired_ref = data.get(REF, "")
-        for channel in data.get(CHANNEL, []):
-            subscriber.channels.append(
-                Channel(
-                    name=channel,
-                    publishers=[],
-                )
-            )
-        return subscriber
-
-    return builder
-
-
 @pytest.fixture
 def renderer() -> Renderer:
     return create_autospec(spec=Renderer)

reconcile/test/saas_auto_promotions_manager/merge_request_manager/merge_request_manager/test_desired_state.py

@@ -5,10 +5,6 @@ from reconcile.saas_auto_promotions_manager.merge_request_manager.desired_state
 )
 from reconcile.saas_auto_promotions_manager.subscriber import Subscriber
 
-from .data_keys import (
-    CHANNEL,
-)
-
 
 def test_desired_state_empty() -> None:
     desired_state = DesiredState(subscribers=[])
@@ -29,10 +25,14 @@ def test_desired_state_single_subscriber(
 def test_desired_state_multiple_subscribers_same_channel_combo(
     subscriber_builder: Callable[..., Subscriber],
 ) -> None:
-    subscriber_a = subscriber_builder({CHANNEL: ["channel-a", "channel-b"]})
-    subscriber_a.desired_ref = "ref-a"
-    subscriber_b = subscriber_builder({CHANNEL: ["channel-a", "channel-b"]})
-    subscriber_b.desired_ref = "ref-b"
+    subscriber_a = subscriber_builder({
+        "CHANNELS": {"channel-a": {}, "channel-b": {}},
+        "DESIRED_REF": "ref-a",
+    })
+    subscriber_b = subscriber_builder({
+        "CHANNELS": {"channel-a": {}, "channel-b": {}},
+        "DESIRED_REF": "ref-b",
+    })
     desired_state = DesiredState(subscribers=[subscriber_a, subscriber_b])
     assert len(desired_state.promotions) == 1
     assert desired_state.promotions[0].content_hashes == {
@@ -43,12 +43,18 @@ def test_desired_state_multiple_subscribers_same_channel_combo(
 def test_desired_state_multiple_subscribers_different_channel_combo(
     subscriber_builder: Callable[..., Subscriber],
 ) -> None:
-    subscriber_a = subscriber_builder({CHANNEL: ["channel-a", "channel-b"]})
-    subscriber_a.desired_ref = "ref-a"
-    subscriber_b = subscriber_builder({CHANNEL: ["channel-a", "channel-b"]})
-    subscriber_b.desired_ref = "ref-b"
-    subscriber_c = subscriber_builder({CHANNEL: ["channel-b", "channel-c"]})
-    subscriber_c.desired_ref = "ref-c"
+    subscriber_a = subscriber_builder({
+        "CHANNELS": {"channel-a": {}, "channel-b": {}},
+        "DESIRED_REF": "ref-a",
+    })
+    subscriber_b = subscriber_builder({
+        "CHANNELS": {"channel-a": {}, "channel-b": {}},
+        "DESIRED_REF": "ref-b",
+    })
+    subscriber_c = subscriber_builder({
+        "CHANNELS": {"channel-b": {}, "channel-c": {}},
+        "DESIRED_REF": "ref-c",
+    })
     desired_state = DesiredState(subscribers=[subscriber_a, subscriber_b, subscriber_c])
     sorted_promotions = sorted(desired_state.promotions)
     assert len(desired_state.promotions) == 2

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

@@ -1,26 +1,10 @@
 import os
 from collections.abc import (
     Callable,
-    Mapping,
 )
 
 import pytest
 
-from reconcile.gql_definitions.fragments.saas_target_namespace import (
-    SaasTargetNamespace,
-)
-from reconcile.saas_auto_promotions_manager.subscriber import (
-    Channel,
-    Subscriber,
-)
-
-from .data_keys import (
-    CHANNELS,
-    CONFIG_HASHES,
-    NAMESPACE,
-    REF,
-)
-
 
 @pytest.fixture
 def file_contents() -> Callable[[str], tuple[str, str]]:
@@ -39,30 +23,3 @@ def file_contents() -> Callable[[str], tuple[str, str]]:
         return (a, b)
 
     return contents
-
-
-@pytest.fixture
-def subscriber_builder(
-    saas_target_namespace_builder: Callable[..., SaasTargetNamespace],
-) -> Callable[[Mapping], Subscriber]:
-    def builder(data: Mapping) -> Subscriber:
-        subscriber = Subscriber(
-            target_namespace=saas_target_namespace_builder(data.get(NAMESPACE, {})),
-            ref="",
-            saas_name="",
-            target_file_path="",
-            template_name="",
-            use_target_config_hash=True,
-        )
-        subscriber.desired_ref = data[REF]
-        subscriber.desired_hashes = data[CONFIG_HASHES]
-        for channel in data.get(CHANNELS, []):
-            subscriber.channels.append(
-                Channel(
-                    name=channel,
-                    publishers=[],
-                )
-            )
-        return subscriber
-
-    return builder

reconcile/test/saas_auto_promotions_manager/merge_request_manager/renderer/test_content_multiple_namespaces.py

@@ -11,29 +11,22 @@ from reconcile.saas_auto_promotions_manager.subscriber import (
     Subscriber,
 )
 
-from .data_keys import (
-    CHANNELS,
-    CONFIG_HASHES,
-    NAMESPACE,
-    REF,
-)
-
 
 def test_content_multiple_namespaces(
     file_contents: Callable[[str], tuple[str, str]],
     subscriber_builder: Callable[[Mapping], Subscriber],
 ):
     subscriber = subscriber_builder({
-        NAMESPACE: {"path": "/some/namespace.yml"},
-        REF: "new_sha",
-        CONFIG_HASHES: [
+        "NAMESPACE": {"path": "/some/namespace.yml"},
+        "DESIRED_REF": "new_sha",
+        "DESIRED_TARGET_HASHES": [
             ConfigHash(
                 channel="channel-a",
                 target_config_hash="new_hash",
                 parent_saas="parent_saas",
             )
         ],
-        CHANNELS: ["channel-a"],
+        "CHANNELS": {"channel-a": {}},
     })
     saas_content, expected = file_contents("multiple_namespaces")
     renderer = Renderer()

reconcile/test/saas_auto_promotions_manager/merge_request_manager/renderer/test_content_single_namespace.py

@@ -11,29 +11,22 @@ from reconcile.saas_auto_promotions_manager.subscriber import (
     Subscriber,
 )
 
-from .data_keys import (
-    CHANNELS,
-    CONFIG_HASHES,
-    NAMESPACE,
-    REF,
-)
-
 
 def test_content_single_namespace(
     file_contents: Callable[[str], tuple[str, str]],
     subscriber_builder: Callable[[Mapping], Subscriber],
 ):
     subscriber = subscriber_builder({
-        NAMESPACE: {"path": "/some/namespace.yml"},
-        REF: "new_sha",
-        CONFIG_HASHES: [
+        "NAMESPACE": {"path": "/some/namespace.yml"},
+        "DESIRED_REF": "new_sha",
+        "DESIRED_TARGET_HASHES": [
             ConfigHash(
                 channel="channel-a",
                 target_config_hash="current_hash",
                 parent_saas="parent_saas",
             )
         ],
-        CHANNELS: ["channel-a"],
+        "CHANNELS": {"channel-a": {}},
     })
     saas_content, expected = file_contents("single_namespace")
     renderer = Renderer()
@@ -49,16 +42,16 @@ def test_content_single_namespace_no_previous_hash(
     subscriber_builder: Callable[[Mapping], Subscriber],
 ):
     subscriber = subscriber_builder({
-        NAMESPACE: {"path": "/some/namespace.yml"},
-        REF: "new_sha",
-        CONFIG_HASHES: [
+        "NAMESPACE": {"path": "/some/namespace.yml"},
+        "DESIRED_REF": "new_sha",
+        "DESIRED_TARGET_HASHES": [
             ConfigHash(
                 channel="channel-a",
                 target_config_hash="new_hash",
                 parent_saas="parent_saas",
             )
         ],
-        CHANNELS: ["channel-a"],
+        "CHANNELS": {"channel-a": {}},
     })
     saas_content, expected = file_contents("single_namespace_no_hash")
     renderer = Renderer()
@@ -74,10 +67,10 @@ def test_content_single_namespace_no_desired_hash(
     subscriber_builder: Callable[[Mapping], Subscriber],
 ):
     subscriber = subscriber_builder({
-        NAMESPACE: {"path": "/some/namespace.yml"},
-        REF: "new_sha",
-        CONFIG_HASHES: [],
-        CHANNELS: ["channel-a"],
+        "NAMESPACE": {"path": "/some/namespace.yml"},
+        "DESIRED_REF": "new_sha",
+        "DESIRED_TARGET_HASHES": [],
+        "CHANNELS": {"channel-a": {}},
     })
     saas_content, expected = file_contents("single_namespace_ignore_hash")
     renderer = Renderer()

reconcile/test/saas_auto_promotions_manager/merge_request_manager/renderer/test_content_single_target.py

@@ -11,21 +11,15 @@ from reconcile.saas_auto_promotions_manager.subscriber import (
     Subscriber,
 )
 
-from .data_keys import (
-    CONFIG_HASHES,
-    NAMESPACE,
-    REF,
-)
-
 
 def test_content_single_target(
     file_contents: Callable[[str], tuple[str, str]],
     subscriber_builder: Callable[[Mapping], Subscriber],
 ):
     subscriber = subscriber_builder({
-        NAMESPACE: {"path": "/some/namespace.yml"},
-        REF: "new_sha",
-        CONFIG_HASHES: [
+        "NAMESPACE": {"path": "/some/namespace.yml"},
+        "DESIRED_REF": "new_sha",
+        "DESIRED_TARGET_HASHES": [
             ConfigHash(
                 channel="channel-a",
                 target_config_hash="new_hash",
@@ -48,9 +42,9 @@ def test_must_not_line_wrap(
 ):
     namespace_name = "/services/sosososolong/namespaces/loooooooooooooooooooooooooooooooooooooooooooooooooooooooooong.yml"
     subscriber = subscriber_builder({
-        NAMESPACE: {"path": namespace_name},
-        REF: "new_sha",
-        CONFIG_HASHES: [
+        "NAMESPACE": {"path": namespace_name},
+        "DESIRED_REF": "new_sha",
+        "DESIRED_TARGET_HASHES": [
             ConfigHash(
                 channel="channel-a",
                 target_config_hash="new_hash",