feat: move duplicate code to util module

Author: feng19

lib/steps/fetch/fetch_musl.ex

@@ -55,20 +55,9 @@ defmodule Burrito.Steps.Fetch.FetchMusl do
     Log.info(:step, "Downloading file: #{url}")
 
     resp =
-      cond do
-        proxy = System.get_env("HTTP_PROXY") || System.get_env("http_proxy") ->
-          Log.info(:step, "Using HTTP_PROXY: #{proxy}")
-          URI.parse(proxy)
-
-        proxy = System.get_env("HTTPS_PROXY") || System.get_env("https_proxy") ->
-          Log.info(:step, "Using HTTPS_PROXY: #{proxy}")
-          URI.parse(proxy)
-
-        true ->
-          nil
-      end
-      |> case do
-        %{scheme: scheme, host: host, port: port} when scheme in ["http", "https"] ->
+      case Burrito.Util.get_proxy() do
+        proxy = %{scheme: scheme, host: host, port: port} when scheme in ["http", "https"] ->
+          Log.info(:step, "Using PROXY: #{proxy}")
           proxy = {String.to_atom(scheme), host, port, []}
           Req.get!(url, raw: true, connect_options: [proxy: proxy])
 

lib/util/default_erts_resolver.ex

@@ -100,20 +100,9 @@ defmodule Burrito.Util.DefaultERTSResolver do
     Log.info(:step, "Downloading file: #{url}")
 
     resp =
-      cond do
-        proxy = System.get_env("HTTP_PROXY") || System.get_env("http_proxy") ->
-          Log.info(:step, "Using HTTP_PROXY: #{proxy}")
-          URI.parse(proxy)
-
-        proxy = System.get_env("HTTPS_PROXY") || System.get_env("https_proxy") ->
-          Log.info(:step, "Using HTTPS_PROXY: #{proxy}")
-          URI.parse(proxy)
-
-        true ->
-          nil
-      end
-      |> case do
-        %{scheme: scheme, host: host, port: port} when scheme in ["http", "https"] ->
+      case Burrito.Util.get_proxy() do
+        proxy = %{scheme: scheme, host: host, port: port} when scheme in ["http", "https"] ->
+          Log.info(:step, "Using PROXY: #{proxy}")
           proxy = {String.to_atom(scheme), host, port, []}
           Req.get!(url, raw: true, connect_options: [proxy: proxy])
 

lib/util/util.ex

@@ -47,4 +47,24 @@ defmodule Burrito.Util do
   def running_standalone?() do
     System.get_env("__BURRITO") != nil
   end
+
+  @doc """
+  Gets the HTTP or HTTPS proxy from environment variables, if set.
+  1. Checks `HTTP_PROXY` and `http_proxy`
+  2. Checks `HTTPS_PROXY` and `https_proxy`
+  3. Returns `nil` if no proxy is set
+  """
+  @spec get_proxy :: URI.t() | nil
+  def get_proxy do
+    cond do
+      proxy = System.get_env("HTTP_PROXY") || System.get_env("http_proxy") ->
+        URI.parse(proxy)
+
+      proxy = System.get_env("HTTPS_PROXY") || System.get_env("https_proxy") ->
+        URI.parse(proxy)
+
+      true ->
+        nil
+    end
+  end
 end