Merge pull request #82 from puzza007/update-cowboy

Update cowlib/cowboy to 2.2.0

Author: puzza007

rebar.config

@@ -5,7 +5,7 @@
 {minimum_otp_vsn, "19.1"}.
 
 {deps, [
-        {cowlib, "1.0.2"},
+        {cowlib, "2.4.0"},
         {worker_pool, "3.1.1"},
         {metrics, "2.5.0"}
        ]}.
@@ -16,7 +16,7 @@
    [{deps,
      [{jsx, "2.9.0"},
       {meck, "0.8.10"},
-      {cowboy, "1.0.0"},
+      {cowboy, "2.4.0"},
       {http_proxy, ".*", {git, "https://github.com/puzza007/http_proxy.git", {branch, "rebar3"}}}
      ]}]
   }]
@@ -40,7 +40,7 @@
                deprecated_functions]}.
 
 {plugins, [rebar3_hex,
-           {coveralls, {git, "https://github.com/markusn/coveralls-erl", {ref, "57a190502cd2606d2b5cc142bd5cec1ec7c497b2"}}}]}.
+           {coveralls, "1.4.0"}]}.
 {cover_enabled, true}.
 {cover_export_enabled, true}.
 {coveralls_coverdata, "_build/test/cover/ct.coverdata"}.

rebar.lock

@@ -1,12 +1,10 @@
 {"1.1.0",
-[{<<"cowlib">>,{pkg,<<"cowlib">>,<<"1.0.2">>},0},
- {<<"metrics">>,
-  {git,"https://github.com/voughtdq/erlang-metrics.git",
-       {ref,"cc99b5be6afcd6bd3715fa23ed9ffd207cfb5996"}},
-  0},
+[{<<"cowlib">>,{pkg,<<"cowlib">>,<<"2.4.0">>},0},
+ {<<"metrics">>,{pkg,<<"metrics">>,<<"2.5.0">>},0},
  {<<"worker_pool">>,{pkg,<<"worker_pool">>,<<"3.1.1">>},0}]}.
 [
 {pkg_hash,[
- {<<"cowlib">>, <<"9D769A1D062C9C3AC753096F868CA121E2730B9A377DE23DEC0F7E08B1DF84EE">>},
+ {<<"cowlib">>, <<"93525F288EBAD37A9DFDDD1CCED54A7BFDC96B8DDF66BE1927447048DE65DA8E">>},
+ {<<"metrics">>, <<"268D218D56529CB5F070D74BBFC3AF64C668379B5B18FAFDA88959442F790C57">>},
  {<<"worker_pool">>, <<"A9BF27CFF366999784A3F0657F016CE3A57901490858CCA3FB3BE1208BF2110D">>}]}
 ].

src/katipo.erl

@@ -207,17 +207,13 @@
 -type body() :: binary().
 -type request() :: map().
 -type metrics() :: proplists:proplist().
--ifdef(OTP_RELEASE).
 -type response() :: {ok, #{status := status(),
                            headers := headers(),
                            cookiejar := cookiejar(),
                            body := body(),
                            metrics => proplists:proplist()}} |
                     {error, #{code := error_code(),
                               message := error_msg()}}.
--else.
--type response() :: {ok, map()} | {error, map()}.
--endif.
 -type http_auth() :: basic | digest.
 -type http_auth_int() :: ?CURLAUTH_UNDEFINED | ?CURLAUTH_BASIC | ?CURLAUTH_DIGEST.
 -type curlmopts() :: [{max_pipeline_length, non_neg_integer()} |

test/get_handler.erl

@@ -1,15 +1,7 @@
 -module(get_handler).
 
--export([init/3]).
--export([handle/2]).
--export([terminate/3]).
+-export([init/2]).
 
-init(_, Req, _) ->
-    {ok, Req, no_state}.
-
-handle(Req, State) ->
+init(Req, Opts) ->
     Req2 = cowboy_req:reply(200, Req),
-    {ok, Req2, State}.
-
-terminate(_, _, _) ->
-    ok.
+    {ok, Req2, Opts}.

test/katipo_SUITE.erl

@@ -30,12 +30,12 @@ init_per_group(https, Config) ->
     Dispatch = cowboy_router:compile([{'_', [{"/", get_handler, []}]}]),
     DataDir = ?config(data_dir, Config),
     CACert = filename:join(DataDir, "cowboy-ca.crt"),
-    {ok, _} = cowboy:start_https(ct_https, 1,
-                                 [{port, 8443},
-                                  {cacertfile, CACert},
-                                  {certfile, filename:join(DataDir, "server.crt")},
-                                  {keyfile, filename:join(DataDir, "server.key")}],
-                                 [{env, [{dispatch, Dispatch}]}]),
+    {ok, _} = cowboy:start_tls(ct_https,
+                               [{port, 8443},
+                                {cacertfile, CACert},
+                                {certfile, filename:join(DataDir, "server.crt")},
+                                {keyfile, filename:join(DataDir, "server.key")}],
+                               #{env => #{dispatch => Dispatch}}),
     [{cacert_file, list_to_binary(CACert)} | Config];
 init_per_group(proxy, Config) ->
     application:ensure_all_started(http_proxy),