feedback

gitpod-io · Nov 7, 2023 · b9c02d9 · b9c02d9
1 parent 8a36f16
commit b9c02d9
Show file tree

Hide file tree

Showing 10 changed files with 318 additions and 307 deletions.
diff --git a/components/dashboard/src/service/public-api.ts b/components/dashboard/src/service/public-api.ts
@@ -45,6 +45,9 @@ export const oidcService = createPromiseClient(OIDCService, transport);
 export const workspaceClient = createServiceClient(WorkspaceService, new JsonRpcWorkspaceClient());
 export const organizationClient = createServiceClient(OrganizationService, new JsonRpcOrganizationClient());
 
+// @ts-ignore
+window.$localTest = workspaceClient;
+
 export function publicApiTeamToProtocol(team: Team): ProtocolTeam {
     return {
         id: team.id,

diff --git a/components/gitpod-protocol/src/generate-async-generator.ts b/components/gitpod-protocol/src/generate-async-generator.ts
@@ -53,7 +53,8 @@ export async function* generateAsyncGenerator<T>(
                 });
             }
         }
-    } catch (e) {
+        // ignore error since code in `try` scope will not throw an error
+        // unless caller use it.throw, then it will throw to itself
     } finally {
         cleanup();
     }

diff --git a/components/public-api/gitpod/experimental/v2/workspace.proto b/components/public-api/gitpod/experimental/v2/workspace.proto
@@ -13,26 +13,26 @@ service WorkspaceService {
   // ID +return NOT_FOUND Workspace does not exist
   rpc GetWorkspace(GetWorkspaceRequest) returns (GetWorkspaceResponse) {}
 
-  // WatchWorkspace watchs the workspace status changes
+  // WatchWorkspaceStatus watchs the workspaces status changes
   //
   // ID +return NOT_FOUND Workspace does not exist
-  rpc WatchWorkspace(WatchWorkspaceRequest) returns (stream WatchWorkspaceResponse) {}
+  rpc WatchWorkspaceStatus(WatchWorkspaceStatusRequest) returns (stream WatchWorkspaceStatusResponse) {}
 }
 
 message GetWorkspaceRequest { string id = 1; }
 
 message GetWorkspaceResponse { Workspace item = 1; }
 
-message WatchWorkspaceRequest {
-  // id specifies the workspace to watch
+message WatchWorkspaceStatusRequest {
+  // workspace_id specifies the workspace to watch
   //
   // +optional if empty then watch all workspaces
-  optional string id = 1;
+  optional string workspace_id = 1;
 }
 
-message WatchWorkspaceResponse {
+message WatchWorkspaceStatusResponse {
   // item is the workspace that was changed
-  Workspace item = 1;
+  WorkspaceStatus status = 1;
 }
 
 // +resource get workspace

diff --git a/components/public-api/go/experimental/v2/v2connect/workspace.connect.go b/components/public-api/go/experimental/v2/v2connect/workspace.connect.go