Feature/ret ep update db+domain multi cluster (#367)

- [dashboard] set ret client to use the http port 4001 - [dashboard] added a migration to add 2 columns in hubs table, region and domain. - [dashboard] added the region and domain field in hubs class - [dashboard] send create hub instances req to orch with region, catch domain and region in orch's response, store them in db (hubs table) - [dashboard] ret_host_url to use orch provided multi-cluster domain and public api to check liveness - [dashboardclient] add domain and region field to hubT - [dashboardclient] use the newly provided domain value from dashboard's /api/v1/hubs for HubLink and HubCard
Hubs-Foundation · Jun 20, 2023 · 9f385f5 · 9f385f5
1 parent 304f7c0
commit 9f385f5
Show file tree

Hide file tree

Showing 10 changed files with 90 additions and 17 deletions.
diff --git a/client/components/modules/hubs/HubCard/HubCard.tsx b/client/components/modules/hubs/HubCard/HubCard.tsx
@@ -18,7 +18,7 @@ type HubCardPropsT = {
 
 const HubCard = ({ hub, refreshHubData, classProp = '' }: HubCardPropsT) => {
   const storeContext = useContext(StoreContext);
-  const { hubId, status, subdomain, lastError } = hub;
+  const { hubId, status, subdomain, domain, lastError } = hub;
   const [showRevertError, setShowRevertError] = useState<boolean>(
     lastError === LastErrorE.SUBDOMAIN_REVERTED
   );
@@ -159,7 +159,7 @@ const HubCard = ({ hub, refreshHubData, classProp = '' }: HubCardPropsT) => {
           )}
 
           {/* Subdomain is ready and available  */}
-          {status === StatusE.READY && <HubLink subdomain={subdomain} />}
+          {status === StatusE.READY && <HubLink subdomain={subdomain} domain={domain} />}
         </div>
 
         {/* FOOTER  */}

diff --git a/client/components/modules/hubs/HubCard/HubLink.tsx b/client/components/modules/hubs/HubCard/HubLink.tsx
@@ -4,11 +4,13 @@ import { HUB_ROOT_DOMAIN } from 'config';
 
 type HubLinkPropsT = {
   subdomain: string;
+  domain: string;
   classProp?: string;
 };
 
-const HubLink = ({ subdomain, classProp = '' }: HubLinkPropsT) => {
-  const subdomainRootdomain = `https://${subdomain}.${HUB_ROOT_DOMAIN}`;
+const HubLink = ({ subdomain, domain=HUB_ROOT_DOMAIN, classProp = '' }: HubLinkPropsT) => {
+
+  const subdomainRootdomain = `https://${subdomain}.${domain || HUB_ROOT_DOMAIN}`;
 
   return (
     <div className={`flex ${classProp}`}>

diff --git a/client/pages/dashboard/index.tsx b/client/pages/dashboard/index.tsx
@@ -28,6 +28,8 @@ const creatingHub: HubT = {
   storageLimitMb: 0,
   subdomain: '',
   tier: 'premium',
+  domain: "myhubs.net",
+  region: "us",
 };
 
 /**
@@ -47,6 +49,8 @@ const ErroringHub: HubT = {
   storageLimitMb: 0,
   subdomain: '',
   tier: 'premium',
+  domain: "myhubs.net",
+  region: "us",
 };
 
 const Dashboard = ({ subscription }: DashboardPropsT) => {

diff --git a/client/types/General.ts b/client/types/General.ts
@@ -35,6 +35,8 @@ export type HubT = {
   storageLimitMb: number;
   subdomain: string;
   tier: TierT;
+  domain: string;
+  region: string;
 };
 
 // TODO Do we still need this?

diff --git a/lib/dash/hub.ex b/lib/dash/hub.ex
@@ -15,6 +15,8 @@ defmodule Dash.Hub do
     field :status, Ecto.Enum, values: [:creating, :updating, :ready, :subdomain_error, :error]
     field :storage_limit_mb, :integer
     field :subdomain, :string
+    field :domain, :string
+    field :region, :string
     field :tier, Ecto.Enum, values: [:mvp, :p0, :p1]
     belongs_to :account, Dash.Account, references: :account_id
 
@@ -29,6 +31,7 @@ defmodule Dash.Hub do
       :storage_limit_mb,
       :tier,
       :subdomain,
+      :domain,
       :status
     ])
     |> validate_required([
@@ -37,6 +40,7 @@ defmodule Dash.Hub do
       :storage_limit_mb,
       :tier,
       :subdomain,
+      :domain,
       :status
     ])
     |> unique_constraint(:subdomain)

diff --git a/lib/dash/orch_client.ex b/lib/dash/orch_client.ex
@@ -16,6 +16,7 @@ defmodule Dash.OrchClient do
       subdomain: hub.subdomain,
       tier: hub.tier,
       ccu_limit: hub.ccu_limit |> to_string(),
+      region: hub.region,
       storage_limit: (hub.storage_limit_mb / 1024) |> to_string()
     }
 
@@ -52,6 +53,7 @@ defmodule Dash.OrchClient do
         storage_limit: Float.to_string(hub.storage_limit_mb / 1024),
         subdomain: hub.subdomain,
         tier: hub.tier,
+        domain: hub.domain,
         useremail: fxa_email
       }),
       [],
@@ -64,6 +66,7 @@ defmodule Dash.OrchClient do
       orch_hub_endpoint(),
       Jason.encode!(%{
         hub_id: hub.hub_id |> to_string,
+        domain: hub.domain,
         subdomain: hub.subdomain
       }),
       [],

diff --git a/lib/dash/plan_state_machine.ex b/lib/dash/plan_state_machine.ex
@@ -91,12 +91,18 @@ defmodule Dash.PlanStateMachine do
         status: :creating,
         storage_limit_mb: @starter_storage_limit_mb,
         subdomain: rand_string(10),
+        domain: "",
+        region: "us",
         tier: :p0
       })
-
-    {:ok, %{status_code: 200}} =
+    {:ok, response} =
       OrchClient.create_hub(account.email, hub, disable_branding?: true)
-
+    if response.status_code == 200 do
+      response_body = Jason.decode!(response.body)
+      domain = response_body["domain"]
+      changeset = Ecto.Changeset.change(hub, domain: domain)
+      Repo.update!(changeset)
+    end
     :ok
   end
 
@@ -117,10 +123,19 @@ defmodule Dash.PlanStateMachine do
         status: :creating,
         storage_limit_mb: @standard_storage_limit_mb,
         subdomain: rand_string(10),
+        domain: "",
+        region: "us",
         tier: :p1
       })
-
-    {:ok, %{status_code: 200}} = OrchClient.create_hub(account.email, hub)
+    {:ok, response} =
+      OrchClient.create_hub(account.email, hub)
+    if response.status_code == 200 do
+      response_body = Jason.decode!(response.body)
+      domain = response_body["domain"]
+      changeset = Ecto.Changeset.change(hub, domain: domain)
+      Repo.update!(changeset)
+    end
+
     :ok
   end
 

diff --git a/lib/dash/ret_client.ex b/lib/dash/ret_client.ex
@@ -8,11 +8,19 @@ defmodule Dash.RetClient do
 
   @ret_host_prefix "ret.hc-"
   @ret_host_postfix ".svc.cluster.local"
-  @ret_internal_port "4000"
-  defp ret_host_url(%Dash.Hub{} = hub), do: ret_host_url(hub.hub_id)
+  @ret_internal_port "4001"
+  defp ret_host_url(%Dash.Hub{} = hub) do
+    if hub.domain != nil and hub.domain != "" do
+      foreignRetHost="https://#{hub.subdomain}.#{hub.domain}"
+      Logger.info("foreign ret -- #{foreignRetHost}")
+      foreignRetHost
+    else
+      ret_host_url(hub.hub_id)
+    end
+  end
 
   defp ret_host_url(hub_id) when is_integer(hub_id) do
-    "https://#{@ret_host_prefix}#{hub_id}#{@ret_host_postfix}:#{@ret_internal_port}"
+    "http://#{@ret_host_prefix}#{hub_id}#{@ret_host_postfix}:#{@ret_internal_port}"
   end
 
   @ret_internal_scope "/api-internal/v1/"
@@ -37,8 +45,7 @@ defmodule Dash.RetClient do
       [
         {"x-ret-dashboard-access-key", get_ret_access_key()},
         {"content-type", "application/json"}
-      ],
-      hackney: [:insecure]
+      ]
     )
   end
 
@@ -160,7 +167,6 @@ defmodule Dash.RetClient do
         Logger.error(
           "Failed to rewrite assets from: #{old_domain} to #{new_domain}. Error: #{inspect(err)}"
         )
-
         {:error, :rewrite_assets_failed}
     end
   end
@@ -174,8 +180,7 @@ defmodule Dash.RetClient do
         [
           {"x-ret-dashboard-access-key", get_ret_access_key()},
           {"content-type", "application/json"}
-        ],
-        hackney: [:insecure]
+        ]
       )
 
     case response do

diff --git a/lib/dash_web/views/api/v1/hub_view.ex b/lib/dash_web/views/api/v1/hub_view.ex
@@ -43,6 +43,8 @@ defmodule DashWeb.Api.V1.HubView do
       storageLimitMb: hub.storage_limit_mb,
       tier: hub.tier,
       subdomain: hub.subdomain,
+      domain: hub.domain,
+      region: hub.region,
       status: hub.status
     }
     |> Map.merge(maybe_include_usage_stats)

diff --git a/priv/repo/migrations/20230616000001_add_domain_and_region_columns_to_hubs.exs b/priv/repo/migrations/20230616000001_add_domain_and_region_columns_to_hubs.exs
@@ -0,0 +1,36 @@
+defmodule Dash.Repo.Migrations.AddDomainAndRegionColumnsToHubs do
+  use Ecto.Migration
+
+  def up do
+    execute("""
+      DO $$ 
+      BEGIN
+          IF NOT EXISTS(
+            SELECT * FROM information_schema.columns
+              WHERE table_name = 'hubs' AND column_name = 'domain'
+          ) THEN
+              ALTER TABLE hubs ADD COLUMN domain VARCHAR(255);
+          END IF;
+      END
+      $$;
+    """)
+    execute("""
+      DO $$ 
+      BEGIN
+          IF NOT EXISTS(
+            SELECT * FROM information_schema.columns
+              WHERE table_name = 'hubs' AND column_name = 'region'
+          ) THEN
+              ALTER TABLE hubs ADD COLUMN region VARCHAR(255);
+          END IF;
+      END
+      $$;
+    """)
+  end
+
+  def down do
+    execute("ALTER TABLE hubs DROP COLUMN IF EXISTS domain")
+    execute("ALTER TABLE hubs DROP COLUMN IF EXISTS region")
+  end
+
+end