Revert "Allow configuration source to be injected"

This reverts commit c8f56b2.

lib/azurex/blob.ex

@@ -10,14 +10,14 @@ defmodule Azurex.Blob do
 
   @typep optional_string :: String.t() | nil
 
-  def list_containers(conf_element \\ :azurex) do
+  def list_containers do
     %HTTPoison.Request{
-      url: Config.api_url(conf_element) <> "/",
+      url: Config.api_url() <> "/",
       params: [comp: "list"]
     }
     |> SharedKey.sign(
-      storage_account_name: Config.storage_account_name(conf_element),
-      storage_account_key: Config.storage_account_key(conf_element)
+      storage_account_name: Config.storage_account_name(),
+      storage_account_key: Config.storage_account_key()
     )
     |> HTTPoison.request()
     |> case do
@@ -71,34 +71,32 @@ defmodule Azurex.Blob do
         ) ::
           :ok
           | {:error, HTTPoison.AsyncResponse.t() | HTTPoison.Error.t() | HTTPoison.Response.t()}
-  def put_blob(name, blob, content_type, container \\ nil, options \\ [])
+  def put_blob(name, blob, content_type, container \\ nil, params \\ [])
 
-  def put_blob(name, {:stream, bitstream}, content_type, container, options) do
+  def put_blob(name, {:stream, bitstream}, content_type, container, params) do
     content_type = content_type || "application/octet-stream"
 
     bitstream
     |> Stream.transform(
       fn -> [] end,
       fn chunk, acc ->
-        with {:ok, block_id} <- Block.put_block(container, chunk, name, options) do
+        with {:ok, block_id} <- Block.put_block(container, chunk, name, params) do
           {[], [block_id | acc]}
         end
       end,
       fn acc ->
-        Block.put_block_list(acc, container, name, content_type, options)
+        Block.put_block_list(acc, container, name, content_type, params)
       end
     )
     |> Stream.run()
   end
 
-  def put_blob(name, blob, content_type, container, options) do
-    {params, options} = Keyword.pop(options, :params, [])
-    {conf_element, _options} = Keyword.pop(options, :config_element, :azurex)
+  def put_blob(name, blob, content_type, container, params) do
     content_type = content_type || "application/octet-stream"
 
     %HTTPoison.Request{
       method: :put,
-      url: get_url(container, conf_element, name),
+      url: get_url(container, name),
       params: params,
       body: blob,
       headers: [
@@ -109,8 +107,8 @@ defmodule Azurex.Blob do
       options: [recv_timeout: :infinity]
     }
     |> SharedKey.sign(
-      storage_account_name: Config.storage_account_name(conf_element),
-      storage_account_key: Config.storage_account_key(conf_element),
+      storage_account_name: Config.storage_account_name(),
+      storage_account_key: Config.storage_account_key(),
       content_type: content_type
     )
     |> HTTPoison.request()
@@ -182,17 +180,17 @@ defmodule Azurex.Blob do
           {:ok, HTTPoison.Response.t()} | {:error, term()}
   def copy_blob(source_name, destination_name, container \\ nil) do
     content_type = "application/octet-stream"
-    source_url = get_url(container, :azurex, source_name)
+    source_url = get_url(container, source_name)
     headers = [{"x-ms-copy-source", source_url}, {"content-type", content_type}]
 
     %HTTPoison.Request{
       method: :put,
-      url: get_url(container, :azurex, destination_name),
+      url: get_url(container, destination_name),
       headers: headers
     }
     |> SharedKey.sign(
-      storage_account_name: Config.storage_account_name(:azurex),
-      storage_account_key: Config.storage_account_key(:azurex),
+      storage_account_name: Config.storage_account_name(),
+      storage_account_key: Config.storage_account_key(),
       content_type: content_type
     )
     |> HTTPoison.request()
@@ -219,18 +217,17 @@ defmodule Azurex.Blob do
   def blob_request(name, container, method, options) do
     {params, options} = Keyword.pop(options, :params, [])
     {headers, options} = Keyword.pop(options, :headers, [])
-    {conf_element, options} = Keyword.pop(options, :config_element, :azurex)
 
     %HTTPoison.Request{
       method: method,
-      url: get_url(container, conf_element, name),
+      url: get_url(container, name),
       params: params,
       headers: headers,
       options: options
     }
     |> SharedKey.sign(
-      storage_account_name: Config.storage_account_name(conf_element),
-      storage_account_key: Config.storage_account_key(conf_element)
+      storage_account_name: Config.storage_account_name(),
+      storage_account_key: Config.storage_account_key()
     )
   end
 
@@ -248,21 +245,18 @@ defmodule Azurex.Blob do
   @spec list_blobs(optional_string) ::
           {:ok, binary()}
           | {:error, HTTPoison.AsyncResponse.t() | HTTPoison.Error.t() | HTTPoison.Response.t()}
-  def list_blobs(container \\ nil, options \\ []) do
-    {params, options} = Keyword.pop(options, :params, [])
-    {conf_element, _options} = Keyword.pop(options, :config_element, :azurex)
-
+  def list_blobs(container \\ nil, params \\ []) do
     %HTTPoison.Request{
-      url: "#{Config.api_url(conf_element)}/#{get_container(container, conf_element)}",
+      url: "#{Config.api_url()}/#{get_container(container)}",
       params:
         [
           comp: "list",
           restype: "container"
         ] ++ params
     }
     |> SharedKey.sign(
-      storage_account_name: Config.storage_account_name(conf_element),
-      storage_account_key: Config.storage_account_key(conf_element)
+      storage_account_name: Config.storage_account_name(),
+      storage_account_key: Config.storage_account_key()
     )
     |> HTTPoison.request()
     |> case do
@@ -275,20 +269,20 @@ defmodule Azurex.Blob do
   @doc """
   Returns the url for a container (defaults to the one in `Azurex.Blob.Config`)
   """
-  @spec get_url(optional_string, String.t()) :: String.t()
-  def get_url(container, conf_element) do
-    "#{Config.api_url(conf_element)}/#{get_container(container, conf_element)}"
+  @spec get_url(optional_string) :: String.t()
+  def get_url(container) do
+    "#{Config.api_url()}/#{get_container(container)}"
   end
 
   @doc """
   Returns the url for a file in a container (defaults to the one in `Azurex.Blob.Config`)
   """
   @spec get_url(optional_string, String.t()) :: String.t()
-  def get_url(container, conf_element, blob_name) do
-    "#{get_url(container, conf_element)}/#{blob_name}"
+  def get_url(container, blob_name) do
+    "#{get_url(container)}/#{blob_name}"
   end
 
-  defp get_container(container, conf_element) do
-    container || Config.default_container(conf_element)
+  defp get_container(container) do
+    container || Config.default_container()
   end
 end

lib/azurex/blob/block.ex

@@ -19,16 +19,14 @@ defmodule Azurex.Blob.Block do
   """
   @spec put_block(String.t(), bitstring(), String.t(), list()) ::
           {:ok, String.t()} | {:error, term()}
-  def put_block(container, chunk, name, options) do
-    {params, options} = Keyword.pop(options, :params, [])
-    {conf_element, _options} = Keyword.pop(options, :config_element, :azurex)
+  def put_block(container, chunk, name, params) do
     block_id = build_block_id()
     content_type = "application/octet-stream"
     params = [{:comp, "block"}, {:blockid, block_id} | params]
 
     %HTTPoison.Request{
       method: :put,
-      url: Blob.get_url(container, conf_element, name),
+      url: Blob.get_url(container, name),
       params: params,
       body: chunk,
       headers: [
@@ -37,8 +35,8 @@ defmodule Azurex.Blob.Block do
       ]
     }
     |> SharedKey.sign(
-      storage_account_name: Config.storage_account_name(conf_element),
-      storage_account_key: Config.storage_account_key(conf_element),
+      storage_account_name: Config.storage_account_name(),
+      storage_account_key: Config.storage_account_key(),
       content_type: content_type
     )
     |> HTTPoison.request()
@@ -56,9 +54,7 @@ defmodule Azurex.Blob.Block do
   """
   @spec put_block_list(list(), String.t(), String.t(), String.t() | nil, list()) ::
           :ok | {:error, term()}
-  def put_block_list(block_ids, container, name, blob_content_type, options) do
-    {params, options} = Keyword.pop(options, :params, [])
-    {conf_element, _options} = Keyword.pop(options, :config_element, :azurex)
+  def put_block_list(block_ids, container, name, blob_content_type, params) do
     params = [{:comp, "blocklist"} | params]
     content_type = "text/plain; charset=UTF-8"
     blob_content_type = blob_content_type || "application/octet-stream"
@@ -78,7 +74,7 @@ defmodule Azurex.Blob.Block do
 
     %HTTPoison.Request{
       method: :put,
-      url: Blob.get_url(container, conf_element, name),
+      url: Blob.get_url(container, name),
       params: params,
       body: body,
       headers: [
@@ -87,8 +83,8 @@ defmodule Azurex.Blob.Block do
       ]
     }
     |> SharedKey.sign(
-      storage_account_name: Config.storage_account_name(conf_element),
-      storage_account_key: Config.storage_account_key(conf_element),
+      storage_account_name: Config.storage_account_name(),
+      storage_account_key: Config.storage_account_key(),
       content_type: content_type
     )
     |> HTTPoison.request()

lib/azurex/blob/config.ex

@@ -8,39 +8,38 @@ defmodule Azurex.Blob.Config do
   or `storage_account_connection_string` required.
   """
 
-  defp conf(config_element), do: Application.get_env(config_element, __MODULE__, [])
+  defp conf, do: Application.get_env(:azurex, __MODULE__, [])
 
   @doc """
   Azure endpoint url, optional
   Defaults to `https://{name}.blob.core.windows.net` where `name` is the `storage_account_name`
   """
-  @spec api_url(atom()) :: String.t()
-  # TODO this, and below functions are public therefore we should probably default this
-  def api_url(config_element) do
+  @spec api_url :: String.t()
+  def api_url do
     cond do
-      api_url = Keyword.get(conf(config_element), :api_url) -> api_url
-      api_url = get_connection_string_value("BlobEndpoint", config_element) -> api_url
-      true -> "https://#{storage_account_name(config_element)}.blob.core.windows.net"
+      api_url = Keyword.get(conf(), :api_url) -> api_url
+      api_url = get_connection_string_value("BlobEndpoint") -> api_url
+      true -> "https://#{storage_account_name()}.blob.core.windows.net"
     end
   end
 
   @doc """
   Azure container name, optional.
   """
-  @spec default_container(atom()) :: String.t() | nil
-  def default_container(config_element) do
-    Keyword.get(conf(config_element), :default_container) ||
+  @spec default_container :: String.t() | nil
+  def default_container do
+    Keyword.get(conf(), :default_container) ||
       raise "Must specify `container` because the default container was not provided."
   end
 
   @doc """
   Azure storage account name.
   Required if `storage_account_connection_string` not set.
   """
-  @spec storage_account_name(atom()) :: String.t()
-  def storage_account_name(config_element) do
-    case Keyword.get(conf(config_element), :storage_account_name) do
-      nil -> get_connection_string_value("AccountName", config_element)
+  @spec storage_account_name :: String.t()
+  def storage_account_name do
+    case Keyword.get(conf(), :storage_account_name) do
+      nil -> get_connection_string_value("AccountName")
       storage_account_name -> storage_account_name
     end || raise @missing_envs_error_msg
   end
@@ -49,10 +48,10 @@ defmodule Azurex.Blob.Config do
   Azure storage account access key. Base64 encoded, as provided by azure UI.
   Required if `storage_account_connection_string` not set.
   """
-  @spec storage_account_key(atom()) :: binary
-  def storage_account_key(config_element) do
-    case Keyword.get(conf(config_element), :storage_account_key) do
-      nil -> get_connection_string_value("AccountKey", config_element)
+  @spec storage_account_key :: binary
+  def storage_account_key do
+    case Keyword.get(conf(), :storage_account_key) do
+      nil -> get_connection_string_value("AccountKey")
       key -> key
     end
     |> Kernel.||(raise @missing_envs_error_msg)
@@ -63,9 +62,9 @@ defmodule Azurex.Blob.Config do
   Azure storage account connection string.
   Required if `storage_account_name` or `storage_account_key` not set.
   """
-  @spec storage_account_connection_string(atom()) :: String.t() | nil
-  def storage_account_connection_string(config_element),
-    do: Keyword.get(conf(config_element), :storage_account_connection_string)
+  @spec storage_account_connection_string :: String.t() | nil
+  def storage_account_connection_string,
+    do: Keyword.get(conf(), :storage_account_connection_string)
 
   @spec parse_connection_string(nil | binary) :: map
   @doc """
@@ -97,9 +96,9 @@ defmodule Azurex.Blob.Config do
   @doc """
   Returns the value in the connection string given the string key.
   """
-  @spec get_connection_string_value(String.t(), atom()) :: String.t() | nil
-  def get_connection_string_value(key, config_element) do
-    storage_account_connection_string(config_element)
+  @spec get_connection_string_value(String.t()) :: String.t() | nil
+  def get_connection_string_value(key) do
+    storage_account_connection_string()
     |> parse_connection_string
     |> Map.get(key)
   end

lib/azurex/blob/container.ex

@@ -5,15 +5,15 @@ defmodule Azurex.Blob.Container do
   alias Azurex.Blob.Config
   alias Azurex.Authorization.SharedKey
 
-  def head_container(container, conf_element \\ :azurex) do
+  def head_container(container) do
     %HTTPoison.Request{
-      url: Config.api_url(conf_element) <> "/" <> container,
+      url: Config.api_url() <> "/" <> container,
       params: [restype: "container"],
       method: :head
     }
     |> SharedKey.sign(
-      storage_account_name: Config.storage_account_name(conf_element),
-      storage_account_key: Config.storage_account_key(conf_element)
+      storage_account_name: Config.storage_account_name(),
+      storage_account_key: Config.storage_account_key()
     )
     |> HTTPoison.request()
     |> case do
@@ -24,15 +24,15 @@ defmodule Azurex.Blob.Container do
     end
   end
 
-  def create(container, conf_element \\ :azurex) do
+  def create(container) do
     %HTTPoison.Request{
-      url: Config.api_url(conf_element) <> "/" <> container,
+      url: Config.api_url() <> "/" <> container,
       params: [restype: "container"],
       method: :put
     }
     |> SharedKey.sign(
-      storage_account_name: Config.storage_account_name(conf_element),
-      storage_account_key: Config.storage_account_key(conf_element),
+      storage_account_name: Config.storage_account_name(),
+      storage_account_key: Config.storage_account_key(),
       content_type: "application/octet-stream"
     )
     |> HTTPoison.request()

lib/azurex/blob/shared_access_signature.ex

@@ -25,7 +25,7 @@ defmodule Azurex.Blob.SharedAccessSignature do
   """
   @spec sas_url(String.t(), String.t(), [{atom(), any()}]) :: String.t()
   def sas_url(container, resource, opts \\ []) do
-    base_url = Azurex.Blob.Config.api_url(:azurex)
+    base_url = Azurex.Blob.Config.api_url()
     resource_type = Keyword.get(opts, :resource_type, :container)
     permissions = Keyword.get(opts, :permissions, [:read])
     from = Keyword.get(opts, :from, DateTime.utc_now())
@@ -38,8 +38,8 @@ defmodule Azurex.Blob.SharedAccessSignature do
         resource,
         {from, expiry},
         permissions,
-        Azurex.Blob.Config.storage_account_name(:azurex),
-        Azurex.Blob.Config.storage_account_key(:azurex)
+        Azurex.Blob.Config.storage_account_name(),
+        Azurex.Blob.Config.storage_account_key()
       )
 
     "#{Path.join(base_url, resource)}?#{token}"