qontract-reconcile 0.10.1rc759__py3-none-any.whl → 0.10.1rc761__py3-none-any.whl

{qontract_reconcile-0.10.1rc759.dist-info → qontract_reconcile-0.10.1rc761.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.10.1rc759
+Version: 0.10.1rc761
 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.1rc759.dist-info → qontract_reconcile-0.10.1rc761.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
@@ -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
@@ -676,7 +679,7 @@ reconcile/utils/acs/notifiers.py,sha256=2n5blP9N1FdGLZuy3do9bpjd8NKg88kmLNNqhAGn
 reconcile/utils/acs/policies.py,sha256=_jAz6cv8KRYtDsXjGoJgNbD8_9PUa5LSwwVlpK4A_cQ,5505
 reconcile/utils/acs/rbac.py,sha256=ugsLM9Pb7FbUbdq85E3VzXGMaB9ZovXob7tdWCxwqZ8,8808
 reconcile/utils/aws_api_typed/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/utils/aws_api_typed/api.py,sha256=rGUh7-gc8AcjUFuLgQxKyPy1KGY7ffNe6zT1EDdurOM,8283
+reconcile/utils/aws_api_typed/api.py,sha256=uqLNd_uNB11sQqLfcrqvXb1Z_K8GtX3K0FZ8zC_FK-A,8329
 reconcile/utils/aws_api_typed/iam.py,sha256=ka46H2-SzTCgy6EJYapKTzyZK9vR1bkfD0wF8bDdy1Q,2201
 reconcile/utils/aws_api_typed/organization.py,sha256=oXftcLVuSs9qej6efdssl38FvjeZaQC5R2Wj3NzxX4U,5529
 reconcile/utils/aws_api_typed/s3.py,sha256=J2uOTtEFgMyKT22pa4DbFnV7zfg575m2DeidQaeselM,1034
@@ -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.1rc759.dist-info/METADATA,sha256=N17GmMBM1N_QQwB544Gd7bz5DTOnTnT4o284Cj2JVgI,2382
-qontract_reconcile-0.10.1rc759.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc759.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
-qontract_reconcile-0.10.1rc759.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc759.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc761.dist-info/METADATA,sha256=GwWf5GcPchuffOX8BPrvZrVtQiE13PieAaupZVu9ucs,2382
+qontract_reconcile-0.10.1rc761.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc761.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
+qontract_reconcile-0.10.1rc761.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc761.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/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/utils/aws_api_typed/api.py

@@ -22,7 +22,15 @@ from reconcile.utils.aws_api_typed.service_quotas import AWSApiServiceQuotas
 from reconcile.utils.aws_api_typed.sts import AWSApiSts
 from reconcile.utils.aws_api_typed.support import AWSApiSupport
 
-SubApi = TypeVar("SubApi")
+SubApi = TypeVar(
+    "SubApi",
+    AWSApiIam,
+    AWSApiOrganizations,
+    AWSApiS3,
+    AWSApiServiceQuotas,
+    AWSApiSts,
+    AWSApiSupport,
+)
 
 
 class AWSCredentials(ABC):
@@ -159,7 +167,7 @@ class AWSApi:
         match api_cls:
             case reconcile.utils.aws_api_typed.iam.AWSApiIam:
                 client = self.session.client("iam")
-                api = api_cls(client)  # type: ignore # mypy bug, it doesn't recognize that api_cls is callable
+                api = api_cls(client)
             case reconcile.utils.aws_api_typed.organization.AWSApiOrganizations:
                 client = self.session.client("organizations")
                 api = api_cls(client)