Skip to content

Commit

Permalink
[rebar3_format-0.7.0] Pin rebar3_format to its latest version (#27)
Browse files Browse the repository at this point in the history
  • Loading branch information
Brujo Benavides authored Nov 9, 2020
1 parent 85dbf90 commit 143970b
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
4 changes: 1 addition & 3 deletions rebar.config
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,9 @@
{alias, [{test, [format, lint, xref, dialyzer, eunit, cover, edoc]}]}.

{plugins, [
{rebar3_format, "~> 0.6.0"},
{rebar3_format, "~> 0.7.0"},
rebar3_lint,
rebar3_hex
]}.

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


5 changes: 4 additions & 1 deletion src/kinetic_config.erl
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,9 @@ merge_args(Args, []) ->
merge_args(Args, [{region, Region} | Rest]) ->
Host = kinetic_utils:endpoint("kinesis", Region),
Url = "https://" ++ Host,
merge_args(Args#kinetic_arguments{region = Region, host = Host, url = Url}, Rest);
merge_args(Args#kinetic_arguments{region = Region,
host = Host,
url = Url},
Rest);
merge_args(Args, [{timeout, Timeout} | Rest]) ->
merge_args(Args#kinetic_arguments{timeout = Timeout}, Rest).
4 changes: 3 additions & 1 deletion test/kinetic_config_tests.erl
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@ merge_args_test_() ->
#kinetic_arguments{region = "region1",
host = Host1 = "host1",
url = Url1 = "url1"},
#kinetic_arguments{region = Region2, host = Host2, url = Url2} =
#kinetic_arguments{region = Region2,
host = Host2,
url = Url2} =
kinetic_config:merge_args(Args1, [{region, "us-east-1"}]),
?assertEqual("us-east-1", Region2),
?assertNotEqual(Host1, Host2),
Expand Down

0 comments on commit 143970b

Please sign in to comment.