From b7f7b7738a588afa5cf5e7b1ce229432b78e0387 Mon Sep 17 00:00:00 2001 From: idimov-keeper <78815270+idimov-keeper@users.noreply.github.com> Date: Mon, 28 Oct 2024 17:50:32 -0500 Subject: [PATCH] KSM-567 Added KSM_CLI_TOKEN environment variable (#681) --- .../keeper_secrets_manager_cli/__main__.py | 3 +++ .../keeper_secrets_manager_cli/profile.py | 1 + 2 files changed, 4 insertions(+) diff --git a/integration/keeper_secrets_manager_cli/keeper_secrets_manager_cli/__main__.py b/integration/keeper_secrets_manager_cli/keeper_secrets_manager_cli/__main__.py index 73866320..d93e1834 100644 --- a/integration/keeper_secrets_manager_cli/keeper_secrets_manager_cli/__main__.py +++ b/integration/keeper_secrets_manager_cli/keeper_secrets_manager_cli/__main__.py @@ -349,8 +349,11 @@ def profile_command(): def profile_init_command(ctx, token, hostname, ini_file, profile_name, token_arg): """Initialize a profile""" + # Command line --token option overrides all other options if token is None and len(token_arg) > 0: token = token_arg[0] + if token is None: + token = os.environ.get("KSM_CLI_TOKEN", None) if token is None: raise KsmCliException("A one time access token is required either as a command parameter or an argument.") diff --git a/integration/keeper_secrets_manager_cli/keeper_secrets_manager_cli/profile.py b/integration/keeper_secrets_manager_cli/keeper_secrets_manager_cli/profile.py index 07f25a50..9ad96e16 100644 --- a/integration/keeper_secrets_manager_cli/keeper_secrets_manager_cli/profile.py +++ b/integration/keeper_secrets_manager_cli/keeper_secrets_manager_cli/profile.py @@ -55,6 +55,7 @@ def __init__(self, cli, ini_file=None, config=None): Profile.init( token=os.environ.get("KSM_TOKEN"), server=os.environ.get("KSM_HOSTNAME", "US"), + ini_file=ini_file, launched_from_app=self._config.launched_from_app ) else: