fix: override _run_inner to catch exceptions

Remove the heading from the original error to not give the impression it is a craft application error to the user, but instead an error generated store side. Signed-off-by: Sergio Schvezov <[email protected]>
canonical · Sep 18, 2024 · 1f4734f · 1f4734f
1 parent fbedf67
commit 1f4734f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/snapcraft/application.py b/snapcraft/application.py
@@ -209,13 +209,13 @@ def _pre_run(self, dispatcher: craft_cli.Dispatcher) -> None:
         super()._pre_run(dispatcher)
 
     @override
-    def run(self) -> int:
+    def _run_inner(self) -> int:
         try:
-            return_code = super().run()
+            return_code = super()._run_inner()
         except craft_store.errors.NoKeyringError as err:
             self._emit_error(
                 craft_cli.errors.CraftError(
-                    f"craft-store error: {err}",
+                    f"{err}",
                     resolution=(
                         "Ensure the keyring is working or "
                         f"{store.constants.ENVIRONMENT_STORE_CREDENTIALS} "
@@ -227,9 +227,7 @@ def run(self) -> int:
             return_code = 1
         except craft_store.errors.CraftStoreError as err:
             self._emit_error(
-                craft_cli.errors.CraftError(
-                    f"craft-store error: {err}", resolution=err.resolution
-                ),
+                craft_cli.errors.CraftError(f"{err}", resolution=err.resolution),
                 cause=err,
             )
             return_code = 1

diff --git a/tests/unit/test_application.py b/tests/unit/test_application.py
@@ -665,20 +665,20 @@ def test_known_core24(snapcraft_yaml, base, build_base, is_known_core24):
 )
 def test_store_error(mocker, capsys, message, resolution, expected_message):
     mocker.patch(
-        "snapcraft.application.Application.run",
+        "snapcraft.application.Application._run_inner",
         side_effect=craft_store.errors.CraftStoreError(message, resolution=resolution),
     )
 
     return_code = application.main()
 
     assert return_code == 1
     _, err = capsys.readouterr()
-    assert f"craft-store error: {expected_message}" in err
+    assert expected_message in err
 
 
 def test_store_key_error(mocker, capsys):
     mocker.patch(
-        "snapcraft.application.Application.run",
+        "snapcraft.application.Application._run_inner",
         side_effect=craft_store.errors.NoKeyringError(),
     )
 
@@ -692,7 +692,7 @@ def test_store_key_error(mocker, capsys):
         # pylint: disable=[line-too-long]
         dedent(
             """\
-            craft-store error: No keyring found to store or retrieve credentials from.
+            No keyring found to store or retrieve credentials from.
             Recommended resolution: Ensure the keyring is working or SNAPCRAFT_STORE_CREDENTIALS is correctly exported into the environment
             For more information, check out: https://snapcraft.io/docs/snapcraft-authentication
         """