fix: reject invalid workspace templateVersionID

Author: ThomasK33

internal/aggregated/convert/workspace.go

@@ -1,6 +1,7 @@
 package convert
 
 import (
+	"fmt"
 	"strconv"
 
 	aggregationv1alpha1 "github.com/coder/coder-k8s/api/aggregation/v1alpha1"
@@ -68,7 +69,7 @@ func WorkspaceCreateRequestFromK8s(
 	obj *aggregationv1alpha1.CoderWorkspace,
 	workspaceName string,
 	templateID uuid.UUID,
-) codersdk.CreateWorkspaceRequest {
+) (codersdk.CreateWorkspaceRequest, error) {
 	if obj == nil {
 		panic("assertion failed: workspace object must not be nil")
 	}
@@ -87,15 +88,14 @@ func WorkspaceCreateRequestFromK8s(
 
 	if obj.Spec.TemplateVersionID == "" {
 		request.TemplateID = templateID
-		return request
+		return request, nil
 	}
 
 	templateVersionID, err := uuid.Parse(obj.Spec.TemplateVersionID)
 	if err != nil {
-		request.TemplateID = templateID
-		return request
+		return codersdk.CreateWorkspaceRequest{}, fmt.Errorf("invalid templateVersionID %q: %w", obj.Spec.TemplateVersionID, err)
 	}
 
 	request.TemplateVersionID = templateVersionID
-	return request
+	return request, nil
 }

internal/aggregated/convert/workspace_test.go

@@ -186,7 +186,10 @@ func TestWorkspaceCreateRequestFromK8s(t *testing.T) {
 		},
 	}
 
-	request := WorkspaceCreateRequestFromK8s(obj, "dev-workspace", templateID)
+	request, err := WorkspaceCreateRequestFromK8s(obj, "dev-workspace", templateID)
+	if err != nil {
+		t.Fatalf("expected no error, got %v", err)
+	}
 	if request.Name != "dev-workspace" {
 		t.Fatalf("expected request name dev-workspace, got %q", request.Name)
 	}
@@ -216,7 +219,10 @@ func TestWorkspaceCreateRequestFromK8sUsesTemplateVersionID(t *testing.T) {
 		},
 	}
 
-	request := WorkspaceCreateRequestFromK8s(obj, "dev-workspace", templateID)
+	request, err := WorkspaceCreateRequestFromK8s(obj, "dev-workspace", templateID)
+	if err != nil {
+		t.Fatalf("expected no error, got %v", err)
+	}
 	if request.TemplateVersionID != templateVersionID {
 		t.Fatalf("expected request template version ID %q, got %q", templateVersionID, request.TemplateVersionID)
 	}
@@ -225,7 +231,7 @@ func TestWorkspaceCreateRequestFromK8sUsesTemplateVersionID(t *testing.T) {
 	}
 }
 
-func TestWorkspaceCreateRequestFromK8sFallsBackToTemplateIDForInvalidTemplateVersionID(t *testing.T) {
+func TestWorkspaceCreateRequestFromK8sReturnsErrorForInvalidTemplateVersionID(t *testing.T) {
 	t.Parallel()
 
 	templateID := uuid.New()
@@ -236,11 +242,8 @@ func TestWorkspaceCreateRequestFromK8sFallsBackToTemplateIDForInvalidTemplateVer
 		},
 	}
 
-	request := WorkspaceCreateRequestFromK8s(obj, "dev-workspace", templateID)
-	if request.TemplateID != templateID {
-		t.Fatalf("expected request template ID %q, got %q", templateID, request.TemplateID)
-	}
-	if request.TemplateVersionID != uuid.Nil {
-		t.Fatalf("expected request template version ID %q, got %q", uuid.Nil, request.TemplateVersionID)
+	_, err := WorkspaceCreateRequestFromK8s(obj, "dev-workspace", templateID)
+	if err == nil {
+		t.Fatal("expected error for invalid templateVersionID")
 	}
 }

internal/aggregated/storage/workspace.go

@@ -222,7 +222,11 @@ func (s *WorkspaceStorage) Create(
 		)
 	}
 
-	request := convert.WorkspaceCreateRequestFromK8s(workspaceObj, workspaceName, template.ID)
+	request, err := convert.WorkspaceCreateRequestFromK8s(workspaceObj, workspaceName, template.ID)
+	if err != nil {
+		return nil, apierrors.NewBadRequest(fmt.Sprintf("invalid workspace spec: %v", err))
+	}
+
 	createdWorkspace, err := sdk.CreateUserWorkspace(ctx, userName, request)
 	if err != nil {
 		return nil, coder.MapCoderError(err, aggregationv1alpha1.Resource("coderworkspaces"), workspaceObj.Name)