Skip to content

Commit a1332cf

Browse files
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
1 parent 10ce480 commit a1332cf

3 files changed

Lines changed: 15 additions & 10 deletions

File tree

‎pre_commit_hooks/detect_aws_credentials.py‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,17 @@
22

33
import argparse
44
import configparser
5+
import json
56
import os
67
from collections.abc import Sequence
78
from typing import NamedTuple
8-
import json
9+
910

1011
class BadFile(NamedTuple):
1112
filename: str
1213
key: str
1314

15+
1416
def get_aws_cred_files_from_env() -> set[str]:
1517
"""Extract credential file paths from environment variables."""
1618
return {
@@ -22,6 +24,7 @@ def get_aws_cred_files_from_env() -> set[str]:
2224
if env_var in os.environ
2325
}
2426

27+
2528
def get_aws_secrets_from_env() -> set[str]:
2629
"""Extract AWS secrets from environment variables."""
2730
keys = set()
@@ -32,6 +35,7 @@ def get_aws_secrets_from_env() -> set[str]:
3235
keys.add(os.environ[env_var])
3336
return keys
3437

38+
3539
def get_aws_secrets_from_json_file(json_credentials_file: str) -> set[str]:
3640
"""Extract AWS secrets from JSON configuration files.
3741
@@ -42,7 +46,7 @@ def get_aws_secrets_from_json_file(json_credentials_file: str) -> set[str]:
4246
if not os.path.exists(aws_credentials_file_path):
4347
return set()
4448

45-
with open(aws_credentials_file_path, 'r') as f:
49+
with open(aws_credentials_file_path) as f:
4650
try:
4751
data = json.load(f)
4852
except json.JSONDecodeError:
@@ -187,4 +191,4 @@ def main(argv: Sequence[str] | None = None) -> int:
187191

188192

189193
if __name__ == '__main__':
190-
raise SystemExit(main())
194+
raise SystemExit(main())

‎testing/resources/aws_temp_secrets_file.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
"secretAccessKey": "tempSecretAccessKey",
55
"sessionToken": "tempSessionToken"
66
}
7-
}
7+
}

‎tests/detect_aws_credentials_test.py‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,15 +68,16 @@ def test_get_aws_secrets_from_env(env_vars, values):
6868
with patch.dict('os.environ', env_vars, clear=True):
6969
assert get_aws_secrets_from_env() == values
7070

71+
7172
@pytest.mark.parametrize(
7273
('filename', 'expected_keys'),
7374
(
74-
(
75-
'aws_temp_secrets_file.json',
76-
{"tempAccessKeyId", "tempSecretAccessKey", "tempSessionToken"},
77-
),
78-
('nonsense.txt', set()),
79-
('ok_json.json', set()),
75+
(
76+
'aws_temp_secrets_file.json',
77+
{'tempAccessKeyId', 'tempSecretAccessKey', 'tempSessionToken'},
78+
),
79+
('nonsense.txt', set()),
80+
('ok_json.json', set()),
8081
),
8182
)
8283
def test_get_aws_secrets_from_json_file(filename, expected_keys):

0 commit comments

Comments
 (0)