beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #25801 from thaJeztah/improve-volume-validation-message

Browse source 
improve error message for volume names that are too short
This commit is contained in:
Justin Cormack 2016-08-17 23:33:08 +01:00 committed by GitHub
commit b0b3249bc2
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
volume/local/local.go
View file

@ -256,6 +256,9 @@ func (r *Root) Scope() string {
}
func (r *Root) validateName(name string) error {
if len(name) == 1 {
return validationError{fmt.Errorf("volume name is too short, names should be at least two alphanumeric characters")}
}
if !volumeNameRegex.MatchString(name) {
return validationError{fmt.Errorf("%q includes invalid characters for a local volume name, only %q are allowed", name, utils.RestrictedNameChars)}
}

1
volume/local/local_test.go
View file

@ -138,6 +138,7 @@ func TestCreate(t *testing.T) {
func TestValidateName(t *testing.T) {
r := &Root{}
names := map[string]bool{
"x": false,
"/testvol": false,
"thing.d": true,
"hello-world": true,