chore: remove resources calls (#4344)

site/src/api/api.ts

@@ -264,15 +264,6 @@ export const getWorkspaceByOwnerAndName = async (
   return response.data
 }
 
-export const getWorkspaceResources = async (
-  workspaceBuildID: string,
-): Promise<TypesGen.WorkspaceResource[]> => {
-  const response = await axios.get<TypesGen.WorkspaceResource[]>(
-    `/api/v2/workspacebuilds/${workspaceBuildID}/resources`,
-  )
-  return response.data
-}
-
 const postWorkspaceBuild =
   (transition: WorkspaceBuildTransition) =>
   async (workspaceId: string, template_version_id?: string): Promise<TypesGen.WorkspaceBuild> => {

site/src/api/typesGenerated.ts

@@ -233,7 +233,7 @@ export interface DAUEntry {
   readonly amount: number
 }
 
-// From codersdk/workspaceresources.go
+// From codersdk/workspaceagents.go
 export interface DERPRegion {
   readonly preferred: boolean
   readonly latency_ms: number
@@ -552,7 +552,7 @@ export interface Workspace {
   readonly last_used_at: string
 }
 
-// From codersdk/workspaceresources.go
+// From codersdk/workspaceagents.go
 export interface WorkspaceAgent {
   readonly id: string
   readonly created_at: string
@@ -574,7 +574,7 @@ export interface WorkspaceAgent {
   readonly latency?: Record<string, DERPRegion>
 }
 
-// From codersdk/workspaceresources.go
+// From codersdk/workspaceagents.go
 export interface WorkspaceAgentInstanceMetadata {
   readonly jail_orchestrator: string
   readonly operating_system: string
@@ -587,7 +587,7 @@ export interface WorkspaceAgentInstanceMetadata {
   readonly vnc: boolean
 }
 
-// From codersdk/workspaceresources.go
+// From codersdk/workspaceagents.go
 export interface WorkspaceAgentResourceMetadata {
   readonly memory_total: number
   readonly disk_total: number
@@ -648,7 +648,7 @@ export interface WorkspaceQuota {
   readonly user_workspace_limit: number
 }
 
-// From codersdk/workspaceresources.go
+// From codersdk/workspacebuilds.go
 export interface WorkspaceResource {
   readonly id: string
   readonly created_at: string
@@ -662,7 +662,7 @@ export interface WorkspaceResource {
   readonly metadata?: WorkspaceResourceMetadata[]
 }
 
-// From codersdk/workspaceresources.go
+// From codersdk/workspacebuilds.go
 export interface WorkspaceResourceMetadata {
   readonly key: string
   readonly value: string
@@ -730,7 +730,7 @@ export type ServerSentEventType = "data" | "error" | "ping"
 // From codersdk/users.go
 export type UserStatus = "active" | "suspended"
 
-// From codersdk/workspaceresources.go
+// From codersdk/workspaceagents.go
 export type WorkspaceAgentStatus = "connected" | "connecting" | "disconnected"
 
 // From codersdk/workspaceapps.go

site/src/pages/TerminalPage/TerminalPage.test.tsx

@@ -69,21 +69,6 @@ describe("TerminalPage", () => {
     await expectTerminalText(container, Language.workspaceErrorMessagePrefix)
   })
 
-  it("shows an error if fetching workspace agent fails", async () => {
-    // Given
-    server.use(
-      rest.get("/api/v2/workspacebuilds/:workspaceId/resources", (req, res, ctx) => {
-        return res(ctx.status(500), ctx.json({ message: "nope" }))
-      }),
-    )
-
-    // When
-    const { container } = renderTerminal()
-
-    // Then
-    await expectTerminalText(container, Language.workspaceAgentErrorMessagePrefix)
-  })
-
   it("shows an error if the websocket fails", async () => {
     // Given
     server.use(

site/src/testHelpers/entities.ts

@@ -189,150 +189,6 @@ export const MockTemplate: TypesGen.Template = {
   icon: "/icon/code.svg",
 }
 
-export const MockWorkspaceAutostartDisabled: TypesGen.UpdateWorkspaceAutostartRequest = {
-  schedule: "",
-}
-
-export const MockWorkspaceAutostartEnabled: TypesGen.UpdateWorkspaceAutostartRequest = {
-  // Runs at 9:30am Monday through Friday using Canada/Eastern
-  // (America/Toronto) time
-  schedule: "CRON_TZ=Canada/Eastern 30 9 * * 1-5",
-}
-
-export const MockWorkspaceBuild: TypesGen.WorkspaceBuild = {
-  build_number: 1,
-  created_at: "2022-05-17T17:39:01.382927298Z",
-  id: "1",
-  initiator_id: MockUser.id,
-  initiator_name: MockUser.username,
-  job: MockProvisionerJob,
-  template_version_id: "",
-  transition: "start",
-  updated_at: "2022-05-17T17:39:01.382927298Z",
-  workspace_name: "test-workspace",
-  workspace_owner_id: MockUser.id,
-  workspace_owner_name: MockUser.username,
-  workspace_id: "759f1d46-3174-453d-aa60-980a9c1442f3",
-  deadline: "2022-05-17T23:39:00.00Z",
-  reason: "initiator",
-  resources: [],
-  status: "running",
-}
-
-export const MockFailedWorkspaceBuild = (
-  transition: TypesGen.WorkspaceTransition = "start",
-): TypesGen.WorkspaceBuild => ({
-  build_number: 1,
-  created_at: "2022-05-17T17:39:01.382927298Z",
-  id: "1",
-  initiator_id: MockUser.id,
-  initiator_name: MockUser.username,
-  job: MockFailedProvisionerJob,
-  template_version_id: "",
-  transition: transition,
-  updated_at: "2022-05-17T17:39:01.382927298Z",
-  workspace_name: "test-workspace",
-  workspace_owner_id: MockUser.id,
-  workspace_owner_name: MockUser.username,
-  workspace_id: "759f1d46-3174-453d-aa60-980a9c1442f3",
-  deadline: "2022-05-17T23:39:00.00Z",
-  reason: "initiator",
-  resources: [],
-  status: "running",
-})
-
-export const MockWorkspaceBuildStop: TypesGen.WorkspaceBuild = {
-  ...MockWorkspaceBuild,
-  id: "2",
-  transition: "stop",
-}
-
-export const MockWorkspaceBuildDelete: TypesGen.WorkspaceBuild = {
-  ...MockWorkspaceBuild,
-  id: "3",
-  transition: "delete",
-}
-
-export const MockBuilds = [MockWorkspaceBuild, MockWorkspaceBuildStop, MockWorkspaceBuildDelete]
-
-export const MockWorkspace: TypesGen.Workspace = {
-  id: "test-workspace",
-  name: "Test-Workspace",
-  created_at: "",
-  updated_at: "",
-  template_id: MockTemplate.id,
-  template_name: MockTemplate.name,
-  template_icon: MockTemplate.icon,
-  outdated: false,
-  owner_id: MockUser.id,
-  owner_name: MockUser.username,
-  autostart_schedule: MockWorkspaceAutostartEnabled.schedule,
-  ttl_ms: 2 * 60 * 60 * 1000, // 2 hours as milliseconds
-  latest_build: MockWorkspaceBuild,
-  last_used_at: "",
-}
-
-export const MockStoppedWorkspace: TypesGen.Workspace = {
-  ...MockWorkspace,
-  latest_build: MockWorkspaceBuildStop,
-}
-export const MockStoppingWorkspace: TypesGen.Workspace = {
-  ...MockWorkspace,
-  latest_build: {
-    ...MockWorkspaceBuildStop,
-    job: MockRunningProvisionerJob,
-  },
-}
-export const MockStartingWorkspace: TypesGen.Workspace = {
-  ...MockWorkspace,
-  latest_build: {
-    ...MockWorkspaceBuild,
-    job: MockRunningProvisionerJob,
-    transition: "start",
-  },
-}
-export const MockCancelingWorkspace: TypesGen.Workspace = {
-  ...MockWorkspace,
-  latest_build: { ...MockWorkspaceBuild, job: MockCancelingProvisionerJob },
-}
-export const MockCanceledWorkspace: TypesGen.Workspace = {
-  ...MockWorkspace,
-  latest_build: { ...MockWorkspaceBuild, job: MockCanceledProvisionerJob },
-}
-export const MockFailedWorkspace: TypesGen.Workspace = {
-  ...MockWorkspace,
-  latest_build: {
-    ...MockWorkspaceBuild,
-    job: MockFailedProvisionerJob,
-  },
-}
-export const MockDeletingWorkspace: TypesGen.Workspace = {
-  ...MockWorkspace,
-  latest_build: { ...MockWorkspaceBuildDelete, job: MockRunningProvisionerJob },
-}
-export const MockDeletedWorkspace: TypesGen.Workspace = {
-  ...MockWorkspace,
-  latest_build: MockWorkspaceBuildDelete,
-}
-
-export const MockOutdatedWorkspace: TypesGen.Workspace = { ...MockFailedWorkspace, outdated: true }
-
-export const MockQueuedWorkspace: TypesGen.Workspace = {
-  ...MockWorkspace,
-  latest_build: {
-    ...MockWorkspaceBuild,
-    job: MockPendingProvisionerJob,
-    transition: "start",
-  },
-}
-
-// requests the MockWorkspace
-export const MockWorkspaceRequest: TypesGen.CreateWorkspaceRequest = {
-  name: "test",
-  parameter_values: [],
-  template_id: "test-template",
-}
-
 export const MockWorkspaceApp: TypesGen.WorkspaceApp = {
   id: "test-app",
   name: "test-app",
@@ -454,6 +310,150 @@ export const MockWorkspaceResource3: TypesGen.WorkspaceResource = {
   ],
 }
 
+export const MockWorkspaceAutostartDisabled: TypesGen.UpdateWorkspaceAutostartRequest = {
+  schedule: "",
+}
+
+export const MockWorkspaceAutostartEnabled: TypesGen.UpdateWorkspaceAutostartRequest = {
+  // Runs at 9:30am Monday through Friday using Canada/Eastern
+  // (America/Toronto) time
+  schedule: "CRON_TZ=Canada/Eastern 30 9 * * 1-5",
+}
+
+export const MockWorkspaceBuild: TypesGen.WorkspaceBuild = {
+  build_number: 1,
+  created_at: "2022-05-17T17:39:01.382927298Z",
+  id: "1",
+  initiator_id: MockUser.id,
+  initiator_name: MockUser.username,
+  job: MockProvisionerJob,
+  template_version_id: "",
+  transition: "start",
+  updated_at: "2022-05-17T17:39:01.382927298Z",
+  workspace_name: "test-workspace",
+  workspace_owner_id: MockUser.id,
+  workspace_owner_name: MockUser.username,
+  workspace_id: "759f1d46-3174-453d-aa60-980a9c1442f3",
+  deadline: "2022-05-17T23:39:00.00Z",
+  reason: "initiator",
+  resources: [MockWorkspaceResource],
+  status: "running",
+}
+
+export const MockFailedWorkspaceBuild = (
+  transition: TypesGen.WorkspaceTransition = "start",
+): TypesGen.WorkspaceBuild => ({
+  build_number: 1,
+  created_at: "2022-05-17T17:39:01.382927298Z",
+  id: "1",
+  initiator_id: MockUser.id,
+  initiator_name: MockUser.username,
+  job: MockFailedProvisionerJob,
+  template_version_id: "",
+  transition: transition,
+  updated_at: "2022-05-17T17:39:01.382927298Z",
+  workspace_name: "test-workspace",
+  workspace_owner_id: MockUser.id,
+  workspace_owner_name: MockUser.username,
+  workspace_id: "759f1d46-3174-453d-aa60-980a9c1442f3",
+  deadline: "2022-05-17T23:39:00.00Z",
+  reason: "initiator",
+  resources: [],
+  status: "running",
+})
+
+export const MockWorkspaceBuildStop: TypesGen.WorkspaceBuild = {
+  ...MockWorkspaceBuild,
+  id: "2",
+  transition: "stop",
+}
+
+export const MockWorkspaceBuildDelete: TypesGen.WorkspaceBuild = {
+  ...MockWorkspaceBuild,
+  id: "3",
+  transition: "delete",
+}
+
+export const MockBuilds = [MockWorkspaceBuild, MockWorkspaceBuildStop, MockWorkspaceBuildDelete]
+
+export const MockWorkspace: TypesGen.Workspace = {
+  id: "test-workspace",
+  name: "Test-Workspace",
+  created_at: "",
+  updated_at: "",
+  template_id: MockTemplate.id,
+  template_name: MockTemplate.name,
+  template_icon: MockTemplate.icon,
+  outdated: false,
+  owner_id: MockUser.id,
+  owner_name: MockUser.username,
+  autostart_schedule: MockWorkspaceAutostartEnabled.schedule,
+  ttl_ms: 2 * 60 * 60 * 1000, // 2 hours as milliseconds
+  latest_build: MockWorkspaceBuild,
+  last_used_at: "",
+}
+
+export const MockStoppedWorkspace: TypesGen.Workspace = {
+  ...MockWorkspace,
+  latest_build: MockWorkspaceBuildStop,
+}
+export const MockStoppingWorkspace: TypesGen.Workspace = {
+  ...MockWorkspace,
+  latest_build: {
+    ...MockWorkspaceBuildStop,
+    job: MockRunningProvisionerJob,
+  },
+}
+export const MockStartingWorkspace: TypesGen.Workspace = {
+  ...MockWorkspace,
+  latest_build: {
+    ...MockWorkspaceBuild,
+    job: MockRunningProvisionerJob,
+    transition: "start",
+  },
+}
+export const MockCancelingWorkspace: TypesGen.Workspace = {
+  ...MockWorkspace,
+  latest_build: { ...MockWorkspaceBuild, job: MockCancelingProvisionerJob },
+}
+export const MockCanceledWorkspace: TypesGen.Workspace = {
+  ...MockWorkspace,
+  latest_build: { ...MockWorkspaceBuild, job: MockCanceledProvisionerJob },
+}
+export const MockFailedWorkspace: TypesGen.Workspace = {
+  ...MockWorkspace,
+  latest_build: {
+    ...MockWorkspaceBuild,
+    job: MockFailedProvisionerJob,
+  },
+}
+export const MockDeletingWorkspace: TypesGen.Workspace = {
+  ...MockWorkspace,
+  latest_build: { ...MockWorkspaceBuildDelete, job: MockRunningProvisionerJob },
+}
+export const MockDeletedWorkspace: TypesGen.Workspace = {
+  ...MockWorkspace,
+  latest_build: MockWorkspaceBuildDelete,
+}
+
+export const MockOutdatedWorkspace: TypesGen.Workspace = { ...MockFailedWorkspace, outdated: true }
+
+export const MockQueuedWorkspace: TypesGen.Workspace = {
+  ...MockWorkspace,
+  latest_build: {
+    ...MockWorkspaceBuild,
+    job: MockPendingProvisionerJob,
+    transition: "start",
+  },
+}
+
+// requests the MockWorkspace
+export const MockWorkspaceRequest: TypesGen.CreateWorkspaceRequest = {
+  name: "test",
+  parameter_values: [],
+  template_id: "test-template",
+}
+
 export const MockUserAgent: Types.UserAgent = {
   browser: "Chrome 99.0.4844",
   device: "Other",

site/src/xServices/terminal/terminalXService.ts

@@ -148,9 +148,7 @@ export const terminalMachine =
             throw new Error("workspace or workspace name is not set")
           }
 
-          const resources = await API.getWorkspaceResources(context.workspace.latest_build.id)
-
-          const agent = resources
+          const agent = context.workspace.latest_build.resources
             .map((resource) => {
               if (!resource.agents || resource.agents.length === 0) {
                 return