Add real owner to imagebuild metadata

components/image-builder-api/imgbuilder.proto

@@ -65,6 +65,7 @@ message BuildRequest {
     BuildSource source = 1;
     BuildRegistryAuth auth = 2;
     bool force_rebuild = 3;
+    string triggered_by = 4;
 }
 
 message BuildRegistryAuth {

components/image-builder-api/typescript/src/imgbuilder_pb.d.ts

@@ -217,6 +217,8 @@ export class BuildRequest extends jspb.Message {
     setAuth(value?: BuildRegistryAuth): BuildRequest;
     getForceRebuild(): boolean;
     setForceRebuild(value: boolean): BuildRequest;
+    getTriggeredBy(): string;
+    setTriggeredBy(value: string): BuildRequest;
 
     serializeBinary(): Uint8Array;
     toObject(includeInstance?: boolean): BuildRequest.AsObject;
@@ -233,6 +235,7 @@ export namespace BuildRequest {
         source?: BuildSource.AsObject,
         auth?: BuildRegistryAuth.AsObject,
         forceRebuild: boolean,
+        triggeredBy: string,
     }
 }
 

components/image-builder-api/typescript/src/imgbuilder_pb.js

@@ -1758,7 +1758,8 @@ proto.builder.BuildRequest.toObject = function(includeInstance, msg) {
   var f, obj = {
     source: (f = msg.getSource()) && proto.builder.BuildSource.toObject(includeInstance, f),
     auth: (f = msg.getAuth()) && proto.builder.BuildRegistryAuth.toObject(includeInstance, f),
-    forceRebuild: jspb.Message.getBooleanFieldWithDefault(msg, 3, false)
+    forceRebuild: jspb.Message.getBooleanFieldWithDefault(msg, 3, false),
+    triggeredBy: jspb.Message.getFieldWithDefault(msg, 4, "")
   };
 
   if (includeInstance) {
@@ -1809,6 +1810,10 @@ proto.builder.BuildRequest.deserializeBinaryFromReader = function(msg, reader) {
       var value = /** @type {boolean} */ (reader.readBool());
       msg.setForceRebuild(value);
       break;
+    case 4:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setTriggeredBy(value);
+      break;
     default:
       reader.skipField();
       break;
@@ -1861,6 +1866,13 @@ proto.builder.BuildRequest.serializeBinaryToWriter = function(message, writer) {
       f
     );
   }
+  f = message.getTriggeredBy();
+  if (f.length > 0) {
+    writer.writeString(
+      4,
+      f
+    );
+  }
 };
 
 
@@ -1956,6 +1968,24 @@ proto.builder.BuildRequest.prototype.setForceRebuild = function(value) {
 };
 
 
+/**
+ * optional string triggered_by = 4;
+ * @return {string}
+ */
+proto.builder.BuildRequest.prototype.getTriggeredBy = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 4, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.builder.BuildRequest} returns this
+ */
+proto.builder.BuildRequest.prototype.setTriggeredBy = function(value) {
+  return jspb.Message.setProto3StringField(this, 4, value);
+};
+
+
 
 /**
  * Oneof group definitions for this message. Each group defines the field

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

@@ -26,8 +26,9 @@ import (
 )
 
 const (
-	annotationRef     = "ref"
-	annotationBaseRef = "baseref"
+	annotationRef       = "ref"
+	annotationBaseRef   = "baseref"
+	annotationManagedBy = "managed-by"
 )
 
 type orchestrator interface {
@@ -70,14 +71,17 @@ func (m *buildMonitor) Run() {
 	for {
 		wss, err := m.wsman.GetWorkspaces(ctx, &wsmanapi.GetWorkspacesRequest{
 			MustMatch: &wsmanapi.MetadataFilter{
-				Owner: buildWorkspaceOwnerID,
+				Annotations: map[string]string{
+					annotationManagedBy: buildWorkspaceManagerID,
+				},
 			},
 		})
 		if err != nil {
 			log.WithError(err).Info("cannot get running builds from ws-manager - retrying")
 			time.Sleep(5 * time.Second)
 			continue
 		}
+
 		m.runningBuildsMu.Lock()
 		m.runningBuilds = make(map[string]*runningBuild, len(wss.Status))
 		m.runningBuildsMu.Unlock()
@@ -87,7 +91,9 @@ func (m *buildMonitor) Run() {
 
 		sub, err := m.wsman.Subscribe(ctx, &wsmanapi.SubscribeRequest{
 			MustMatch: &wsmanapi.MetadataFilter{
-				Owner: buildWorkspaceOwnerID,
+				Annotations: map[string]string{
+					annotationManagedBy: buildWorkspaceManagerID,
+				},
 			},
 		})
 		if err != nil {

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

@@ -42,8 +42,8 @@ import (
 )
 
 const (
-	// buildWorkspaceOwnerID is the owner ID we pass to ws-manager
-	buildWorkspaceOwnerID = "image-builder"
+	// buildWorkspaceManagerID identifies the manager for the workspace
+	buildWorkspaceManagerID = "image-builder"
 
 	// maxBuildRuntime is the maximum time a build is allowed to take
 	maxBuildRuntime = 60 * time.Minute
@@ -345,12 +345,11 @@ func (o *Orchestrator) Build(req *protocol.BuildRequest, resp protocol.ImageBuil
 			Metadata: &wsmanapi.WorkspaceMetadata{
 				MetaId: buildID,
 				Annotations: map[string]string{
-					annotationRef:     wsrefstr,
-					annotationBaseRef: baseref,
+					annotationRef:       wsrefstr,
+					annotationBaseRef:   baseref,
+					annotationManagedBy: buildWorkspaceManagerID,
 				},
-				// TODO(cw): use the actual image build owner here and move to annotation based filter
-				//           when retrieving running image builds.
-				Owner: buildWorkspaceOwnerID,
+				Owner: req.GetTriggeredBy(),
 			},
 			Spec: &wsmanapi.StartWorkspaceSpec{
 				Initializer:        initializer,

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

@@ -938,6 +938,7 @@ export class WorkspaceStarter {
             req.setSource(src);
             req.setAuth(auth);
             req.setForceRebuild(forceRebuild);
+            req.setTriggeredBy(user.id);
 
             // Make sure we persist logInfo as soon as we retrieve it
             const imageBuildLogInfo = new Deferred<ImageBuildLogInfo>();