Fixing issues with using ehttpc

Author: Pablo Lopez

src/kinetic.erl

@@ -34,12 +34,12 @@ stop() ->
     application:stop(kinetic).
 
 start(Opts) when is_list(Opts) ->
-    start_pool(),
+    start_pool(Opts),
     kinetic_sup:start_link(Opts).
 
 -spec start(normal | {takeover, node()} | {failover, node()}, any()) -> {ok, pid()}.
 start(_, Opts) ->
-    start_pool(),
+    start_pool(Opts),
     kinetic_sup:start_link(Opts).
 
 -spec stop(any()) -> ok.
@@ -257,7 +257,6 @@ execute(Operation, Payload, Opts) ->
             #kinetic_arguments{aws_credentials = AwsCreds,
                                region = Region,
                                date = Date,
-                               url = Url,
                                host = Host,
                                timeout = Timeout} =
                 kinetic_config:merge_args(Args, Opts),
@@ -283,7 +282,7 @@ execute(Operation, Payload, Opts) ->
                                                    aws_date => Date},
                                                  iolist_to_binary(Body))],
                     Worker = ehttpc_pool:pick_worker(?EHTTPC_POOL),
-                    case ehttpc:request(Worker, post, {Url, Headers, Body}, Timeout) of
+                    case ehttpc:request(Worker, post, {"", Headers, Body}, Timeout) of
                         {ok, 200, _, ResponseBody} ->
                             {ok, kinetic_utils:decode(ResponseBody)};
                         {ok, Code, RespHeaders, ResponseBody} ->
@@ -306,6 +305,16 @@ get_value(Key, TupleList) ->
     {Key, Value} = lists:keyfind(Key, 1, TupleList),
     Value.
 
-start_pool() ->
+start_pool(Opts) ->
+    Region =
+        case proplists:get_value(region, Opts, undefined) of
+            undefined ->
+                {ok, Zone} = imds:zone(),
+                kinetic_utils:region(Zone);
+            R ->
+                R
+        end,
+    Endpoint = kinetic_utils:endpoint(Region),
     PoolSize = application:get_env(?MODULE, pool_size, 100),
-    ehttpc_sup:start_pool(?EHTTPC_POOL, [{pool_size, PoolSize}]).
+    ehttpc_sup:start_pool(?EHTTPC_POOL,
+                          [{host, Endpoint}, {port, 443}, {pool_size, PoolSize}]).

src/kinetic_config.erl

@@ -85,31 +85,18 @@ handle_info(_Info, State) ->
 
 % Internal implementation
 
-region("us-east-1" ++ _R) ->
-    "us-east-1";
-region("us-west-1" ++ _R) ->
-    "us-west-1";
-region("us-west-2" ++ _R) ->
-    "us-west-2";
-region("ap-northeast-1" ++ _R) ->
-    "ap-northeast-1";
-region("ap-southeast-1" ++ _R) ->
-    "ap-southeast-1";
-region("eu-west-1" ++ _R) ->
-    "eu-west-1".
-
 new_args(Opts) ->
     Region =
         case proplists:get_value(region, Opts, undefined) of
             undefined ->
                 {ok, Zone} = imds:zone(),
-                region(Zone);
+                kinetic_utils:region(Zone);
             R ->
                 R
         end,
 
     DefaultTimeout = proplists:get_value(timeout, Opts, 5000),
-    Host = kinetic_utils:endpoint("kinesis", Region),
+    Host = kinetic_utils:endpoint(Region),
     Url = "https://" ++ Host,
 
     %% erliam should support named profiles for using specific roles or preconfigured
@@ -141,7 +128,7 @@ new_args(Opts) ->
 merge_args(Args, []) ->
     Args;
 merge_args(Args, [{region, Region} | Rest]) ->
-    Host = kinetic_utils:endpoint("kinesis", Region),
+    Host = kinetic_utils:endpoint(Region),
     Url = "https://" ++ Host,
     merge_args(Args#kinetic_arguments{region = Region,
                                       host = Host,

src/kinetic_utils.erl

@@ -1,18 +1,23 @@
 -module(kinetic_utils).
 
--export([endpoint/2, decode/1, encode/1]).
+-export([region/1, endpoint/1, decode/1, encode/1]).
 
-endpoint("kinesis", "us-east-1") ->
+region("us-east-1" ++ _R) ->
+    "us-east-1";
+region("us-west-2" ++ _R) ->
+    "us-west-2";
+region("ap-southeast-1" ++ _R) ->
+    "ap-southeast-1";
+region("eu-west-1" ++ _R) ->
+    "eu-west-1".
+
+endpoint("us-east-1") ->
     "kinesis.us-east-1.amazonaws.com";
-endpoint("kinesis", "us-west-1") ->
-    "kinesis.us-west-1.amazonaws.com";
-endpoint("kinesis", "us-west-2") ->
+endpoint("us-west-2") ->
     "kinesis.us-west-2.amazonaws.com";
-endpoint("kinesis", "eu-west-1") ->
+endpoint("eu-west-1") ->
     "kinesis.eu-west-1.amazonaws.com";
-endpoint("kinesis", "ap-northeast-1") ->
-    "kinesis.ap-northeast-1.amazonaws.com";
-endpoint("kinesis", "ap-southeast-1") ->
+endpoint("ap-southeast-1") ->
     "kinesis.ap-southeast-1.amazonaws.com".
 
 decode(<<"">>) ->

test/kinetic_utils_tests.erl

@@ -19,10 +19,9 @@ test_json_encoding_decoding() ->
 
 test_endpoint() ->
     Service = "kinesis",
-    Regions =
-        ["us-east-1", "us-west-1", "us-west-2", "eu-west-1", "ap-northeast-1", "ap-southeast-1"],
+    Regions = ["us-east-1", "us-west-2", "eu-west-1", "ap-southeast-1"],
     lists:foreach(fun(Region) ->
                      Url = Service ++ "." ++ Region ++ ".amazonaws.com",
-                     Url = kinetic_utils:endpoint(Service, Region)
+                     Url = kinetic_utils:endpoint(Region)
                   end,
                   Regions).