Add basic formatter and format regular files

The formatter file is copied from aws-codegen and this commit only
formats the regular files (not the generated by that tool).
We should start to generate formatted files soon.

Author: philss

.formatter.exs

@@ -0,0 +1,4 @@
+# Used by "mix format"
+[
+  inputs: ["{mix,.formatter}.exs", "{config,lib,test}/**/*.{ex,exs}"]
+]

lib/aws/request.ex

@@ -117,7 +117,11 @@ defmodule AWS.Request do
 
             case response_header_parameters do
               [_ | _] ->
-                merge_body_with_response_headers(response_body, response, response_header_parameters)
+                merge_body_with_response_headers(
+                  response_body,
+                  response,
+                  response_header_parameters
+                )
 
               _ ->
                 response_body
@@ -191,7 +195,8 @@ defmodule AWS.Request do
     end
   end
 
-  defp encode!(%Client{} = client, protocol, payload) when protocol in @valid_protocols and is_map(payload) do
+  defp encode!(%Client{} = client, protocol, payload)
+       when protocol in @valid_protocols and is_map(payload) do
     encode_format =
       case protocol do
         "query" -> :query
@@ -244,17 +249,20 @@ defmodule AWS.Request do
 
     canonical_request = Internal.canonical_request(method, url, headers, body)
     hashed_canonical_request = Util.sha256_hexdigest(canonical_request)
-    credential_scope = Internal.credential_scope(short_date, client.region,
-                                                 client.service)
-    signing_key = Internal.signing_key(client.secret_access_key, short_date,
-                                       client.region, client.service)
-    string_to_sign = Internal.string_to_sign(long_date, credential_scope,
-                                             hashed_canonical_request)
+    credential_scope = Internal.credential_scope(short_date, client.region, client.service)
+
+    signing_key =
+      Internal.signing_key(client.secret_access_key, short_date, client.region, client.service)
+
+    string_to_sign =
+      Internal.string_to_sign(long_date, credential_scope, hashed_canonical_request)
+
     signature = Util.hmac_sha256_hexdigest(signing_key, string_to_sign)
     signed_headers = Internal.signed_headers(headers)
-    authorization = Internal.authorization(client.access_key_id,
-                                           credential_scope, signed_headers,
-                                           signature)
+
+    authorization =
+      Internal.authorization(client.access_key_id, credential_scope, signed_headers, signature)
+
     Internal.add_authorization_header(headers, authorization)
   end
 
@@ -274,23 +282,33 @@ defmodule AWS.Request do
     headers = Internal.add_date_header(headers, long_date)
     canonical_request = Internal.canonical_request(method, url, headers, body)
     hashed_canonical_request = Util.sha256_hexdigest(canonical_request)
-    credential_scope = Internal.credential_scope(short_date, client.region,
-                                                 client.service)
-    signing_key = Internal.signing_key(client.secret_access_key, short_date,
-                                       client.region, client.service)
-    string_to_sign = Internal.string_to_sign(long_date, credential_scope,
-                                             hashed_canonical_request)
+    credential_scope = Internal.credential_scope(short_date, client.region, client.service)
+
+    signing_key =
+      Internal.signing_key(client.secret_access_key, short_date, client.region, client.service)
+
+    string_to_sign =
+      Internal.string_to_sign(long_date, credential_scope, hashed_canonical_request)
+
     signature = Util.hmac_sha256_hexdigest(signing_key, string_to_sign)
     signed_headers = Internal.signed_headers(headers)
-    credential = Enum.join([client.access_key_id, short_date, client.region,
-                            client.service, "aws4_request"], "/")
-    result = [{"X-Amz-Algorithm", "AWS4-HMAC-SHA256"},
-              {"X-Amz-Credential", credential},
-              {"X-Amz-Date", long_date},
-              {"X-Amz-SignedHeaders", signed_headers},
-              {"X-Amz-Signature", signature}]
+
+    credential =
+      Enum.join(
+        [client.access_key_id, short_date, client.region, client.service, "aws4_request"],
+        "/"
+      )
+
+    result = [
+      {"X-Amz-Algorithm", "AWS4-HMAC-SHA256"},
+      {"X-Amz-Credential", credential},
+      {"X-Amz-Date", long_date},
+      {"X-Amz-SignedHeaders", signed_headers},
+      {"X-Amz-Signature", signature}
+    ]
+
     if expiry = :proplists.get_value("X-Amz-Expires", headers, nil) do
-      [{"X-Amz-Expires", expiry}|result]
+      [{"X-Amz-Expires", expiry} | result]
     else
       result
     end
@@ -323,6 +341,7 @@ defmodule AWS.Request do
   def add_headers([], headers) do
     headers
   end
+
   def add_headers([{name, _} = header | additions], headers) do
     case List.keyfind(headers, name, 0) do
       nil -> add_headers(additions, [header | headers])
@@ -343,23 +362,24 @@ defmodule AWS.Request.Internal do
   of headers.
   """
   def add_authorization_header(headers, authorization) do
-    [{"Authorization", authorization}|headers]
+    [{"Authorization", authorization} | headers]
   end
 
   @doc """
   Add an `X-Amz-Date` header with a long date value in `YYMMDDTHHMMSSZ` format
   to a list of headers.
   """
   def add_date_header(headers, date) do
-    [{"X-Amz-Date", date}|headers]
+    [{"X-Amz-Date", date} | headers]
   end
 
   @doc """
   Add an `X-Amz-Security-Token` if credentials configurations are configured for it
   """
   def add_security_token(headers, %AWS.Client{session_token: nil}), do: headers
+
   def add_security_token(headers, %AWS.Client{session_token: session_token}),
-    do: [{"X-Amz-Security-Token", session_token}|headers]
+    do: [{"X-Amz-Security-Token", session_token} | headers]
 
   @doc """
   Add an X-Amz-Content-SHA256 header which is the hash of the payload.
@@ -374,11 +394,22 @@ defmodule AWS.Request.Internal do
   Generate an AWS4-HMAC-SHA256 authorization signature.
   """
   def authorization(access_key_id, credential_scope, signed_headers, signature) do
-    Enum.join(["AWS4-HMAC-SHA256 ",
-               "Credential=", access_key_id, "/", credential_scope, ", ",
-               "SignedHeaders=", signed_headers, ", ",
-               "Signature=", signature],
-              "")
+    Enum.join(
+      [
+        "AWS4-HMAC-SHA256 ",
+        "Credential=",
+        access_key_id,
+        "/",
+        credential_scope,
+        ", ",
+        "SignedHeaders=",
+        signed_headers,
+        ", ",
+        "Signature=",
+        signature
+      ],
+      ""
+    )
   end
 
   @doc """
@@ -405,7 +436,7 @@ defmodule AWS.Request.Internal do
   """
   def canonical_request(method, url, headers, body) when is_atom(method) do
     Atom.to_string(method)
-    |> String.upcase
+    |> String.upcase()
     |> canonical_request(url, headers, body)
   end
 
@@ -414,8 +445,18 @@ defmodule AWS.Request.Internal do
     canonical_headers = canonical_headers(headers)
     signed_headers = signed_headers(headers)
     payload_hash = AWS.Util.sha256_hexdigest(body)
-    Enum.join([method, canonical_url, canonical_query_string,
-               canonical_headers, signed_headers, payload_hash], "\n")
+
+    Enum.join(
+      [
+        method,
+        canonical_url,
+        canonical_query_string,
+        canonical_headers,
+        signed_headers,
+        payload_hash
+      ],
+      "\n"
+    )
   end
 
   @doc """
@@ -440,15 +481,15 @@ defmodule AWS.Request.Internal do
   and header names are semicolon-joined in alphabetical order.
   """
   def signed_headers(headers) do
-    Enum.map(headers, &signed_header/1) |> Enum.sort |> Enum.join(";")
+    Enum.map(headers, &signed_header/1) |> Enum.sort() |> Enum.join(";")
   end
 
   @doc """
   Generate a signing key from a secret access key, a short date in `YYMMDD`
   format, a region identifier and a service identifier.
   """
   def signing_key(secret_access_key, short_date, region, service) do
-    "AWS4" <> secret_access_key
+    ("AWS4" <> secret_access_key)
     |> AWS.Util.hmac_sha256(short_date)
     |> AWS.Util.hmac_sha256(region)
     |> AWS.Util.hmac_sha256(service)
@@ -479,18 +520,19 @@ defmodule AWS.Request.Internal do
     |> Enum.map(&String.split(&1, "="))
     |> Enum.sort()
     |> Enum.map_join("&", fn
-         [key, value] -> key <> "=" <> value
-         [key] -> key <> "="
-       end)
+      [key, value] -> key <> "=" <> value
+      [key] -> key <> "="
+    end)
   end
 
   @doc """
   Generate the text to sign from a long date in `YYMMDDTHHMMSSZ` format, a
   credential scope and a hashed canonical request.
   """
   def string_to_sign(long_date, credential_scope, hashed_canonical_request) do
-    Enum.join(["AWS4-HMAC-SHA256", long_date,
-               credential_scope, hashed_canonical_request], "\n")
+    Enum.join(
+      ["AWS4-HMAC-SHA256", long_date, credential_scope, hashed_canonical_request],
+      "\n"
+    )
   end
-
 end

lib/aws/util.ex

@@ -37,7 +37,6 @@ defmodule AWS.Util do
   def encode_query(value) do
     value
     |> Enum.map(fn {k, v} -> {k, to_string(v)} end)
-    |> :uri_string.compose_query
+    |> :uri_string.compose_query()
   end
-
 end

lib/aws/xml.ex

@@ -30,9 +30,9 @@ defmodule AWS.XML do
 
   def encode_to_iodata!(map, _opts \\ []) do
     map
-    |> Map.to_list
+    |> Map.to_list()
     |> Enum.map(&encode_xml_key_value/1)
-    |> :erlang.iolist_to_binary
+    |> :erlang.iolist_to_binary()
   end
 
   def decode!(xml, _opts \\ []) do
@@ -45,40 +45,55 @@ defmodule AWS.XML do
   defp encode_xml_key_value({k, v}) when is_binary(k) and is_binary(v) do
     ["<", k, ">", v, "</", k, ">"]
   end
+
   defp encode_xml_key_value({k, values}) when is_binary(k) and is_list(values) do
     for v <- values do
       encode_xml_key_value({k, v})
     end
   end
+
   defp encode_xml_key_value({k, v}) when is_binary(k) and is_integer(v) do
     ["<", k, ">", Integer.to_charlist(v), "</", k, ">"]
   end
+
   defp encode_xml_key_value({k, v}) when is_binary(k) and is_float(v) do
     ["<", k, ">", Float.to_charlist(v), "</", k, ">"]
   end
+
   defp encode_xml_key_value({k, v}) when is_binary(k) and is_map(v) do
-    [ "<", k, ">",
+    [
+      "<",
+      k,
+      ">",
       v
-      |> Map.to_list
+      |> Map.to_list()
       |> Enum.map(&encode_xml_key_value/1),
-      "</", k, ">"
+      "</",
+      k,
+      ">"
     ]
   end
 
   _ = """
   Callback hook_fun for xmerl parser
   """
+
   defp hook_fun(element, global_state) when Record.is_record(element, :xmlElement) do
     tag = xmlElement(element, :name)
     content = xmlElement(element, :content)
-    value = case List.foldr(content, :none, &content_to_map/2) do
-              v = %{@text => text} ->
-                case String.trim(text) do
-                  ""    -> Map.delete(v, @text)
-                  trimmed -> Map.put(v, @text, trimmed)
-                end
-              v -> v
-            end
+
+    value =
+      case List.foldr(content, :none, &content_to_map/2) do
+        v = %{@text => text} ->
+          case String.trim(text) do
+            "" -> Map.delete(v, @text)
+            trimmed -> Map.put(v, @text, trimmed)
+          end
+
+        v ->
+          v
+      end
+
     {%{Atom.to_string(tag) => value}, global_state}
   end
 
@@ -99,20 +114,25 @@ defmodule AWS.XML do
   elements are processed as described above and all the text parts
   are merged under the `__text' key.
   """
+
   defp content_to_map(x, :none) do
     x
   end
 
   defp content_to_map(x, acc) when is_map(x) and is_map(acc) do
     [{tag, value}] = Map.to_list(x)
+
     case Map.has_key?(acc, tag) do
       true ->
         update_fun = fn
           l when is_list(l) -> [value | l]
           v -> [value, v]
         end
+
         Map.update!(acc, tag, update_fun)
-      false -> Map.put(acc, tag, value)
+
+      false ->
+        Map.put(acc, tag, value)
     end
   end
 
@@ -131,5 +151,4 @@ defmodule AWS.XML do
   defp content_to_map(x, acc) when is_map(x) and is_binary(acc) do
     Map.put(x, @text, acc)
   end
-
 end

test/aws/util_test.exs

@@ -3,10 +3,10 @@ defmodule AWS.UtilTest do
   alias AWS.Util
 
   test "hmac_sha256/2 returns a SHA256 HMAC for a message" do
-    expected = <<110, 158, 242, 155, 117, 255, 252,  91,
-                 122, 186, 229,  39, 213, 143, 218, 219,
-                  47, 228,  46, 114,  25,   1,  25, 118,
-                 145, 115,  67,   6,  95,  88, 237,  74>>
+    expected =
+      <<110, 158, 242, 155, 117, 255, 252, 91, 122, 186, 229, 39, 213, 143, 218, 219, 47, 228, 46,
+        114, 25, 1, 25, 118, 145, 115, 67, 6, 95, 88, 237, 74>>
+
     assert ^expected = Util.hmac_sha256("key", "message")
   end