Fix: retrieve agents from the template

fioan89 · fioan89 · commit e2f8fe647561 · 2022-08-17T00:32:24.000+03:00
- template is more reliable than a workspace build job (which can be one that stops) - resolves #67
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@
 
 ### Changed
 - workspace panel is now updated every 5 seconds
+- combinations of workspace names and agent names are now listed even when a workspace is down 
 - minimum supported Gateway build is now 222.3739.40
 
 ### Fixed
diff --git a/src/main/kotlin/com/coder/gateway/sdk/CoderRestClientService.kt b/src/main/kotlin/com/coder/gateway/sdk/CoderRestClientService.kt
@@ -101,13 +101,13 @@ class CoderRestClientService {
     }
 
     /**
-     * Retrieves the workspace agents. A workspace is a collection of objects like, VMs, containers, cloud DBs, etc...
-     * Agents run on compute hosts like VMs or containers.
+     * Retrieves the workspace agents a template declares.
+     * A workspace is a collection of objects like, VMs, containers, cloud DBs, etc...Agents run on compute hosts like VMs or containers.
      *
      * @throws WorkspaceResourcesResponseException if workspace resources could not be retrieved.
      */
-    fun workspaceAgents(workspace: Workspace): List<WorkspaceAgent> {
-        val workspaceResourcesResponse = retroRestClient.workspaceResourceByBuild(workspace.latestBuild.id).execute()
+    fun workspaceAgentsByTemplate(workspace: Workspace): List<WorkspaceAgent> {
+        val workspaceResourcesResponse = retroRestClient.templateVersionResources(workspace.latestBuild.templateVersionID).execute()
         if (!workspaceResourcesResponse.isSuccessful) {
             throw WorkspaceResourcesResponseException("Could not retrieve agents for ${workspace.name} workspace :${workspaceResourcesResponse.code()}, reason: ${workspaceResourcesResponse.message()}")
         }
diff --git a/src/main/kotlin/com/coder/gateway/sdk/v2/CoderV2RestFacade.kt b/src/main/kotlin/com/coder/gateway/sdk/v2/CoderV2RestFacade.kt
@@ -31,8 +31,8 @@ interface CoderV2RestFacade {
     @GET("api/v2/buildinfo")
     fun buildInfo(): Call<BuildInfo>
 
-    @GET("api/v2/workspacebuilds/{buildID}/resources")
-    fun workspaceResourceByBuild(@Path("buildID") build: UUID): Call<List<WorkspaceResource>>
+    @GET("api/v2/templateversions/{templateID}/resources")
+    fun templateVersionResources(@Path("templateID") templateID: UUID): Call<List<WorkspaceResource>>
 
     /**
      * Queues a new build to occur for a workspace.
diff --git a/src/main/kotlin/com/coder/gateway/views/steps/CoderWorkspacesStepView.kt b/src/main/kotlin/com/coder/gateway/views/steps/CoderWorkspacesStepView.kt
@@ -332,7 +332,7 @@ class CoderWorkspacesStepView(val enableNextButtonCallback: (Boolean) -> Unit) :
 
     private fun Workspace.agentModels(): List<WorkspaceAgentModel> {
         return try {
-            val agents = coderClient.workspaceAgents(this)
+            val agents = coderClient.workspaceAgentsByTemplate(this)
             when (agents.size) {
                 0 -> {
                     listOf(

Original file line number	Diff line number	Diff line change
`@@ -101,13 +101,13 @@ class CoderRestClientService {`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`/**`
`104`		`- * Retrieves the workspace agents. A workspace is a collection of objects like, VMs, containers, cloud DBs, etc...`
`105`		`- * Agents run on compute hosts like VMs or containers.`
	`104`	`+ * Retrieves the workspace agents a template declares.`
	`105`	`+ * A workspace is a collection of objects like, VMs, containers, cloud DBs, etc...Agents run on compute hosts like VMs or containers.`
`106`	`106`	`*`
`107`	`107`	`* @throws WorkspaceResourcesResponseException if workspace resources could not be retrieved.`
`108`	`108`	`*/`
`109`		`- fun workspaceAgents(workspace: Workspace): List<WorkspaceAgent> {`
`110`		`- val workspaceResourcesResponse = retroRestClient.workspaceResourceByBuild(workspace.latestBuild.id).execute()`
	`109`	`+ fun workspaceAgentsByTemplate(workspace: Workspace): List<WorkspaceAgent> {`
	`110`	`+ val workspaceResourcesResponse = retroRestClient.templateVersionResources(workspace.latestBuild.templateVersionID).execute()`
`111`	`111`	`if (!workspaceResourcesResponse.isSuccessful) {`
`112`	`112`	`throw WorkspaceResourcesResponseException("Could not retrieve agents for ${workspace.name} workspace :${workspaceResourcesResponse.code()}, reason: ${workspaceResourcesResponse.message()}")`
`113`	`113`	`}`