[ws-manager-api] IDEImage as parent message type

gitpod-io · Oct 26, 2021 · d1f9eae · d1f9eae
1 parent 7fab584
commit d1f9eae
Show file tree

Hide file tree

Showing 13 changed files with 635 additions and 930 deletions.
diff --git a/components/ee/ws-scheduler/pkg/scaler/driver.go b/components/ee/ws-scheduler/pkg/scaler/driver.go
@@ -290,7 +290,7 @@ func (wspd *WorkspaceManagerPrescaleDriver) startGhostWorkspaces(ctx context.Con
 					Username: "gitpod-ghost",
 				},
 				DeprecatedIdeImage: wspd.Config.IDEImage,
-				IdeImage: &api.StartWorkspaceSpec_IDEImage{
+				IdeImage: &api.IDEImage{
 					WebRef: wspd.Config.IDEImage,
 				},
 				Initializer: &csapi.WorkspaceInitializer{

diff --git a/components/image-builder-mk3/pkg/orchestrator/orchestrator.go b/components/image-builder-mk3/pkg/orchestrator/orchestrator.go
@@ -362,7 +362,7 @@ func (o *Orchestrator) Build(req *protocol.BuildRequest, resp protocol.ImageBuil
 				Timeout:            maxBuildRuntime.String(),
 				WorkspaceImage:     o.Config.BuilderImage,
 				DeprecatedIdeImage: o.Config.BuilderImage,
-				IdeImage: &wsmanapi.StartWorkspaceSpec_IDEImage{
+				IdeImage: &wsmanapi.IDEImage{
 					WebRef: o.Config.BuilderImage,
 				},
 				WorkspaceLocation: contextPath,

diff --git a/components/ws-manager-api/core.proto b/components/ws-manager-api/core.proto
@@ -268,8 +268,6 @@ message WorkspaceStatus {
     WorkspaceAuthentication auth = 9;
 }
 
-// WorkspaceSpec is the specification of a workspace at runtime
-message WorkspaceSpec {
     // IDEImage configures the IDE images a workspace will use
     message IDEImage {
         // web_ref is a reference to an OCI image used for serving the web-based IDE
@@ -278,6 +276,8 @@ message WorkspaceSpec {
         string desktop_ref = 2;
     }
 
+// WorkspaceSpec is the specification of a workspace at runtime
+message WorkspaceSpec {
     // workspace_image is the name of the Docker image this workspace runs
     string workspace_image = 1;
 
@@ -452,14 +452,6 @@ message WorkspaceAuthentication {
 
 // StartWorkspaceSpec specifies the configuration of a workspace for a workspace start
 message StartWorkspaceSpec {
-    // IDEImage configures the IDE images a workspace will use
-    message IDEImage {
-        // web_ref is a reference to an OCI image used for serving the web-based IDE
-        string web_ref = 1;
-        // desktop_ref is an optional reference to an OCI image used for serving desktop IDEs
-        string desktop_ref = 2;
-    }
-
     // workspace_image is the Docker image name of the workspace container
     string workspace_image = 1;