[image-builder-mk3] Fix image build error "did not produce a workspac…

…e image"
gitpod-io · Oct 12, 2021 · a94ad43 · a94ad43
1 parent 3692b2f
commit a94ad43
Show file tree

Hide file tree

Showing 12 changed files with 191 additions and 104 deletions.
diff --git a/components/image-builder-api/go/imgbuilder.pb.go b/components/image-builder-api/go/imgbuilder.pb.go
diff --git a/components/image-builder-api/imgbuilder.proto b/components/image-builder-api/imgbuilder.proto
@@ -109,6 +109,7 @@ enum BuildStatus {
 message LogsRequest {
     string build_ref = 1;
     bool censored = 2;
+    string build_id = 3;
 }
 
 message LogsResponse {
@@ -126,4 +127,5 @@ message BuildInfo {
     string base_ref = 4;
     BuildStatus status = 2;
     int64 started_at = 3;
+    string build_id = 5;
 }
diff --git a/components/image-builder-api/typescript/src/imgbuilder_pb.d.ts b/components/image-builder-api/typescript/src/imgbuilder_pb.d.ts
@@ -362,6 +362,8 @@ export class LogsRequest extends jspb.Message {
     setBuildRef(value: string): LogsRequest;
     getCensored(): boolean;
     setCensored(value: boolean): LogsRequest;
+    getBuildId(): string;
+    setBuildId(value: string): LogsRequest;
 
     serializeBinary(): Uint8Array;
     toObject(includeInstance?: boolean): LogsRequest.AsObject;
@@ -377,6 +379,7 @@ export namespace LogsRequest {
     export type AsObject = {
         buildRef: string,
         censored: boolean,
+        buildId: string,
     }
 }
 
@@ -450,6 +453,8 @@ export class BuildInfo extends jspb.Message {
     setStatus(value: BuildStatus): BuildInfo;
     getStartedAt(): number;
     setStartedAt(value: number): BuildInfo;
+    getBuildId(): string;
+    setBuildId(value: string): BuildInfo;
 
     serializeBinary(): Uint8Array;
     toObject(includeInstance?: boolean): BuildInfo.AsObject;
@@ -467,6 +472,7 @@ export namespace BuildInfo {
         baseRef: string,
         status: BuildStatus,
         startedAt: number,
+        buildId: string,
     }
 }
 

diff --git a/components/image-builder-api/typescript/src/imgbuilder_pb.js b/components/image-builder-api/typescript/src/imgbuilder_pb.js
@@ -2812,7 +2812,8 @@ proto.builder.LogsRequest.prototype.toObject = function(opt_includeInstance) {
 proto.builder.LogsRequest.toObject = function(includeInstance, msg) {
   var f, obj = {
     buildRef: jspb.Message.getFieldWithDefault(msg, 1, ""),
-    censored: jspb.Message.getBooleanFieldWithDefault(msg, 2, false)
+    censored: jspb.Message.getBooleanFieldWithDefault(msg, 2, false),
+    buildId: jspb.Message.getFieldWithDefault(msg, 3, "")
   };
 
   if (includeInstance) {
@@ -2857,6 +2858,10 @@ proto.builder.LogsRequest.deserializeBinaryFromReader = function(msg, reader) {
       var value = /** @type {boolean} */ (reader.readBool());
       msg.setCensored(value);
       break;
+    case 3:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setBuildId(value);
+      break;
     default:
       reader.skipField();
       break;
@@ -2900,6 +2905,13 @@ proto.builder.LogsRequest.serializeBinaryToWriter = function(message, writer) {
       f
     );
   }
+  f = message.getBuildId();
+  if (f.length > 0) {
+    writer.writeString(
+      3,
+      f
+    );
+  }
 };
 
 
@@ -2939,6 +2951,24 @@ proto.builder.LogsRequest.prototype.setCensored = function(value) {
 };
 
 
+/**
+ * optional string build_id = 3;
+ * @return {string}
+ */
+proto.builder.LogsRequest.prototype.getBuildId = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 3, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.builder.LogsRequest} returns this
+ */
+proto.builder.LogsRequest.prototype.setBuildId = function(value) {
+  return jspb.Message.setProto3StringField(this, 3, value);
+};
+
+
 
 
 
@@ -3389,7 +3419,8 @@ proto.builder.BuildInfo.toObject = function(includeInstance, msg) {
     ref: jspb.Message.getFieldWithDefault(msg, 1, ""),
     baseRef: jspb.Message.getFieldWithDefault(msg, 4, ""),
     status: jspb.Message.getFieldWithDefault(msg, 2, 0),
-    startedAt: jspb.Message.getFieldWithDefault(msg, 3, 0)
+    startedAt: jspb.Message.getFieldWithDefault(msg, 3, 0),
+    buildId: jspb.Message.getFieldWithDefault(msg, 5, "")
   };
 
   if (includeInstance) {
@@ -3442,6 +3473,10 @@ proto.builder.BuildInfo.deserializeBinaryFromReader = function(msg, reader) {
       var value = /** @type {number} */ (reader.readInt64());
       msg.setStartedAt(value);
       break;
+    case 5:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setBuildId(value);
+      break;
     default:
       reader.skipField();
       break;
@@ -3499,6 +3534,13 @@ proto.builder.BuildInfo.serializeBinaryToWriter = function(message, writer) {
       f
     );
   }
+  f = message.getBuildId();
+  if (f.length > 0) {
+    writer.writeString(
+      5,
+      f
+    );
+  }
 };
 
 
@@ -3574,6 +3616,24 @@ proto.builder.BuildInfo.prototype.setStartedAt = function(value) {
 };
 
 
+/**
+ * optional string build_id = 5;
+ * @return {string}
+ */
+proto.builder.BuildInfo.prototype.getBuildId = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 5, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.builder.BuildInfo} returns this
+ */
+proto.builder.BuildInfo.prototype.setBuildId = function(value) {
+  return jspb.Message.setProto3StringField(this, 5, value);
+};
+
+
 /**
  * @enum {number}
  */

diff --git a/components/image-builder-mk3/go.mod b/components/image-builder-mk3/go.mod
@@ -16,6 +16,7 @@ require (
 	github.com/gitpod-io/gitpod/ws-manager/api v0.0.0-00010101000000-000000000000
 	github.com/golang/mock v1.6.0
 	github.com/google/go-cmp v0.5.6
+	github.com/google/uuid v1.2.0
 	github.com/hashicorp/go-retryablehttp v0.7.0
 	github.com/mattn/go-isatty v0.0.11
 	github.com/opencontainers/go-digest v1.0.0