Skip to content

Commit 81d19b8

Browse files
author
Brujo Benavides
authored
Upgrade the formatter to its latest version (#11)
* Upgrade the formatter to its latest version * Upgrade the formatter to its latest version
1 parent b43d8d4 commit 81d19b8

File tree

5 files changed

+22
-25
lines changed

5 files changed

+22
-25
lines changed

rebar.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
{cover_opts, [verbose]}.
2323

24-
{deps, [{jiffy, "1.0.4"}]}.
24+
{deps, [{jiffy, "1.0.6"}]}.
2525

2626
{dialyzer, [
2727
{warnings, [no_return, error_handling]},
@@ -41,6 +41,6 @@
4141

4242
{alias, [{test, [format, lint, xref, dialyzer, eunit, cover]}]}.
4343

44-
{plugins, [rebar3_lint, {rebar3_format, "~> 0.7.0"}]}.
44+
{plugins, [rebar3_lint, {rebar3_format, "~> 0.8.1"}]}.
4545

4646
{format, [{files, ["src/*.erl", "include/*.hrl"]}]}.

rebar.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{"1.2.0",
2-
[{<<"jiffy">>,{pkg,<<"jiffy">>,<<"1.0.4">>},0}]}.
2+
[{<<"jiffy">>,{pkg,<<"jiffy">>,<<"1.0.6">>},0}]}.
33
[
44
{pkg_hash,[
5-
{<<"jiffy">>, <<"72ADEFF75C52A2FF07DE738F0813768ABE7CE158026CC1115A170340259C0CAA">>}]},
5+
{<<"jiffy">>, <<"8F0AB1D44D72F9A80556EA559907B669574134911FECF836EEB3DB1D238A6899">>}]},
66
{pkg_hash_ext,[
7-
{<<"jiffy">>, <<"113E5299EE4E6B9F40204256D7BBBD1CAF646EDEAEF31EF0F7F5F842C0DAD39E">>}]}
7+
{<<"jiffy">>, <<"6614F7B7EEF8DFE242BF7A74EFE68CEC49989F84C9E40C091F5A58792C65F1C8">>}]}
88
].

src/awsv4.erl

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ headers(#credentials{secret_access_key = SecretAccessKey,
8686
{"x-amz-date", ActualAwsDate},
8787
{"x-amz-security-token", SecurityToken},
8888
{"x-amz-target", TargetAPI}]
89-
++
89+
++
9090
if is_map(ExtraSignedHeaders) ->
9191
maps:to_list(ExtraSignedHeaders);
9292
true ->
@@ -210,17 +210,15 @@ quote(X, Kind) when is_binary(X) ->
210210
|| <<C:8>> <= X >>.
211211

212212
should_encode(X, Kind) ->
213+
ExtraChars =
214+
case Kind of
215+
all ->
216+
":/?#[]@";
217+
path ->
218+
[]
219+
end,
213220
%% note: does not encode gen-delims ()
214-
X > 127 orelse
215-
X < 33 orelse
216-
lists:member(X,
217-
"!$&'()*+,;=" ++
218-
case Kind of
219-
all ->
220-
":/?#[]@";
221-
path ->
222-
[]
223-
end).
221+
X > 127 orelse X < 33 orelse lists:member(X, "!$&'()*+,;=" ++ ExtraChars).
224222

225223
hexlify(Bin) ->
226224
[int_to_hex(X) || X <- binary_to_list(Bin)].

src/erliam_srv.erl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,10 @@ update_credentials() ->
100100
end.
101101

102102
remaining_lifetime(#credentials{expiration = ExpTime}) ->
103+
Now = calendar:universal_time(),
103104
max(0,
104-
calendar:datetime_to_gregorian_seconds(parse_exptime(ExpTime)) -
105-
calendar:datetime_to_gregorian_seconds(
106-
calendar:universal_time())).
105+
calendar:datetime_to_gregorian_seconds(parse_exptime(ExpTime))
106+
- calendar:datetime_to_gregorian_seconds(Now)).
107107

108108
parse_exptime([Y1, Y2, Y3, Y4, $-, Mon1, Mon2, $-, D1, D2, $T, H1, H2, $:, Min1, Min2, $:,
109109
S1, S2, $Z]) ->

src/erliam_sts.erl

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,11 @@ get_session_token(Credentials) ->
2020
Query = #{"Action" => "GetSessionToken", "Version" => "2011-06-15"},
2121
Host = ?STS_HOST,
2222
Headers =
23-
[{"Accept", "text/xml"}] ++
24-
awsv4:headers(Credentials,
25-
#{service => "sts",
26-
region => ?STS_REGION,
27-
query_params => Query,
28-
host => Host}),
23+
[{"Accept", "text/xml"} | awsv4:headers(Credentials,
24+
#{service => "sts",
25+
region => ?STS_REGION,
26+
query_params => Query,
27+
host => Host})],
2928
Url = "https://" ++ Host ++ "?" ++ awsv4:canonical_query(Query),
3029
decode_response(httpc:request(get,
3130
{Url, Headers},

0 commit comments

Comments
 (0)