diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-06-10 08:42:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-10 08:42:16 -0400 |
| commit | 63468464e8365adefebee7127be888ea649edd8e (patch) | |
| tree | 1b4d8c8a9af7736f5f4cc813d7897341a3c2b27c /pkg/api/handlers/libpod | |
| parent | 9967f28339dc43c97966bc07345af53a374faf67 (diff) | |
| parent | 87718c4e676dc503f67ca6f283c4242cf19f9eb7 (diff) | |
| download | podman-63468464e8365adefebee7127be888ea649edd8e.tar.gz podman-63468464e8365adefebee7127be888ea649edd8e.tar.bz2 podman-63468464e8365adefebee7127be888ea649edd8e.zip | |
Merge pull request #6546 from rhatdan/lint
Turn on golint
Diffstat (limited to 'pkg/api/handlers/libpod')
| -rw-r--r-- | pkg/api/handlers/libpod/pods.go | 6 | ||||
| -rw-r--r-- | pkg/api/handlers/libpod/volumes.go | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkg/api/handlers/libpod/pods.go b/pkg/api/handlers/libpod/pods.go index d998167d0..7d4d03144 100644 --- a/pkg/api/handlers/libpod/pods.go +++ b/pkg/api/handlers/libpod/pods.go @@ -32,11 +32,11 @@ func PodCreate(w http.ResponseWriter, r *http.Request) { } pod, err := generate.MakePod(&psg, runtime) if err != nil { - http_code := http.StatusInternalServerError + httpCode := http.StatusInternalServerError if errors.Cause(err) == define.ErrPodExists { - http_code = http.StatusConflict + httpCode = http.StatusConflict } - utils.Error(w, "Something went wrong.", http_code, err) + utils.Error(w, "Something went wrong.", httpCode, err) return } utils.WriteResponse(w, http.StatusCreated, handlers.IDResponse{ID: pod.ID()}) diff --git a/pkg/api/handlers/libpod/volumes.go b/pkg/api/handlers/libpod/volumes.go index c42ca407b..b5574b87b 100644 --- a/pkg/api/handlers/libpod/volumes.go +++ b/pkg/api/handlers/libpod/volumes.go @@ -46,7 +46,7 @@ func CreateVolume(w http.ResponseWriter, r *http.Request) { volumeOptions = append(volumeOptions, libpod.WithVolumeLabels(input.Label)) } if len(input.Options) > 0 { - parsedOptions, err := parse.ParseVolumeOptions(input.Options) + parsedOptions, err := parse.VolumeOptions(input.Options) if err != nil { utils.InternalServerError(w, err) return |