github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 06:54:01 +00:00
Code Issues Projects Releases Wiki Activity

Unexport DNS regexps, lengths are still used

Browse Source
This commit is contained in:
Tim Hockin 2016-04-28 20:46:33 -07:00
parent 766f44f715
commit 493b3fab65
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkg/util/validation/validation.go
View File

@ -85,10 +85,10 @@ func IsValidLabelValue(value string) []string {
return errs return errs
} }
const DNS1123LabelFmt string = "[a-z0-9]([-a-z0-9]*[a-z0-9])?" const dns1123LabelFmt string = "[a-z0-9]([-a-z0-9]*[a-z0-9])?"
const DNS1123LabelMaxLength int = 63 const DNS1123LabelMaxLength int = 63
var dns1123LabelRegexp = regexp.MustCompile("^" + DNS1123LabelFmt + "$") var dns1123LabelRegexp = regexp.MustCompile("^" + dns1123LabelFmt + "$")
// IsDNS1123Label tests for a string that conforms to the definition of a label in // IsDNS1123Label tests for a string that conforms to the definition of a label in
// DNS (RFC 1123). // DNS (RFC 1123).
@ -98,15 +98,15 @@ func IsDNS1123Label(value string) []string {
errs = append(errs, MaxLenError(DNS1123LabelMaxLength)) errs = append(errs, MaxLenError(DNS1123LabelMaxLength))
} }
if !dns1123LabelRegexp.MatchString(value) { if !dns1123LabelRegexp.MatchString(value) {
errs = append(errs, RegexError(DNS1123LabelFmt, "my-name", "123-abc")) errs = append(errs, RegexError(dns1123LabelFmt, "my-name", "123-abc"))
} }
return errs return errs
} }
const DNS1123SubdomainFmt string = DNS1123LabelFmt + "(\\." + DNS1123LabelFmt + ")*" const dns1123SubdomainFmt string = dns1123LabelFmt + "(\\." + dns1123LabelFmt + ")*"
const DNS1123SubdomainMaxLength int = 253 const DNS1123SubdomainMaxLength int = 253
var dns1123SubdomainRegexp = regexp.MustCompile("^" + DNS1123SubdomainFmt + "$") var dns1123SubdomainRegexp = regexp.MustCompile("^" + dns1123SubdomainFmt + "$")
// IsDNS1123Subdomain tests for a string that conforms to the definition of a // IsDNS1123Subdomain tests for a string that conforms to the definition of a
// subdomain in DNS (RFC 1123). // subdomain in DNS (RFC 1123).
@ -116,15 +116,15 @@ func IsDNS1123Subdomain(value string) []string {
errs = append(errs, MaxLenError(DNS1123SubdomainMaxLength)) errs = append(errs, MaxLenError(DNS1123SubdomainMaxLength))
} }
if !dns1123SubdomainRegexp.MatchString(value) { if !dns1123SubdomainRegexp.MatchString(value) {
errs = append(errs, RegexError(DNS1123SubdomainFmt, "example.com")) errs = append(errs, RegexError(dns1123SubdomainFmt, "example.com"))
} }
return errs return errs
} }
const DNS952LabelFmt string = "[a-z]([-a-z0-9]*[a-z0-9])?" const dns952LabelFmt string = "[a-z]([-a-z0-9]*[a-z0-9])?"
const DNS952LabelMaxLength int = 24 const DNS952LabelMaxLength int = 24
var dns952LabelRegexp = regexp.MustCompile("^" + DNS952LabelFmt + "$") var dns952LabelRegexp = regexp.MustCompile("^" + dns952LabelFmt + "$")
// IsDNS952Label tests for a string that conforms to the definition of a label in // IsDNS952Label tests for a string that conforms to the definition of a label in
// DNS (RFC 952). // DNS (RFC 952).
@ -134,20 +134,20 @@ func IsDNS952Label(value string) []string {
errs = append(errs, MaxLenError(DNS952LabelMaxLength)) errs = append(errs, MaxLenError(DNS952LabelMaxLength))
} }
if !dns952LabelRegexp.MatchString(value) { if !dns952LabelRegexp.MatchString(value) {
errs = append(errs, RegexError(DNS952LabelFmt, "my-name", "abc-123")) errs = append(errs, RegexError(dns952LabelFmt, "my-name", "abc-123"))
} }
return errs return errs
} }
const CIdentifierFmt string = "[A-Za-z_][A-Za-z0-9_]*" const cIdentifierFmt string = "[A-Za-z_][A-Za-z0-9_]*"
var cIdentifierRegexp = regexp.MustCompile("^" + CIdentifierFmt + "$") var cIdentifierRegexp = regexp.MustCompile("^" + cIdentifierFmt + "$")
// IsCIdentifier tests for a string that conforms the definition of an identifier // IsCIdentifier tests for a string that conforms the definition of an identifier
// in C. This checks the format, but not the length. // in C. This checks the format, but not the length.
func IsCIdentifier(value string) []string { func IsCIdentifier(value string) []string {
if !cIdentifierRegexp.MatchString(value) { if !cIdentifierRegexp.MatchString(value) {
return []string{RegexError(CIdentifierFmt, "my_name", "MY_NAME", "MyName")} return []string{RegexError(cIdentifierFmt, "my_name", "MY_NAME", "MyName")}
} }
return nil return nil
} }
@ -247,7 +247,7 @@ func IsHTTPHeaderName(value string) []string {
return nil return nil
} }
const configMapKeyFmt = "\\.?" + DNS1123SubdomainFmt const configMapKeyFmt = "\\.?" + dns1123SubdomainFmt
var configMapKeyRegexp = regexp.MustCompile("^" + configMapKeyFmt + "$") var configMapKeyRegexp = regexp.MustCompile("^" + configMapKeyFmt + "$")