qontract-reconcile 0.10.1rc767__py3-none-any.whl → 0.10.1rc769__py3-none-any.whl

{qontract_reconcile-0.10.1rc767.dist-info → qontract_reconcile-0.10.1rc769.dist-info}/METADATA

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

@@ -419,9 +419,9 @@ reconcile/saas_auto_promotions_manager/merge_request_manager/merge_request_manag
 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=WDpClngRA7o9j9o8WsTDDU42p_xVqkmr6dERxQXBIAA,8579
 reconcile/saas_auto_promotions_manager/merge_request_manager/open_merge_requests.py,sha256=-qGQOh6Jdp4lomNDij3zWVC0pl6uPHFWS5Woqcp5HQk,410
-reconcile/saas_auto_promotions_manager/merge_request_manager/renderer.py,sha256=ERi-a400C-c0HnAyS6EsvCrsyY3MO4xL8N3A1e04T4M,7087
+reconcile/saas_auto_promotions_manager/merge_request_manager/renderer.py,sha256=IZ7cuH6uOi7f0aIPVi1irBmP0CIK5vmEuhKBJz4YA1s,7235
 reconcile/saas_auto_promotions_manager/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/saas_auto_promotions_manager/utils/saas_files_inventory.py,sha256=7LlTQCzYotWCbtYBaNQP81CFlLUOvsyGMBQE-Ha0cKY,7820
+reconcile/saas_auto_promotions_manager/utils/saas_files_inventory.py,sha256=txisb7NT7u5vpmZqRK3R4bpHDiJ7IUyNt9FZfvgm9MA,7998
 reconcile/skupper_network/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/skupper_network/integration.py,sha256=178Q9RSYuZ9NmrCK4jRMLMekrewUaaRdclccI6zBsQ8,10786
 reconcile/skupper_network/models.py,sha256=DNTI7HZv-rqY42GIIxyRuvroHLvdH6rJerjIq9lj3RU,6663
@@ -783,8 +783,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.1rc767.dist-info/METADATA,sha256=JWA4m9u9lod5MIvLOvk3dDfvQrKGG8cmdIdd4tpoU9M,2382
-qontract_reconcile-0.10.1rc767.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc767.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
-qontract_reconcile-0.10.1rc767.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc767.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc769.dist-info/METADATA,sha256=5H5IpMZ9UroJcmYE5gaf7AwF0yRZS-AWxlPIefGupoI,2382
+qontract_reconcile-0.10.1rc769.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc769.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
+qontract_reconcile-0.10.1rc769.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc769.dist-info/RECORD,,

reconcile/saas_auto_promotions_manager/merge_request_manager/renderer.py

@@ -13,6 +13,9 @@ from reconcile.gql_definitions.common.saas_files import (
 from reconcile.gql_definitions.fragments.saas_target_namespace import (
     SaasTargetNamespace,
 )
+from reconcile.saas_auto_promotions_manager.merge_request_manager.open_merge_requests import (
+    MRKind,
+)
 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
@@ -139,6 +142,8 @@ class Renderer:
 
 {IS_BATCHABLE}: {is_batchable}
 
+{MR_KIND_REF}: {MRKind.BATCHER.value}
+
 {VERSION_REF}: {SAPM_VERSION}
         """
 

reconcile/saas_auto_promotions_manager/utils/saas_files_inventory.py

@@ -42,6 +42,8 @@ class SaasFilesInventory:
         for saas_file in self._saas_files:
             for resource_template in saas_file.resource_templates:
                 for target in resource_template.targets:
+                    if target.disable or target.delete:
+                        continue
                     if not target.promotion:
                         continue
                     auth_code = (
@@ -87,6 +89,8 @@ class SaasFilesInventory:
             for resource_template in saas_file.resource_templates:
                 for target in resource_template.targets:
                     file_path = target.path if target.path else saas_file.path
+                    if target.disable or target.delete:
+                        continue
                     if not target.promotion:
                         continue
                     if not target.promotion.auto: