opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-23 10:38:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2880 from mheon/update_allowed_regex_error

Browse Source 
Update invalid name errors to report the correct regex
This commit is contained in:
OpenShift Merge Robot
2019-04-10 08:07:16 -07:00
committed by GitHub
parent 2f2c7660c3 e2f0a785a4
commit 1701707dad
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libpod/options.go
View File

@ -17,7 +17,8 @@ import (
) )
var ( var (
nameRegex = regexp.MustCompile("^[a-zA-Z0-9][a-zA-Z0-9_.-]*$") nameRegex = regexp.MustCompile("^[a-zA-Z0-9][a-zA-Z0-9_.-]*$")
regexError = errors.Wrapf(ErrInvalidArg, "names must match [a-zA-Z0-9][a-zA-Z0-9_.-]*")
) )
// Runtime Creation Options // Runtime Creation Options
@ -593,7 +594,7 @@ func WithName(name string) CtrCreateOption {
// Check the name against a regex // Check the name against a regex
if !nameRegex.MatchString(name) { if !nameRegex.MatchString(name) {
return errors.Wrapf(ErrInvalidArg, "name must match regex [a-zA-Z0-9_-]+") return regexError
} }
ctr.config.Name = name ctr.config.Name = name
@ -1276,7 +1277,7 @@ func WithVolumeName(name string) VolumeCreateOption {
// Check the name against a regex // Check the name against a regex
if !nameRegex.MatchString(name) { if !nameRegex.MatchString(name) {
return errors.Wrapf(ErrInvalidArg, "name must match regex [a-zA-Z0-9_-]+") return regexError
} }
volume.config.Name = name volume.config.Name = name
@ -1382,7 +1383,7 @@ func WithPodName(name string) PodCreateOption {
// Check the name against a regex // Check the name against a regex
if !nameRegex.MatchString(name) { if !nameRegex.MatchString(name) {
return errors.Wrapf(ErrInvalidArg, "name must match regex [a-zA-Z0-9_-]+") return regexError
} }
pod.config.Name = name pod.config.Name = name