rancher/norman
1
0
Fork 0
mirror of https://github.com/rancher/norman.git synced 2025-09-12 21:33:21 +00:00
Code Issues Releases Wiki Activity

don't validate empty string as DNS name

Browse Source
This commit is contained in:
Darren Shepherd
2018-01-20 23:23:24 -07:00
parent ef71925351
commit da40fa7b06
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
parse/builder/builder.go
View File

@@ -259,14 +259,17 @@ func (b *Builder) convert(fieldType string, value interface{}, op Operation) (in
case "string": case "string":
return convert.ToString(value), nil return convert.ToString(value), nil
case "dnsLabel": case "dnsLabel":
value := convert.ToString(value) str := convert.ToString(value)
if str == "" {
return "", nil
}
if op == Create || op == Update { if op == Create || op == Update {
if errs := validation.IsDNS1123Subdomain(convert.ToString(value)); len(errs) != 0 { if errs := validation.IsDNS1123Subdomain(str); len(errs) != 0 {
return value, httperror.NewAPIError(httperror.InvalidFormat, fmt.Sprintf("invalid value %s: %s", value, return value, httperror.NewAPIError(httperror.InvalidFormat, fmt.Sprintf("invalid value %s: %s", value,
strings.Join(errs, ","))) strings.Join(errs, ",")))
} }
} }
return value, nil return str, nil
case "intOrString": case "intOrString":
num, err := convert.ToNumber(value) num, err := convert.ToNumber(value)
if err == nil { if err == nil {