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

Fixup issues found by golint

Browse Source 
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
Daniel J Walsh
2020-06-09 16:47:30 -04:00
parent fbe09d78e9
commit 4bb43b898d
56 changed files with 100 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/handlers/compat/info.go
View File

@ -177,7 +177,7 @@ func getContainersState(r *libpod.Runtime) map[define.ContainerStatus]int {
if err != nil {
continue
}
states[state] += 1
states[state]++
}
}
return states

4
pkg/api/handlers/compat/networks.go
View File

@ -20,10 +20,6 @@ import (
"github.com/pkg/errors"
)
type CompatInspectNetwork struct {
types.NetworkResource
}
func InspectNetwork(w http.ResponseWriter, r *http.Request) {
runtime := r.Context().Value("runtime").(*libpod.Runtime)

6
pkg/api/handlers/libpod/pods.go
View File

@ -31,11 +31,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()})

2
pkg/api/handlers/libpod/volumes.go
View File

@ -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

2
pkg/api/handlers/utils/containers.go
View File

@ -62,7 +62,7 @@ func WaitContainer(w http.ResponseWriter, r *http.Request) (int32, error) {
func CreateContainer(ctx context.Context, w http.ResponseWriter, runtime *libpod.Runtime, cc *createconfig.CreateConfig) {
var pod *libpod.Pod
ctr, err := createconfig.CreateContainerFromCreateConfig(runtime, cc, ctx, pod)
ctr, err := createconfig.CreateContainerFromCreateConfig(ctx, runtime, cc, pod)
if err != nil {
Error(w, "Something went wrong.", http.StatusInternalServerError, errors.Wrap(err, "CreateContainerFromCreateConfig()"))
return