Fixup issues found by golint

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

7 files changed, 10 insertions, 14 deletions

diff --git a/pkg/api/handlers/compat/info.go b/pkg/api/handlers/compat/info.go
index e9756a03f..d4a933c54 100644
--- a/pkg/api/handlers/compat/info.go
+++ b/pkg/api/handlers/compat/info.go
@@ -177,7 +177,7 @@ func getContainersState(r *libpod.Runtime) map[define.ContainerStatus]int {
 			if err != nil {
 				continue
 			}
-			states[state] += 1
+			states[state]++
 		}
 	}
 	return states
diff --git a/pkg/api/handlers/compat/networks.go b/pkg/api/handlers/compat/networks.go
index c52ca093f..8734ba405 100644
--- a/pkg/api/handlers/compat/networks.go
+++ b/pkg/api/handlers/compat/networks.go
@@ -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)
 
diff --git a/pkg/api/handlers/libpod/pods.go b/pkg/api/handlers/libpod/pods.go
index c3f8d5d66..dd6262a20 100644
--- a/pkg/api/handlers/libpod/pods.go
+++ b/pkg/api/handlers/libpod/pods.go
@@ -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()})
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
diff --git a/pkg/api/handlers/utils/containers.go b/pkg/api/handlers/utils/containers.go
index a46b308b5..4bcac6e72 100644
--- a/pkg/api/handlers/utils/containers.go
+++ b/pkg/api/handlers/utils/containers.go
@@ -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
diff --git a/pkg/api/server/handler_api.go b/pkg/api/server/handler_api.go
index 7a7db12f3..dbdb7f17b 100644
--- a/pkg/api/server/handler_api.go
+++ b/pkg/api/server/handler_api.go
@@ -34,9 +34,9 @@ func (s *APIServer) APIHandler(h http.HandlerFunc) http.HandlerFunc {
 			}
 
 			// TODO: Use r.ConnContext when ported to go 1.13
-			c := context.WithValue(r.Context(), "decoder", s.Decoder)
-			c = context.WithValue(c, "runtime", s.Runtime)
-			c = context.WithValue(c, "shutdownFunc", s.Shutdown)
+			c := context.WithValue(r.Context(), "decoder", s.Decoder) //nolint
+			c = context.WithValue(c, "runtime", s.Runtime)            //nolint
+			c = context.WithValue(c, "shutdownFunc", s.Shutdown)      //nolint
 			r = r.WithContext(c)
 
 			h(w, r)
diff --git a/pkg/api/server/server.go b/pkg/api/server/server.go
index 499a4c58a..bd6a99b96 100644
--- a/pkg/api/server/server.go
+++ b/pkg/api/server/server.go
@@ -257,7 +257,7 @@ func (t *IdleTracker) ConnState(conn net.Conn, state http.ConnState) {
 		if oldActive == 0 {
 			t.timer.Stop()
 		}
-		t.total += 1
+		t.total++
 	case http.StateIdle, http.StateClosed:
 		delete(t.active, conn)
 		// Restart the timer if we've become idle