Skip to content

Support getting an expiration from a credential process helper #89

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mattmatters wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support getting an expiration from a credential process helper #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions src/aws_credentials_file.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@
-export([fetch/1]).

-spec fetch(aws_credentials_provider:options()) ->
{error, any()} | {ok, aws_credentials:credentials(), 'infinity'}.
{ok, aws_credentials:credentials(), aws_credentials_provider:expiration()} |
{error, any()}.
fetch(Options) ->
FilePath = get_file_path(Options),
ConfigPath = does_credentials_file_exist(FilePath, config),
Expand Down Expand Up @@ -77,18 +78,18 @@ maybe_add_home(Path) ->
end.

-spec maybe_add_region(
{error, any()} | {ok, aws_credentials:credentials(), 'infinity'},
{error, any()} | {ok, aws_credentials:credentials(), aws_credentials_provider:expiration()},
{error, any()} | string(),
aws_credentials_provider:options()
) -> {ok, aws_credentials:credentials(), 'infinity'}.
) -> {ok, aws_credentials:credentials(), aws_credentials_provider:expiration()}.
maybe_add_region({error, _} = Error, _Config, _Options) -> Error;
maybe_add_region(Result, {error, _Error}, _Options) -> Result;
maybe_add_region({ok, Credentials, infinity}, ConfigPath, Options) ->
maybe_add_region({ok, Credentials, Expiration}, ConfigPath, Options) ->
case parse_config_file(ConfigPath, Options) of
{ok, Config} ->
{ok, maps:put(region, maps:get(<<"region">>, Config), Credentials), infinity};
{ok, maps:put(region, maps:get(<<"region">>, Config), Credentials), Expiration};
{error, _} ->
{ok, Credentials, infinity}
{ok, Credentials, Expiration}
end.

-spec check_path_exists(string()) -> {error, 'file_not_found'} | string().
Expand All @@ -99,7 +100,7 @@ check_path_exists(Path) ->
end.

-spec parse_credentials_file(string(), aws_credentials_provider:options()) ->
{error, any()} | {ok, aws_credentials:credentials(), 'infinity'}.
{error, any()} | {ok, aws_credentials:credentials(), aws_credentials_provider:expiration()}.
parse_credentials_file(Path, Options) ->
{ok, F} = file:read_file(Path),
{ok, Profiles} = eini:parse(F),
Expand All @@ -114,7 +115,7 @@ parse_credentials_file(Path, Options) ->
maps:get(<<"aws_access_key_id">>, Profile),
maps:get(<<"aws_secret_access_key">>, Profile),
maps:get(<<"aws_session_token">>, Profile)),
infinity};
maps:get(<<"aws_expiration">>, Profile, infinity)};
false ->
{ok, aws_credentials:make_map(?MODULE,
maps:get(<<"aws_access_key_id">>, Profile),
Expand Down Expand Up @@ -151,6 +152,8 @@ read_from_profile(File, Profile) ->
{true, {<<"aws_secret_access_key">>, SAK}};
({<<"SessionToken">>, ST}) ->
{true, {<<"aws_session_token">>, ST}};
({<<"Expiration">>, E}) ->
{true, {<<"aws_expiration">>, E}};
(_) ->
false
end, maps:to_list(CredResult))),
Expand Down
2 changes: 1 addition & 1 deletion test/aws_credentials_providers_SUITE_data/credential_process/credentials
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[default]
credential_process = echo '{"AccessKeyId":"dummy_access_key2", "SecretAccessKey":"dummy_secret_access_key2"}'
credential_process = echo '{"AccessKeyId":"dummy_access_key2", "SecretAccessKey":"dummy_secret_access_key2", "Expiration": "2026-09-25T23:43:56"}'