kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #32268 from cpuguy83/volume_err_obfuscate

Browse source 
don't obfuscate error during volume create
This commit is contained in:
Brian Goff 2017-04-05 09:05:10 -04:00 committed by GitHub
commit b7c3b312c9
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
daemon/create.go
View file

@ -20,7 +20,6 @@ import (
"github.com/docker/docker/pkg/idtools" "github.com/docker/docker/pkg/idtools"
"github.com/docker/docker/pkg/stringid" "github.com/docker/docker/pkg/stringid"
"github.com/docker/docker/runconfig" "github.com/docker/docker/runconfig"
volumestore "github.com/docker/docker/volume/store"
"github.com/opencontainers/runc/libcontainer/label" "github.com/opencontainers/runc/libcontainer/label"
) )
@ -242,9 +241,6 @@ func (daemon *Daemon) VolumeCreate(name, driverName string, opts, labels map[str
v, err := daemon.volumes.Create(name, driverName, opts, labels) v, err := daemon.volumes.Create(name, driverName, opts, labels)
if err != nil { if err != nil {
if volumestore.IsNameConflict(err) {
return nil, fmt.Errorf("A volume named %s already exists. Choose a different volume name.", name)
}
return nil, err return nil, err
} }

4
integration-cli/docker_cli_external_volume_driver_unix_test.go
View file

@ -287,7 +287,7 @@ func (s *DockerExternalVolumeSuite) TestVolumeCLICreateOptionConflict(c *check.C
out, _, err := dockerCmdWithError("volume", "create", "test", "--driver", volumePluginName) out, _, err := dockerCmdWithError("volume", "create", "test", "--driver", volumePluginName)
c.Assert(err, check.NotNil, check.Commentf("volume create exception name already in use with another driver")) c.Assert(err, check.NotNil, check.Commentf("volume create exception name already in use with another driver"))
c.Assert(out, checker.Contains, "A volume named test already exists") c.Assert(out, checker.Contains, "must be unique")
out, _ = dockerCmd(c, "volume", "inspect", "--format={{ .Driver }}", "test") out, _ = dockerCmd(c, "volume", "inspect", "--format={{ .Driver }}", "test")
_, _, err = dockerCmdWithError("volume", "create", "test", "--driver", strings.TrimSpace(out)) _, _, err = dockerCmdWithError("volume", "create", "test", "--driver", strings.TrimSpace(out))
@ -570,7 +570,7 @@ func (s *DockerExternalVolumeSuite) TestExternalVolumeDriverOutOfBandDelete(c *c
out, err = s.d.Cmd("volume", "create", "-d", "local", "--name", "test") out, err = s.d.Cmd("volume", "create", "-d", "local", "--name", "test")
c.Assert(err, checker.NotNil, check.Commentf(out)) c.Assert(err, checker.NotNil, check.Commentf(out))
c.Assert(out, checker.Contains, "volume named test already exists") c.Assert(out, checker.Contains, "must be unique")
// simulate out of band volume deletion on plugin level // simulate out of band volume deletion on plugin level
delete(p.vols, "test") delete(p.vols, "test")