Fixup issues found by golint

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

16 files changed, 33 insertions, 33 deletions

diff --git a/cmd/podman/common/default.go b/cmd/podman/common/default.go
index 7233b2091..6e5994b18 100644
--- a/cmd/podman/common/default.go
+++ b/cmd/podman/common/default.go
@@ -16,5 +16,5 @@ var (
 	// DefaultImageVolume default value
 	DefaultImageVolume = "bind"
 	// Pull in configured json library
-	json = registry.JsonLibrary()
+	json = registry.JSONLibrary()
 )
diff --git a/cmd/podman/common/specgen.go b/cmd/podman/common/specgen.go
index 26003b40f..2286e67de 100644
--- a/cmd/podman/common/specgen.go
+++ b/cmd/podman/common/specgen.go
@@ -669,7 +669,7 @@ func makeHealthCheckFromCli(inCmd, interval string, retries uint, timeout, start
 	hc.Interval = intervalDuration
 
 	if retries < 1 {
-		return nil, errors.New("healthcheck-retries must be greater than 0.")
+		return nil, errors.New("healthcheck-retries must be greater than 0")
 	}
 	hc.Retries = int(retries)
 	timeoutDuration, err := time.ParseDuration(timeout)
diff --git a/cmd/podman/containers/container.go b/cmd/podman/containers/container.go
index a102318fb..3ff341dcd 100644
--- a/cmd/podman/containers/container.go
+++ b/cmd/podman/containers/container.go
@@ -10,7 +10,7 @@ import (
 
 var (
 	// Pull in configured json library
-	json = registry.JsonLibrary()
+	json = registry.JSONLibrary()
 
 	// Command: podman _container_
 	containerCmd = &cobra.Command{
diff --git a/cmd/podman/containers/stats.go b/cmd/podman/containers/stats.go
index c61b161e4..357ab7d38 100644
--- a/cmd/podman/containers/stats.go
+++ b/cmd/podman/containers/stats.go
@@ -87,13 +87,13 @@ func init() {
 func checkStatOptions(cmd *cobra.Command, args []string) error {
 	opts := 0
 	if statsOptions.All {
-		opts += 1
+		opts++
 	}
 	if statsOptions.Latest {
-		opts += 1
+		opts++
 	}
 	if len(args) > 0 {
-		opts += 1
+		opts++
 	}
 	if opts > 1 {
 		return errors.Errorf("--all, --latest and containers cannot be used together")
diff --git a/cmd/podman/images/image.go b/cmd/podman/images/image.go
index 790c16c05..ebef126c0 100644
--- a/cmd/podman/images/image.go
+++ b/cmd/podman/images/image.go
@@ -9,7 +9,7 @@ import (
 
 var (
 	// Pull in configured json library
-	json = registry.JsonLibrary()
+	json = registry.JSONLibrary()
 
 	// Command: podman _image_
 	imageCmd = &cobra.Command{
diff --git a/cmd/podman/images/list.go b/cmd/podman/images/list.go
index 23757104b..236ae15b4 100644
--- a/cmd/podman/images/list.go
+++ b/cmd/podman/images/list.go
@@ -100,7 +100,7 @@ func images(cmd *cobra.Command, args []string) error {
 
 	switch {
 	case listFlag.quiet:
-		return writeId(summaries)
+		return writeID(summaries)
 	case cmd.Flag("format").Changed && listFlag.format == "json":
 		return writeJSON(summaries)
 	default:
@@ -108,7 +108,7 @@ func images(cmd *cobra.Command, args []string) error {
 	}
 }
 
-func writeId(imageS []*entities.ImageSummary) error {
+func writeID(imageS []*entities.ImageSummary) error {
 	var ids = map[string]struct{}{}
 	for _, e := range imageS {
 		i := "sha256:" + e.ID
diff --git a/cmd/podman/networks/list.go b/cmd/podman/networks/list.go
index 24604c055..498a4dc18 100644
--- a/cmd/podman/networks/list.go
+++ b/cmd/podman/networks/list.go
@@ -33,8 +33,8 @@ var (
 
 var (
 	networkListOptions entities.NetworkListOptions
-	headers            string = "NAME\tVERSION\tPLUGINS\n"
-	defaultListRow     string = "{{.Name}}\t{{.Version}}\t{{.Plugins}}\n"
+	headers            = "NAME\tVERSION\tPLUGINS\n"
+	defaultListRow     = "{{.Name}}\t{{.Version}}\t{{.Plugins}}\n"
 )
 
 func networkListFlags(flags *pflag.FlagSet) {
@@ -57,7 +57,7 @@ func init() {
 
 func networkList(cmd *cobra.Command, args []string) error {
 	var (
-		nlprs []NetworkListPrintReports
+		nlprs []ListPrintReports
 	)
 
 	// validate the filter pattern.
@@ -83,7 +83,7 @@ func networkList(cmd *cobra.Command, args []string) error {
 	}
 
 	for _, r := range responses {
-		nlprs = append(nlprs, NetworkListPrintReports{r})
+		nlprs = append(nlprs, ListPrintReports{r})
 	}
 
 	row := networkListOptions.Format
@@ -125,14 +125,14 @@ func jsonOut(responses []*entities.NetworkListReport) error {
 	return nil
 }
 
-type NetworkListPrintReports struct {
+type ListPrintReports struct {
 	*entities.NetworkListReport
 }
 
-func (n NetworkListPrintReports) Version() string {
+func (n ListPrintReports) Version() string {
 	return n.CNIVersion
 }
 
-func (n NetworkListPrintReports) Plugins() string {
+func (n ListPrintReports) Plugins() string {
 	return network.GetCNIPlugins(n.NetworkConfigList)
 }
diff --git a/cmd/podman/pods/pod.go b/cmd/podman/pods/pod.go
index ed265ef90..9dc538c71 100644
--- a/cmd/podman/pods/pod.go
+++ b/cmd/podman/pods/pod.go
@@ -10,7 +10,7 @@ import (
 
 var (
 	// Pull in configured json library
-	json = registry.JsonLibrary()
+	json = registry.JSONLibrary()
 
 	// Command: podman _pod_
 	podCmd = &cobra.Command{
diff --git a/cmd/podman/pods/stats.go b/cmd/podman/pods/stats.go
index d3950fdbc..d14632f01 100644
--- a/cmd/podman/pods/stats.go
+++ b/cmd/podman/pods/stats.go
@@ -71,7 +71,7 @@ func stats(cmd *cobra.Command, args []string) error {
 	}
 
 	format := statsOptions.Format
-	doJson := strings.ToLower(format) == formats.JSONString
+	doJSON := strings.ToLower(format) == formats.JSONString
 	header := getPodStatsHeader(format)
 
 	for {
@@ -80,7 +80,7 @@ func stats(cmd *cobra.Command, args []string) error {
 			return err
 		}
 		// Print the stats in the requested format and configuration.
-		if doJson {
+		if doJSON {
 			if err := printJSONPodStats(reports); err != nil {
 				return err
 			}
diff --git a/cmd/podman/registry/json.go b/cmd/podman/registry/json.go
index f25406c3c..a8a1623f5 100644
--- a/cmd/podman/registry/json.go
+++ b/cmd/podman/registry/json.go
@@ -11,8 +11,8 @@ var (
 	jsonSync sync.Once
 )
 
-// JsonLibrary provides a "encoding/json" compatible API
-func JsonLibrary() jsoniter.API {
+// JSONLibrary provides a "encoding/json" compatible API
+func JSONLibrary() jsoniter.API {
 	jsonSync.Do(func() {
 		json = jsoniter.ConfigCompatibleWithStandardLibrary
 	})
diff --git a/cmd/podman/report/report.go b/cmd/podman/report/report.go
index 8392f10e0..ce349ef35 100644
--- a/cmd/podman/report/report.go
+++ b/cmd/podman/report/report.go
@@ -3,4 +3,4 @@ package report
 import "github.com/containers/libpod/cmd/podman/registry"
 
 // Pull in configured json library
-var json = registry.JsonLibrary()
+var json = registry.JSONLibrary()
diff --git a/cmd/podman/root.go b/cmd/podman/root.go
index b62ee144a..4f834e87d 100644
--- a/cmd/podman/root.go
+++ b/cmd/podman/root.go
@@ -119,10 +119,10 @@ func persistentPreRunE(cmd *cobra.Command, args []string) error {
 	}
 
 	if cmd.Flag("cpu-profile").Changed {
-		f, err := os.Create(cfg.CpuProfile)
+		f, err := os.Create(cfg.CPUProfile)
 		if err != nil {
 			return errors.Wrapf(err, "unable to create cpu profiling file %s",
-				cfg.CpuProfile)
+				cfg.CPUProfile)
 		}
 		if err := pprof.StartCPUProfile(f); err != nil {
 			return err
@@ -212,13 +212,13 @@ func rootFlags(opts *entities.PodmanConfig, flags *pflag.FlagSet) {
 	// V2 flags
 	flags.BoolVarP(&opts.Remote, "remote", "r", false, "Access remote Podman service (default false)")
 	// TODO Read uri from containers.config when available
-	flags.StringVar(&opts.Uri, "url", registry.DefaultAPIAddress(), "URL to access Podman service (CONTAINER_HOST)")
+	flags.StringVar(&opts.URI, "url", registry.DefaultAPIAddress(), "URL to access Podman service (CONTAINER_HOST)")
 	flags.StringSliceVar(&opts.Identities, "identity", []string{}, "path to SSH identity file, (CONTAINER_SSHKEY)")
 	flags.StringVar(&opts.PassPhrase, "passphrase", "", "passphrase for identity file (not secure, CONTAINER_PASSPHRASE), ssh-agent always supported")
 
 	cfg := opts.Config
 	flags.StringVar(&cfg.Engine.CgroupManager, "cgroup-manager", cfg.Engine.CgroupManager, "Cgroup manager to use (\"cgroupfs\"|\"systemd\")")
-	flags.StringVar(&opts.CpuProfile, "cpu-profile", "", "Path for the cpu profiling results")
+	flags.StringVar(&opts.CPUProfile, "cpu-profile", "", "Path for the cpu profiling results")
 	flags.StringVar(&opts.ConmonPath, "conmon", "", "Path of the conmon binary")
 	flags.StringVar(&cfg.Engine.NetworkCmdPath, "network-cmd-path", cfg.Engine.NetworkCmdPath, "Path to the command for configuring the network")
 	flags.StringVar(&cfg.Network.NetworkConfigDir, "cni-config-dir", cfg.Network.NetworkConfigDir, "Path of the configuration directory for CNI networks")
diff --git a/cmd/podman/system/df.go b/cmd/podman/system/df.go
index 8fe035209..9318bba12 100644
--- a/cmd/podman/system/df.go
+++ b/cmd/podman/system/df.go
@@ -63,7 +63,7 @@ func printSummary(reports *entities.SystemDfReport, userFormat string) error {
 		dfSummaries       []*dfSummary
 		active            int
 		size, reclaimable int64
-		format            string    = "{{.Type}}\t{{.Total}}\t{{.Active}}\t{{.Size}}\t{{.Reclaimable}}\n"
+		format                      = "{{.Type}}\t{{.Total}}\t{{.Active}}\t{{.Size}}\t{{.Reclaimable}}\n"
 		w                 io.Writer = os.Stdout
 	)
 
@@ -74,7 +74,7 @@ func printSummary(reports *entities.SystemDfReport, userFormat string) error {
 
 	for _, i := range reports.Images {
 		if i.Containers > 0 {
-			active += 1
+			active++
 		}
 		size += i.Size
 		if i.Containers < 1 {
@@ -99,7 +99,7 @@ func printSummary(reports *entities.SystemDfReport, userFormat string) error {
 	)
 	for _, c := range reports.Containers {
 		if c.Status == "running" {
-			conActive += 1
+			conActive++
 		} else {
 			conReclaimable += c.RWSize
 		}
diff --git a/cmd/podman/system/service.go b/cmd/podman/system/service.go
index 1b07ee301..ecd17c251 100644
--- a/cmd/podman/system/service.go
+++ b/cmd/podman/system/service.go
@@ -64,7 +64,7 @@ func aliasTimeoutFlag(_ *pflag.FlagSet, name string) pflag.NormalizedName {
 }
 
 func service(cmd *cobra.Command, args []string) error {
-	apiURI, err := resolveApiURI(args)
+	apiURI, err := resolveAPIURI(args)
 	if err != nil {
 		return err
 	}
@@ -103,7 +103,7 @@ func service(cmd *cobra.Command, args []string) error {
 	return restService(opts, cmd.Flags(), registry.PodmanConfig())
 }
 
-func resolveApiURI(_url []string) (string, error) {
+func resolveAPIURI(_url []string) (string, error) {
 	// When determining _*THE*_ listening endpoint --
 	// 1) User input wins always
 	// 2) systemd socket activation
diff --git a/cmd/podman/system/system.go b/cmd/podman/system/system.go
index d9691ad2a..acf41a32d 100644
--- a/cmd/podman/system/system.go
+++ b/cmd/podman/system/system.go
@@ -9,7 +9,7 @@ import (
 
 var (
 	// Pull in configured json library
-	json = registry.JsonLibrary()
+	json = registry.JSONLibrary()
 
 	// Command: podman _system_
 	systemCmd = &cobra.Command{
diff --git a/cmd/podman/volumes/volume.go b/cmd/podman/volumes/volume.go
index 3e90d178c..12947a6b1 100644
--- a/cmd/podman/volumes/volume.go
+++ b/cmd/podman/volumes/volume.go
@@ -9,7 +9,7 @@ import (
 
 var (
 	// Pull in configured json library
-	json = registry.JsonLibrary()
+	json = registry.JSONLibrary()
 
 	// Command: podman _volume_
 	volumeCmd = &cobra.Command{