qontract-reconcile 0.10.1rc1191__py3-none-any.whl → 0.10.1rc1193__py3-none-any.whl

{qontract_reconcile-0.10.1rc1191.dist-info → qontract_reconcile-0.10.1rc1193.dist-info}/METADATA

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

@@ -818,7 +818,7 @@ reconcile/utils/runtime/sharding.py,sha256=r0ieUtNed7NvknSw6qQrCkKpVXE1shuHGnfFc
 reconcile/utils/saasherder/__init__.py,sha256=3U8plqMAPRE1kjwZ5YnIsYsggTf4_gS7flRUEuXVBAs,343
 reconcile/utils/saasherder/interfaces.py,sha256=C2wrw34OXypshVocAsPrVZsSHptgw4g9u7Haa2wulZQ,9087
 reconcile/utils/saasherder/models.py,sha256=z8ln03zi2a8cu716NcNUDHp8Dv1VcVbhqdWVxCl7x9A,10148
-reconcile/utils/saasherder/saasherder.py,sha256=t7dqcXj9FFULROG_gUmdoSNQOLKfhdlquzwxw710yOA,85358
+reconcile/utils/saasherder/saasherder.py,sha256=120A33jOQefZfYUpeDzaeNR4-Twe5V5bsBSe0DoOCSo,86115
 reconcile/utils/terraform/__init__.py,sha256=zNbiyTWo35AT1sFTElL2j_AA0jJ_yWE_bfFn-nD2xik,250
 reconcile/utils/terraform/config.py,sha256=5UVrd563TMcvi4ooa5JvWVDW1I3bIWg484u79evfV_8,164
 reconcile/utils/terraform/config_client.py,sha256=gRL1rQ0AqvShei_rcGqC3HDYGskOFKE1nPrJyJE9yno,4676
@@ -838,12 +838,12 @@ tools/app_interface_metrics_exporter.py,sha256=zkwkxdAUAxjdc-pzx2_oJXG25fo0Fnyd5
 tools/app_interface_reporter.py,sha256=oZPib4HPq0aZ2Zui1QGJGk6qQdfpeihujGDBnSdKyGE,17627
 tools/glitchtip_access_reporter.py,sha256=oPBnk_YoDuljU3v0FaChzOwwnk4vap1xEE67QEjzdqs,2948
 tools/glitchtip_access_revalidation.py,sha256=8kbBJk04mkq28kWoRDDkfCGIF3GRg3pJrFAh1sW0dbk,2821
-tools/qontract_cli.py,sha256=cYuovHYsRDm1CyIEdhMgx2qUkyl1tXqOO5glxAN1h8c,143860
+tools/qontract_cli.py,sha256=f64mkGqv7WfZa-HvhiMe_Cig3XjOUdzwCm-MBG3DqCs,143755
 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
 tools/cli_commands/container_images_report.py,sha256=64LXkv3eoWtMFZwBgkYE9jSnReDD7A9M0GEVXsR9aGk,5183
-tools/cli_commands/erv2.py,sha256=f_Zc5ZCPenXbFj8zv_kcKJgmGkErYHGNIhbzOfOaD4Q,22041
+tools/cli_commands/erv2.py,sha256=pWjd6yBhzakB1Lz4DUaESTbzEIO9-Njc7p7k_gvZj1U,22040
 tools/cli_commands/gpg_encrypt.py,sha256=x02JOMn834z89YSNvr5B-oJky7rR1C0begCkPh45eHk,4958
 tools/cli_commands/systems_and_tools.py,sha256=EMHOF1AtUDaoSk0bbjl6oUKYAz4rTZjIBaF-6E6GspM,16816
 tools/cli_commands/cost_report/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -882,8 +882,8 @@ tools/test/test_qontract_cli.py,sha256=iuzKbQ6ahinvjoQmQLBrG4shey0z-1rB6qCgS8T6d
 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.1rc1191.dist-info/METADATA,sha256=PYtZqqEcXMwJNmaFvFxZTdM7fWRL05zlsWrO6ZboOOQ,2213
-qontract_reconcile-0.10.1rc1191.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-qontract_reconcile-0.10.1rc1191.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc1191.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc1191.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc1193.dist-info/METADATA,sha256=k_Cwgii6ONKxPtx4vnZZQfe5EXDW2C19xn5t5PFWj1o,2213
+qontract_reconcile-0.10.1rc1193.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+qontract_reconcile-0.10.1rc1193.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc1193.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc1193.dist-info/RECORD,,

reconcile/utils/saasherder/saasherder.py

@@ -1112,29 +1112,54 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
                 username, password = (
                     base64.b64decode(auth["auth"]).decode("utf-8").split(":")
                 )
-                with suppress(Exception):
-                    return Image(
-                        image,
-                        username=username,
-                        password=password,
-                        auth_server=image_auth.auth_server,
-                        timeout=REQUEST_TIMEOUT,
-                    )
+
+                return SaasHerder._get_and_validate_image(
+                    full_image_path=image,
+                    username=username,
+                    password=password,
+                    auth_server=image_auth.auth_server,
+                    timeout=REQUEST_TIMEOUT,
+                    error_prefix=error_prefix,
+                )
 
         # basic auth fallback for backwards compatibility
+        return SaasHerder._get_and_validate_image(
+            full_image_path=image,
+            username=image_auth.username,
+            password=image_auth.password,
+            auth_server=image_auth.auth_server,
+            timeout=REQUEST_TIMEOUT,
+            error_prefix=error_prefix,
+        )
+
+    @staticmethod
+    def _get_and_validate_image(
+        full_image_path: str,
+        username: str | Any,
+        password: str | Any,
+        auth_server: str | Any,
+        timeout: int,
+        error_prefix: str,
+    ) -> Image | None:
         try:
-            return Image(
-                image,
-                username=image_auth.username,
-                password=image_auth.password,
-                auth_server=image_auth.auth_server,
-                timeout=REQUEST_TIMEOUT,
+            img = Image(
+                full_image_path,
+                username=username,
+                password=password,
+                auth_server=auth_server,
+                timeout=timeout,
             )
+            if img:
+                return img
+            else:
+                logging.error(
+                    f"{error_prefix} Image : {full_image_path} does not exist"
+                )
         except Exception as e:
             logging.error(
-                f"{error_prefix} Image is invalid: {image}. " + f"details: {e!s}"
+                f"{error_prefix} Image is invalid: {full_image_path}. "
+                + f"details: {e!s}"
             )
-
         return None
 
     def _check_images(

tools/cli_commands/erv2.py

@@ -470,7 +470,7 @@ class TerraformCli:
                 self.progress_spinner.stop()
             if not Confirm.ask(
                 "\nEverything ok? Would you like to upload the modified terraform states",
-                default=False,
+                default=True,
             ):
                 return
 

tools/qontract_cli.py

@@ -4229,8 +4229,7 @@ def migrate(ctx, dry_run: bool, skip_build: bool) -> None:
 
     if not Confirm.ask(
         dedent("""
-            Please disable terraform-resources: [i blue]https://app-interface.unleash.devshift.net/projects/default/features/terraform-resources[/]
-            in Unleash before proceeding!
+            Please ensure [red]terraform-resources[/] is disabled before proceeding!
 
             Do you want to proceed?"""),
         default=True,