ARMADA-2849 Add Validation for Jobset ID (#213) (#3904)

Co-authored-by: Eleanor Pratt <Eleanor.Pratt@gresearch.co.uk>

internal/server/submit/validation/submit_request.go

@@ -21,6 +21,8 @@ var (
 	requestValidators = []requestValidator{
 		validateHasQueue,
 		validateGangs,
+		validateHasJobSetId,
+		validateJobSetIdLength,
 	}
 	itemValidators = []itemValidator{
 		validateHasNamespace,
@@ -100,6 +102,23 @@ func validateIngresses(j *api.JobSubmitRequestItem, _ configuration.SubmissionCo
 	return nil
 }
 
+// Ensures that the request has non-empty job set id field.
+func validateHasJobSetId(j *api.JobSubmitRequest, _ configuration.SubmissionConfig) error {
+	if len(j.JobSetId) == 0 {
+		return fmt.Errorf("job set id is a required field")
+	}
+	return nil
+}
+
+// Ensures that the request has job set id field isn't too long.
+func validateJobSetIdLength(j *api.JobSubmitRequest, _ configuration.SubmissionConfig) error {
+	const maxJobSetIdChars = 1024
+	if len(j.GetJobSetId()) >= maxJobSetIdChars {
+		return fmt.Errorf("job set id of length %d must be less than max character length %d", len(j.GetJobSetId()), maxJobSetIdChars)
+	}
+	return nil
+}
+
 // Ensures that the request has non-empty namespace field.
 func validateHasNamespace(j *api.JobSubmitRequestItem, _ configuration.SubmissionConfig) error {
 	if len(j.Namespace) == 0 {

internal/server/submit/validation/submit_request_test.go

@@ -525,6 +525,64 @@ func TestValidateNamespace(t *testing.T) {
 	}
 }
 
+func TestValidateHasJobSetID(t *testing.T) {
+	tests := map[string]struct {
+		req           *api.JobSubmitRequest
+		expectSuccess bool
+	}{
+		"no job set id": {
+			req:           &api.JobSubmitRequest{},
+			expectSuccess: false,
+		},
+		"has any job set id": {
+			req: &api.JobSubmitRequest{
+				JobSetId: "job_set_id",
+			},
+			expectSuccess: true,
+		},
+	}
+	for name, tc := range tests {
+		t.Run(name, func(t *testing.T) {
+			err := validateHasJobSetId(tc.req, configuration.SubmissionConfig{})
+			if tc.expectSuccess {
+				assert.NoError(t, err)
+			} else {
+				assert.Error(t, err)
+			}
+		})
+	}
+}
+
+func TestValidateJobSetIdLength(t *testing.T) {
+	tests := map[string]struct {
+		req           *api.JobSubmitRequest
+		expectSuccess bool
+	}{
+		"job set id of 1023 chars valid": {
+			req: &api.JobSubmitRequest{
+				JobSetId: strings.Repeat("a", 1023),
+			},
+			expectSuccess: true,
+		},
+		"job set id of 1024 chars invalid": {
+			req: &api.JobSubmitRequest{
+				JobSetId: strings.Repeat("a", 1024),
+			},
+			expectSuccess: false,
+		},
+	}
+	for name, tc := range tests {
+		t.Run(name, func(t *testing.T) {
+			err := validateJobSetIdLength(tc.req, configuration.SubmissionConfig{})
+			if tc.expectSuccess {
+				assert.NoError(t, err)
+			} else {
+				assert.Error(t, err)
+			}
+		})
+	}
+}
+
 func TestValidatePodSpecSize(t *testing.T) {
 	defaultPodSpec := &v1.PodSpec{
 		Volumes: []v1.Volume{