diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-01-31 08:06:41 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-31 08:06:41 -0800 |
| commit | 1cf4b72a6ea8f6fe8344e91badd19a8fe264193e (patch) | |
| tree | 835d3de0f328facc0d7c456ec3824f24fcf58e81 /pkg/api/handlers/libpod/volumes.go | |
| parent | c29273e84f98e67589d8adcb7ab8d142d4563cd3 (diff) | |
| parent | f1eaccedfa08455d699d00dcda63b95aeb34833e (diff) | |
| download | podman-1cf4b72a6ea8f6fe8344e91badd19a8fe264193e.tar.gz podman-1cf4b72a6ea8f6fe8344e91badd19a8fe264193e.tar.bz2 podman-1cf4b72a6ea8f6fe8344e91badd19a8fe264193e.zip | |
Merge pull request #5030 from baude/apiv2longname
fix longname handling for bindings
Diffstat (limited to 'pkg/api/handlers/libpod/volumes.go')
| -rw-r--r-- | pkg/api/handlers/libpod/volumes.go | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/pkg/api/handlers/libpod/volumes.go b/pkg/api/handlers/libpod/volumes.go index 3e0e597c6..7e7e46718 100644 --- a/pkg/api/handlers/libpod/volumes.go +++ b/pkg/api/handlers/libpod/volumes.go @@ -8,15 +8,12 @@ import ( "github.com/containers/libpod/libpod" "github.com/containers/libpod/pkg/api/handlers" "github.com/containers/libpod/pkg/api/handlers/utils" - "github.com/gorilla/mux" "github.com/gorilla/schema" "github.com/pkg/errors" log "github.com/sirupsen/logrus" ) func CreateVolume(w http.ResponseWriter, r *http.Request) { - // 200 ok - // 500 internal var ( volumeOptions []libpod.VolumeCreateOption runtime = r.Context().Value("runtime").(*libpod.Runtime) @@ -66,7 +63,7 @@ func InspectVolume(w http.ResponseWriter, r *http.Request) { var ( runtime = r.Context().Value("runtime").(*libpod.Runtime) ) - name := mux.Vars(r)["name"] + name := utils.GetName(r) vol, err := runtime.GetVolume(name) if err != nil { utils.VolumeNotFound(w, name, err) @@ -132,7 +129,7 @@ func RemoveVolume(w http.ResponseWriter, r *http.Request) { errors.Wrapf(err, "Failed to parse parameters for %s", r.URL.String())) return } - name := mux.Vars(r)["name"] + name := utils.GetName(r) vol, err := runtime.LookupVolume(name) if err != nil { utils.VolumeNotFound(w, name, err) |