derivepassphrase.git

@@ -2911,7 +2911,7 @@ def derivepassphrase_vault(  # noqa: C901,PLR0912,PLR0913,PLR0914,PLR0915

     sv_or_global_options = options_in_group[PassphraseGenerationOption]

     for param in sv_or_global_options:

         if is_param_set(param) and not (

-            service or is_param_set(params_by_str['--config'])

+            service is not None or is_param_set(params_by_str['--config'])

         ):

             err_msg = _msg.TranslatedString(

                 _msg.ErrMsgTemplate.PARAMS_NEEDS_SERVICE_OR_CONFIG,

@@ -2921,7 +2921,7 @@ def derivepassphrase_vault(  # noqa: C901,PLR0912,PLR0913,PLR0914,PLR0915

             raise click.UsageError(str(err_msg))  # noqa: DOC501

     sv_options = [params_by_str['--notes'], params_by_str['--delete']]

     for param in sv_options:

-        if is_param_set(param) and not service:

+        if is_param_set(param) and not service is not None:

             err_msg = _msg.TranslatedString(

                 _msg.ErrMsgTemplate.PARAMS_NEEDS_SERVICE,

                 param=param.opts[0],

@@ -2934,7 +2934,7 @@ def derivepassphrase_vault(  # noqa: C901,PLR0912,PLR0913,PLR0914,PLR0915

         *options_in_group[StorageManagementOption],

     ]

     for param in no_sv_options:

-        if is_param_set(param) and service:

+        if is_param_set(param) and service is not None:

             err_msg = _msg.TranslatedString(

                 _msg.ErrMsgTemplate.PARAMS_NO_SERVICE,

                 param=param.opts[0],

@@ -3215,10 +3215,18 @@ def derivepassphrase_vault(  # noqa: C901,PLR0912,PLR0913,PLR0914,PLR0915

             },

             cast(

                 dict[str, Any],

-                configuration['services'].get(service or '', {}),

+                configuration['services'].get(service, {}) if service else {},

             ),

             cast(dict[str, Any], configuration.get('global', {})),

         )

+        if not store_config_only and not service:

+            err_msg = _msg.TranslatedString(

+                _msg.ErrMsgTemplate.SERVICE_REQUIRED,

+                service_metavar=_msg.TranslatedString(

+                    _msg.Label.VAULT_METAVAR_SERVICE

+                ),

+            )

+            raise click.UsageError(str(err_msg))

         if use_key:

             try:

                 key = base64.standard_b64encode(

@@ -3350,14 +3358,7 @@ def derivepassphrase_vault(  # noqa: C901,PLR0912,PLR0913,PLR0914,PLR0915

             ), f'Invalid vault configuration: {configuration!r}'

             put_config(configuration)

         else:

-            if not service:

-                err_msg = _msg.TranslatedString(

-                    _msg.ErrMsgTemplate.SERVICE_REQUIRED,

-                    service_metavar=_msg.TranslatedString(

-                        _msg.Label.VAULT_METAVAR_SERVICE

-                    ),

-                )

-                raise click.UsageError(str(err_msg))

+            assert service is not None

             kwargs: dict[str, Any] = {

                 k: v

                 for k, v in settings.items()