Fix Workspace validation (#504)

.changes/unreleased/BUG FIXES-504-20241107-160657.yaml

@@ -0,0 +1,5 @@
+kind: BUG FIXES
+body: '`Workspace`: Fix an issue where `spec.agentPool` can be set even when `spec.executionMode` is not set to `agent`.'
+time: 2024-11-07T16:06:57.85398+01:00
+custom:
+    PR: "504"

api/v1alpha2/workspace_validation.go

@@ -47,6 +47,12 @@ func (w *Workspace) validateSpecAgentPool() field.ErrorList {
 	}
 
 	f := field.NewPath("spec").Child("agentPool")
+	if w.Spec.ExecutionMode != "agent" {
+		allErrs = append(allErrs, field.Required(
+			f,
+			"'spec.executionMode' must be set to 'agent' when 'spec.agentPool' is set"),
+		)
+	}
 
 	if spec.ID == "" && spec.Name == "" {
 		allErrs = append(allErrs, field.Invalid(

api/v1alpha2/workspace_validation_test.go

@@ -20,13 +20,15 @@ func TestValidateWorkspaceSpecAgentPool(t *testing.T) {
 				AgentPool: &WorkspaceAgentPool{
 					ID: "this",
 				},
+				ExecutionMode: "agent",
 			},
 		},
 		"HasOnlyName": {
 			Spec: WorkspaceSpec{
 				AgentPool: &WorkspaceAgentPool{
 					Name: "this",
 				},
+				ExecutionMode: "agent",
 			},
 		},
 	}
@@ -46,11 +48,22 @@ func TestValidateWorkspaceSpecAgentPool(t *testing.T) {
 					ID:   "this",
 					Name: "this",
 				},
+				ExecutionMode: "agent",
 			},
 		},
 		"HasEmptyIDandName": {
 			Spec: WorkspaceSpec{
-				AgentPool: &WorkspaceAgentPool{},
+				AgentPool:     &WorkspaceAgentPool{},
+				ExecutionMode: "agent",
+			},
+		},
+		"HasInvalidExecutionMode": {
+			Spec: WorkspaceSpec{
+				AgentPool: &WorkspaceAgentPool{
+					ID:   "this",
+					Name: "this",
+				},
+				ExecutionMode: "remote",
 			},
 		},
 	}