diff --git a/pre_commit_hooks/detect_aws_credentials.py b/pre_commit_hooks/detect_aws_credentials.py index 93077f3..243b853 100644 --- a/pre_commit_hooks/detect_aws_credentials.py +++ b/pre_commit_hooks/detect_aws_credentials.py @@ -36,7 +36,7 @@ def get_aws_secrets_from_env() -> set[str]: return keys -def get_aws_secrets_from_json_file(json_credentials_file: str) -> set[str]: +def get_aws_secrets_from_json(json_credentials_file: str) -> set[str]: """Extract AWS secrets from JSON configuration files. Read a JSON-style configuration file and return a set with all found AWS @@ -141,7 +141,7 @@ def main(argv: Sequence[str] | None = None) -> int: action='append', default=['~/.aws/cli/cache/', '~/.aws/login/cache/'], help=( - 'Location of additional AWS JSON credential file from which to get ' + 'Location of AWS JSON credential files from which to get ' 'secret keys. Can be passed multiple times.' ), ) @@ -174,7 +174,7 @@ def main(argv: Sequence[str] | None = None) -> int: keys |= get_aws_secrets_from_file(credential_file) for json_credential_file in json_credential_files: - keys |= get_aws_secrets_from_json_file(json_credential_file) + keys |= get_aws_secrets_from_json(json_credential_file) # Secrets might be part of environment variables, so add such secrets to # the set of keys. keys |= get_aws_secrets_from_env() diff --git a/tests/detect_aws_credentials_test.py b/tests/detect_aws_credentials_test.py index c3bfea0..ea4dfaa 100644 --- a/tests/detect_aws_credentials_test.py +++ b/tests/detect_aws_credentials_test.py @@ -7,7 +7,7 @@ import pytest from pre_commit_hooks.detect_aws_credentials import get_aws_cred_files_from_env from pre_commit_hooks.detect_aws_credentials import get_aws_secrets_from_env from pre_commit_hooks.detect_aws_credentials import get_aws_secrets_from_file -from pre_commit_hooks.detect_aws_credentials import get_aws_secrets_from_json_file +from pre_commit_hooks.detect_aws_credentials import get_aws_secrets_from_json from pre_commit_hooks.detect_aws_credentials import main from testing.util import get_resource_path @@ -84,9 +84,9 @@ def test_get_aws_secrets_from_env(env_vars, values): ('ok_json.json', set()), ), ) -def test_get_aws_secrets_from_json_file(filename, expected_keys): +def test_get_aws_secrets_from_json(filename, expected_keys): """Test that reading secrets from files works.""" - keys = get_aws_secrets_from_json_file(get_resource_path(filename)) + keys = get_aws_secrets_from_json(get_resource_path(filename)) assert keys == expected_keys