test 3

Author: geropl

components/image-builder-api/typescript/src/sugar.ts

@@ -131,11 +131,10 @@ export class PromisifiedImageBuilderClient {
 
     // build returns a nested promise. The outer one resolves/rejects with the build start,
     // the inner one resolves/rejects when the build is done.
-    public build(ctx: TraceContext, request: BuildRequest): Promise<StagedBuildResponse> {
+    public build(ctx: TraceContext, request: BuildRequest, logInfo: Deferred<ImageBuildLogInfo> = new Deferred<ImageBuildLogInfo>()): Promise<StagedBuildResponse> {
         const span = TraceContext.startSpan(`/image-builder/build`, ctx);
 
         const buildResult = new Deferred<BuildResponse>();
-        const logInfo = new Deferred<ImageBuildLogInfo>();
 
         const result = new Deferred<StagedBuildResponse>();
         const resultResp: StagedBuildResponse = {
@@ -171,6 +170,7 @@ export class PromisifiedImageBuilderClient {
                     resultResp.baseRef = resp.getBaseRef();
                 }
 
+                log.warn(`BUILDINFO: ${JSON.stringify(resp.getInfo()?.toObject(), undefined, 2)}`)
                 if (resp.hasInfo() && !logInfo.isResolved) {
                     // assumes that log info stays stable for instance lifetime
                     const info = resp.getInfo()

components/image-builder-mk3/pkg/orchestrator/monitor.go

@@ -20,7 +20,6 @@ import (
 	"github.com/hashicorp/go-retryablehttp"
 	"golang.org/x/xerrors"
 
-	"github.com/gitpod-io/gitpod/common-go/kubernetes"
 	"github.com/gitpod-io/gitpod/common-go/log"
 	"github.com/gitpod-io/gitpod/common-go/tracing"
 	"github.com/gitpod-io/gitpod/image-builder/api"

components/image-builder-mk3/pkg/orchestrator/monitor_test.go

@@ -12,7 +12,6 @@ import (
 	"github.com/google/go-cmp/cmp/cmpopts"
 	"google.golang.org/protobuf/types/known/timestamppb"
 
-	"github.com/gitpod-io/gitpod/common-go/kubernetes"
 	"github.com/gitpod-io/gitpod/image-builder/api"
 	wsmanapi "github.com/gitpod-io/gitpod/ws-manager/api"
 )
@@ -89,9 +88,8 @@ func TestExtractBuildResponse(t *testing.T) {
 				Metadata: &wsmanapi.WorkspaceMetadata{
 					MetaId: buildID,
 					Annotations: map[string]string{
-						annotationRef:                     ref,
-						annotationBaseRef:                 baseref,
-						kubernetes.WorkspaceURLAnnotation: url,
+						annotationRef:     ref,
+						annotationBaseRef: baseref,
 					},
 					StartedAt: timestamppb.New(time.Unix(startedAt, 0)),
 				},
@@ -100,6 +98,9 @@ func TestExtractBuildResponse(t *testing.T) {
 				Auth: &wsmanapi.WorkspaceAuthentication{
 					OwnerToken: ownerToken,
 				},
+				Spec: &wsmanapi.WorkspaceSpec{
+					Url: url,
+				},
 			}
 			test.Mod(status)
 			act := extractBuildResponse(status)

components/server/src/workspace/workspace-starter.ts

@@ -32,8 +32,9 @@ import * as path from 'path';
 import * as grpc from "@grpc/grpc-js";
 import { IDEConfig, IDEConfigService } from "../ide-config";
 import { EnvVarWithValue } from "@gitpod/gitpod-protocol/src/protocol";
-import { WithReferrerContext } from "@gitpod/gitpod-protocol/lib/protocol";
+import { WithReferrerContext, ImageBuildLogInfo } from "@gitpod/gitpod-protocol/lib/protocol";
 import { IDEOption } from "@gitpod/gitpod-protocol/lib/ide-protocol";
+import { Deferred } from "@gitpod/gitpod-protocol/lib/util/deferred";
 
 export interface StartWorkspaceOptions {
     rethrow?: boolean;
@@ -568,20 +569,21 @@ export class WorkspaceStarter {
             req.setAuth(auth);
             req.setForcerebuild(forceRebuild);
 
-            const result = await client.build({ span }, req);
+            // Make sure we persist logInfo as soon as we retrieve it
+            const imageBuildLogInfo = new Deferred<ImageBuildLogInfo>();
+            imageBuildLogInfo.promise.then(async logInfo => {
+                await this.workspaceDb.trace({span}).updatePartial(workspace.id, {
+                    imageBuildLogInfo: logInfo,
+                }).catch(err => log.error("error writing image build log info to the DB", err));
+            }).catch(err => log.warn("image build: never received log info"));
+
+            const result = await client.build({ span }, req, imageBuildLogInfo);
 
             // Update the workspace now that we know what the name of the workspace image will be (which doubles as buildID)
             workspace.imageNameResolved = result.ref;
             span.log({ "ref": workspace.imageNameResolved });
             await this.workspaceDb.trace({ span }).store(workspace);
 
-            // Make sure we persist logInfo once we retrieve it
-            result.logPromise.then(async logInfo => {
-                await this.workspaceDb.trace({span}).updatePartial(workspace.id, {
-                    imageBuildLogInfo: logInfo,
-                }).catch(err => log.error("error writing image build log info to the DB", err));
-            }).catch(err => log.warn("image build: never received log info"));
-
             // Update workspace instance to tell the world we're building an image
             const workspaceImage = result.ref;
             const status: WorkspaceInstanceStatus = result.actuallyNeedsBuild ? { ...instance.status, phase: 'preparing' } : instance.status;