impl + 2

mustard-mh · mustard-mh · commit b6ef9a1e79c7 · 2024-11-29T20:42:43.000Z
diff --git a/components/public-api-server/pkg/apiv1/workspace.go b/components/public-api-server/pkg/apiv1/workspace.go
@@ -434,15 +434,15 @@ func convertWorkspaceInfo(input *protocol.WorkspaceInfo) (*v1.Workspace, error)
 	}, nil
 }
 
-func convertIdeConfig(ideConfig *protocol.WorkspaceInstanceIDEConfig) *v1.EditorReference {
+func convertIdeConfig(ideConfig *protocol.WorkspaceInstanceIDEConfig) *v1.WorkspaceInstanceStatus_EditorReference {
 	if ideConfig == nil {
 		return nil
 	}
 	ideVersion := "stable"
 	if ideConfig.UseLatest {
 		ideVersion = "stable"
 	}
-	return &v1.EditorReference{
+	return &v1.WorkspaceInstanceStatus_EditorReference{
 		Name:          ideConfig.IDE,
 		Version:       ideVersion,
 		PreferToolbox: ideConfig.PreferToolbox,

Original file line number	Diff line number	Diff line change
`@@ -434,15 +434,15 @@ func convertWorkspaceInfo(input protocol.WorkspaceInfo) (v1.Workspace, error)`
`434`	`434`	`}, nil`
`435`	`435`	`}`
`436`	`436`
`437`		`-func convertIdeConfig(ideConfig protocol.WorkspaceInstanceIDEConfig) v1.EditorReference {`
	`437`	`+func convertIdeConfig(ideConfig protocol.WorkspaceInstanceIDEConfig) v1.WorkspaceInstanceStatus_EditorReference {`
`438`	`438`	`if ideConfig == nil {`
`439`	`439`	`return nil`
`440`	`440`	`}`
`441`	`441`	`ideVersion := "stable"`
`442`	`442`	`if ideConfig.UseLatest {`
`443`	`443`	`ideVersion = "stable"`
`444`	`444`	`}`
`445`		`- return &v1.EditorReference{`
	`445`	`+ return &v1.WorkspaceInstanceStatus_EditorReference{`
`446`	`446`	`Name: ideConfig.IDE,`
`447`	`447`	`Version: ideVersion,`
`448`	`448`	`PreferToolbox: ideConfig.PreferToolbox,`