diff options
| author | Matthew Heon <mheon@redhat.com> | 2019-04-09 14:12:39 -0400 |
|---|---|---|
| committer | Matthew Heon <mheon@redhat.com> | 2019-04-09 14:20:07 -0400 |
| commit | e2f0a785a4ff03a59b3ca30725ed3ecce1fe4bc5 (patch) | |
| tree | c24e751e493f2553df14dffe98cc997de8946d2d | |
| parent | fe79bdd07e140176dc64ebef8da3eea2ae28b96b (diff) | |
| download | podman-e2f0a785a4ff03a59b3ca30725ed3ecce1fe4bc5.tar.gz podman-e2f0a785a4ff03a59b3ca30725ed3ecce1fe4bc5.tar.bz2 podman-e2f0a785a4ff03a59b3ca30725ed3ecce1fe4bc5.zip | |
Update invalid name errors to report the correct regex
Signed-off-by: Matthew Heon <mheon@redhat.com>
| -rw-r--r-- | libpod/options.go | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libpod/options.go b/libpod/options.go index 9326e54e4..8038f1935 100644 --- a/libpod/options.go +++ b/libpod/options.go @@ -17,7 +17,8 @@ import ( ) 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 @@ -593,7 +594,7 @@ func WithName(name string) CtrCreateOption { // Check the name against a regex if !nameRegex.MatchString(name) { - return errors.Wrapf(ErrInvalidArg, "name must match regex [a-zA-Z0-9_-]+") + return regexError } ctr.config.Name = name @@ -1276,7 +1277,7 @@ func WithVolumeName(name string) VolumeCreateOption { // Check the name against a regex if !nameRegex.MatchString(name) { - return errors.Wrapf(ErrInvalidArg, "name must match regex [a-zA-Z0-9_-]+") + return regexError } volume.config.Name = name @@ -1382,7 +1383,7 @@ func WithPodName(name string) PodCreateOption { // Check the name against a regex if !nameRegex.MatchString(name) { - return errors.Wrapf(ErrInvalidArg, "name must match regex [a-zA-Z0-9_-]+") + return regexError } pod.config.Name = name |