From d098671f3bf286bbbae744be20b43e16a294fd43 Mon Sep 17 00:00:00 2001 From: Jonas L Date: Thu, 5 May 2022 09:41:32 +0200 Subject: [PATCH] feat: replace click envar with auto_envvar_prefix (#1829) --- analyzer/libretime_analyzer/main.py | 3 +-- playout/libretime_liquidsoap/main.py | 3 ++- playout/libretime_playout/main.py | 2 +- playout/libretime_playout/notify/main.py | 3 ++- shared/libretime_shared/cli.py | 4 ---- 5 files changed, 6 insertions(+), 9 deletions(-) diff --git a/analyzer/libretime_analyzer/main.py b/analyzer/libretime_analyzer/main.py index 99c2dd68d..4bb4e170e 100644 --- a/analyzer/libretime_analyzer/main.py +++ b/analyzer/libretime_analyzer/main.py @@ -15,12 +15,11 @@ VERSION = "1.0" DEFAULT_RETRY_QUEUE_FILEPATH = Path("retry_queue") -@click.command() +@click.command(context_settings={"auto_envvar_prefix": DEFAULT_ENV_PREFIX}) @cli_logging_options() @cli_config_options() @click.option( "--retry-queue-filepath", - envvar=f"{DEFAULT_ENV_PREFIX}_RETRY_QUEUE_FILEPATH", type=click.Path(path_type=Path), help="Path to the retry queue file.", default=DEFAULT_RETRY_QUEUE_FILEPATH, diff --git a/playout/libretime_liquidsoap/main.py b/playout/libretime_liquidsoap/main.py index 64a4f3fd0..8f61bf291 100644 --- a/playout/libretime_liquidsoap/main.py +++ b/playout/libretime_liquidsoap/main.py @@ -7,13 +7,14 @@ from typing import Optional import click from libretime_shared.cli import cli_logging_options +from libretime_shared.config import DEFAULT_ENV_PREFIX from libretime_shared.logging import level_from_name, setup_logger from loguru import logger from . import generate_liquidsoap_cfg -@click.command() +@click.command(context_settings={"auto_envvar_prefix": DEFAULT_ENV_PREFIX}) @cli_logging_options() def cli(log_level: int, log_filepath: Optional[Path]): """ diff --git a/playout/libretime_playout/main.py b/playout/libretime_playout/main.py index 7c7ede163..7f50f8300 100644 --- a/playout/libretime_playout/main.py +++ b/playout/libretime_playout/main.py @@ -112,7 +112,7 @@ def liquidsoap_startup_test(telnet_lock, liquidsoap_host, liquidsoap_port): logger.info("Liquidsoap version string found %s" % liquidsoap_version_string) -@click.command() +@click.command(context_settings={"auto_envvar_prefix": DEFAULT_ENV_PREFIX}) @cli_logging_options() @cli_config_options() def cli(log_level: str, log_filepath: Optional[Path], config_filepath: Optional[Path]): diff --git a/playout/libretime_playout/notify/main.py b/playout/libretime_playout/notify/main.py index 294be5d81..7b25ef512 100644 --- a/playout/libretime_playout/notify/main.py +++ b/playout/libretime_playout/notify/main.py @@ -18,6 +18,7 @@ from typing import Optional import click from libretime_api_client.version1 import AirtimeApiClient from libretime_shared.cli import cli_logging_options +from libretime_shared.config import DEFAULT_ENV_PREFIX from libretime_shared.logging import level_from_name, setup_logger from loguru import logger @@ -26,7 +27,7 @@ def api_client(): return AirtimeApiClient(logger=logger) -@click.group() +@click.group(context_settings={"auto_envvar_prefix": DEFAULT_ENV_PREFIX}) @cli_logging_options() def cli(log_level: str, log_filepath: Optional[Path]): """ diff --git a/shared/libretime_shared/cli.py b/shared/libretime_shared/cli.py index acc572040..a195c031f 100644 --- a/shared/libretime_shared/cli.py +++ b/shared/libretime_shared/cli.py @@ -3,7 +3,6 @@ from typing import Any, Callable, Optional import click -from .config import DEFAULT_ENV_PREFIX from .logging import INFO, LOG_LEVEL_MAP @@ -19,7 +18,6 @@ def cli_logging_options() -> Callable: func = click.option( "--log-level", "log_level", - envvar=f"{DEFAULT_ENV_PREFIX}_LOG_LEVEL", type=click.Choice(list(LOG_LEVEL_MAP.keys())), default=INFO.name, help="Name of the logging level.", @@ -28,7 +26,6 @@ def cli_logging_options() -> Callable: func = click.option( "--log-filepath", "log_filepath", - envvar=f"{DEFAULT_ENV_PREFIX}_LOG_FILEPATH", type=click.Path(path_type=Path), help="Path to the logging file.", default=None, @@ -55,7 +52,6 @@ def cli_config_options( "--c", "--config", "config_filepath", - envvar=f"{DEFAULT_ENV_PREFIX}_CONFIG_FILEPATH", type=click.Path(path_type=Path), help="Path to the config file.", required=required,