mathew updates: 1

Signed-off-by: Mathew Wicks <5735406+thesuperzapper@users.noreply.github.com>

Author: thesuperzapper

workspaces/backend/internal/models/workspaces/funcs.go

@@ -18,7 +18,6 @@ package workspaces
 
 import (
 	"fmt"
-	"path"
 
 	kubefloworgv1beta1 "github.com/kubeflow/notebooks/workspaces/controller/api/v1beta1"
 	"k8s.io/utils/ptr"
@@ -90,6 +89,9 @@ func NewWorkspaceModelFromWorkspace(ws *kubefloworgv1beta1.Workspace, wsk *kubef
 		}
 	}
 
+	imageConfigModel, imageConfigValue := buildImageConfig(ws, wsk)
+	podConfigModel, _ := buildPodConfig(ws, wsk)
+
 	workspaceModel := Workspace{
 		Name:      ws.Name,
 		Namespace: ws.Namespace,
@@ -114,8 +116,8 @@ func NewWorkspaceModelFromWorkspace(ws *kubefloworgv1beta1.Workspace, wsk *kubef
 				Data: dataVolumes,
 			},
 			Options: PodTemplateOptions{
-				ImageConfig: buildImageConfig(ws, wsk),
-				PodConfig:   buildPodConfig(ws, wsk),
+				ImageConfig: imageConfigModel,
+				PodConfig:   podConfigModel,
 			},
 		},
 		Activity: Activity{
@@ -125,51 +127,11 @@ func NewWorkspaceModelFromWorkspace(ws *kubefloworgv1beta1.Workspace, wsk *kubef
 			//       https://github.com/kubeflow/notebooks/issues/38
 			LastProbe: nil,
 		},
-		Services: buildServicesList(ws, wsk),
+		Services: buildServices(ws, imageConfigValue),
 	}
 	return workspaceModel
 }
 
-func buildServicesList(ws *kubefloworgv1beta1.Workspace, wsk *kubefloworgv1beta1.WorkspaceKind) []Service {
-	if !wskExists(wsk) {
-		return nil
-	}
-
-	imageConfig := wsk.Spec.PodTemplate.Options.ImageConfig
-	basePath := "/workspace"
-	namespacePath := path.Join(basePath, ws.Namespace, ws.Name)
-
-	services := make([]Service, 0, len(imageConfig.Values))
-
-	for _, val := range imageConfig.Values {
-		services = append(services, extractServices(&val, namespacePath)...)
-	}
-	return services
-}
-
-func extractServices(val *kubefloworgv1beta1.ImageConfigValue, namespacePath string) []Service {
-	if len(val.Spec.Ports) == 0 {
-		return []Service{}
-	}
-
-	services := make([]Service, 0, len(val.Spec.Ports))
-
-	for _, port := range val.Spec.Ports {
-		displayName := port.DisplayName
-		if displayName == "" {
-			displayName = val.Id
-		}
-		service := Service{
-			HttpService: &HttpService{
-				DisplayName: displayName,
-				HttpPath:    path.Join(namespacePath, port.Id),
-			},
-		}
-		services = append(services, service)
-	}
-	return services
-}
-
 func wskExists(wsk *kubefloworgv1beta1.WorkspaceKind) bool {
 	return wsk != nil && wsk.UID != ""
 }
@@ -193,7 +155,7 @@ func buildHomeVolume(ws *kubefloworgv1beta1.Workspace, wsk *kubefloworgv1beta1.W
 	}
 }
 
-func buildImageConfig(ws *kubefloworgv1beta1.Workspace, wsk *kubefloworgv1beta1.WorkspaceKind) ImageConfig {
+func buildImageConfig(ws *kubefloworgv1beta1.Workspace, wsk *kubefloworgv1beta1.WorkspaceKind) (ImageConfig, *kubefloworgv1beta1.ImageConfigValue) {
 	// create a map of image configs from the WorkspaceKind for easy lookup by ID
 	// NOTE: we can only build this map if the WorkspaceKind exists, otherwise it will be empty
 	imageConfigMap := make(map[string]kubefloworgv1beta1.ImageConfigValue)
@@ -205,13 +167,15 @@ func buildImageConfig(ws *kubefloworgv1beta1.Workspace, wsk *kubefloworgv1beta1.
 	}
 
 	// get the current image config
+	var currentImageConfigValue *kubefloworgv1beta1.ImageConfigValue
 	currentImageConfig := OptionInfo{
 		Id:          ws.Spec.PodTemplate.Options.ImageConfig,
 		DisplayName: UnknownImageConfig,
 		Description: UnknownImageConfig,
 		Labels:      nil,
 	}
 	if cfg, ok := imageConfigMap[currentImageConfig.Id]; ok {
+		currentImageConfigValue = &cfg
 		currentImageConfig.DisplayName = cfg.Spawner.DisplayName
 		currentImageConfig.Description = ptr.Deref(cfg.Spawner.Description, "")
 		currentImageConfig.Labels = buildOptionLabels(cfg.Spawner.Labels)
@@ -260,10 +224,10 @@ func buildImageConfig(ws *kubefloworgv1beta1.Workspace, wsk *kubefloworgv1beta1.
 		Current:       currentImageConfig,
 		Desired:       desiredImageConfig,
 		RedirectChain: redirectChain,
-	}
+	}, currentImageConfigValue
 }
 
-func buildPodConfig(ws *kubefloworgv1beta1.Workspace, wsk *kubefloworgv1beta1.WorkspaceKind) PodConfig {
+func buildPodConfig(ws *kubefloworgv1beta1.Workspace, wsk *kubefloworgv1beta1.WorkspaceKind) (PodConfig, *kubefloworgv1beta1.PodConfigValue) {
 	// create a map of pod configs from the WorkspaceKind for easy lookup by ID
 	// NOTE: we can only build this map if the WorkspaceKind exists, otherwise it will be empty
 	podConfigMap := make(map[string]kubefloworgv1beta1.PodConfigValue)
@@ -275,13 +239,15 @@ func buildPodConfig(ws *kubefloworgv1beta1.Workspace, wsk *kubefloworgv1beta1.Wo
 	}
 
 	// get the current pod config
+	var currentPodConfigValue *kubefloworgv1beta1.PodConfigValue
 	currentPodConfig := OptionInfo{
 		Id:          ws.Spec.PodTemplate.Options.PodConfig,
 		DisplayName: UnknownPodConfig,
 		Description: UnknownPodConfig,
 		Labels:      nil,
 	}
 	if cfg, ok := podConfigMap[currentPodConfig.Id]; ok {
+		currentPodConfigValue = &cfg
 		currentPodConfig.DisplayName = cfg.Spawner.DisplayName
 		currentPodConfig.Description = ptr.Deref(cfg.Spawner.Description, "")
 		currentPodConfig.Labels = buildOptionLabels(cfg.Spawner.Labels)
@@ -330,7 +296,7 @@ func buildPodConfig(ws *kubefloworgv1beta1.Workspace, wsk *kubefloworgv1beta1.Wo
 		Current:       currentPodConfig,
 		Desired:       desiredPodConfig,
 		RedirectChain: redirectChain,
-	}
+	}, currentPodConfigValue
 }
 
 func buildOptionLabels(labels []kubefloworgv1beta1.OptionSpawnerLabel) []OptionLabel {
@@ -364,3 +330,23 @@ func buildRedirectMessage(msg *kubefloworgv1beta1.RedirectMessage) *RedirectMess
 		Level: messageLevel,
 	}
 }
+
+func buildServices(ws *kubefloworgv1beta1.Workspace, imageConfigValue *kubefloworgv1beta1.ImageConfigValue) []Service {
+	if imageConfigValue == nil {
+		return nil
+	}
+
+	services := make([]Service, len(imageConfigValue.Spec.Ports))
+	for i := range imageConfigValue.Spec.Ports {
+		port := imageConfigValue.Spec.Ports[i]
+		switch port.Protocol { //nolint:gocritic
+		case kubefloworgv1beta1.ImagePortProtocolHTTP:
+			services[i].HttpService = &HttpService{
+				DisplayName: port.DisplayName,
+				HttpPath:    fmt.Sprintf("/workspace/%s/%s/%s/", ws.Namespace, ws.Name, port.Id),
+			}
+		}
+	}
+
+	return services
+}

workspaces/backend/internal/models/workspaces/types.go

@@ -29,7 +29,7 @@ type Workspace struct {
 	StateMessage  string            `json:"stateMessage"`
 	PodTemplate   PodTemplate       `json:"podTemplate"`
 	Activity      Activity          `json:"activity"`
-	Services      []Service         `json:"services,omitempty"`
+	Services      []Service         `json:"services"`
 }
 
 type WorkspaceState string
@@ -87,15 +87,6 @@ type ImageConfig struct {
 	RedirectChain []RedirectStep `json:"redirectChain,omitempty"`
 }
 
-type Service struct {
-	HttpService *HttpService `json:"httpService,omitempty"`
-}
-
-type HttpService struct {
-	DisplayName string `json:"displayName"`
-	HttpPath    string `json:"httpPath"`
-}
-
 type PodConfig struct {
 	Current       OptionInfo     `json:"current"`
 	Desired       *OptionInfo    `json:"desired,omitempty"`
@@ -153,3 +144,12 @@ const (
 	ProbeResultFailure ProbeResult = "Failure"
 	ProbeResultTimeout ProbeResult = "Timeout"
 )
+
+type Service struct {
+	HttpService *HttpService `json:"httpService,omitempty"`
+}
+
+type HttpService struct {
+	DisplayName string `json:"displayName"`
+	HttpPath    string `json:"httpPath"`
+}