Skip to content

Commit c2a9b20

Browse files
authored
Merge pull request #6330 from devtron-labs/fix-build-infra-cm-cs
fixed: panic handling for payload validator
2 parents 44adbfb + 653cac0 commit c2a9b20

File tree

1 file changed

+11
-0
lines changed

1 file changed

+11
-0
lines changed

internal/util/ValidateUtil.go

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,10 @@ func IntValidator() (*validator.Validate, error) {
9595
if err != nil {
9696
return v, err
9797
}
98+
err = v.RegisterValidation("global-entity-name", validateGlobalEntityName)
99+
if err != nil {
100+
return v, err
101+
}
98102
err = v.RegisterValidation("not-system-admin-user", validateForSystemOrAdminUser)
99103
if err != nil {
100104
return v, err
@@ -129,3 +133,10 @@ func validateDockerImage(fl validator.FieldLevel) bool {
129133
}
130134
return false
131135
}
136+
137+
func validateGlobalEntityName(fl validator.FieldLevel) bool {
138+
// ^[a-z0-9]+(?:[-._]+[a-z0-9]+)*$
139+
hostnameRegexString := `^[a-z0-9]+(?:[-._]+[a-z0-9]+)*$`
140+
hostnameRegexRFC952 := regexp.MustCompile(hostnameRegexString)
141+
return hostnameRegexRFC952.MatchString(fl.Field().String())
142+
}

0 commit comments

Comments
 (0)