Skip to content

Commit 40fe4df

Browse files
fix: decorator copilot feedback
1 parent 08d7868 commit 40fe4df

1 file changed

Lines changed: 5 additions & 4 deletions

File tree

cloudsmith_cli/cli/decorators.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,8 @@ def wrapper(ctx, *args, **kwargs):
116116
ctx.meta["creds_file"] = creds_file
117117

118118
opts.load_config_file(path=config_file, profile=profile)
119-
creds_values = opts.load_creds_file(path=creds_file, profile=profile) or {}
120-
opts.api_key_from_file = creds_values.get("api_key")
119+
opts.load_creds_file(path=creds_file, profile=profile)
120+
opts.api_key_from_file = opts.api_key
121121
kwargs["opts"] = opts
122122
return ctx.invoke(f, *args, **kwargs)
123123

@@ -230,10 +230,11 @@ def wrapper(ctx, *args, **kwargs):
230230
api_key = kwargs.pop("api_key")
231231

232232
source = ctx.get_parameter_source("api_key")
233-
if source == ParameterSource.COMMANDLINE:
233+
api_key_nonempty = api_key and api_key.strip()
234+
if source == ParameterSource.COMMANDLINE and api_key_nonempty:
234235
opts.api_key_from_flag = api_key
235236
opts.api_key_from_env = None
236-
elif source == ParameterSource.ENVIRONMENT:
237+
elif source == ParameterSource.ENVIRONMENT and api_key_nonempty:
237238
opts.api_key_from_flag = None
238239
opts.api_key_from_env = api_key
239240
else:

0 commit comments

Comments
 (0)