resolve PR comments round 2

Author: Taras Tyshko

lib/nerves_hub/accounts/user_notifier.ex

@@ -17,7 +17,7 @@ defmodule NervesHub.Accounts.UserNotifier do
   alias NervesHub.Emails.WelcomeTemplate
 
   alias NervesHub.SwooshMailer, as: Mailer
-  alias Phoenix.HTML.Safe, as: HTMLSafe
+  alias Phoenix.HTML
 
   def deliver_confirmation_instructions(user, confirmation_url) do
     assigns = %{
@@ -208,7 +208,7 @@ defmodule NervesHub.Accounts.UserNotifier do
 
     text =
       module.text_render(assigns)
-      |> HTMLSafe.to_iodata()
+      |> HTML.Safe.to_iodata()
       |> IO.iodata_to_binary()
 
     {html, text}

lib/nerves_hub/devices/log_lines.ex

@@ -6,7 +6,7 @@ defmodule NervesHub.Devices.LogLines do
   alias NervesHub.AnalyticsRepo
   alias NervesHub.Devices.Device
   alias NervesHub.Devices.LogLine
-  alias Phoenix.Channel.Server
+  alias Phoenix.Channel.Server, as: ChannelServer
 
   import Ecto.Query
 
@@ -55,7 +55,7 @@ defmodule NervesHub.Devices.LogLines do
         _ = AnalyticsRepo.insert_all(LogLine, [changeset.changes], settings: [async_insert: 1])
 
         topic = "device:#{device.identifier}:internal"
-        _ = Server.broadcast(NervesHub.PubSub, topic, "logs:received", log_line)
+        _ = ChannelServer.broadcast(NervesHub.PubSub, topic, "logs:received", log_line)
 
         {:ok, log_line}
 

lib/nerves_hub/extensions.ex

@@ -15,7 +15,7 @@ defmodule NervesHub.Extensions do
     critical firmware update.
   """
 
-  alias Phoenix.Channel.Server
+  alias Phoenix.Channel.Server, as: ChannelServer
 
   @callback handle_in(event :: String.t(), Phoenix.Channel.payload(), Phoenix.Socket.t()) ::
               {:noreply, Phoenix.Socket.t()}
@@ -77,7 +77,7 @@ defmodule NervesHub.Extensions do
 
   def broadcast_extension_event(target, event, extension) do
     params = %{"extensions" => [extension]}
-    Server.broadcast_from!(NervesHub.PubSub, self(), topic(target), event, params)
+    ChannelServer.broadcast_from!(NervesHub.PubSub, self(), topic(target), event, params)
   end
 
   defp topic(%NervesHub.Devices.Device{} = device), do: "device:#{device.id}:extensions"

lib/nerves_hub/extensions/geo.ex

@@ -2,7 +2,7 @@ defmodule NervesHub.Extensions.Geo do
   @behaviour NervesHub.Extensions
 
   alias NervesHub.Devices.Connections
-  alias Phoenix.Channel.Server
+  alias Phoenix.Channel.Server, as: ChannelServer
 
   @impl NervesHub.Extensions
   def description() do
@@ -52,7 +52,7 @@ defmodule NervesHub.Extensions.Geo do
     Connections.merge_update_metadata(socket.assigns.reference_id, %{location: location})
     event = "location:updated"
     topic = "device:#{socket.assigns.device.identifier}:internal"
-    _ = Server.broadcast(NervesHub.PubSub, topic, event, location)
+    _ = ChannelServer.broadcast(NervesHub.PubSub, topic, event, location)
 
     {:noreply, socket}
   end

lib/nerves_hub/extensions/health.ex

@@ -5,7 +5,7 @@ defmodule NervesHub.Extensions.Health do
   alias NervesHub.Devices.HealthStatus
   alias NervesHub.Devices.Metrics
   alias NervesHub.Helpers.Logging
-  alias Phoenix.Channel.Server
+  alias Phoenix.Channel.Server, as: ChannelServer
 
   require Logger
 
@@ -110,6 +110,6 @@ defmodule NervesHub.Extensions.Health do
 
   defp device_internal_broadcast!(device, event, payload) do
     topic = "device:#{device.id}:extensions"
-    Server.broadcast_from!(NervesHub.PubSub, self(), topic, event, payload)
+    ChannelServer.broadcast_from!(NervesHub.PubSub, self(), topic, event, payload)
   end
 end

lib/nerves_hub/tracker.ex

@@ -5,7 +5,7 @@ defmodule NervesHub.Tracker do
 
   alias NervesHub.Devices.Device
   alias NervesHub.Repo
-  alias Phoenix.Channel.Server
+  alias Phoenix.Channel.Server, as: ChannelServer
   alias Phoenix.PubSub
 
   def online(%{} = device) do
@@ -19,7 +19,7 @@ defmodule NervesHub.Tracker do
   def confirm_online(%Device{identifier: identifier}) do
     topic = "device:#{identifier}:internal"
     params = %{device_id: identifier, status: "online"}
-    _ = Server.broadcast(NervesHub.PubSub, topic, "connection:status", params)
+    _ = ChannelServer.broadcast(NervesHub.PubSub, topic, "connection:status", params)
 
     :ok
   end
@@ -38,7 +38,7 @@ defmodule NervesHub.Tracker do
   defp publish(identifier, status) do
     topic = "device:#{identifier}:internal"
     params = %{device_id: identifier, status: status}
-    _ = Server.broadcast(NervesHub.PubSub, topic, "connection:change", params)
+    _ = ChannelServer.broadcast(NervesHub.PubSub, topic, "connection:change", params)
 
     :ok
   end

test/nerves_hub/devices_test.exs

@@ -15,9 +15,8 @@ defmodule NervesHub.DevicesTest do
   alias NervesHub.Fixtures
   alias NervesHub.ManagedDeployments
   alias NervesHub.Products
-  alias NervesHub.Support.Fwup
-
   alias NervesHub.Repo
+  alias NervesHub.Support
 
   setup do
     user = Fixtures.user_fixture()
@@ -858,14 +857,19 @@ defmodule NervesHub.DevicesTest do
 
       # create some firmware which can be uploaded to each org
       {:ok, _} =
-        Fwup.create_firmware(tmp_dir, "old-firmware", %{
+        Support.Fwup.create_firmware(tmp_dir, "old-firmware", %{
           product: "Same Product Name",
           fwup_version: "1.13.0"
         })
 
       # sign and upload for org one
       {:ok, signed_firmware_one} =
-        Fwup.sign_firmware(tmp_dir, org_key_one.name, "old-firmware", "old-firmware-signed-one")
+        Support.Fwup.sign_firmware(
+          tmp_dir,
+          org_key_one.name,
+          "old-firmware",
+          "old-firmware-signed-one"
+        )
 
       {:ok, old_firmware_one} = Firmwares.create_firmware(org_one, signed_firmware_one)
 
@@ -875,7 +879,12 @@ defmodule NervesHub.DevicesTest do
 
       # sign and upload for org two
       {:ok, old_signed_firmware_two} =
-        Fwup.sign_firmware(tmp_dir, org_key_two.name, "old-firmware", "old-firmware-signed-two")
+        Support.Fwup.sign_firmware(
+          tmp_dir,
+          org_key_two.name,
+          "old-firmware",
+          "old-firmware-signed-two"
+        )
 
       {:ok, old_firmware_two} = Firmwares.create_firmware(org_two, old_signed_firmware_two)
 
@@ -885,14 +894,19 @@ defmodule NervesHub.DevicesTest do
 
       # and now create some new firmware which can be uploaded to each org
       {:ok, _} =
-        Fwup.create_firmware(tmp_dir, "new-firmware", %{
+        Support.Fwup.create_firmware(tmp_dir, "new-firmware", %{
           product: "Same Product Name",
           fwup_version: "1.13.0"
         })
 
       # sign and upload for org one
       {:ok, new_signed_firmware_one} =
-        Fwup.sign_firmware(tmp_dir, org_key_one.name, "new-firmware", "new-firmware-signed-one")
+        Support.Fwup.sign_firmware(
+          tmp_dir,
+          org_key_one.name,
+          "new-firmware",
+          "new-firmware-signed-one"
+        )
 
       {:ok, new_firmware_one} = Firmwares.create_firmware(org_one, new_signed_firmware_one)
 
@@ -902,7 +916,12 @@ defmodule NervesHub.DevicesTest do
 
       # sign and upload for org two
       {:ok, new_signed_firmware_two} =
-        Fwup.sign_firmware(tmp_dir, org_key_two.name, "new-firmware", "new-firmware-signed-two")
+        Support.Fwup.sign_firmware(
+          tmp_dir,
+          org_key_two.name,
+          "new-firmware",
+          "new-firmware-signed-two"
+        )
 
       {:ok, new_firmware_two} = Firmwares.create_firmware(org_two, new_signed_firmware_two)
 

test/nerves_hub_web/channels/websocket_test.exs

@@ -17,7 +17,7 @@ defmodule NervesHubWeb.WebsocketTest do
   alias NervesHub.Support.Utils
   alias NervesHubWeb.DeviceEndpoint
   alias NervesHubWeb.Endpoint
-  alias X509.Certificate
+  alias X509.Certificate.Validity, as: X509Validity
 
   import Ecto.Query
 
@@ -184,7 +184,7 @@ defmodule NervesHubWeb.WebsocketTest do
         key
         |> X509.PublicKey.derive()
         |> X509.Certificate.new("CN=#{device.identifier}", ca, ca_key,
-          validity: Certificate.Validity.new(not_before, not_after)
+          validity: X509Validity.new(not_before, not_after)
         )
 
       # Verify our cert is indeed expired
@@ -240,7 +240,7 @@ defmodule NervesHubWeb.WebsocketTest do
 
       not_before = Timex.now() |> Timex.shift(days: -3)
       not_after = Timex.now() |> Timex.shift(days: -1)
-      validity = Certificate.Validity.new(not_before, not_after)
+      validity = X509Validity.new(not_before, not_after)
       ca_key = X509.PrivateKey.new_ec(:secp256r1)
 
       ca =

test/support/conn_case.ex

@@ -15,7 +15,7 @@ defmodule NervesHubWeb.ConnCase do
 
   use ExUnit.CaseTemplate
 
-  alias Ecto.Adapters.SQL.Sandbox
+  alias Ecto.Adapters.SQL.Sandbox, as: SQLSandbox
   alias Phoenix.ConnTest
 
   using do
@@ -34,10 +34,10 @@ defmodule NervesHubWeb.ConnCase do
   end
 
   setup tags do
-    :ok = Sandbox.checkout(NervesHub.Repo)
+    :ok = SQLSandbox.checkout(NervesHub.Repo)
 
     if !tags[:async] do
-      Sandbox.mode(NervesHub.Repo, {:shared, self()})
+      SQLSandbox.mode(NervesHub.Repo, {:shared, self()})
     end
 
     {:ok, conn: ConnTest.build_conn()}
@@ -61,7 +61,7 @@ defmodule NervesHubWeb.APIConnCase do
 
   use ExUnit.CaseTemplate
 
-  alias Ecto.Adapters.SQL.Sandbox
+  alias Ecto.Adapters.SQL.Sandbox, as: SQLSandbox
   alias NervesHub.Fixtures
 
   using do
@@ -90,10 +90,10 @@ defmodule NervesHubWeb.APIConnCase do
   end
 
   setup tags do
-    :ok = Sandbox.checkout(NervesHub.Repo)
+    :ok = SQLSandbox.checkout(NervesHub.Repo)
 
     if !tags[:async] do
-      Sandbox.mode(NervesHub.Repo, {:shared, self()})
+      SQLSandbox.mode(NervesHub.Repo, {:shared, self()})
     end
 
     user = Fixtures.user_fixture()

test/support/data_case.ex

@@ -14,7 +14,7 @@ defmodule NervesHub.DataCase do
 
   use ExUnit.CaseTemplate
 
-  alias Ecto.Adapters.SQL.Sandbox
+  alias Ecto.Adapters.SQL.Sandbox, as: SQLSandbox
 
   using do
     quote do
@@ -33,12 +33,12 @@ defmodule NervesHub.DataCase do
   end
 
   setup tags do
-    :ok = Sandbox.checkout(NervesHub.Repo)
-    :ok = Sandbox.checkout(NervesHub.ObanRepo)
+    :ok = SQLSandbox.checkout(NervesHub.Repo)
+    :ok = SQLSandbox.checkout(NervesHub.ObanRepo)
 
     if !tags[:async] do
-      Sandbox.mode(NervesHub.Repo, {:shared, self()})
-      Sandbox.mode(NervesHub.ObanRepo, {:shared, self()})
+      SQLSandbox.mode(NervesHub.Repo, {:shared, self()})
+      SQLSandbox.mode(NervesHub.ObanRepo, {:shared, self()})
     end
 
     :ok