WIP: [image-builder, et. al] Switch image build logs to work server-to-imagebuild workspace instead of server-to-imagebuilder

The goal here is to make image build logs accessible from all meta clusters. This helps to move forward with removing the cross-cluster messagebus dependency while image-builder(s) still runs in the meta cluster(s).

Author: geropl

components/gitpod-db/src/typeorm/entity/db-workspace.ts

@@ -6,7 +6,7 @@
 
 import { PrimaryColumn, Column, Entity, Index } from "typeorm";
 
-import { Workspace, WorkspaceConfig, WorkspaceContext, WorkspaceImageSource, WorkspaceType, WorkspaceSoftDeletion } from "@gitpod/gitpod-protocol";
+import { Workspace, WorkspaceConfig, WorkspaceContext, WorkspaceImageSource, WorkspaceType, WorkspaceSoftDeletion, ImageBuildLogInfo } from "@gitpod/gitpod-protocol";
 import { TypeORM } from "../typeorm";
 import { Transformer } from "../transformer";
 
@@ -105,4 +105,7 @@ export class DBWorkspace implements Workspace {
     })
     @Index('ind_basedOnSnapshotId')
     basedOnSnapshotId?: string;
+
+    @Column("simple-json", { nullable: true })
+    imageBuildLogInfo?: ImageBuildLogInfo;
 }

components/gitpod-db/src/typeorm/migration/1642088620203-WorkspaceImageBuildLogInfo.ts

@@ -0,0 +1,15 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+import { columnExists } from "./helper/helper";
+
+export class WorkspaceImageBuildLogInfo1642088620203 implements MigrationInterface {
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        if (!(await columnExists(queryRunner, "d_b_workspace", "imageBuildLogInfo"))) {
+            await queryRunner.query("ALTER TABLE d_b_workspace ADD COLUMN `imageBuildLogInfo` text NULL");
+        }
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+    }
+
+}

components/gitpod-db/src/typeorm/workspace-db-impl.ts

@@ -20,7 +20,6 @@ import { DBPrebuiltWorkspace } from "./entity/db-prebuilt-workspace";
 import { DBPrebuiltWorkspaceUpdatable } from "./entity/db-prebuilt-workspace-updatable";
 import { BUILTIN_WORKSPACE_PROBE_USER_ID } from "../user-db";
 import { DBPrebuildInfo } from "./entity/db-prebuild-info-entry";
-import { FindInstanceOptions } from "..";
 
 type RawTo<T> = (instance: WorkspaceInstance, ws: Workspace) => T;
 interface OrderBy {

components/gitpod-db/src/workspace-db.ts

@@ -46,11 +46,6 @@ export interface PrebuildWithWorkspace {
     workspace: Workspace;
 }
 
-export type FindInstanceOptions = Partial<Pick<
-    WorkspaceInstance, "region"> & {
-        phasePersisted: WorkspaceInstancePhase;
-    }>;
-
 export type WorkspaceAndOwner = Pick<Workspace, "id" | "ownerId">;
 export type WorkspaceOwnerAndSoftDeleted = Pick<Workspace, "id" | "ownerId" | "softDeleted">;
 

components/gitpod-protocol/src/protocol.ts

@@ -448,12 +448,19 @@ export interface Workspace {
     basedOnPrebuildId?: string;
 
     basedOnSnapshotId?: string;
+
+    imageBuildLogInfo?: ImageBuildLogInfo;
 }
 
 export type WorkspaceSoftDeletion = "user" | "gc";
 
 export type WorkspaceType = "regular" | "prebuild" | "probe";
 
+export interface ImageBuildLogInfo {
+    url: string,
+    headers: { [key: string]: string },
+}
+
 export namespace Workspace {
 
     export function getFullRepositoryName(ws: Workspace): string | undefined {

components/image-builder-api/go/imgbuilder.pb.go

@@ -128,4 +128,6 @@ message BuildInfo {
     BuildStatus status = 2;
     int64 started_at = 3;
     string build_id = 5;
+    string log_url = 6;
+    map<string, string> log_url_extra_headers = 7;
 }

components/image-builder-api/go/imgbuilder_grpc.pb.go

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2021 Gitpod GmbH. All rights reserved.
+ * Copyright (c) 2022 Gitpod GmbH. All rights reserved.
  * Licensed under the GNU Affero General Public License (AGPL).
  * See License-AGPL.txt in the project root for license information.
  */