Merge pull request #226 from CaptainFact/ops/elixir-release

Betree · web-flow · commit 1b3c66cce235 · 2020-08-20T18:26:09.000+02:00
Move to mix release
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -46,6 +46,7 @@ jobs:
         run: mix ecto.create && mix ecto.migrate
       - name: Start API
         run: iex -S mix run &
+      - uses: actions/setup-node@v1
       - name: Checkout Frontend
         uses: actions/checkout@v2
         with:
@@ -57,7 +58,7 @@ jobs:
         id: node-modules
         with:
           path: captain-fact-frontend/node_modules
-          key: ${{ runner.os }}-node-modules-${{ hashFiles('captain-fact-frontend/package-lock.json') }}
+          key: ${{ runner.os }}-node_modules-${{ hashFiles('captain-fact-frontend/package-lock.json') }}
       - name: Install Frontend's dependencies
         working-directory: captain-fact-frontend
         run: npm ci --prefer-offline --no-audit
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 _build
 deps
+erl_crash.dump
 
 # Local uploads
 dev/resources
diff --git a/.tool-versions b/.tool-versions
@@ -1,2 +1,2 @@
-erlang 21.0
-elixir 1.6-otp-21
+erlang 22.2.7
+elixir 1.10.1
diff --git a/apps/cf_atom_feed/config/config.exs b/apps/cf_atom_feed/config/config.exs
@@ -10,10 +10,6 @@ config :cf_atom_feed,
   namespace: CF.AtomFeed,
   ecto_repos: [DB.Repo]
 
-config :cf_atom_feed,
-       CF.AtomFeed.Router,
-       cowboy: [port: 4004]
-
 # Configures Elixir's Logger
 config :logger, :console,
   format: "$time $metadata[$level] $message\n",
diff --git a/apps/cf_atom_feed/config/dev.exs b/apps/cf_atom_feed/config/dev.exs
@@ -2,3 +2,7 @@ use Mix.Config
 
 # Do not include metadata nor timestamps in development logs
 config :logger, :console, format: "[$level] $message\n"
+
+config :cf_atom_feed,
+       CF.AtomFeed.Router,
+       cowboy: [port: 4004]
diff --git a/apps/cf_atom_feed/config/prod.exs b/apps/cf_atom_feed/config/prod.exs
@@ -1,6 +1,4 @@
 use Mix.Config
 
-config :cf_atom_feed, CF.AtomFeed.Router, cowboy: [port: 80]
-
 # Do not print debug messages in production
 config :logger, level: :info
diff --git a/apps/cf_atom_feed/lib/application.ex b/apps/cf_atom_feed/lib/application.ex
@@ -6,11 +6,12 @@ defmodule CF.AtomFeed.Application do
   def start(_type, _args) do
     import Supervisor.Spec
 
-    # Define workers and child supervisors to be supervised
-    children = [
-      # Start the endpoint when the application starts
-      supervisor(CF.AtomFeed.Router, [])
-    ]
+    children = []
+    config = Application.get_env(:cf_atom_feed, CF.AtomFeed.Router)
+
+    if config[:cowboy] do
+      children = [supervisor(CF.AtomFeed.Router, []) | children]
+    end
 
     # See https://hexdocs.pm/elixir/Supervisor.html
     # for other strategies and supported options
diff --git a/apps/cf_graphql/README.md b/apps/cf_graphql/README.md
@@ -8,6 +8,5 @@ Following secrets must be configured in production:
 - db_username
 - db_password
 - db_name
-- basic_auth_password
 - frontend_url
 - host
diff --git a/apps/cf_graphql/config/config.exs b/apps/cf_graphql/config/config.exs
@@ -9,12 +9,7 @@ use Mix.Config
 config :cf_graphql,
   namespace: CF.Graphql,
   ecto_repos: [DB.Repo],
-  env: Mix.env(),
-  basic_auth: [
-    username: "captain",
-    password: "SetAtRuntime",
-    realm: "GraphiQL Public Endpoint"
-  ]
+  env: Mix.env()
 
 # Configures the endpoint
 config :cf_graphql, CF.GraphQLWeb.Endpoint,
diff --git a/apps/cf_graphql/config/prod.exs b/apps/cf_graphql/config/prod.exs
@@ -5,7 +5,7 @@ config :logger, level: :info
 
 # Configure endpoint
 config :cf_graphql, CF.GraphQLWeb.Endpoint,
-  http: [port: 80],
+  server: false,
   debug_errors: false,
   code_reloader: false,
   check_origin: false,
diff --git a/apps/cf_graphql/lib/router.ex b/apps/cf_graphql/lib/router.ex
@@ -12,16 +12,10 @@ defmodule CF.GraphQLWeb.Router do
     plug(CF.Graphql.AuthPipeline)
   end
 
-  pipeline :basic_auth do
-    plug(BasicAuth, use_config: {:cf_graphql, :basic_auth})
-  end
-
   scope "/" do
     pipe_through(:api_auth)
 
     scope @graphiql_route do
-      if Mix.env() == :prod, do: pipe_through(:basic_auth)
-
       forward(
         "/",
         Absinthe.Plug.GraphiQL,
diff --git a/apps/cf_graphql/mix.exs b/apps/cf_graphql/mix.exs
@@ -39,7 +39,6 @@ defmodule CF.Graphql.Mixfile do
       {:corsica, "~> 1.0"},
       {:absinthe_ecto, "~> 0.1.3"},
       {:absinthe_plug, "~> 1.4.1"},
-      {:basic_auth, "~> 2.2.2"},
       {:kaur, "~> 1.1"},
       {:poison, "~> 3.1"},
 
diff --git a/apps/cf_jobs/lib/application.ex b/apps/cf_jobs/lib/application.ex
@@ -6,6 +6,9 @@ defmodule CF.Jobs.Application do
   def start(_type, _args) do
     import Supervisor.Spec
 
+    # Wait 30s before starting to give some time for the migrations to run
+    :timer.sleep(30000)
+
     env = Application.get_env(:cf, :env)
     # Define workers and child supervisors to be supervised
     children = [
diff --git a/apps/cf_rest_api/config/prod.exs b/apps/cf_rest_api/config/prod.exs
@@ -1,7 +1,6 @@
 use Mix.Config
 
 config :cf_rest_api, CF.RestApi.Endpoint,
-  url: [port: 80],
-  http: [port: 80],
   force_ssl: false,
-  check_origin: []
+  check_origin: [],
+  server: false
diff --git a/apps/cf_rest_api/lib/views/error_view.ex b/apps/cf_rest_api/lib/views/error_view.ex
@@ -16,8 +16,7 @@ defmodule CF.RestApi.ErrorView do
     %{error: message}
   end
 
-  def render("403.json", assigns) do
-    Logger.debug(inspect(assigns))
+  def render("403.json", _) do
     %{error: "forbidden"}
   end
 
@@ -29,13 +28,12 @@ defmodule CF.RestApi.ErrorView do
     %{error: message}
   end
 
-  def render("error.json", assigns) do
-    Logger.debug(inspect(assigns))
+  def render("error.json", _) do
     %{error: "unexpected"}
   end
 
   def render(_, assigns) do
-    Logger.debug(inspect(assigns))
+    IO.inspect(assigns)
     %{error: "unexpected"}
   end
 end
diff --git a/apps/cf_reverse_proxy/config/config.exs b/apps/cf_reverse_proxy/config/config.exs
@@ -0,0 +1,7 @@
+use Mix.Config
+
+# Configures the endpoint
+config :cf_reverse_proxy, port: 5000
+
+# Import environment specific config
+import_config "#{Mix.env()}.exs"
diff --git a/apps/cf_reverse_proxy/config/dev.exs b/apps/cf_reverse_proxy/config/dev.exs
@@ -0,0 +1 @@
+use Mix.Config
diff --git a/apps/cf_reverse_proxy/config/prod.exs b/apps/cf_reverse_proxy/config/prod.exs
@@ -0,0 +1,3 @@
+use Mix.Config
+
+config :cf_reverse_proxy, port: 80
diff --git a/apps/cf_reverse_proxy/config/test.exs b/apps/cf_reverse_proxy/config/test.exs
@@ -0,0 +1 @@
+use Mix.Config
diff --git a/apps/cf_reverse_proxy/lib/application.ex b/apps/cf_reverse_proxy/lib/application.ex
@@ -0,0 +1,37 @@
+defmodule CF.ReverseProxy.Application do
+  use Application
+
+  def start(_type, _args) do
+    import Supervisor.Spec, warn: false
+    port = Application.get_env(:cf_reverse_proxy, :port)
+
+    websocket =
+      {Phoenix.Transports.WebSocket, {CF.RestApi.Endpoint, CF.RestApi.UserSocket, :websocket}}
+
+    cowboy_options = [
+      port: port,
+      dispatch: [
+        {:_,
+         [
+           {"/socket/websocket", Phoenix.Endpoint.CowboyWebSocket, websocket},
+           {:_, Plug.Adapters.Cowboy.Handler, {CF.ReverseProxy.Plug, []}}
+         ]}
+      ]
+    ]
+
+    cowboy = Plug.Adapters.Cowboy.child_spec(:http, CF.ReverseProxy.Plug, [], cowboy_options)
+    opts = [strategy: :one_for_one, name: CF.ReverseProxy.Supervisor]
+    Supervisor.start_link([cowboy], opts)
+  end
+
+  def config_change(_changed, _new, _removed) do
+    :ok
+  end
+
+  def version() do
+    case :application.get_key(:cf_reverse_proxy, :vsn) do
+      {:ok, version} -> to_string(version)
+      _ -> "unknown"
+    end
+  end
+end
diff --git a/apps/cf_reverse_proxy/lib/plug.ex b/apps/cf_reverse_proxy/lib/plug.ex
@@ -0,0 +1,61 @@
+defmodule CF.ReverseProxy.Plug do
+  @moduledoc false
+
+  use Plug.Builder
+
+  plug(
+    Corsica,
+    max_age: 3600,
+    allow_headers: ~w(Accept Content-Type Authorization Origin),
+    origins: [~r/(.*)\.captainfact\.io$/]
+  )
+
+  @default_host CF.RestApi.Endpoint
+  @base_host_regex ~r/^(?<service>rest|graphql|feed)\./
+  @subdomains %{
+    "graphql" => CF.GraphQLWeb.Endpoint,
+    "rest" => CF.RestApi.Endpoint,
+    "feed" => CF.AtomFeed.Router
+  }
+
+  def init(opts), do: opts
+
+  # See https://github.com/wojtekmach/acme_bank/blob/master/apps/master_proxy/lib/master_proxy/plug.ex
+  # Or CaddyServer
+  # https://elixirforum.com/t/umbrella-with-2-phoenix-apps-how-to-forward-request-from-1-to-2-and-vice-versa/1797/18?u=betree
+  # https://github.com/jesseshieh/master_proxy
+
+  if Application.get_env(:cf, :env) == :dev do
+    # Dev requests are routed through here
+    def call(conn, _) do
+      [path_info, endpoint] =
+        case conn.path_info do
+          ["rest" | _] -> [tl(conn.path_info), CF.RestApi.Endpoint]
+          ["graphql" | _] -> [tl(conn.path_info), CF.GraphQLWeb.Endpoint]
+          ["feed" | _] -> [tl(conn.path_info), CF.AtomFeed.Router]
+          path_info -> [path_info, CF.RestApi.Endpoint]
+        end
+
+      conn
+      |> Map.replace!(:path_info, path_info)
+      |> Map.replace!(:request_path, Enum.join(path_info, "/"))
+      |> endpoint.call(endpoint.init(nil))
+    end
+  else
+    # Prod requests are routed through here
+    def call(conn, _) do
+      subdomain = get_domain_from_host(conn.host)
+      endpoint = Map.get(@subdomains, subdomain, @default_host)
+      endpoint.call(conn, endpoint.init(nil))
+    end
+
+    defp get_domain_from_host(host) do
+      @base_host_regex
+      |> Regex.named_captures(host)
+      |> case do
+        %{"service" => service} -> service
+        _ -> "rest"
+      end
+    end
+  end
+end
diff --git a/apps/cf_reverse_proxy/mix.exs b/apps/cf_reverse_proxy/mix.exs
@@ -0,0 +1,49 @@
+defmodule CF.ReverseProxy.Mixfile do
+  use Mix.Project
+
+  def project do
+    [
+      app: :cf_reverse_proxy,
+      version: "1.0.0",
+      build_path: "../../_build",
+      compilers: [:phoenix] ++ Mix.compilers(),
+      config_path: "../../config/config.exs",
+      deps_path: "../../deps",
+      lockfile: "../../mix.lock",
+      elixir: "~> 1.6",
+      elixirc_paths: elixirc_paths(Mix.env()),
+      build_embedded: Mix.env() == :prod,
+      start_permanent: Mix.env() == :prod,
+      aliases: aliases(),
+      deps: deps()
+    ]
+  end
+
+  def application do
+    [
+      mod: {CF.ReverseProxy.Application, []},
+      extra_applications: [:logger]
+    ]
+  end
+
+  # Specifies which paths to compile per environment.
+  defp elixirc_paths(:test), do: ["lib", "test/support"]
+  defp elixirc_paths(:dev), do: ["lib"]
+  defp elixirc_paths(_), do: ["lib"]
+
+  # Dependencies
+  defp deps do
+    [
+      {:cf_rest_api, in_umbrella: true},
+      {:cf_graphql, in_umbrella: true},
+      {:cf_atom_feed, in_umbrella: true},
+      {:phoenix, "~> 1.3.0"},
+      {:cowboy, "~> 1.0"},
+      {:corsica, "~> 1.0"}
+    ]
+  end
+
+  defp aliases do
+    []
+  end
+end
diff --git a/apps/db/lib/db/application.ex b/apps/db/lib/db/application.ex
@@ -2,6 +2,7 @@ defmodule DB.Application do
   @moduledoc false
 
   use Application
+  require Logger
 
   def start(_type, _args) do
     import Supervisor.Spec, warn: false
@@ -16,7 +17,19 @@ defmodule DB.Application do
     # See http://elixir-lang.org/docs/stable/elixir/Supervisor.html
     # for other strategies and supported options
     opts = [strategy: :one_for_one, name: DB.Supervisor]
-    Supervisor.start_link(children, opts)
+    link = Supervisor.start_link(children, opts)
+    migrate_db()
+    link
+  end
+
+  defp migrate_db do
+    Logger.info("Running migrations...")
+    Ecto.Migrator.run(DB.Repo, migrations_path(), :up, all: true)
+    Logger.info("Migrated!")
+  end
+
+  defp migrations_path do
+    Path.join([:code.priv_dir(:db), "repo", "migrations"])
   end
 
   def version() do
diff --git a/apps/db/priv/repo/migrations/20170118223600_create_postgres_extensions.exs b/apps/db/priv/repo/migrations/20170118223600_create_postgres_extensions.exs
@@ -2,7 +2,7 @@ defmodule DB.Repo.Migrations.CreatePostgresExtensions do
   use Ecto.Migration
 
   def change do
-    execute("CREATE EXTENSION citext;")
-    execute("CREATE EXTENSION unaccent;")
+    execute("CREATE EXTENSION IF NOT EXISTS citext;")
+    execute("CREATE EXTENSION IF NOT EXISTS unaccent;")
   end
 end
diff --git a/config/releases.exs b/config/releases.exs
diff --git a/mix.exs b/mix.exs
diff --git a/mix.lock b/mix.lock
diff --git a/rel/commands/migrate.sh b/rel/commands/migrate.sh
diff --git a/rel/commands/seed.sh b/rel/commands/seed.sh
diff --git a/rel/commands/seed_politicians.sh b/rel/commands/seed_politicians.sh
diff --git a/rel/config.exs b/rel/config.exs
diff --git a/rel/hooks/migrate_db/migrate.sh b/rel/hooks/migrate_db/migrate.sh
diff --git a/rel/release.sh b/rel/release.sh
diff --git a/rel/runtime_config/config.exs b/rel/runtime_config/config.exs
diff --git a/rel/test_release.sh b/rel/test_release.sh
