qontract-reconcile 0.10.1rc611__py3-none-any.whl → 0.10.1rc613__py3-none-any.whl

{qontract_reconcile-0.10.1rc611.dist-info → qontract_reconcile-0.10.1rc613.dist-info}/METADATA

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

@@ -352,7 +352,7 @@ reconcile/oum/models.py,sha256=0ZyCnULRxAbIEXX60BkkPZVg53DCD6ZJ6wnNT2ANROM,1743
 reconcile/oum/providers.py,sha256=3kEjXvsTPzXc7gzrdO7hWqgzcMmMZMpk2S0X7wQUTWU,1767
 reconcile/oum/standalone.py,sha256=bzyV8wz3SrERG9zJRFiJCBzSIGwDNj9sNqUytngDw94,7368
 reconcile/prometheus_rules_tester/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/prometheus_rules_tester/integration.py,sha256=hCJJ0udrvgMM78_gFUGvZWOH8azI2tABQKpQq6lHhY0,9232
+reconcile/prometheus_rules_tester/integration.py,sha256=glzYgt9WXRoVFGaonmYxsQBJ5RNR3HTrgsmwhIWKhgk,9329
 reconcile/rhidp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/rhidp/common.py,sha256=suTh9T4dPOgrKi-rDALgjzCSL9JHGnkTYALFIIjNCJE,6801
 reconcile/rhidp/metrics.py,sha256=Yp0GtpjhieEdru0qkG3osBTJiKUzg6CAjwPoFTQDnCg,417
@@ -370,11 +370,11 @@ reconcile/saas_auto_promotions_manager/publisher.py,sha256=4_M9Oykhj-kEZPUn05E2D
 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_v2.py,sha256=awjaelk-1YbuxA-SsamzinDmM820I8TynGkelJe3Uq4,6991
+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/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=QP3Ui67AYhbUmBN5LF_vSCnlp6eOl97vPPCDgqTgxXc,6902
+reconcile/saas_auto_promotions_manager/merge_request_manager/renderer.py,sha256=Z2G4wMQB3DLTuMlH_MGURGR4uLyh-6RnksQJzdym5VQ,6960
 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
@@ -712,8 +712,8 @@ tools/test/test_app_interface_metrics_exporter.py,sha256=SX7qL3D1SIRKFo95FoQztvf
 tools/test/test_qontract_cli.py,sha256=OvalpVRfY4pNmpMaWHHYqBjV68b1eGQjX8SCyTAXb1w,3501
 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.1rc611.dist-info/METADATA,sha256=re9XFwEechJsNUfAK4s4FAFgp4lnj3LKjF7hvvHN6bw,2382
-qontract_reconcile-0.10.1rc611.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-qontract_reconcile-0.10.1rc611.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
-qontract_reconcile-0.10.1rc611.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc611.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc613.dist-info/METADATA,sha256=OmG5nHaRuu7nDCZ91tOV_K4XRN0ZAvgzKYz1IbS9j0E,2382
+qontract_reconcile-0.10.1rc613.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+qontract_reconcile-0.10.1rc613.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
+qontract_reconcile-0.10.1rc613.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc613.dist-info/RECORD,,

reconcile/prometheus_rules_tester/integration.py

@@ -133,7 +133,10 @@ def get_rules_and_tests(
 
     iterable = []
     for namespace in namespace_with_prom_rules:
-        for resource in namespace["openshiftResources"]:
+        prom_rules = [
+            r for r in namespace["openshiftResources"] if r["provider"] in PROVIDERS
+        ]
+        for resource in prom_rules:
             iterable.append(
                 RuleToFetch(
                     namespace=namespace,

reconcile/saas_auto_promotions_manager/merge_request_manager/merge_request_manager_v2.py

@@ -131,7 +131,10 @@ class MergeRequestManagerV2:
             is_batchable=addition.batchable,
         )
         title = self._renderer.render_title(
-            is_draft=False, canary=False, channels=description_channels
+            is_draft=False,
+            canary=False,
+            channels=description_channels,
+            batch_size=len(addition.content_hashes),
         )
         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.utils.ruamel import create_ruamel_instance
 PROMOTION_DATA_SEPARATOR = (
     "**SAPM Data - DO NOT MANUALLY CHANGE ANYTHING BELOW THIS LINE**"
 )
-SAPM_VERSION = "2.1.2"
+SAPM_VERSION = "2.1.3"
 CONTENT_HASHES = "content_hashes"
 CHANNELS_REF = "channels"
 IS_BATCHABLE = "is_batchable"
@@ -140,9 +140,11 @@ class Renderer:
 {VERSION_REF}: {SAPM_VERSION}
         """
 
-    def render_title(self, is_draft: bool, canary: bool, channels: str) -> str:
+    def render_title(
+        self, is_draft: bool, canary: bool, channels: str, batch_size: int
+    ) -> str:
         canary_suffix = "Canary" if canary else ""
-        content = f"[SAPM{canary_suffix}] auto-promotion ID {int(hashlib.sha256(channels.encode('utf-8')).hexdigest(), 16) % 10**8}"
+        content = f"[SAPM{canary_suffix}] auto-promotion ID {int(hashlib.sha256(channels.encode('utf-8')).hexdigest(), 16) % 10**8} - batch size: {batch_size}"
         if is_draft:
             return f"Draft: {content}"
         return content