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

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

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

@@ -352,8 +352,8 @@ reconcile/saas_auto_promotions_manager/merge_request_manager/__init__.py,sha256=
 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=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=sNkSKmEA1rgT2R8VNuYuHBjJWa_wpHX3M64LlOb7jB4,6959
+reconcile/saas_auto_promotions_manager/merge_request_manager/reconciler.py,sha256=lxQUJgpwfnzvGZTNpmLOeTSiXzzJta1aSezMF9HRTwg,7734
+reconcile/saas_auto_promotions_manager/merge_request_manager/renderer.py,sha256=huslpgeXNf_VmEVmWHIYYSwEcT67zsbuubYMk2P9ezc,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
@@ -460,7 +460,7 @@ reconcile/test/saas_auto_promotions_manager/merge_request_manager/merge_request_
 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_merge_request_manager.py,sha256=ryROiiQNtZvuG820CB-RQ9FMmLAGshezyMDNDiJNA_E,2369
 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=-rSv-C-JFaY0gsjSFgcXz9ASNQQOzwizaQEbVYJtLHg,14906
+reconcile/test/saas_auto_promotions_manager/merge_request_manager/merge_request_manager/test_reconciler.py,sha256=to7lRzKTqN1cwEcnzDUKPWbIAzffI9jD870en0-zif8,17868
 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
@@ -534,7 +534,7 @@ reconcile/utils/filtering.py,sha256=zZnHH0u0SaTDyzuFXZ_mREURGLvjEqQIQy4z-7QBVlc,
 reconcile/utils/git.py,sha256=Qad7mfPuS9s7eKODeWSewehwSGgJPCbQuLda1qg_6GA,1522
 reconcile/utils/git_secrets.py,sha256=0wGNL5mvDtVPRuu3vEQgld1Am64gIDJHtmu1_ZKxMAI,1973
 reconcile/utils/github_api.py,sha256=_bttNxYKeam_tLVe27L7O4gKqSn6CeyuFnJn8tSaUVY,2488
-reconcile/utils/gitlab_api.py,sha256=7gImzen-LzEcdyTbRNcvuLOczzm03sEI78NmKBSMAl4,27228
+reconcile/utils/gitlab_api.py,sha256=UMqWIHR_GkxEn5lgvxHLrjcwprRvRuKowxkwvu1xvvM,27241
 reconcile/utils/gpg.py,sha256=EKG7_fdMv8BMlV5yUdPiqoTx-KrzmVSEAl2sLkaKwWI,1123
 reconcile/utils/gql.py,sha256=bzIYYYYGIO_4Db4sA-mnZUOPVNBELZD5EcIUSTbYG1o,13604
 reconcile/utils/grouping.py,sha256=kWKivD14eAkiDneH_VIl_XyUdcVVQgiaKA9sLsuD2dw,441
@@ -667,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.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,,
+qontract_reconcile-0.10.1rc534.dist-info/METADATA,sha256=V0qyziPJ21CkzDNPHeicy8Z76OhLTIP-AQVa0kX-85E,2349
+qontract_reconcile-0.10.1rc534.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+qontract_reconcile-0.10.1rc534.dist-info/entry_points.txt,sha256=rTjAv28I_CHLM8ID3OPqMI_suoQ9s7tFbim4aYjn9kk,376
+qontract_reconcile-0.10.1rc534.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc534.dist-info/RECORD,,

reconcile/saas_auto_promotions_manager/merge_request_manager/reconciler.py

@@ -80,6 +80,7 @@ class Reconciler:
         desired_promotions_after_unbatching: list[Promotion] = []
         for promotion in self._desired_promotions:
             if promotion.content_hashes.issubset(unbatchable_hashes):
+                desired_promotions_after_unbatching.append(promotion)
                 continue
             elif promotion.content_hashes.issubset(falsely_marked_batchable_hashes):
                 diff.additions.append(
@@ -143,7 +144,7 @@ class Reconciler:
 
         batch_with_capacity: Optional[OpenMergeRequest] = None
         for mr in self._open_mrs:
-            if len(mr.content_hashes) < batch_limit:
+            if mr.is_batchable and len(mr.content_hashes) < batch_limit:
                 batch_with_capacity = mr
                 # Note, there should always only be maximum one batch with capacity available
                 break

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.1.1"
+SAPM_VERSION = "2.1.2"
 CONTENT_HASHES = "content_hashes"
 CHANNELS_REF = "channels"
 IS_BATCHABLE = "is_batchable"

reconcile/test/saas_auto_promotions_manager/merge_request_manager/merge_request_manager/test_reconciler.py

@@ -367,6 +367,94 @@ def _aggregate_channels(items: Sequence[Addition | Deletion]) -> set[str]:
                 ],
             ),
         ),
+        # We have an unbatchable open MR.
+        # We do not want any change on the existing unbatchable MR,
+        # but at the same time expect a new MR to be opened for the new promotion.
+        (
+            [
+                Promotion(
+                    channels={"chan1"},
+                    content_hashes={"hash1"},
+                ),
+                Promotion(
+                    channels={"chan2"},
+                    content_hashes={"hash2"},
+                ),
+            ],
+            [
+                OpenMergeRequest(
+                    raw=create_autospec(spec=ProjectMergeRequest),
+                    channels={"chan1"},
+                    content_hashes={"hash1"},
+                    failed_mr_check=False,
+                    is_batchable=False,
+                ),
+            ],
+            Diff(
+                deletions=[],
+                additions=[
+                    Addition(
+                        content_hashes={
+                            "hash2",
+                        },
+                        channels={"chan2"},
+                        batchable=True,
+                    ),
+                ],
+            ),
+        ),
+        # We have multiple unbatchable open MRs.
+        # We do not want any change on the existing unbatchable MRs,
+        # but at the same time expect a new MR to be opened for the new promotions.
+        (
+            [
+                Promotion(
+                    channels={"chan1"},
+                    content_hashes={"hash1"},
+                ),
+                Promotion(
+                    channels={"chan2"},
+                    content_hashes={"hash2"},
+                ),
+                Promotion(
+                    channels={"chan3"},
+                    content_hashes={"hash3"},
+                ),
+                Promotion(
+                    channels={"chan4"},
+                    content_hashes={"hash4"},
+                ),
+            ],
+            [
+                OpenMergeRequest(
+                    raw=create_autospec(spec=ProjectMergeRequest),
+                    channels={"chan1"},
+                    content_hashes={"hash1"},
+                    failed_mr_check=False,
+                    is_batchable=False,
+                ),
+                OpenMergeRequest(
+                    raw=create_autospec(spec=ProjectMergeRequest),
+                    channels={"chan2"},
+                    content_hashes={"hash2"},
+                    failed_mr_check=False,
+                    is_batchable=False,
+                ),
+            ],
+            Diff(
+                deletions=[],
+                additions=[
+                    Addition(
+                        content_hashes={
+                            "hash3",
+                            "hash4",
+                        },
+                        channels={"chan3", "chan4"},
+                        batchable=True,
+                    ),
+                ],
+            ),
+        ),
     ],
 )
 def test_reconcile(

reconcile/utils/gitlab_api.py

@@ -453,6 +453,7 @@ class GitLabApi:  # pylint: disable=too-many-public-methods
             if c["username"] == self.user.username and body.startswith(startswith):
                 self.delete_comment(c["note"])
 
+    @retry()
     def get_project_labels(self) -> Set[str]:
         return {ln.name for ln in self.get_items(self.project.labels.list)}