qontract-reconcile 0.10.1rc895__py3-none-any.whl → 0.10.1rc897__py3-none-any.whl

{qontract_reconcile-0.10.1rc895.dist-info → qontract_reconcile-0.10.1rc897.dist-info}/METADATA

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

@@ -711,7 +711,7 @@ reconcile/utils/three_way_diff_strategy.py,sha256=OniTnogBkdgy_7Xg51N1MgjS-Qtk8u
 reconcile/utils/throughput.py,sha256=iP4UWAe2LVhDo69mPPmgo9nQ7RxHD6_GS8MZe-aSiuM,344
 reconcile/utils/vault.py,sha256=f4mJLKE5vGMvNBbo8Xe0dPFLF5-Vchs5Ry5lyf0FuMg,14902
 reconcile/utils/vaultsecretref.py,sha256=0KUSzuvTRxPyKY919TO3-B_eYg4_76fzKvMF8j5s1G0,911
-reconcile/utils/vcs.py,sha256=qQ2-fxW2QvhNMcPbzRoqPCTyOfbvEK5iaeDd4Wk5msw,8509
+reconcile/utils/vcs.py,sha256=b6WNrczLoKs24O4E74me-fVuNHyPdXeBAAvUQ-bna-o,8879
 reconcile/utils/acs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/utils/acs/base.py,sha256=6bMvtvmqb8j7fvOYqKu3lMWQzRuhMmZ6xv1Gfyev1hU,2535
 reconcile/utils/acs/notifiers.py,sha256=WI2HEerP73vDDYtBW-mC40MQAbo-VcTJbonl4_rhCTk,4997
@@ -813,7 +813,7 @@ tools/app_interface_metrics_exporter.py,sha256=zkwkxdAUAxjdc-pzx2_oJXG25fo0Fnyd5
 tools/app_interface_reporter.py,sha256=uy9eRHf6EdvD8ZY2WYdroGXm18DOdnqVZyxaWN3Bm_0,17724
 tools/glitchtip_access_reporter.py,sha256=oPBnk_YoDuljU3v0FaChzOwwnk4vap1xEE67QEjzdqs,2948
 tools/glitchtip_access_revalidation.py,sha256=8kbBJk04mkq28kWoRDDkfCGIF3GRg3pJrFAh1sW0dbk,2821
-tools/qontract_cli.py,sha256=OPbq5AEL5wPD0ZFiUCdbq4-X-NMkk0Ewn9MsCaqUqlg,124263
+tools/qontract_cli.py,sha256=lEjrFQSUHDRYrIbQ96ncwjiIqNVqW8lZrpzy8_V_pFo,124262
 tools/sd_app_sre_alert_report.py,sha256=e9vAdyenUz2f5c8-z-5WY0wv-SJ9aePKDH2r4IwB6pc,5063
 tools/template_validation.py,sha256=qpKYaTgk0GOPGa2Ct5_5sKdwIHtCAKIBGzsMPuJU5fw,3371
 tools/cli_commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -844,8 +844,8 @@ tools/test/test_qontract_cli.py,sha256=_D61RFGAN5x44CY1tYbouhlGXXABwYfxKSWSQx3Jr
 tools/test/test_saas_promotion_state.py,sha256=dy4kkSSAQ7bC0Xp2CociETGN-2aABEfL6FU5D9Jl00Y,6056
 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.1rc895.dist-info/METADATA,sha256=nYyPD-kRgAAdkzf0grC3_RGx8tTN5ZkcFY_R_LMUEfE,2273
-qontract_reconcile-0.10.1rc895.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc895.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc895.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc895.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc897.dist-info/METADATA,sha256=2lJ7mAg-WLGpc_5bBbkZBEyH7n8uaow4sTIi4ZuA5w0,2273
+qontract_reconcile-0.10.1rc897.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc897.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc897.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc897.dist-info/RECORD,,

reconcile/utils/vcs.py

@@ -37,6 +37,10 @@ class Commit:
     date: datetime
 
 
+class VCSMissingSourceBranchError(Exception):
+    pass
+
+
 class VCS:
     """
     Abstraction layer for aggregating different Version Control Systems.
@@ -212,7 +216,13 @@ class VCS:
                 merge_request=mr,
                 body=comment,
             )
+            source_branch = mr.attributes.get("source_branch")
+            if not source_branch:
+                raise VCSMissingSourceBranchError(
+                    f"Source branch is missing for MR {mr.attributes.get('iid')}"
+                )
             self._app_interface_api.close(mr)
+            self._app_interface_api.delete_branch(source_branch)
 
     def get_file_content_from_app_interface_master(self, file_path: str) -> str:
         file_path = (

tools/qontract_cli.py

@@ -3690,7 +3690,7 @@ def get_promotion_state(channel: str, sha: str):
         else:
             print(f"{publisher_id=}")
             print(
-                f"State link: https://{region}.console.aws.amazon.com/s3/object/{bucket}?region=us-east-1&bucketType=general&prefix=state/openshift-saas-deploy/promotions_v2/{channel}/{publisher_id}/{sha}"
+                f"State link: https://{region}.console.aws.amazon.com/s3/object/{bucket}?region={region}&bucketType=general&prefix=state/openshift-saas-deploy/promotions_v2/{channel}/{publisher_id}/{sha}"
             )
             print(f"Content: {state}")