refactor: streamline workspace namespace handling with conversion functions

Author: whnbaek

internal/client/client.go

@@ -12,6 +12,7 @@ import (
 	"path/filepath"
 	"time"
 
+	"github.com/bacchus-snu/sgs-cli/internal/sgs"
 	"gopkg.in/yaml.v3"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
@@ -377,7 +378,7 @@ func SetWorkspace(workspace string) error {
 				context = make(map[string]interface{})
 				ctxMap["context"] = context
 			}
-			context["namespace"] = workspace
+			context["namespace"] = sgs.WorkspaceToNamespace(workspace)
 			break
 		}
 	}

internal/cmd/get.go

@@ -419,12 +419,13 @@ func getWorkspaces(ctx context.Context, k8sClient *client.Client, verbose bool,
 		}
 	}
 
+	currentNS := workspace.FromNamespace(k8sClient.Namespace) // Strip ws- prefix for comparison
 	w := tabwriter.NewWriter(os.Stdout, 0, 0, 2, ' ', 0)
 	if verbose {
 		fmt.Fprintln(w, "NAME\tACCESS\tGPU QUOTA\tCPU QUOTA\tMEM QUOTA")
 		for _, ws := range workspaces {
 			current := ""
-			if ws.Name == k8sClient.Namespace {
+			if ws.Name == currentNS {
 				current = " (current)"
 			}
 			fmt.Fprintf(w, "%s%s\t%s\t%d\t%s\t%s\n",
@@ -434,7 +435,7 @@ func getWorkspaces(ctx context.Context, k8sClient *client.Client, verbose bool,
 		fmt.Fprintln(w, "NAME\tACCESS\tGPU QUOTA")
 		for _, ws := range workspaces {
 			current := ""
-			if ws.Name == k8sClient.Namespace {
+			if ws.Name == currentNS {
 				current = " (current)"
 			}
 			fmt.Fprintf(w, "%s%s\t%s\t%d\n", ws.Name, current, formatWorkspaceAccess(ws.NodeGroup), ws.GPUQuota)
@@ -460,7 +461,7 @@ func describeWorkspace(ctx context.Context, k8sClient *client.Client, name strin
 	}
 
 	current := ""
-	if ws.Name == k8sClient.Namespace {
+	if ws.Name == workspace.FromNamespace(k8sClient.Namespace) {
 		current = " (current)"
 	}
 
@@ -617,8 +618,8 @@ func describeWorkspaces(ctx context.Context, k8sClient *client.Client) {
 
 // getAll displays all resources (nodes, volumes, sessions, workspaces)
 func getAll(ctx context.Context, k8sClient *client.Client, verbose bool) {
-	// Get current workspace for header
-	currentWS := k8sClient.Namespace
+	// Get current workspace for header (strip ws- prefix for display)
+	currentWS := workspace.FromNamespace(k8sClient.Namespace)
 
 	// Workspaces
 	fmt.Println("--- Workspaces ---")

internal/sgs/constants.go

@@ -1,6 +1,8 @@
 // Package sgs provides shared constants and types for the SGS CLI.
 package sgs
 
+import "strings"
+
 // Label keys for Kubernetes resources
 const (
 	LabelManagedBy      = "app.kubernetes.io/managed-by"
@@ -39,3 +41,19 @@ const (
 
 // Beacon mount path - the runtime wrapper detects this path to trigger root swap
 const BeaconMount = "/sgs-os-volume"
+
+// Workspace namespace prefix - workspace namespaces are named ws-<workspace>
+const WorkspacePrefix = "ws-"
+
+// WorkspaceToNamespace converts a workspace name to its Kubernetes namespace
+func WorkspaceToNamespace(workspace string) string {
+	if strings.HasPrefix(workspace, WorkspacePrefix) {
+		return workspace // already has prefix
+	}
+	return WorkspacePrefix + workspace
+}
+
+// NamespaceToWorkspace converts a Kubernetes namespace to workspace name (strips ws- prefix)
+func NamespaceToWorkspace(namespace string) string {
+	return strings.TrimPrefix(namespace, WorkspacePrefix)
+}

internal/workspace/workspace.go

@@ -13,6 +13,12 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
+// ToNamespace converts a workspace name to its Kubernetes namespace
+var ToNamespace = sgs.WorkspaceToNamespace
+
+// FromNamespace converts a Kubernetes namespace to workspace name (strips ws- prefix)
+var FromNamespace = sgs.NamespaceToWorkspace
+
 // WorkspaceInfo represents information about an SGS workspace
 type WorkspaceInfo struct {
 	Name      string
@@ -58,7 +64,7 @@ func List(ctx context.Context, c *client.Client) ([]WorkspaceInfo, error) {
 			}
 
 			info := &WorkspaceInfo{
-				Name: ns.Name,
+				Name: FromNamespace(ns.Name),
 			}
 
 			// Parse node selector annotation for node group
@@ -105,9 +111,12 @@ func List(ctx context.Context, c *client.Client) ([]WorkspaceInfo, error) {
 
 // Get returns information about a specific workspace
 func Get(ctx context.Context, c *client.Client, name string) (*WorkspaceInfo, error) {
+	// Convert workspace name to K8s namespace (add ws- prefix)
+	nsName := ToNamespace(name)
+
 	// Get namespace with retry
 	ns, err := client.RetryWithContext(ctx, func() (*corev1.Namespace, error) {
-		return c.Clientset.CoreV1().Namespaces().Get(ctx, name, metav1.GetOptions{})
+		return c.Clientset.CoreV1().Namespaces().Get(ctx, nsName, metav1.GetOptions{})
 	})
 	if err != nil {
 		return nil, fmt.Errorf("workspace not found: %s", name)
@@ -120,14 +129,14 @@ func Get(ctx context.Context, c *client.Client, name string) (*WorkspaceInfo, er
 
 	// Try to access resource quotas to verify permission (with retry)
 	quotas, err := client.RetryWithContext(ctx, func() (*corev1.ResourceQuotaList, error) {
-		return c.Clientset.CoreV1().ResourceQuotas(name).List(ctx, metav1.ListOptions{})
+		return c.Clientset.CoreV1().ResourceQuotas(nsName).List(ctx, metav1.ListOptions{})
 	})
 	if err != nil {
 		return nil, fmt.Errorf("access denied to workspace: %s", name)
 	}
 
 	info := &WorkspaceInfo{
-		Name: name,
+		Name: FromNamespace(nsName), // Use name without prefix
 	}
 
 	// Parse node selector annotation
@@ -160,7 +169,8 @@ func GetCurrent(ctx context.Context, c *client.Client) (*WorkspaceInfo, error) {
 
 // Exists checks if a workspace exists (but doesn't check permission)
 func Exists(ctx context.Context, c *client.Client, name string) bool {
-	ns, err := c.Clientset.CoreV1().Namespaces().Get(ctx, name, metav1.GetOptions{})
+	nsName := ToNamespace(name) // Add ws- prefix for K8s API
+	ns, err := c.Clientset.CoreV1().Namespaces().Get(ctx, nsName, metav1.GetOptions{})
 	if err != nil {
 		return false
 	}