Skip to content

allow underscore symbol in triple values regexp #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
futujaos merged 1 commit into from
Mar 23, 2026
Merged

allow underscore symbol in triple values regexp #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion server/pkg/task.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ type Task struct {
jobs []HostPort
}

var valueRegexp = regexp.MustCompile(`^[a-z0-9]{1,30}$`)
var valueRegexp = regexp.MustCompile(`^[a-z0-9_]{1,30}$`)

// Identifies task, for sorting and domain hash
func (t *Task) ID() string {
Expand Down
16 changes: 8 additions & 8 deletions server/pkg/task_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ func TestValidateTask(t *testing.T) {
task: Task{
operationID: "123",
operationAlias: "alias",
taskName: "task",
service: "service",
taskName: "ta_sk",
service: "service_1",
},
},
{
Expand All @@ -30,27 +30,27 @@ func TestValidateTask(t *testing.T) {
taskName: "task",
service: "service",
},
err: errors.New("field \"operationAlias\" value \"ali-as\" does not match regexp \"^[a-z0-9]{1,30}$\""),
err: errors.New("field \"operationAlias\" value \"ali-as\" does not match regexp \"^[a-z0-9_]{1,30}$\""),
},
{
name: "invalid task name",
task: Task{
operationID: "123",
operationAlias: "alias",
operationAlias: "_alias",
taskName: "Task",
service: "service",
},
err: errors.New("field \"taskName\" value \"Task\" does not match regexp \"^[a-z0-9]{1,30}$\""),
err: errors.New("field \"taskName\" value \"Task\" does not match regexp \"^[a-z0-9_]{1,30}$\""),
},
{
name: "invalid service",
task: Task{
operationID: "123",
operationAlias: "alias",
taskName: "task",
taskName: "ta_sk",
service: "$ervice",
},
err: errors.New("field \"service\" value \"$ervice\" does not match regexp \"^[a-z0-9]{1,30}$\""),
err: errors.New("field \"service\" value \"$ervice\" does not match regexp \"^[a-z0-9_]{1,30}$\""),
},
{
name: "invalid service",
Expand All @@ -60,7 +60,7 @@ func TestValidateTask(t *testing.T) {
taskName: "task",
service: "serviceserviceserviceserviceserviceserviceserviceservice",
},
err: errors.New("field \"service\" value \"serviceserviceserviceserviceserviceserviceserviceservice\" does not match regexp \"^[a-z0-9]{1,30}$\""),
err: errors.New("field \"service\" value \"serviceserviceserviceserviceserviceserviceserviceservice\" does not match regexp \"^[a-z0-9_]{1,30}$\""),
},
{
name: "do not check if no alias",
Expand Down
Loading