Skip to content
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

Fixed bug for incorrect name #4175

Merged
merged 12 commits into from
Oct 12, 2023
Merged

Fixed bug for incorrect name #4175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
8ac2b7e
Fixed bug regarding return from invalid name error
Virtual4087 Oct 5, 2023
d87d11a
Merge pull request #1 from Virtual4087/Virtual4087-patch-1
Virtual4087 Oct 5, 2023
87dcb1b
Included the regex value instead of copy pasting it
Virtual4087 Oct 6, 2023
ea5ad0a
Merge branch 'flyteorg:master' into Fixed-bug-for-incorrect-name
Virtual4087 Oct 6, 2023
bdcbd45
Merge branch 'flyteorg:master' into Fixed-bug-for-incorrect-name
Virtual4087 Oct 6, 2023
22d4890
Merge branch 'flyteorg:master' into Fixed-bug-for-incorrect-name
Virtual4087 Oct 8, 2023
03da965
Updated test
Virtual4087 Oct 8, 2023
d405f3e
Merge branch 'flyteorg:master' into Fixed-bug-for-incorrect-name
Virtual4087 Oct 10, 2023
9c12b82
Update execution_validator_test.go
Virtual4087 Oct 10, 2023
b93f27f
Update execution_validator_test.go
Virtual4087 Oct 10, 2023
45c0cc4
Merge branch 'flyteorg:master' into Fixed-bug-for-incorrect-name
Virtual4087 Oct 12, 2023
705044c
Corrected a bug regarding escape sequence
Virtual4087 Oct 12, 2023
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 flyteadmin/pkg/manager/impl/validation/execution_validator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ func CheckValidExecutionID(executionID, fieldName string) error {
matched := executionIDRegex.MatchString(executionID)

if !matched {
return errors.NewFlyteAdminErrorf(codes.InvalidArgument, "invalid %s format: %s", fieldName, executionID)
return errors.NewFlyteAdminErrorf(codes.InvalidArgument, "invalid %s format: %s, does not match regex '%s'", fieldName, executionID, executionIDRegex.String())
}

return nil
Expand Down
6 changes: 3 additions & 3 deletions flyteadmin/pkg/manager/impl/validation/execution_validator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ func TestValidateExecInvalidName(t *testing.T) {
request := testutils.GetExecutionRequest()
request.Name = "12345"
err := ValidateExecutionRequest(context.Background(), request, testutils.GetRepoWithDefaultProject(), execConfig)
assert.EqualError(t, err, "invalid name format: 12345")
assert.EqualError(t, err, "invalid name format: 12345, does not match regex '^[a-z][a-z\\-0-9]*$'")

request.Name = "e2345"
err = ValidateExecutionRequest(context.Background(), request, testutils.GetRepoWithDefaultProject(), execConfig)
Expand Down Expand Up @@ -170,10 +170,10 @@ func TestValidExecutionIdInvalidLength(t *testing.T) {
func TestValidExecutionIdInvalidChars(t *testing.T) {
err := CheckValidExecutionID("a_sdd", "a")
assert.NotNil(t, err)
assert.EqualError(t, err, "invalid a format: a_sdd")
assert.EqualError(t, err, "invalid a format: a_sdd, does not match regex '^[a-z][a-z\\-0-9]*$'")
err = CheckValidExecutionID("asd@", "a")
assert.NotNil(t, err)
assert.EqualError(t, err, "invalid a format: asd@")
assert.EqualError(t, err, "invalid a format: asd@, does not match regex '^[a-z][a-z\\-0-9]*$'")
}

func TestValidateCreateWorkflowEventRequest(t *testing.T) {
Expand Down
Loading