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

Merge pull request #3641 from mheon/no_fuzzy_volume_lookup

Browse Source 
When retrieving volumes, only use exact names
This commit is contained in:
OpenShift Merge Robot
2019-07-25 11:24:29 +02:00
committed by GitHub
parent 2283471f8d f747a06d53
commit 7c9095ea1d
1 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libpod/runtime_volume.go
View File

@ -2,7 +2,6 @@ package libpod
import ( import (
"context" "context"
"strings"
"github.com/containers/libpod/libpod/define" "github.com/containers/libpod/libpod/define"
"github.com/containers/libpod/libpod/events" "github.com/containers/libpod/libpod/events"
@ -72,7 +71,7 @@ func (r *Runtime) RemoveVolumes(ctx context.Context, volumes []string, all, forc
return deletedVols, nil return deletedVols, nil
} }
// GetVolume retrieves a volume by its name // GetVolume retrieves a volume given its full name.
func (r *Runtime) GetVolume(name string) (*Volume, error) { func (r *Runtime) GetVolume(name string) (*Volume, error) {
r.lock.RLock() r.lock.RLock()
defer r.lock.RUnlock() defer r.lock.RUnlock()
@ -82,20 +81,11 @@ func (r *Runtime) GetVolume(name string) (*Volume, error) {
} }
vol, err := r.state.Volume(name) vol, err := r.state.Volume(name)
if err == nil {
return vol, err
}
vols, err := r.GetAllVolumes()
if err != nil { if err != nil {
return nil, err return nil, err
} }
for _, v := range vols {
if strings.HasPrefix(v.Name(), name) { return vol, nil
return v, nil
}
}
return nil, errors.Errorf("unable to find volume %s", name)
} }
// HasVolume checks to see if a volume with the given name exists // HasVolume checks to see if a volume with the given name exists