qontract-reconcile 0.10.1rc758__py3-none-any.whl → 0.10.1rc760__py3-none-any.whl

{qontract_reconcile-0.10.1rc758.dist-info → qontract_reconcile-0.10.1rc760.dist-info}/METADATA

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

@@ -395,17 +395,19 @@ reconcile/rhidp/sso_client/base.py,sha256=EfQ2ewcOKh5idg46UKAkY6z0m_nGQfvnQKffa2
 reconcile/rhidp/sso_client/integration.py,sha256=kA8g7c38ZBSdrRtyfEqy_WgSreD1PbwY7ZIN-3tZRPc,2221
 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=h1RS-rE8_UaVoLV4c9NyfNfjzvHLQcEVwVN_2UxT7T8,6843
+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/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/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
-reconcile/saas_auto_promotions_manager/merge_request_manager/merge_request_manager_v2.py,sha256=Z-tUicItSMWq4WoAU59WTYChtOeS2FShD_bxrhNzsgc,7069
+reconcile/saas_auto_promotions_manager/merge_request_manager/merge_request_manager_v2.py,sha256=IRLHdz-XMn-rIb0jFddYkIuN9c7FC6InJZ61c9fVjvI,6193
 reconcile/saas_auto_promotions_manager/merge_request_manager/metrics.py,sha256=sdHp71Wl87tFM-Z_QvqvdHhyrppFLGi4ekksCi_e_bs,977
 reconcile/saas_auto_promotions_manager/merge_request_manager/mr_parser.py,sha256=x8Gg-YjEFWEeDPJH3Y8SrfcJbwhLuAqCz4kIhfEyaaA,7060
-reconcile/saas_auto_promotions_manager/merge_request_manager/reconciler.py,sha256=nst5ZynEQs9Hy9Z2DAjN8_ALIS_5XnrbJh7KG4YVRrE,7789
-reconcile/saas_auto_promotions_manager/merge_request_manager/renderer.py,sha256=Z2G4wMQB3DLTuMlH_MGURGR4uLyh-6RnksQJzdym5VQ,6960
+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/skupper_network/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -437,7 +439,7 @@ reconcile/terraform_init/integration.py,sha256=xcFKTc_or3xB3kE_I3OECNkkgbwALIwwd
 reconcile/terraform_init/merge_request.py,sha256=3CYtgSd7Q9zjKg4wsDz437EPCRfGeZZ8fZ0Y-ChKXJY,1475
 reconcile/terraform_init/merge_request_manager.py,sha256=fMcT6hbdEF3nFATJpvr8BedvQHq_MzFkgVJSloBNwOQ,3101
 reconcile/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/test/conftest.py,sha256=rQousYrxUz-EwAIbsYO6bIwR1B4CrOz9y_zaUVo2lfI,4466
+reconcile/test/conftest.py,sha256=0pO4UxFeBALKbL9gwemyap0VkbPR8n5TtZbf5c9pSv0,4303
 reconcile/test/fixtures.py,sha256=9SDWAUlSd1rCx7z3GhULHcpr-I6FyCsXxaFAZIqYQsQ,591
 reconcile/test/test_acs_notifiers.py,sha256=xf3WL6q6V7KQdTVSx6YI-pa4yzOX3mkvIJomgPUc3Mw,12746
 reconcile/test/test_acs_policies.py,sha256=8pwnXpAO-0OI-6oubjf_oPPlpZjVldeZfJJ9uhsNMWM,17579
@@ -455,7 +457,7 @@ reconcile/test/test_cli.py,sha256=qx_iBwh4Z-YkK3sbjK1wEziPTgn060EN-baf9DNvR3k,10
 reconcile/test/test_closedbox_endpoint_monitoring.py,sha256=isMHYwRWMFARU2nbJgbl69kD6H0eA86noCM4MPVI1fo,7151
 reconcile/test/test_dashdotdb_dora.py,sha256=MfHGAsX2eSQSvBVt9_1Sah3aQKNJBXA9Iu86X0NWD6c,7705
 reconcile/test/test_database_access_manager.py,sha256=-9fYo8wMNhbJUTK_bd7g_fS5zYsAlqQ0rBDDYBMZvZQ,19595
-reconcile/test/test_deadmanssnitch.py,sha256=qtn1zwWgIQYw5JULLPvDLaj0GWiecYnvky0HcuETjdo,9843
+reconcile/test/test_deadmanssnitch.py,sha256=YAf8wlZoEC60Ul7UA6Y6XqwnZ1yqf07J15ABqeLpqW4,9835
 reconcile/test/test_gabi_authorized_users.py,sha256=6XnV5Q9inxP81ktGMVKyWucjBTUj8Imy2L0HG3YHyUE,2496
 reconcile/test/test_gcr_mirror.py,sha256=A0y8auKZzr62-mGoxSQ__JnN0-ijZUltzjwR5miBgso,490
 reconcile/test/test_github_org.py,sha256=j3KeB4OnSln1gm2hidce49xdMru-j75NS3cM-AEgzZc,4511
@@ -513,7 +515,7 @@ reconcile/test/test_terraform_users.py,sha256=XOAfGvITCJPI1LTlISmHbA4ONMQMkxYUMT
 reconcile/test/test_terraform_vpc_peerings.py,sha256=ubcsKh0TrUIwuI1-W3ETIgzsFvzAyeoFmEJFC-IK6JY,20538
 reconcile/test/test_terraform_vpc_peerings_build_desired_state.py,sha256=DAfpb12I0PlqnuVUHK2vh4LH4d1OylT3H2GE_3TGZZI,47852
 reconcile/test/test_three_way_diff_strategy.py,sha256=2fjEqE2w4pIzKq18PRcADTSe01aGwsZfMGloU8xfNaE,3346
-reconcile/test/test_unleash.py,sha256=c1s_FRAZrAzzd3FbZrzHYjJzHELhoxPHBZnEzqsfMQg,6416
+reconcile/test/test_unleash.py,sha256=krPgOVmwTE6lb773040Ely9BPbNYOeOIY0_8BK72dgo,6690
 reconcile/test/test_utils_jinja2.py,sha256=TpzQlpFnLGzNEZp5WOh0o7AuBiGEktqO4MuwiiJW2YY,3895
 reconcile/test/test_vault_replication.py,sha256=wlc4jm9f8P641UvvxIFFFc5_unJysNkOVrKJscjhQr0,16867
 reconcile/test/test_vault_utils.py,sha256=vbJnc89XAuE07qbTuWxHM5o9F6R9SO5aHXA38fwxT7A,1122
@@ -527,6 +529,7 @@ reconcile/test/saas_auto_promotions_manager/merge_request_manager/__init__.py,sh
 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/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_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
@@ -597,7 +600,7 @@ reconcile/utils/binary.py,sha256=EsOGg82Y2QJh91SGJE0tYpBKqU0iaaagQVoYONBtQn8,235
 reconcile/utils/config.py,sha256=aId5zrPjM_84u_T4yTRE_Psu3zo5-5_JCR6_7Wgv5UQ,990
 reconcile/utils/constants.py,sha256=pOUd97bqZdsAu5RWJ8NUs9cwCY7K9y0eW9VVeJ4fZIU,138
 reconcile/utils/data_structures.py,sha256=VyKfnlNJTiRvZKNpfgIrjESQ2YgmEpWuPQXT14WA1vI,311
-reconcile/utils/deadmanssnitch_api.py,sha256=hkfbfbRAhzLpI39o6Du7FZKVtf4UVJ1OljOQNUkmODM,2478
+reconcile/utils/deadmanssnitch_api.py,sha256=OWwkqZxjLRNNfFrfZt-zJ4H1hm4OHg5EZ6lP55APOZc,2493
 reconcile/utils/defer.py,sha256=SniUsbgOEs9Pa8JkecLu0F94O63yQPByKXaElDYe0FI,377
 reconcile/utils/differ.py,sha256=kJmUp9ZffFPSUEviaAw3s9c92ErwRJeHaRexGPai7wA,7643
 reconcile/utils/disabled_integrations.py,sha256=avdDsFyl_LdTsrPVzlcIhWzT_V4C4MXw1ZC__aOtluE,1126
@@ -651,12 +654,12 @@ reconcile/utils/promtool.py,sha256=kT2rFZSBaRqW7SSHAuYzGZzQxM5Dzk8KW1NnEUYZU_s,2
 reconcile/utils/quay_api.py,sha256=EuOegpb-7ntEjkKLFwM2Oo4Nw7SyFtmyl3sQ9aXMtrM,8152
 reconcile/utils/raw_github_api.py,sha256=ZHC-SZuAyRe1zaMoOU7Krt1-zecDxENd9c_NzQYqK9g,2968
 reconcile/utils/repo_owners.py,sha256=j-pUjc9PuDzq7KpjNLpnhqfU8tUG4nj2WMhFp4ick7g,6629
-reconcile/utils/rest_api_base.py,sha256=uXLdXocNmRCxJsYFWOdUNLaTEu-dcxMLJg_CwRefETE,3970
+reconcile/utils/rest_api_base.py,sha256=X5o4idyRCDzwnF5xFwmjyoaHmM1tXSZnykTA54Z7D2Q,4006
 reconcile/utils/ruamel.py,sha256=FzL4_L0FnMOUZmgThrZSMJs5MTdXwiy-E9MZWfk8bh8,397
 reconcile/utils/secret_reader.py,sha256=2DeYAAQFjUULEKlLw3UDAUoND6gbqvCh9uKPtlc-0us,10403
 reconcile/utils/semver_helper.py,sha256=-WfPOMSA2v1h7hT3PwVf-Htg7wOsoKlQC1JdmDX2Ars,1268
 reconcile/utils/sharding.py,sha256=gkYf0lD3IUKQPEmdRJZ70mdDT1c9qWjbdP7evRsUis4,839
-reconcile/utils/slack_api.py,sha256=OPmzU6L9rJx2XXDlZkMlxLjOWu17yC-fVCoUItzQrXw,16295
+reconcile/utils/slack_api.py,sha256=C-VThgYRtrRWraq9ZE6hEf1bXrwzRDCDK0uRw3DP6ew,16425
 reconcile/utils/smtp_client.py,sha256=gJNbBQJpAt5PX4t_TaeNHsXM8vt50bFgndml6yK2b5o,2800
 reconcile/utils/sqs_gateway.py,sha256=gFl9DM4DmGnptuxTOe4lS3YTyE80eSAvK42ljS8h4dA,2287
 reconcile/utils/state.py,sha256=FK8NLT1xyumuXpYRm0Nk6pWpOE_U6-NovGn6zKCw8vw,16298
@@ -783,8 +786,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.1rc758.dist-info/METADATA,sha256=AV5BARka8wT3N8-xnQvmBspzkrCa7ewkyMWLaQ2xb-s,2382
-qontract_reconcile-0.10.1rc758.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc758.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
-qontract_reconcile-0.10.1rc758.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc758.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc760.dist-info/METADATA,sha256=4WvkJGFrn51U56sSukrjQU-JoWydSXzdq7hg8hzcsoQ,2382
+qontract_reconcile-0.10.1rc760.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc760.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
+qontract_reconcile-0.10.1rc760.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc760.dist-info/RECORD,,

reconcile/saas_auto_promotions_manager/integration.py

@@ -18,6 +18,7 @@ from reconcile.saas_auto_promotions_manager.merge_request_manager.reconciler imp
 from reconcile.saas_auto_promotions_manager.merge_request_manager.renderer import (
     Renderer,
 )
+from reconcile.saas_auto_promotions_manager.meta import QONTRACT_INTEGRATION
 from reconcile.saas_auto_promotions_manager.publisher import Publisher
 from reconcile.saas_auto_promotions_manager.s3_exporter import S3Exporter
 from reconcile.saas_auto_promotions_manager.subscriber import Subscriber
@@ -34,14 +35,10 @@ from reconcile.typed_queries.saas_files import get_saas_files
 from reconcile.utils.defer import defer
 from reconcile.utils.promotion_state import PromotionState
 from reconcile.utils.secret_reader import create_secret_reader
-from reconcile.utils.semver_helper import make_semver
 from reconcile.utils.state import State, init_state
 from reconcile.utils.unleash import get_feature_toggle_state
 from reconcile.utils.vcs import VCS
 
-QONTRACT_INTEGRATION = "saas-auto-promotions-manager"
-QONTRACT_INTEGRATION_VERSION = make_semver(0, 1, 0)
-
 
 class SaasAutoPromotionsManager:
     def __init__(

reconcile/saas_auto_promotions_manager/merge_request_manager/desired_state.py

@@ -0,0 +1,28 @@
+from collections import defaultdict
+from collections.abc import Iterable
+
+from reconcile.saas_auto_promotions_manager.merge_request_manager.reconciler import (
+    Promotion,
+)
+from reconcile.saas_auto_promotions_manager.subscriber import Subscriber
+
+
+class DesiredState:
+    def __init__(self, subscribers: Iterable[Subscriber]) -> None:
+        self.content_hash_to_subscriber: dict[str, list[Subscriber]] = {}
+        subscribers_per_channel_combo: dict[str, list[Subscriber]] = defaultdict(list)
+        for subscriber in subscribers:
+            channel_combo = ",".join([c.name for c in subscriber.channels])
+            subscribers_per_channel_combo[channel_combo].append(subscriber)
+
+        desired_promotions: list[Promotion] = []
+        for channel_combo, subs in subscribers_per_channel_combo.items():
+            combined_content_hash = Subscriber.combined_content_hash(subscribers=subs)
+            self.content_hash_to_subscriber[combined_content_hash] = subs
+            desired_promotions.append(
+                Promotion(
+                    content_hashes={combined_content_hash},
+                    channels={channel_combo},
+                )
+            )
+        self.promotions = desired_promotions

reconcile/saas_auto_promotions_manager/merge_request_manager/merge_request_manager_v2.py

@@ -1,9 +1,11 @@
 import logging
-from collections import defaultdict
 from collections.abc import Iterable
 
 from gitlab.exceptions import GitlabGetError
 
+from reconcile.saas_auto_promotions_manager.merge_request_manager.desired_state import (
+    DesiredState,
+)
 from reconcile.saas_auto_promotions_manager.merge_request_manager.merge_request import (
     SAPMMR,
 )
@@ -21,7 +23,6 @@ from reconcile.saas_auto_promotions_manager.merge_request_manager.mr_parser impo
 )
 from reconcile.saas_auto_promotions_manager.merge_request_manager.reconciler import (
     Addition,
-    Promotion,
     Reconciler,
 )
 from reconcile.saas_auto_promotions_manager.merge_request_manager.renderer import (
@@ -66,33 +67,12 @@ class MergeRequestManagerV2:
         self._mr_parser = mr_parser
         self._renderer = renderer
         self._reconciler = reconciler
-        self._content_hash_to_subscriber: dict[str, list[Subscriber]] = {}
         self._sapm_mrs: list[SAPMMR] = []
 
-    def _aggregate_desired_state(
-        self, subscribers: Iterable[Subscriber]
-    ) -> list[Promotion]:
-        subscribers_per_channel_combo: dict[str, list[Subscriber]] = defaultdict(list)
-        for subscriber in subscribers:
-            channel_combo = ",".join([c.name for c in subscriber.channels])
-            subscribers_per_channel_combo[channel_combo].append(subscriber)
-
-        desired_promotions: list[Promotion] = []
-        for channel_combo, subs in subscribers_per_channel_combo.items():
-            combined_content_hash = Subscriber.combined_content_hash(subscribers=subs)
-            self._content_hash_to_subscriber[combined_content_hash] = subs
-            desired_promotions.append(
-                Promotion(
-                    content_hashes={combined_content_hash},
-                    channels={channel_combo},
-                )
-            )
-        return desired_promotions
-
     def _render_mr(self, addition: Addition) -> None:
         subs: list[Subscriber] = []
         for content_hash in addition.content_hashes:
-            subs.extend(self._content_hash_to_subscriber[content_hash])
+            subs.extend(self._desired_state.content_hash_to_subscriber[content_hash])
         content_by_path: dict[str, str] = {}
         has_error = False
         for sub in subs:
@@ -151,11 +131,12 @@ class MergeRequestManagerV2:
 
     def reconcile(self, subscribers: Iterable[Subscriber]) -> None:
         current_state = self._mr_parser.retrieve_open_mrs(label=SAPM_LABEL)
-        desired_state = self._aggregate_desired_state(subscribers=subscribers)
+        desired_state = DesiredState(subscribers=subscribers)
+        self._desired_state = desired_state
 
         diff = self._reconciler.reconcile(
             batch_limit=BATCH_SIZE_LIMIT,
-            desired_promotions=desired_state,
+            desired_promotions=desired_state.promotions,
             open_mrs=current_state,
         )
         parallel_open_mrs = (

reconcile/saas_auto_promotions_manager/merge_request_manager/reconciler.py

@@ -14,7 +14,7 @@ class Reason(Enum):
     NEW_BATCH = "Closing this MR in favor of a new batch MR."
 
 
-@dataclass
+@dataclass(order=True)
 class Promotion:
     content_hashes: set[str]
     channels: set[str]

reconcile/saas_auto_promotions_manager/merge_request_manager/renderer.py

@@ -13,13 +13,14 @@ from reconcile.gql_definitions.common.saas_files import (
 from reconcile.gql_definitions.fragments.saas_target_namespace import (
     SaasTargetNamespace,
 )
+from reconcile.saas_auto_promotions_manager.meta import QONTRACT_INTEGRATION_VERSION
 from reconcile.saas_auto_promotions_manager.subscriber import Subscriber
 from reconcile.utils.ruamel import create_ruamel_instance
 
 PROMOTION_DATA_SEPARATOR = (
     "**SAPM Data - DO NOT MANUALLY CHANGE ANYTHING BELOW THIS LINE**"
 )
-SAPM_VERSION = "2.1.3"
+SAPM_VERSION = QONTRACT_INTEGRATION_VERSION
 CONTENT_HASHES = "content_hashes"
 CHANNELS_REF = "channels"
 IS_BATCHABLE = "is_batchable"

reconcile/saas_auto_promotions_manager/meta.py

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

reconcile/test/conftest.py

@@ -12,10 +12,10 @@ from typing import (
 )
 from unittest.mock import create_autospec
 
-import httpretty as _httpretty
 import pytest
 from pydantic import BaseModel
 from pydantic.error_wrappers import ValidationError
+from pytest_httpserver import HTTPServer
 
 from reconcile.gql_definitions.fragments.vault_secret import VaultSecret
 from reconcile.test.fixtures import Fixtures
@@ -29,13 +29,6 @@ def patch_sleep(mocker):
     yield mocker.patch.object(time, "sleep")
 
 
-@pytest.fixture()
-def httpretty():
-    with _httpretty.enabled(allow_net_connect=False):
-        _httpretty.reset()
-        yield _httpretty
-
-
 @pytest.fixture
 def secret_reader(mocker) -> None:
     mock_secretreader = mocker.patch(
@@ -153,19 +146,18 @@ def gql_api_builder() -> Callable[[Optional[Mapping]], GqlApi]:
 
 
 @pytest.fixture
-def set_httpretty_responses_based_on_fixture(httpretty: _httpretty) -> Callable:
-    """Create httpretty responses based fixture files."""
+def set_httpserver_responses_based_on_fixture(httpserver: HTTPServer) -> Callable:
+    """Create httpserver responses based fixture files."""
 
-    def _(url: str, fx: Fixtures, paths: Iterable[str]) -> None:
+    def _(fx: Fixtures, paths: Iterable[str]) -> None:
         for path in paths:
             for method in ["get", "post", "put", "patch", "delete"]:
-                method_file = Path(fx.path(path)) / f"{method}.json"
+                method_file = Path(fx.path(path.lstrip("/"))) / f"{method}.json"
                 if method_file.exists():
-                    httpretty.register_uri(
-                        getattr(httpretty, method.upper()),
-                        f"{url}/{path}",
-                        body=method_file.read_text(),
-                        content_type="text/json",
+                    httpserver.expect_oneshot_request(
+                        path, method=method
+                    ).respond_with_data(
+                        method_file.read_text(), content_type="text/json"
                     )
 
     return _

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

@@ -0,0 +1,60 @@
+from collections.abc import Callable
+
+from reconcile.saas_auto_promotions_manager.merge_request_manager.desired_state import (
+    DesiredState,
+)
+from reconcile.saas_auto_promotions_manager.subscriber import Subscriber
+
+from .data_keys import (
+    CHANNEL,
+)
+
+
+def test_desired_state_empty() -> None:
+    desired_state = DesiredState(subscribers=[])
+    assert desired_state.promotions == []
+
+
+def test_desired_state_single_subscriber(
+    subscriber_builder: Callable[..., Subscriber],
+) -> None:
+    subscriber = subscriber_builder({})
+    desired_state = DesiredState(subscribers=[subscriber])
+    assert len(desired_state.promotions) == 1
+    assert desired_state.promotions[0].content_hashes == {
+        Subscriber.combined_content_hash([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"
+    desired_state = DesiredState(subscribers=[subscriber_a, subscriber_b])
+    assert len(desired_state.promotions) == 1
+    assert desired_state.promotions[0].content_hashes == {
+        Subscriber.combined_content_hash([subscriber_a, subscriber_b]),
+    }
+
+
+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"
+    desired_state = DesiredState(subscribers=[subscriber_a, subscriber_b, subscriber_c])
+    sorted_promotions = sorted(desired_state.promotions)
+    assert len(desired_state.promotions) == 2
+    assert sorted_promotions[0].content_hashes == {
+        Subscriber.combined_content_hash([subscriber_a, subscriber_b]),
+    }
+    assert sorted_promotions[1].content_hashes == {
+        Subscriber.combined_content_hash([subscriber_c]),
+    }

reconcile/test/test_deadmanssnitch.py

@@ -20,7 +20,7 @@ from reconcile.utils.deadmanssnitch_api import (
 
 
 @pytest.fixture
-def deadmanssnitch_api() -> MockerFixture:
+def deadmanssnitch_api() -> MagicMock:
     return create_autospec(DeadMansSnitchApi)
 
 
@@ -55,7 +55,7 @@ def secret_reader(mocker: MockerFixture) -> MockerFixture:
 
 def test_get_current_state(
     secret_reader: MagicMock,
-    deadmanssnitch_api: MockerFixture,
+    deadmanssnitch_api: MagicMock,
     mocker: MockerFixture,
     deadmanssnitch_settings: DeadMansSnitchSettingsV1,
 ) -> None:

reconcile/test/test_unleash.py

@@ -1,8 +1,8 @@
-import json
 import os
+from collections.abc import Callable
 
-import httpretty
 import pytest
+from pytest_httpserver import HTTPServer
 from UnleashClient.features import Feature
 
 import reconcile.utils.unleash
@@ -22,6 +22,75 @@ def reset_client():
     reconcile.utils.unleash.client = None
 
 
+def _setup_unleash_httpserver(features: dict, httpserver: HTTPServer) -> HTTPServer:
+    httpserver.expect_request("/client/features").respond_with_json(features)
+    httpserver.expect_request("/client/register", method="post").respond_with_data(
+        status=202
+    )
+    return httpserver
+
+
+@pytest.fixture
+def setup_unleash_disable_cluster_strategy(httpserver: HTTPServer):
+    def _(enabled: bool) -> HTTPServer:
+        features = {
+            "version": 2,
+            "features": [
+                {
+                    "strategies": [
+                        {
+                            "name": "disableCluster",
+                            "constraints": [],
+                            "parameters": {"cluster_name": "foo"},
+                        },
+                    ],
+                    "impressionData": False,
+                    "enabled": enabled,
+                    "name": "test-strategies",
+                    "description": "",
+                    "project": "default",
+                    "stale": False,
+                    "type": "release",
+                    "variants": [],
+                }
+            ],
+        }
+        return _setup_unleash_httpserver(features, httpserver)
+
+    return _
+
+
+@pytest.fixture
+def setup_unleash_enable_cluster_strategy(httpserver: HTTPServer):
+    def _(enabled: bool) -> HTTPServer:
+        features = {
+            "version": 2,
+            "features": [
+                {
+                    "strategies": [
+                        {
+                            "name": "enableCluster",
+                            "constraints": [],
+                            "parameters": {"cluster_name": "enabled-cluster"},
+                        },
+                    ],
+                    "impressionData": False,
+                    "enabled": enabled,
+                    "name": "test-strategies",
+                    "description": "",
+                    "project": "default",
+                    "stale": False,
+                    "type": "release",
+                    "variants": [],
+                }
+            ],
+        }
+
+        return _setup_unleash_httpserver(features, httpserver)
+
+    return _
+
+
 def test__get_unleash_api_client(mocker):
     mocked_unleash_client = mocker.patch(
         "reconcile.utils.unleash.UnleashClient",
@@ -108,42 +177,12 @@ def test_get_feature_toggles(mocker, monkeypatch):
     assert toggles["bar"] == "enabled"
 
 
-def setup_unleash_disable_cluster_strategy_httpretty(enabled: bool):
-    features = {
-        "version": 2,
-        "features": [
-            {
-                "strategies": [
-                    {
-                        "name": "disableCluster",
-                        "constraints": [],
-                        "parameters": {"cluster_name": "foo"},
-                    },
-                ],
-                "impressionData": False,
-                "enabled": enabled,
-                "name": "test-strategies",
-                "description": "",
-                "project": "default",
-                "stale": False,
-                "type": "release",
-                "variants": [],
-            }
-        ],
-    }
-
-    feature_param = (httpretty.GET, "http://unleash/api/client/features")
-    httpretty.register_uri(*feature_param, body=json.dumps(features), status=200)
-
-    register_param = (httpretty.POST, "http://unleash/api/client/register")
-    httpretty.register_uri(*register_param, status=202)
-
-
-@httpretty.activate(allow_net_connect=False)
-def test_get_feature_toggle_state_with_strategy(reset_client):
-    os.environ["UNLEASH_API_URL"] = "http://unleash/api"
+def test_get_feature_toggle_state_with_strategy(
+    reset_client: None, setup_unleash_disable_cluster_strategy: Callable
+):
+    httpserver = setup_unleash_disable_cluster_strategy(True)
+    os.environ["UNLEASH_API_URL"] = httpserver.url_for("/")
     os.environ["UNLEASH_CLIENT_ACCESS_TOKEN"] = "bar"
-    setup_unleash_disable_cluster_strategy_httpretty(True)
     assert not get_feature_toggle_state(
         "test-strategies", context={"cluster_name": "foo"}
     )
@@ -151,53 +190,24 @@ def test_get_feature_toggle_state_with_strategy(reset_client):
     _shutdown_client()
 
 
-@httpretty.activate(allow_net_connect=False)
-def test_get_feature_toggle_state_disabled_with_strategy(reset_client):
-    os.environ["UNLEASH_API_URL"] = "http://unleash/api"
+def test_get_feature_toggle_state_disabled_with_strategy(
+    reset_client: None, setup_unleash_disable_cluster_strategy: Callable
+):
+    httpserver = setup_unleash_disable_cluster_strategy(False)
+    os.environ["UNLEASH_API_URL"] = httpserver.url_for("/")
     os.environ["UNLEASH_CLIENT_ACCESS_TOKEN"] = "bar"
-    setup_unleash_disable_cluster_strategy_httpretty(False)
     assert not get_feature_toggle_state(
         "test-strategies", context={"cluster_name": "bar"}
     )
     _shutdown_client()
 
 
-def setup_unleash_enable_cluster_strategy_httpretty(enabled: bool):
-    features = {
-        "version": 2,
-        "features": [
-            {
-                "strategies": [
-                    {
-                        "name": "enableCluster",
-                        "constraints": [],
-                        "parameters": {"cluster_name": "enabled-cluster"},
-                    },
-                ],
-                "impressionData": False,
-                "enabled": enabled,
-                "name": "test-strategies",
-                "description": "",
-                "project": "default",
-                "stale": False,
-                "type": "release",
-                "variants": [],
-            }
-        ],
-    }
-
-    feature_param = (httpretty.GET, "http://unleash/api/client/features")
-    httpretty.register_uri(*feature_param, body=json.dumps(features), status=200)
-
-    register_param = (httpretty.POST, "http://unleash/api/client/register")
-    httpretty.register_uri(*register_param, status=202)
-
-
-@httpretty.activate(allow_net_connect=False)
-def test_get_feature_toggle_state_with_enable_cluster_strategy(reset_client):
-    os.environ["UNLEASH_API_URL"] = "http://unleash/api"
+def test_get_feature_toggle_state_with_enable_cluster_strategy(
+    reset_client: None, setup_unleash_enable_cluster_strategy: Callable
+):
+    httpserver = setup_unleash_enable_cluster_strategy(True)
+    os.environ["UNLEASH_API_URL"] = httpserver.url_for("/")
     os.environ["UNLEASH_CLIENT_ACCESS_TOKEN"] = "bar"
-    setup_unleash_enable_cluster_strategy_httpretty(True)
     assert get_feature_toggle_state(
         "test-strategies", context={"cluster_name": "enabled-cluster"}
     )

reconcile/utils/deadmanssnitch_api.py

@@ -49,10 +49,12 @@ class DeadMansSnitchApi:
         self.session.close()
 
     def get_snitches(self, tags: list[str]) -> list[Snitch]:
-        full_url = f"{self.url}?tags={','.join(tags)}"
         logging.debug("Getting snitches for tags:%s", tags)
         response = self.session.get(
-            url=full_url, auth=(self.token, ""), timeout=self.timeout
+            url=self.url,
+            params={"tags": ",".join(tags)},
+            auth=(self.token, ""),
+            timeout=self.timeout,
         )
         response.raise_for_status()
         snitches = [Snitch(**item) for item in response.json()]

reconcile/utils/rest_api_base.py

@@ -75,6 +75,7 @@ class ApiBase:
 
     def _get(self, url: str) -> dict[str, Any]:
         response = self.session.get(urljoin(self.host, url), timeout=self.read_timeout)
+        response.raise_for_status()
         return response.json()
 
     def _list(

reconcile/utils/slack_api.py

@@ -166,6 +166,7 @@ class SlackApi:
         api_config: Optional[SlackApiConfig] = None,
         init_usergroups: bool = True,
         channel: Optional[str] = None,
+        slack_url: Optional[str] = None,
         **chat_kwargs: Any,
     ) -> None:
         """
@@ -187,7 +188,11 @@ class SlackApi:
         else:
             self.config = SlackApiConfig()
 
-        self._sc = WebClient(token=token, timeout=self.config.timeout)
+        self._sc = WebClient(
+            token=token,
+            timeout=self.config.timeout,
+            base_url=slack_url or WebClient.BASE_URL,
+        )
         self._configure_client_retry()
 
         self._results: dict[str, Any] = {}