TrueCloudLab/distribution
14
0
Fork 3
Code Issues 2 Pull requests Projects Releases 2 Packages Wiki Activity Actions

reference: optional repeated == any number of times

Browse source 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2022-11-09 19:46:45 +01:00
parent 919bd8ab09
commit 71a0666398
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
reference/regexp.go
View file

@ -59,7 +59,7 @@ var (
// that may be part of image names. This is purposely a subset of what is // that may be part of image names. This is purposely a subset of what is
// allowed by DNS to ensure backwards compatibility with Docker image // allowed by DNS to ensure backwards compatibility with Docker image
// names. This includes IPv4 addresses on decimal format. // names. This includes IPv4 addresses on decimal format.
domainName = domainNameComponent + optional(repeated(`\.`+domainNameComponent)) domainName = domainNameComponent + anyTimes(`\.`+domainNameComponent)
// host defines the structure of potential domains based on the URI // host defines the structure of potential domains based on the URI
// Host subcomponent on rfc3986. It may be a subset of DNS domain name, // Host subcomponent on rfc3986. It may be a subset of DNS domain name,
@ -100,8 +100,8 @@ var (
// pathComponent restricts path-components to start with an alphanumeric // pathComponent restricts path-components to start with an alphanumeric
// character, with following parts able to be separated by a separator // character, with following parts able to be separated by a separator
// (one period, one or two underscore and multiple dashes). // (one period, one or two underscore and multiple dashes).
pathComponent = alphanumeric + optional(repeated(separator, alphanumeric)) pathComponent = alphanumeric + anyTimes(separator+alphanumeric)
namePat = optional(domainAndPort+`/`) + pathComponent + optional(repeated(`/`+pathComponent)) namePat = optional(domainAndPort+`/`) + pathComponent + anyTimes(`/`+pathComponent)
// NameRegexp is the format for the name component of references, including // NameRegexp is the format for the name component of references, including
// an optional domain and port, but without tag or digest suffix. // an optional domain and port, but without tag or digest suffix.
@ -109,7 +109,7 @@ var (
// anchoredNameRegexp is used to parse a name value, capturing the // anchoredNameRegexp is used to parse a name value, capturing the
// domain and trailing components. // domain and trailing components.
anchoredNameRegexp = regexp.MustCompile(anchored(optional(capture(domainAndPort), `/`), capture(pathComponent, optional(repeated(`/`+pathComponent))))) anchoredNameRegexp = regexp.MustCompile(anchored(optional(capture(domainAndPort), `/`), capture(pathComponent, anyTimes(`/`+pathComponent))))
referencePat = anchored(capture(namePat), optional(`:`, capture(tag)), optional(`@`, capture(digestPat))) referencePat = anchored(capture(namePat), optional(`:`, capture(tag)), optional(`@`, capture(digestPat)))
@ -134,10 +134,10 @@ func optional(res ...string) string {
return `(?:` + strings.Join(res, "") + `)?` return `(?:` + strings.Join(res, "") + `)?`
} }
// repeated wraps the regexp in a non-capturing group to get one or more // anyTimes wraps the expression in a non-capturing group that can occur
// matches. // any number of times.
func repeated(res ...string) string { func anyTimes(res ...string) string {
return `(?:` + strings.Join(res, "") + `)+` return `(?:` + strings.Join(res, "") + `)*`
} }
// capture wraps the expression in a capturing group. // capture wraps the expression in a capturing group.