From 231a051036d86b70faae33931d3f3eb47783b964 Mon Sep 17 00:00:00 2001 From: Robin Krahl Date: Sun, 8 Dec 2024 14:07:16 +0100 Subject: [PATCH] Update click dependency --- pynitrokey/cli/nethsm.py | 58 +++++++++++++++++++++++----------------- pyproject.toml | 3 +-- 2 files changed, 35 insertions(+), 26 deletions(-) diff --git a/pynitrokey/cli/nethsm.py b/pynitrokey/cli/nethsm.py index d66ed18f..8eb7947d 100644 --- a/pynitrokey/cli/nethsm.py +++ b/pynitrokey/cli/nethsm.py @@ -906,7 +906,15 @@ def generate_key( @click.option("--public-key", is_flag=True, help="Query the public key") @click.option("--certificate", is_flag=True, help="Query the certificate") @click.pass_context -def get_config(ctx: Context, **kwargs: bool) -> None: +def get_config( + ctx: Context, + logging: bool, + network: bool, + time: bool, + unattended_boot: bool, + public_key: bool, + certificate: bool, +) -> None: """Query the configuration of a NetHSM. Only the configuration items selected with the corresponding option are @@ -916,40 +924,42 @@ def get_config(ctx: Context, **kwargs: bool) -> None: role.""" with connect(ctx) as nethsm: print(f"Configuration for NetHSM {nethsm.host}:") - show_all = not any(kwargs.values()) + show_all = not any( + [logging, network, time, unattended_boot, public_key, certificate] + ) - if show_all or kwargs["logging"]: - logging = nethsm.get_config_logging() + if show_all or logging: + logging_config = nethsm.get_config_logging() print(" Logging:") - print(" IP address: ", logging.ip_address) - print(" Port: ", logging.port) - print(" Log level: ", logging.log_level) + print(" IP address: ", logging_config.ip_address) + print(" Port: ", logging_config.port) + print(" Log level: ", logging_config.log_level) - if show_all or kwargs["network"]: - network = nethsm.get_config_network() + if show_all or network: + network_config = nethsm.get_config_network() print(" Network:") - print(" IP address: ", network.ip_address) - print(" Netmask: ", network.netmask) - print(" Gateway: ", network.gateway) + print(" IP address: ", network_config.ip_address) + print(" Netmask: ", network_config.netmask) + print(" Gateway: ", network_config.gateway) - if show_all or kwargs["time"]: - time = nethsm.get_config_time() - print(" Time: ", time) + if show_all or time: + time_config = nethsm.get_config_time() + print(" Time: ", time_config) - if show_all or kwargs["unattended_boot"]: - unattended_boot = nethsm.get_config_unattended_boot() - print(" Unattended boot:", unattended_boot) + if show_all or unattended_boot: + unattended_boot_config = nethsm.get_config_unattended_boot() + print(" Unattended boot:", unattended_boot_config) - if show_all or kwargs["public_key"]: - public_key = nethsm.get_public_key() + if show_all or public_key: + public_key_config = nethsm.get_public_key() print(" Public key:") - for line in public_key.splitlines(): + for line in public_key_config.splitlines(): print(f" {line}") - if show_all or kwargs["certificate"]: - certificate = nethsm.get_certificate() + if show_all or certificate: + certificate_config = nethsm.get_certificate() print(" Certificate:") - for line in certificate.splitlines(): + for line in certificate_config.splitlines(): print(f" {line}") diff --git a/pyproject.toml b/pyproject.toml index 21041054..70976d70 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -22,7 +22,7 @@ classifiers = [ ] dependencies = [ "cffi", - "click >=8.0, <=8.1.3", + "click >=8.1.6, <9", "cryptography >=41.0.4,<44", "ecdsa", "fido2 >=1.1.2,<2", @@ -110,7 +110,6 @@ warn_return_any = false module = [ "cbor.*", "cffi.*", - "click.*", "ecdsa.*", "intelhex.*", "nacl.*",