Remove zero ssl issuer for identifier and use ip for identifiers

Signed-off-by: Zack Siri <[email protected]>
upmaru · Nov 9, 2023 · c1c4681 · c1c4681
1 parent 5af4c8c
commit c1c4681
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 64 deletions.
diff --git a/lib/uplink/clients/caddy/admin.ex b/lib/uplink/clients/caddy/admin.ex
@@ -4,10 +4,6 @@ defmodule Uplink.Clients.Caddy.Admin do
 
   @derive Jason.Encoder
 
-  @mappings %{
-    "zerossl" => __MODULE__.Issuer.ZeroSSL
-  }
-
   @primary_key false
   embedded_schema do
     embeds_one :identity, Identity, primary_key: false do
@@ -34,24 +30,5 @@ defmodule Uplink.Clients.Caddy.Admin do
   defp identity_changeset(identity, params) do
     identity
     |> cast(params, [:identifiers, :issuers])
-    |> maybe_cast_issuers()
-  end
-
-  defp maybe_cast_issuers(changeset) do
-    if issuers = get_change(changeset, :issuers) do
-      issuers =
-        issuers
-        |> Enum.map(fn issuer ->
-          module =
-            Map.get(@mappings, issuer["module"]) ||
-              Map.get(@mappings, issuer[:module])
-
-          module.parse(issuer)
-        end)
-
-      put_change(changeset, :issuers, issuers)
-    else
-      changeset
-    end
   end
 end
diff --git a/lib/uplink/clients/caddy/admin/issuer/zero_ssl.ex b/lib/uplink/clients/caddy/admin/issuer/zero_ssl.ex
diff --git a/lib/uplink/clients/caddy/config/builder.ex b/lib/uplink/clients/caddy/config/builder.ex
@@ -20,25 +20,30 @@ defmodule Uplink.Clients.Caddy.Config.Builder do
         metadata.hosts == [] || is_nil(metadata.main_port)
       end)
 
-    %{"organization" => %{"storage" => storage_params} = organization} =
-      Uplink.Clients.Instellar.get_self()
+    %{"organization" => %{"storage" => storage_params}} =
+      uplink = Uplink.Clients.Instellar.get_self()
 
     %{
-      admin: admin(organization),
+      admin: admin(uplink),
       apps: apps(install_states),
       storage: Storage.parse(storage_params)
     }
   end
 
-  def admin(%{"slug" => slug}) do
-    zero_ssl_api_key = Caddy.config(:zero_ssl_api_key)
+  def admin(uplink) do
+    identifiers =
+      if instances = Map.get(uplink, "instances") do
+        instances
+        |> Enum.map(fn i ->
+          i["node"]["public_ip"]
+        end)
+      else
+        []
+      end
 
     %{
       identity: %{
-        identifiers: ["uplink", slug],
-        issuers: [
-          %{module: "zerossl", api_key: zero_ssl_api_key}
-        ]
+        identifiers: identifiers
       }
     }
     |> Admin.parse()

diff --git a/test/scenarios/deployment.ex b/test/scenarios/deployment.ex
@@ -83,7 +83,18 @@ defmodule Uplink.Scenarios.Deployment do
             "secret_access_key" => "secret"
           }
         }
-      }
+      },
+      "instances" => [
+        %{
+          "id" => 1,
+          "slug" => "uplink-01",
+          "node" => %{
+            "id" => 1,
+            "slug" => "some-node-01",
+            "public_ip" => "127.0.0.1"
+          }
+        }
+      ]
     })
 
     Application.put_env(

diff --git a/test/uplink/boot_test.exs b/test/uplink/boot_test.exs
@@ -114,7 +114,18 @@ defmodule Uplink.BootTest do
               "secret_access_key" => "secret"
             }
           }
-        }
+        },
+        "instances" => [
+          %{
+            "id" => 1,
+            "slug" => "uplink-01",
+            "node" => %{
+              "id" => 1,
+              "slug" => "some-node-01",
+              "public_ip" => "127.0.0.1"
+            }
+          }
+        ]
       })
 
       Application.put_env(

diff --git a/test/uplink/clients/caddy/config/builder_test.exs b/test/uplink/clients/caddy/config/builder_test.exs
@@ -39,8 +39,7 @@ defmodule Uplink.Clients.Caddy.Config.BuilderTest do
     assert %{host: _hosts} = match
 
     assert %{identity: identity} = admin
-    assert %{issuers: [zerossl]} = identity
-    assert %{module: "zerossl"} = zerossl
+    assert %{issuers: [], identifiers: ["127.0.0.1"]} = identity
 
     assert %{module: "s3"} = storage
   end

diff --git a/test/uplink/clients/caddy/config/reload_test.exs b/test/uplink/clients/caddy/config/reload_test.exs
@@ -114,7 +114,18 @@ defmodule Uplink.Clients.Caddy.Config.ReloadTest do
             "secret_access_key" => "secret"
           }
         }
-      }
+      },
+      "instances" => [
+        %{
+          "id" => 1,
+          "slug" => "uplink-01",
+          "node" => %{
+            "id" => 1,
+            "slug" => "some-node-01",
+            "public_ip" => "127.0.0.1"
+          }
+        }
+      ]
     })
 
     Application.put_env(