Clean up tests

Signed-off-by: Zack Siri <[email protected]>
upmaru · Nov 24, 2023 · 940e4a0 · 940e4a0
1 parent 99058dd
commit 940e4a0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 32 deletions.
diff --git a/lib/uplink/packages/instance/bootstrap.ex b/lib/uplink/packages/instance/bootstrap.ex
@@ -4,17 +4,16 @@ defmodule Uplink.Packages.Instance.Bootstrap do
     max_attempts: 1
 
   alias Uplink.Repo
-  alias Uplink.Members
   alias Uplink.Members.Actor
 
   alias Uplink.Packages
   alias Uplink.Packages.Install
   alias Uplink.Packages.Instance
   alias Uplink.Packages.Instance.Cleanup
 
-  alias Uplink.Clients.LXD
   alias Uplink.Clients.Instellar
-  alias Uplink.Clients.LXD.Cluster
+
+  alias Uplink.Clients.LXD
   alias Uplink.Clients.LXD.Cluster.Member
 
   @transition_parameters %{
@@ -33,15 +32,14 @@ defmodule Uplink.Packages.Instance.Bootstrap do
   import Ecto.Query, only: [preload: 2]
 
   def perform(%Oban.Job{
-        args:
-          %{
-            "instance" =>
-              %{
-                "slug" => name
-              } = instance_params,
-            "install_id" => install_id,
-            "actor_id" => actor_id
-          } = job_args
+        args: %{
+          "instance" =>
+            %{
+              "slug" => name
+            } = instance_params,
+          "install_id" => install_id,
+          "actor_id" => actor_id
+        }
       }) do
     %Actor{} = actor = Repo.get(Actor, actor_id)
 
@@ -51,10 +49,6 @@ defmodule Uplink.Packages.Instance.Bootstrap do
       |> preload([:deployment])
       |> Repo.get(install_id)
 
-    cluster_member_names =
-      LXD.list_cluster_members()
-      |> Enum.map(& &1.server_name)
-
     frequency =
       LXD.list_instances()
       |> Enum.frequencies_by(fn instance ->
@@ -90,7 +84,7 @@ defmodule Uplink.Packages.Instance.Bootstrap do
       profile_name = Packages.profile_name(metadata)
       package = channel.package
 
-      instance_params =
+      lxd_instance_params =
         Map.merge(@default_params, %{
           "name" => name,
           "architecture" => architecture,
@@ -133,7 +127,7 @@ defmodule Uplink.Packages.Instance.Bootstrap do
       formation_instance = Formation.new_lxd_instance(formation_instance_params)
 
       client
-      |> Formation.lxd_create(selected_member.server_name, instance_params,
+      |> Formation.lxd_create(selected_member.server_name, lxd_instance_params,
         project: project_name
       )
       |> Formation.lxd_start(name, project: project_name)

diff --git a/test/uplink/packages/instance/bootstrap_test.exs b/test/uplink/packages/instance/bootstrap_test.exs
@@ -70,20 +70,6 @@ defmodule Uplink.Packages.Instance.BootstrapTest do
   end
 
   describe "bootstrap instance" do
-    test "no matching cluster member", %{
-      install: install,
-      actor: actor
-    } do
-      assert {:ok, %{resource: install}} =
-               perform_job(Bootstrap, %{
-                 instance: %{slug: "something-1", node: %{slug: "some-node-01"}},
-                 install_id: install.id,
-                 actor_id: actor.id
-               })
-
-      assert install.current_state == "failed"
-    end
-
     test "when project does not exist", %{
       bypass: bypass,
       install: install,