Address review comments

Co-authored-by: Gero Posmyk-Leinemann <[email protected]>
Tool: gitpod/catfood.gitpod.cloud

Author: filiptronicek

components/dashboard/src/service/public-api.ts

@@ -124,7 +124,6 @@ function createServiceClient<T extends ServiceType>(
                     return grpcClient;
                 }
                 if (preferJsonRpc) {
-                    console.debug("using preferred jsonrpc client for", type.typeName, prop);
                     return jsonRpcOptions.client;
                 }
                 const featureFlags = [`dashboard_public_api_${jsonRpcOptions.featureFlagSuffix}_enabled`];

components/server/src/workspace/gitpod-server-impl.ts

@@ -242,7 +242,8 @@ export class GitpodServerImpl implements GitpodServerWithTracing, Disposable {
     }
 
     private async listenForPrebuildUpdates(ctx?: TraceContext) {
-        if (!this.client) {
+        const userId = this.userID;
+        if (!this.client || !userId) {
             return;
         }
 
@@ -258,19 +259,19 @@ export class GitpodServerImpl implements GitpodServerWithTracing, Disposable {
                 ctx,
             );
 
-        if (!this.disposables.disposed && this.userID) {
+        if (!this.disposables.disposed) {
             await runWithRequestContext(
                 {
                     requestKind: "gitpod-server-impl-listener",
                     requestMethod: "listenForPrebuildUpdates",
                     signal: new AbortController().signal,
-                    subjectId: SubjectId.fromUserId(this.userID),
+                    subjectId: SubjectId.fromUserId(userId),
                 },
                 async () => {
                     const organizations = await this.getTeams(ctx ?? {});
                     for (const organization of organizations) {
                         const hasPermission = await this.auth.hasPermissionOnOrganization(
-                            this.userID,
+                            userId,
                             "read_prebuild",
                             organization.id,
                         );

components/spicedb/schema/schema.yaml

@@ -17,7 +17,7 @@ schema: |-
 
       permission make_admin = installation->admin + organization->installation_admin
 
-      // administrate is for changes such as blocking or verifying, i.e. things that only admins can do on user
+      // administrate is for changes such as blocking or verifiying, i.e. things that only admins can do on user
       permission admin_control = installation->admin + organization->installation_admin
 
       permission read_ssh = self

components/ws-manager-bridge/src/prebuild-updater.ts

@@ -39,7 +39,6 @@ export class PrebuildUpdater {
         const span = TraceContext.startSpan("updatePrebuiltWorkspace", ctx);
         try {
             const prebuild = await this.workspaceDB.trace({ span }).findPrebuildByWorkspaceID(status.metadata!.metaId!);
-            const workspace = await this.workspaceDB.trace({ span }).findById(workspaceId);
             if (!prebuild) {
                 log.warn(logCtx, "Headless workspace without prebuild");
                 TraceContext.setError({ span }, new Error("headless workspace without prebuild"));
@@ -99,7 +98,7 @@ export class PrebuildUpdater {
                         prebuildID: updatedPrebuild.id,
                         status: updatedPrebuild.state,
                         workspaceID: workspaceId,
-                        organizationID: workspace?.organizationId,
+                        organizationID: info.teamId,
                     });
                 }
             }
@@ -115,7 +114,6 @@ export class PrebuildUpdater {
         const span = TraceContext.startSpan("stopPrebuildInstance", ctx);
 
         const prebuild = await this.workspaceDB.trace({}).findPrebuildByWorkspaceID(instance.workspaceId);
-        const workspace = await this.workspaceDB.trace({}).findById(instance.workspaceId);
         if (prebuild) {
             // this is a prebuild - set it to aborted
             prebuild.state = "aborted";
@@ -130,7 +128,7 @@ export class PrebuildUpdater {
                         prebuildID: prebuild.id,
                         status: prebuild.state,
                         workspaceID: instance.workspaceId,
-                        organizationID: workspace?.organizationId,
+                        organizationID: info.teamId,
                     });
                 }
             }