derivepassphrase.git

@@ -16,6 +16,7 @@ import os

 import socket

 from typing import (

     TYPE_CHECKING,

+    NoReturn,

     TextIO,

     cast,

 )

@@ -844,13 +845,23 @@ def derivepassphrase(

                     opt_str, f'mutually exclusive with {other_str}', ctx=ctx

                 )

+    def err(msg: str) -> NoReturn:

+        click.echo(f'{PROG_NAME}: {msg}', err=True)

+        ctx.exit(1)

+

     def get_config() -> _types.VaultConfig:

         try:

             return _load_config()

         except FileNotFoundError:

             return {'services': {}}

         except Exception as e:  # noqa: BLE001

-            ctx.fail(f'cannot load config: {e}')

+            err(f'Cannot load config: {e}')

+

+    def put_config(config: _types.VaultConfig, /) -> None:

+        try:

+            _save_config(config)

+        except Exception as exc:  # noqa: BLE001

+            err(f'Cannot store config: {exc}')

     configuration: _types.VaultConfig

@@ -914,24 +925,24 @@ def derivepassphrase(

                     break

             else:

                 if not notes_value.strip():

-                    ctx.fail('not saving new notes: user aborted request')

+                    err('not saving new notes: user aborted request')

             configuration['services'].setdefault(service, {})['notes'] = (

                 notes_value.strip('\n')

             )

-            _save_config(configuration)

+            put_config(configuration)

     elif delete_service_settings:

         assert service is not None

         configuration = get_config()

         if service in configuration['services']:

             del configuration['services'][service]

-            _save_config(configuration)

+            put_config(configuration)

     elif delete_globals:

         configuration = get_config()

         if 'global' in configuration:

             del configuration['global']

-            _save_config(configuration)

+            put_config(configuration)

     elif clear_all_settings:

-        _save_config({'services': {}})

+        put_config({'services': {}})

     elif import_settings:

         try:

             # TODO: keep track of auto-close; try os.dup if feasible

@@ -943,13 +954,13 @@ def derivepassphrase(

             with infile:

                 maybe_config = json.load(infile)

         except json.JSONDecodeError as e:

-            ctx.fail(f'Cannot load config: cannot decode JSON: {e}')

+            err(f'Cannot load config: cannot decode JSON: {e}')

         except OSError as e:

-            ctx.fail(f'Cannot load config: {e.strerror}')

+            err(f'Cannot load config: {e.strerror}: {e.filename!r}')

         if _types.is_vault_config(maybe_config):

-            _save_config(maybe_config)

+            put_config(maybe_config)

         else:

-            ctx.fail('not a valid config')

+            err(f'Cannot load config: {_INVALID_VAULT_CONFIG}')

     elif export_settings:

         configuration = get_config()

         try:

@@ -962,7 +973,7 @@ def derivepassphrase(

             with outfile:

                 json.dump(configuration, outfile)

         except OSError as e:

-            ctx.fail(f'cannot write config: {e.strerror}')

+            err(f'Cannot store config: {e.strerror}: {e.filename!r}')

     else:

         configuration = get_config()

         # This block could be type checked more stringently, but this

@@ -1001,13 +1012,13 @@ def derivepassphrase(

                     'ASCII'

                 )

             except IndexError:

-                ctx.fail('no valid SSH key selected')

+                err('no valid SSH key selected')

             except (LookupError, RuntimeError) as e:

-                ctx.fail(str(e))

+                err(str(e))

         elif use_phrase:

             maybe_phrase = _prompt_for_passphrase()

             if not maybe_phrase:

-                ctx.fail('no passphrase given')

+                err('no passphrase given')

             else:

                 phrase = maybe_phrase

         if store_config_only:

@@ -609,7 +609,7 @@ class TestCLI:

                 result.stderr_bytes

             ), 'program did not print any error message'

             assert (

-                b'not a valid config' in result.stderr_bytes

+                b'Invalid vault config' in result.stderr_bytes

             ), 'program did not print the expected error message'

     def test_213a_import_bad_config_not_json_data(

@@ -699,7 +699,7 @@ class TestCLI:

                 result.stderr_bytes

             ), 'program did not print any error message'

             assert (

-                b'cannot load config' in result.stderr_bytes

+                b'Cannot load config' in result.stderr_bytes

             ), 'program did not print the expected error message'

     def test_214b_export_settings_not_a_file(

@@ -724,7 +724,7 @@ class TestCLI:

                 result.stderr_bytes

             ), 'program did not print any error message'

             assert (

-                b'cannot load config' in result.stderr_bytes

+                b'Cannot load config' in result.stderr_bytes

             ), 'program did not print the expected error message'

     def test_214c_export_settings_target_not_a_file(

@@ -747,7 +747,7 @@ class TestCLI:

                 result.stderr_bytes

             ), 'program did not print any error message'

             assert (

-                b'cannot write config' in result.stderr_bytes

+                b'Cannot store config' in result.stderr_bytes

             ), 'program did not print the expected error message'

     def test_214d_export_settings_settings_directory_not_a_directory(

@@ -773,7 +773,7 @@ class TestCLI:

                 result.stderr_bytes

             ), 'program did not print any error message'

             assert (

-                b'cannot load config' in result.stderr_bytes

+                b'Cannot load config' in result.stderr_bytes

             ), 'program did not print the expected error message'

     def test_220_edit_notes_successfully(self, monkeypatch: Any) -> None: