qontract-reconcile 0.10.1rc530__py3-none-any.whl → 0.10.1rc532__py3-none-any.whl

{qontract_reconcile-0.10.1rc530.dist-info → qontract_reconcile-0.10.1rc532.dist-info}/METADATA

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

@@ -345,16 +345,15 @@ 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=1nm3aV5a0frEPTSww4ue1mfQ_Px6XaRZoaBRhPgJiAU,6472
+reconcile/saas_auto_promotions_manager/integration.py,sha256=G_IRL85fNI8Knw31KstDPE_AXJv6VFzc5AsqMeU7CBs,5788
 reconcile/saas_auto_promotions_manager/publisher.py,sha256=4_M9Oykhj-kEZPUn05E2DY5gD6-x32Dgf7K3NPOkGEg,2029
 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/merge_request.py,sha256=BeAJWLow7b4HQyZ9zz398sQkPeIz8chpMkCts2NU27c,1282
-reconcile/saas_auto_promotions_manager/merge_request_manager/merge_request_manager.py,sha256=VuSORhskZjJKgm6crgg0AfTEDbj5rtb1JHMfXA8yvxs,8133
-reconcile/saas_auto_promotions_manager/merge_request_manager/merge_request_manager_v2.py,sha256=eEKT8lqS7Dw0oG_oykRRIYNlWmncHk-Npc1LCpcVrAw,5785
+reconcile/saas_auto_promotions_manager/merge_request_manager/merge_request_manager_v2.py,sha256=Efl4PBOt78UgB-NL_j3_FXabtpQvkJhCEXaHwyspVcE,6006
 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=_gZ0ef-5E9hCdpkSw4b8SdTfpcaTS722KPWey4LhD5I,7644
-reconcile/saas_auto_promotions_manager/merge_request_manager/renderer.py,sha256=1j9Mmq-PN_fMI45CWPKTGW9VlytcQaTyf0mQSbWPdfQ,6959
+reconcile/saas_auto_promotions_manager/merge_request_manager/renderer.py,sha256=sNkSKmEA1rgT2R8VNuYuHBjJWa_wpHX3M64LlOb7jB4,6959
 reconcile/saas_auto_promotions_manager/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/saas_auto_promotions_manager/utils/saas_files_inventory.py,sha256=mihuWynroB1Cea1Lsvf6V8Nb8PGiBdcLC0uhCX_52Y0,6966
 reconcile/skupper_network/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -454,7 +453,7 @@ reconcile/test/test_vpc_peerings_validator.py,sha256=dFSmjc_dMN2GqMbntCFpa7PUZmy
 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/test_integration_test.py,sha256=UIafVpeof9Zd3Q17mEDIUwgdBGf8oFxkf7h8tLfmwCE,2077
+reconcile/test/saas_auto_promotions_manager/test_integration_test.py,sha256=fQB3V5kyTOzODbt43jQ03pfOLuAWq3nW3R9tVTWkTrQ,1729
 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
@@ -668,8 +667,8 @@ tools/test/test_app_interface_metrics_exporter.py,sha256=SX7qL3D1SIRKFo95FoQztvf
 tools/test/test_qontract_cli.py,sha256=d18KrdhtUGqoC7_kWZU128U0-VJEj-0rjFkLVufcI6I,2755
 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.1rc530.dist-info/METADATA,sha256=vBKtmSp2hYuK2N6ks8hGTMvpT7L7s6ZFD3yMu1NpS8w,2349
-qontract_reconcile-0.10.1rc530.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-qontract_reconcile-0.10.1rc530.dist-info/entry_points.txt,sha256=rTjAv28I_CHLM8ID3OPqMI_suoQ9s7tFbim4aYjn9kk,376
-qontract_reconcile-0.10.1rc530.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc530.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc532.dist-info/METADATA,sha256=3nnHvXZzInihpt9YyT72NRdKRXxmLdmKHc0cqWW86u8,2349
+qontract_reconcile-0.10.1rc532.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+qontract_reconcile-0.10.1rc532.dist-info/entry_points.txt,sha256=rTjAv28I_CHLM8ID3OPqMI_suoQ9s7tFbim4aYjn9kk,376
+qontract_reconcile-0.10.1rc532.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc532.dist-info/RECORD,,

reconcile/saas_auto_promotions_manager/integration.py

@@ -6,9 +6,6 @@ from sretoolbox.utils import threaded
 from reconcile.openshift_saas_deploy import (
     QONTRACT_INTEGRATION as OPENSHIFT_SAAS_DEPLOY,
 )
-from reconcile.saas_auto_promotions_manager.merge_request_manager.merge_request_manager import (
-    MergeRequestManager,
-)
 from reconcile.saas_auto_promotions_manager.merge_request_manager.merge_request_manager_v2 import (
     MergeRequestManagerV2,
 )
@@ -52,7 +49,6 @@ class SaasAutoPromotionsManager:
         vcs: VCS,
         saas_file_inventory: SaasFilesInventory,
         merge_request_manager_v2: MergeRequestManagerV2,
-        merge_request_manager: MergeRequestManager,
         thread_pool_size: int,
         dry_run: bool,
     ):
@@ -60,7 +56,6 @@ class SaasAutoPromotionsManager:
         self._vcs = vcs
         self._saas_file_inventory = saas_file_inventory
         self._merge_request_manager_v2 = merge_request_manager_v2
-        self._merge_request_manager = merge_request_manager
         self._thread_pool_size = thread_pool_size
         self._dry_run = dry_run
 
@@ -92,18 +87,12 @@ class SaasAutoPromotionsManager:
         self._fetch_publisher_real_world_states()
         self._compute_desired_subscriber_states()
         subscribers_with_diff = self._get_subscribers_with_diff()
-        self._merge_request_manager.housekeeping()
-        self._merge_request_manager.create_promotion_merge_requests(
-            subscribers=subscribers_with_diff
-        )
         self._merge_request_manager_v2.reconcile(subscribers=subscribers_with_diff)
 
 
 def init_external_dependencies(
     dry_run: bool,
-) -> tuple[
-    PromotionState, VCS, SaasFilesInventory, MergeRequestManagerV2, MergeRequestManager
-]:
+) -> tuple[PromotionState, VCS, SaasFilesInventory, MergeRequestManagerV2]:
     """
     Lets initialize everything that involves calls to external dependencies:
     - VCS -> Gitlab / Github queries
@@ -137,11 +126,6 @@ def init_external_dependencies(
         mr_parser=mr_parser,
         renderer=Renderer(),
     )
-    merge_request_manager = MergeRequestManager(
-        mr_parser=mr_parser,
-        renderer=Renderer(),
-        vcs=vcs,
-    )
     saas_files = get_saas_files()
     saas_inventory = SaasFilesInventory(saas_files=saas_files)
     deployment_state = PromotionState(
@@ -152,7 +136,6 @@ def init_external_dependencies(
         vcs,
         saas_inventory,
         merge_request_manager_v2,
-        merge_request_manager,
     )
 
 
@@ -167,7 +150,6 @@ def run(
         vcs,
         saas_inventory,
         merge_request_manager_v2,
-        merge_request_manager,
     ) = init_external_dependencies(dry_run=dry_run)
     if defer:
         defer(vcs.cleanup)
@@ -176,7 +158,6 @@ def run(
         deployment_state=deployment_state,
         vcs=vcs,
         saas_file_inventory=saas_inventory,
-        merge_request_manager=merge_request_manager,
         merge_request_manager_v2=merge_request_manager_v2,
         thread_pool_size=thread_pool_size,
         dry_run=dry_run,

reconcile/saas_auto_promotions_manager/merge_request_manager/merge_request_manager_v2.py

@@ -19,20 +19,21 @@ from reconcile.saas_auto_promotions_manager.merge_request_manager.renderer impor
     Renderer,
 )
 from reconcile.saas_auto_promotions_manager.subscriber import Subscriber
-from reconcile.utils.mr.labels import DO_NOT_MERGE_HOLD
+from reconcile.utils.mr.labels import AUTO_MERGE
 from reconcile.utils.vcs import VCS
 
 BATCH_SIZE_LIMIT = 5
-SAPM_LABEL = "SAPMCanary"
-SAPM_MR_LABELS = [SAPM_LABEL, DO_NOT_MERGE_HOLD]
 
-MR_DESC = """
-:warning: **THIS IS A TEST MR - DO NOT MERGE OR CHANGE THIS!**
+SAPM_LABEL = "SAPM"
+SAPM_MR_LABELS = [SAPM_LABEL, AUTO_MERGE]
 
-If you witness any issues with this MR, please reach out to kfischer from AppSRE.
+MR_DESC = """
+This is an auto-promotion triggered by app-interface's [saas-auto-promotions-manager](https://github.com/app-sre/qontract-reconcile/tree/master/reconcile/saas_auto_promotions_manager) (SAPM).
+This MR promotes all subscribers with auto-promotions for the channel(s) listed below.
 
-Please **do not remove or change any label** from this MR.
+Please **do not manually modify** this MR in any way, as it might result in blocking the auto-promotion.
 
+This description is used by SAPM to manage auto-promotions.
 """
 
 
@@ -120,7 +121,7 @@ class MergeRequestManagerV2:
             is_batchable=addition.batchable,
         )
         title = self._renderer.render_title(
-            is_draft=False, canary=True, channels=description_channels
+            is_draft=False, canary=False, channels=description_channels
         )
         logging.info(
             "Open MR for update in channel(s) %s",

reconcile/saas_auto_promotions_manager/merge_request_manager/renderer.py

@@ -19,7 +19,7 @@ from reconcile.saas_auto_promotions_manager.subscriber import Subscriber
 PROMOTION_DATA_SEPARATOR = (
     "**SAPM Data - DO NOT MANUALLY CHANGE ANYTHING BELOW THIS LINE**"
 )
-SAPM_VERSION = "2.0.0"
+SAPM_VERSION = "2.1.1"
 CONTENT_HASHES = "content_hashes"
 CHANNELS_REF = "channels"
 IS_BATCHABLE = "is_batchable"

reconcile/test/saas_auto_promotions_manager/test_integration_test.py

@@ -1,9 +1,6 @@
 from unittest.mock import create_autospec
 
 from reconcile.saas_auto_promotions_manager.integration import SaasAutoPromotionsManager
-from reconcile.saas_auto_promotions_manager.merge_request_manager.merge_request_manager import (
-    MergeRequestManager,
-)
 from reconcile.saas_auto_promotions_manager.merge_request_manager.merge_request_manager_v2 import (
     MergeRequestManagerV2,
 )
@@ -39,17 +36,11 @@ def test_integration_test():
         mr_parser=create_autospec(spec=MRParser),
         renderer=create_autospec(spec=Renderer),
     )
-    merge_request_manager = MergeRequestManager(
-        vcs=vcs,
-        mr_parser=create_autospec(spec=MRParser),
-        renderer=create_autospec(spec=Renderer),
-    )
     manager = SaasAutoPromotionsManager(
         deployment_state=create_autospec(spec=PromotionState),
         saas_file_inventory=SaasFilesInventory(saas_files=[]),
         vcs=vcs,
         merge_request_manager_v2=merge_request_manager_v2,
-        merge_request_manager=merge_request_manager,
         thread_pool_size=1,
         dry_run=False,
     )

reconcile/saas_auto_promotions_manager/merge_request_manager/merge_request_manager.py

@@ -1,190 +0,0 @@
-import logging
-import re
-from collections import defaultdict
-from collections.abc import Iterable
-
-from gitlab.exceptions import GitlabGetError
-
-from reconcile.saas_auto_promotions_manager.merge_request_manager.merge_request import (
-    SAPMMR,
-)
-from reconcile.saas_auto_promotions_manager.merge_request_manager.mr_parser import (
-    MRParser,
-    OpenMergeRequest,
-)
-from reconcile.saas_auto_promotions_manager.merge_request_manager.renderer import (
-    CHANNELS_REF,
-    CONTENT_HASHES,
-    IS_BATCHABLE,
-    VERSION_REF,
-    Renderer,
-)
-from reconcile.saas_auto_promotions_manager.subscriber import Subscriber
-from reconcile.utils.mr.labels import AUTO_MERGE
-from reconcile.utils.vcs import VCS
-
-ITEM_SEPARATOR = ","
-
-SAPM_LABEL = "SAPM"
-SAPM_MR_LABELS = [SAPM_LABEL, AUTO_MERGE]
-
-MR_DESC = """
-This is an auto-promotion triggered by app-interface's [saas-auto-promotions-manager](https://github.com/app-sre/qontract-reconcile/tree/master/reconcile/saas_auto_promotions_manager) (SAPM).
-The channel(s) mentioned in the MR title had an event.
-This MR promotes all subscribers with auto-promotions for these channel(s).
-
-Please **do not remove or change any label** from this MR.
-
-Parts of this description are used by SAPM to manage auto-promotions.
-"""
-
-
-class MergeRequestManager:
-    """
-    Manager for SAPM merge requests. This class
-    is responsible for housekeeping (closing old/bad MRs) and
-    opening new MRs for subscribers with a state diff.
-
-    The idea is that for every channel combination there exists
-    maximum one open MR in app-interface. I.e., all changes for
-    a channel combination at a minumum are batched in a single MR.
-    The MR description is used to store current state for SAPM.
-    Channels can also be batched together into a single MR to reduce the overall
-    amount of MRs.
-    """
-
-    def __init__(self, vcs: VCS, mr_parser: MRParser, renderer: Renderer):
-        self._vcs = vcs
-        self._mr_parser = mr_parser
-        self._renderer = renderer
-        self._version_ref_regex = re.compile(rf"{VERSION_REF}: (.*)$", re.MULTILINE)
-        self._content_hash_regex = re.compile(rf"{CONTENT_HASHES}: (.*)$", re.MULTILINE)
-        self._channels_regex = re.compile(rf"{CHANNELS_REF}: (.*)$", re.MULTILINE)
-        self._is_batchable_regex = re.compile(rf"{IS_BATCHABLE}: (.*)$", re.MULTILINE)
-        self._open_mrs: list[OpenMergeRequest] = []
-        self._unbatchable_hashes: set[str] = set()
-
-    def _unbatch_failed_mrs(self) -> None:
-        """
-        We optimistically batch MRs together that didnt run through MR check yet.
-        Vast majority of auto-promotion MRs are succeeding checks, so we can stay optimistic.
-        In the rare case of an MR failing the check, we want to unbatch it.
-        I.e., we open a dedicated MR for each channel in the batched MR, mark the new MRs as non-batchable
-        and close the old batched MR. By doing so, we ensure that unrelated MRs are not blocking each other.
-        Unbatched MRs are marked and will never be batched again.
-        """
-        open_mrs_after_unbatching: list[OpenMergeRequest] = []
-        for mr in self._open_mrs:
-            if mr.is_batchable and mr.failed_mr_check:
-                self._vcs.close_app_interface_mr(
-                    mr.raw,
-                    "Closing this MR because it failed MR check and isn't marked un-batchable yet.",
-                )
-                # Remember these hashes as unbatchable
-                self._unbatchable_hashes.update(mr.content_hashes)
-            else:
-                open_mrs_after_unbatching.append(mr)
-        self._open_mrs = open_mrs_after_unbatching
-
-    def housekeeping(self) -> None:
-        self._open_mrs = self._mr_parser.retrieve_open_mrs(label=SAPM_LABEL)
-        self._unbatch_failed_mrs()
-
-    def _aggregate_subscribers_per_channel_combo(
-        self, subscribers: Iterable[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)
-        return subscribers_per_channel_combo
-
-    def _merge_request_already_exists(self, channels: str, content_hash: str) -> bool:
-        return any(
-            True
-            for mr in self._open_mrs
-            if content_hash in mr.content_hashes and channels in mr.channels
-        )
-
-    def create_promotion_merge_requests(
-        self, subscribers: Iterable[Subscriber]
-    ) -> None:
-        """
-        Open new MR for channel combinations with new content.
-        If there is new content, close any existing MR for that
-        channel combination.
-        """
-        subscribers_per_channel_combo = self._aggregate_subscribers_per_channel_combo(
-            subscribers=subscribers
-        )
-        for channel_combo, subs in subscribers_per_channel_combo.items():
-            combined_content_hash = Subscriber.combined_content_hash(subscribers=subs)
-            if self._merge_request_already_exists(
-                content_hash=combined_content_hash, channels=channel_combo
-            ):
-                logging.info(
-                    "There is already an open merge request for channel(s) %s - skipping",
-                    channel_combo,
-                )
-                continue
-            for mr in self._open_mrs:
-                if channel_combo not in mr.channels:
-                    continue
-                if combined_content_hash not in mr.content_hashes:
-                    logging.info(
-                        "Closing MR %s because it has out-dated content",
-                        mr.raw.attributes.get("web_url", "NO_WEBURL"),
-                    )
-                    self._vcs.close_app_interface_mr(
-                        mr=mr.raw,
-                        comment="Closing this MR because it has out-dated content.",
-                    )
-            content_by_path: dict[str, str] = {}
-            has_error = False
-            for sub in subs:
-                if sub.target_file_path not in content_by_path:
-                    try:
-                        content_by_path[sub.target_file_path] = (
-                            self._vcs.get_file_content_from_app_interface_master(
-                                file_path=sub.target_file_path
-                            )
-                        )
-                    except GitlabGetError as e:
-                        if e.response_code == 404:
-                            logging.error(
-                                "The saas file %s does not exist anylonger. Most likely qontract-server data not in synch. This should resolve soon on its own.",
-                                sub.target_file_path,
-                            )
-                            has_error = True
-                            break
-                        raise e
-                content_by_path[sub.target_file_path] = (
-                    self._renderer.render_merge_request_content(
-                        subscriber=sub,
-                        current_content=content_by_path[sub.target_file_path],
-                    )
-                )
-            if has_error:
-                continue
-
-            description = self._renderer.render_description(
-                message=MR_DESC,
-                content_hashes=combined_content_hash,
-                channels=channel_combo,
-                is_batchable=combined_content_hash not in self._unbatchable_hashes,
-            )
-            title = self._renderer.render_title(
-                is_draft=False, canary=False, channels=channel_combo
-            )
-            logging.info(
-                "Open MR for update in channel(s) %s",
-                channel_combo,
-            )
-            self._vcs.open_app_interface_merge_request(
-                mr=SAPMMR(
-                    labels=SAPM_MR_LABELS,
-                    content_by_path=content_by_path,
-                    title=title,
-                    description=description,
-                )
-            )