diff options
| author | Brent Baude <bbaude@redhat.com> | 2020-01-30 12:40:19 -0600 |
|---|---|---|
| committer | Brent Baude <bbaude@redhat.com> | 2020-01-31 08:38:25 -0600 |
| commit | f1eaccedfa08455d699d00dcda63b95aeb34833e (patch) | |
| tree | 65d385fd683a66686b225827c760e5bc95f7e346 /pkg/api/handlers/generic | |
| parent | 36af2833f954e1c822b917ecff45c05858188c2d (diff) | |
| download | podman-f1eaccedfa08455d699d00dcda63b95aeb34833e.tar.gz podman-f1eaccedfa08455d699d00dcda63b95aeb34833e.tar.bz2 podman-f1eaccedfa08455d699d00dcda63b95aeb34833e.zip | |
fix longname handling for bindings
the api needs to account for image input where the image is encoded as a fqd image name.
Signed-off-by: Brent Baude <bbaude@redhat.com>
Diffstat (limited to 'pkg/api/handlers/generic')
| -rw-r--r-- | pkg/api/handlers/generic/containers.go | 4 | ||||
| -rw-r--r-- | pkg/api/handlers/generic/containers_stats.go | 3 | ||||
| -rw-r--r-- | pkg/api/handlers/generic/images.go | 5 |
3 files changed, 5 insertions, 7 deletions
diff --git a/pkg/api/handlers/generic/containers.go b/pkg/api/handlers/generic/containers.go index 8dc73ae14..b16b87e73 100644 --- a/pkg/api/handlers/generic/containers.go +++ b/pkg/api/handlers/generic/containers.go @@ -99,7 +99,7 @@ func ListContainers(w http.ResponseWriter, r *http.Request) { func GetContainer(w http.ResponseWriter, r *http.Request) { runtime := r.Context().Value("runtime").(*libpod.Runtime) - name := mux.Vars(r)["name"] + name := utils.GetName(r) ctnr, err := runtime.LookupContainer(name) if err != nil { utils.ContainerNotFound(w, name, err) @@ -174,7 +174,7 @@ func LogsFromContainer(w http.ResponseWriter, r *http.Request) { return } - name := mux.Vars(r)["name"] + name := utils.GetName(r) ctnr, err := runtime.LookupContainer(name) if err != nil { utils.ContainerNotFound(w, name, err) diff --git a/pkg/api/handlers/generic/containers_stats.go b/pkg/api/handlers/generic/containers_stats.go index e33d37606..f8804b5c0 100644 --- a/pkg/api/handlers/generic/containers_stats.go +++ b/pkg/api/handlers/generic/containers_stats.go @@ -11,7 +11,6 @@ import ( "github.com/containers/libpod/pkg/api/handlers/utils" "github.com/containers/libpod/pkg/cgroups" docker "github.com/docker/docker/api/types" - "github.com/gorilla/mux" "github.com/gorilla/schema" "github.com/pkg/errors" "github.com/sirupsen/logrus" @@ -36,7 +35,7 @@ func StatsContainer(w http.ResponseWriter, r *http.Request) { return } - name := mux.Vars(r)["name"] + name := utils.GetName(r) ctnr, err := runtime.LookupContainer(name) if err != nil { utils.ContainerNotFound(w, name, err) diff --git a/pkg/api/handlers/generic/images.go b/pkg/api/handlers/generic/images.go index ba1cf47b4..20dd84456 100644 --- a/pkg/api/handlers/generic/images.go +++ b/pkg/api/handlers/generic/images.go @@ -16,7 +16,6 @@ import ( "github.com/containers/libpod/pkg/api/handlers/utils" "github.com/containers/libpod/pkg/util" "github.com/docker/docker/api/types" - "github.com/gorilla/mux" "github.com/gorilla/schema" "github.com/pkg/errors" ) @@ -26,7 +25,7 @@ func ExportImage(w http.ResponseWriter, r *http.Request) { // 500 server runtime := r.Context().Value("runtime").(*libpod.Runtime) - name := mux.Vars(r)["name"] + name := utils.GetName(r) newImage, err := runtime.ImageRuntime().NewFromLocal(name) if err != nil { utils.ImageNotFound(w, name, errors.Wrapf(err, "Failed to find image %s", name)) @@ -285,7 +284,7 @@ func GetImage(w http.ResponseWriter, r *http.Request) { // 200 no error // 404 no such // 500 internal - name := mux.Vars(r)["name"] + name := utils.GetName(r) newImage, err := handlers.GetImage(r, name) if err != nil { utils.Error(w, "Something went wrong.", http.StatusNotFound, errors.Wrapf(err, "Failed to find image %s", name)) |