Skip to content

Commit 3de528b

Browse files
committed
chore: fully revert old_password,new_password env
1 parent 1e9298e commit 3de528b

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

src/badfish/main.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2453,10 +2453,10 @@ async def execute_badfish(_host, _args, logger, format_handler=None):
24532453
_username = _args.get("u") or os.environ.get("BADFISH_USERNAME")
24542454
_password = _args.get("p") or os.environ.get("BADFISH_PASSWORD")
24552455

2456-
if _args.get("p") or _args.get("new_password") or _args.get("old_password"):
2456+
if _args.get("p"):
24572457
logger.warning(
2458-
"Passing secrets via command line arguments is unsafe. "
2459-
"Please use environment variables (BADFISH_USERNAME, BADFISH_PASSWORD)."
2458+
"Passing secrets via command line arguments can be unsafe. "
2459+
"Consider using environment variables (BADFISH_USERNAME, BADFISH_PASSWORD)."
24602460
)
24612461

24622462
if not _username or not _password:

tests/test_base.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ def badfish_call(
7575
env_vars["BADFISH_USERNAME"] = mock_user
7676
if mock_pass is not None:
7777
env_vars["BADFISH_PASSWORD"] = mock_pass
78+
argv.extend(self.args)
7879

7980
with patch.dict(os.environ, env_vars):
8081
try:

tests/test_execution.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ def test_cli_secrets_warning(self, mock_get, mock_post, mock_delete):
9898
# Explicitly use CLI secrets to trigger the warning
9999
_, err = self.badfish_call(use_cli_secrets=True)
100100

101-
assert "Passing secrets via command line arguments is unsafe" in err
101+
assert "Passing secrets via command line arguments can be unsafe" in err
102102

103103
@patch("aiohttp.ClientSession.delete")
104104
@patch("aiohttp.ClientSession.post")

0 commit comments

Comments
 (0)