From 41b1c662e924e9773056d54b380ba2580f6599b3 Mon Sep 17 00:00:00 2001 From: Michael Jeffrey Date: Wed, 4 Jan 2023 13:39:21 -0700 Subject: [PATCH 1/2] fix reading from application env --- src/aws_credentials_env.erl | 5 +---- test/aws_credentials_providers_SUITE.erl | 12 ++++++++++++ 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/aws_credentials_env.erl b/src/aws_credentials_env.erl index 97cfd14..7f605e5 100644 --- a/src/aws_credentials_env.erl +++ b/src/aws_credentials_env.erl @@ -72,10 +72,7 @@ os_getenv(Var) when is_list(Var) -> -spec erlang_get_env(string()) -> any(). erlang_get_env(Var) when is_list(Var) -> Atom = make_env_var(string:to_lower(Var)), - case application:get_env(aws_credentials, Atom, undefined) of - undefined -> undefined; - {ok, Value} -> Value - end. + application:get_env(aws_credentials, Atom, undefined). -spec make_env_var([string()]) -> atom(). make_env_var(Var) when is_list(Var) -> list_to_atom(Var). diff --git a/test/aws_credentials_providers_SUITE.erl b/test/aws_credentials_providers_SUITE.erl index 7cca301..8cbd957 100644 --- a/test/aws_credentials_providers_SUITE.erl +++ b/test/aws_credentials_providers_SUITE.erl @@ -33,6 +33,7 @@ all() -> , {group, profile_env} , {group, ec2} , {group, env} + , {group, application_env} , {group, ecs} ]. @@ -44,6 +45,7 @@ groups() -> , {profile_env, [], all_testcases()} , {ec2, [], all_testcases()} , {env, [], all_testcases()} + , {application_env, [], all_testcases()} , {ecs, [], all_testcases()} ]. @@ -66,6 +68,7 @@ init_per_group(GroupName, Config) -> config_env -> init_group(config_env, provider(file), file, Config); credential_env -> init_group(credential_env, provider(file), credential_env, Config); profile_env -> init_group(profile_env, provider(file), config_credential, Config); + application_env -> init_group(application_env, provider(env), application_env, Config); GroupName -> init_group(GroupName, Config) end. @@ -99,6 +102,9 @@ assert_test(config_credential) -> assert_test(config_env) -> Provider = provider(file), assert_values(?DUMMY_ACCESS_KEY, ?DUMMY_SECRET_ACCESS_KEY, Provider, ?DUMMY_REGION2); +assert_test(application_env) -> + Provider = provider(env), + assert_values(?DUMMY_ACCESS_KEY, ?DUMMY_SECRET_ACCESS_KEY, Provider); assert_test(credential_env) -> Provider = provider(file), assert_values(?DUMMY_ACCESS_KEY2, ?DUMMY_SECRET_ACCESS_KEY2, Provider); @@ -199,6 +205,12 @@ setup_provider(profile_env, _Config) -> #{ mocks => [] , env => [{"AWS_PROFILE", Old}] }; +setup_provider(application_env, _Config) -> + application:set_env(aws_credentials, aws_access_key_id, binary_to_list(?DUMMY_ACCESS_KEY)), + application:set_env(aws_credentials, aws_secret_access_key, binary_to_list(?DUMMY_SECRET_ACCESS_KEY)), + #{ mocks => [] + , env => [] + }; setup_provider(_GroupName, _Config) -> #{ mocks => [] , env => [] From 51e905563289a793e28bd1a1ea98540b74358f58 Mon Sep 17 00:00:00 2001 From: Michael Jeffrey Date: Wed, 4 Jan 2023 14:16:37 -0700 Subject: [PATCH 2/2] appease the linter --- test/aws_credentials_providers_SUITE.erl | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/test/aws_credentials_providers_SUITE.erl b/test/aws_credentials_providers_SUITE.erl index 8cbd957..6ef1186 100644 --- a/test/aws_credentials_providers_SUITE.erl +++ b/test/aws_credentials_providers_SUITE.erl @@ -206,8 +206,12 @@ setup_provider(profile_env, _Config) -> , env => [{"AWS_PROFILE", Old}] }; setup_provider(application_env, _Config) -> - application:set_env(aws_credentials, aws_access_key_id, binary_to_list(?DUMMY_ACCESS_KEY)), - application:set_env(aws_credentials, aws_secret_access_key, binary_to_list(?DUMMY_SECRET_ACCESS_KEY)), + application:set_env(aws_credentials + , aws_access_key_id + , binary_to_list(?DUMMY_ACCESS_KEY)), + application:set_env(aws_credentials + , aws_secret_access_key + , binary_to_list(?DUMMY_SECRET_ACCESS_KEY)), #{ mocks => [] , env => [] };