Extract ssh config

BrunoQuaresma · BrunoQuaresma · commit 2388cae5c3fc · 2023-11-13T13:19:50.000Z
diff --git a/site/src/api/queries/deployment.ts b/site/src/api/queries/deployment.ts
@@ -27,3 +27,10 @@ export const health = () => {
     queryFn: API.getHealth,
   };
 };
+
+export const deploymentSSHConfig = () => {
+  return {
+    queryKey: ["deployment", "sshConfig"],
+    queryFn: API.getDeploymentSSHConfig,
+  };
+};
diff --git a/site/src/pages/WorkspacePage/WorkspaceReadyPage.tsx b/site/src/pages/WorkspacePage/WorkspaceReadyPage.tsx
@@ -36,7 +36,7 @@ import { useWorkspaceBuildLogs } from "hooks/useWorkspaceBuildLogs";
 import { decreaseDeadline, increaseDeadline } from "api/queries/workspaces";
 import { getErrorMessage } from "api/errors";
 import { displaySuccess, displayError } from "components/GlobalSnackbar/utils";
-import { deploymentConfig } from "api/queries/deployment";
+import { deploymentConfig, deploymentSSHConfig } from "api/queries/deployment";
 import { WorkspacePermissions } from "./permissions";
 import { workspaceResolveAutostart } from "api/queries/workspaceQuota";
 
@@ -70,7 +70,7 @@ export const WorkspaceReadyPage = ({
 }: WorkspaceReadyPageProps): JSX.Element => {
   const { buildInfo } = useDashboard();
   const featureVisibility = useFeatureVisibility();
-  const { buildError, cancellationError, sshPrefix, missedParameters } =
+  const { buildError, cancellationError, missedParameters } =
     workspaceState.context;
   if (workspace === undefined) {
     throw Error("Workspace is undefined");
@@ -150,6 +150,8 @@ export const WorkspaceReadyPage = ({
   );
   const canAutostart = !canAutostartResponse.data?.parameter_mismatch ?? false;
 
+  const sshPrefixQuery = useQuery(deploymentSSHConfig());
+
   return (
     <>
       <Helmet>
@@ -214,7 +216,7 @@ export const WorkspaceReadyPage = ({
           [WorkspaceErrors.CANCELLATION_ERROR]: cancellationError,
         }}
         buildInfo={buildInfo}
-        sshPrefix={sshPrefix}
+        sshPrefix={sshPrefixQuery.data?.hostname_prefix}
         template={template}
         buildLogs={
           shouldDisplayBuildLogs && (
diff --git a/site/src/xServices/workspace/workspaceXService.ts b/site/src/xServices/workspace/workspaceXService.ts
@@ -26,14 +26,11 @@ export interface WorkspaceContext {
   cancellationError?: unknown;
   // debug
   createBuildLogLevel?: TypesGen.CreateWorkspaceBuildRequest["log_level"];
-  // SSH Config
-  sshPrefix?: string;
   // Change version
   templateVersionIdToChange?: TypesGen.TemplateVersion["id"];
 }
 
 export type WorkspaceEvent =
-  | { type: "LOAD" }
   | { type: "REFRESH_WORKSPACE"; data: TypesGen.ServerSentEvent["data"] }
   | { type: "START"; buildParameters?: TypesGen.WorkspaceBuildParameter[] }
   | { type: "STOP" }
@@ -97,15 +94,8 @@ export const workspaceMachine = createMachine(
         };
       },
     },
-    initial: "loadInitialData",
+    initial: "ready",
     states: {
-      loadInitialData: {
-        on: {
-          LOAD: {
-            target: "ready",
-          },
-        },
-      },
       ready: {
         type: "parallel",
         on: {
@@ -334,30 +324,6 @@ export const workspaceMachine = createMachine(
               },
             },
           },
-          sshConfig: {
-            initial: "gettingSshConfig",
-            states: {
-              gettingSshConfig: {
-                invoke: {
-                  src: "getSSHPrefix",
-                  onDone: {
-                    target: "success",
-                    actions: ["assignSSHPrefix"],
-                  },
-                  onError: {
-                    target: "error",
-                    actions: ["displaySSHPrefixError"],
-                  },
-                },
-              },
-              error: {
-                type: "final",
-              },
-              success: {
-                type: "final",
-              },
-            },
-          },
         },
       },
       error: {
@@ -407,17 +373,6 @@ export const workspaceMachine = createMachine(
       logWatchWorkspaceWarning: (_, event) => {
         console.error("Watch workspace error:", event);
       },
-      // SSH
-      assignSSHPrefix: assign({
-        sshPrefix: (_, { data }) => data.hostname_prefix,
-      }),
-      displaySSHPrefixError: (_, { data }) => {
-        const message = getErrorMessage(
-          data,
-          "Error getting the deployment ssh configuration.",
-        );
-        displayError(message);
-      },
       displayActivateError: (_, { data }) => {
         const message = getErrorMessage(data, "Error activate workspace.");
         displayError(message);
@@ -585,9 +540,6 @@ export const workspaceMachine = createMachine(
           context.eventSource?.close();
         };
       },
-      getSSHPrefix: async () => {
-        return API.getDeploymentSSHConfig();
-      },
     },
   },
 );
