Update configuration handling to work with Electric 1.0 (#16)

Author: magnetised

lib/phoenix/sync/electric.ex

@@ -320,7 +320,7 @@ defmodule Phoenix.Sync.Electric do
     defp start_embedded(env, mode, db_config_fun, message) do
       db_config =
         db_config_fun.()
-        |> Keyword.update!(:connection_opts, &Electric.Utils.obfuscate_password/1)
+        |> obfuscate_credentials()
 
       electric_config = core_configuration(env, db_config)
 
@@ -367,6 +367,24 @@ defmodule Phoenix.Sync.Electric do
           opts
       end
     end
+
+    defp obfuscate_credentials(opts) do
+      opts
+      |> Keyword.update!(:replication_connection_opts, &Electric.Utils.obfuscate_password/1)
+      |> then(fn opts ->
+        case Keyword.fetch(opts, :query_connection_opts) do
+          :error ->
+            opts
+
+          {:ok, query_connection_opts} ->
+            Keyword.put(
+              opts,
+              :query_connection_opts,
+              Electric.Utils.obfuscate_password(query_connection_opts)
+            )
+        end
+      end)
+    end
   else
     defp start_embedded(_env, _mode, _db_config_fun, _message) do
       {:error,
@@ -428,13 +446,20 @@ defmodule Phoenix.Sync.Electric do
   defp validate_database_config(_env, mode, opts) do
     case Keyword.pop(opts, :repo, nil) do
       {nil, opts} ->
-        case Keyword.fetch(opts, :connection_opts) do
-          {:ok, connection_opts} when is_list(connection_opts) ->
-            # TODO: validate reasonable connection opts?
-            {:start, fn -> opts end,
-             "Starting Electric replication stream from postgresql://#{connection_opts[:host]}:#{connection_opts[:port] || 5432}/#{connection_opts[:database]}"}
+        case {Keyword.get(opts, :connection_opts),
+              Keyword.get(opts, :replication_connection_opts)} do
+          {[_ | _] = connection_opts, _} ->
+            opts =
+              opts
+              |> Keyword.delete(:connection_opts)
+              |> Keyword.put(:replication_connection_opts, connection_opts)
 
-          :error ->
+            {:start, fn -> opts end, start_message(connection_opts)}
+
+          {nil, [_ | _] = connection_opts} ->
+            {:start, fn -> opts end, start_message(connection_opts)}
+
+          {nil, nil} ->
             case mode do
               :embedded ->
                 {:error,
@@ -450,14 +475,21 @@ defmodule Phoenix.Sync.Electric do
           repo_config = apply(repo, :config, [])
 
           {:start,
-           fn -> Keyword.put(opts, :connection_opts, convert_repo_config(repo_config)) end,
-           "Starting Electric replication stream using #{repo} configuration"}
+           fn ->
+             connection_opts = convert_repo_config(repo_config)
+
+             Keyword.put(opts, :replication_connection_opts, connection_opts)
+           end, "Starting Electric replication stream using #{repo} configuration"}
         else
           {:error, "#{inspect(repo)} is not a valid Ecto.Repo module"}
         end
     end
   end
 
+  defp start_message(connection_opts) do
+    "Starting Electric replication stream from postgresql://#{connection_opts[:host]}:#{connection_opts[:port] || 5432}/#{connection_opts[:database]}"
+  end
+
   if @electric_available? do
     defp convert_repo_config(repo_config) do
       expected_keys = Electric.connection_opts_schema() |> Keyword.keys()

mix.exs

@@ -38,8 +38,8 @@ defmodule Phoenix.Sync.MixProject do
       {:ecto_sql, "~> 3.10", optional: true},
       # require an exact version because electric moves very quickly atm
       # and a more generous specification would inevitably break.
-      {:electric, "== 1.0.0-beta.20", optional: true},
-      {:electric_client, ">= 0.3.0-beta.4"}
+      {:electric, "== 1.0.1", optional: true},
+      {:electric_client, "== 0.3.0"}
     ] ++ deps_for_env(Mix.env())
   end