Merge pull request #8947 from Luap99/cleanup-code

Fix problems reported by staticcheck

28 files changed, 55 insertions, 105 deletions

diff --git a/cmd/podman/common/create.go b/cmd/podman/common/create.go
index 24703eda2..280175f95 100644
--- a/cmd/podman/common/create.go
+++ b/cmd/podman/common/create.go
@@ -1,7 +1,6 @@
 package common
 
 import (
-	"fmt"
 	"os"
 
 	"github.com/containers/common/pkg/auth"
@@ -181,7 +180,7 @@ func DefineCreateFlags(cmd *cobra.Command, cf *ContainerCLIOpts) {
 	createFlags.StringSliceVar(
 		&cf.Devices,
 		deviceFlagName, devices(),
-		fmt.Sprintf("Add a host device to the container"),
+		"Add a host device to the container",
 	)
 	_ = cmd.RegisterFlagCompletionFunc(deviceFlagName, completion.AutocompleteDefault)
 
@@ -359,7 +358,7 @@ func DefineCreateFlags(cmd *cobra.Command, cf *ContainerCLIOpts) {
 		&cf.InitPath,
 		initPathFlagName, initPath(),
 		// Do not use  the Value field for setting the default value to determine user input (i.e., non-empty string)
-		fmt.Sprintf("Path to the container-init binary"),
+		"Path to the container-init binary",
 	)
 	_ = cmd.RegisterFlagCompletionFunc(initPathFlagName, completion.AutocompleteDefault)
 
diff --git a/cmd/podman/containers/prune.go b/cmd/podman/containers/prune.go
index d3842778b..50731dd21 100644
--- a/cmd/podman/containers/prune.go
+++ b/cmd/podman/containers/prune.go
@@ -18,9 +18,9 @@ import (
 )
 
 var (
-	pruneDescription = fmt.Sprintf(`podman container prune
+	pruneDescription = `podman container prune
 
-	Removes all non running containers`)
+	Removes all non running containers`
 	pruneCommand = &cobra.Command{
 		Use:               "prune [options]",
 		Short:             "Remove all non running containers",
diff --git a/cmd/podman/play/kube.go b/cmd/podman/play/kube.go
index 1f54db203..4c44fa30f 100644
--- a/cmd/podman/play/kube.go
+++ b/cmd/podman/play/kube.go
@@ -127,23 +127,23 @@ func kube(cmd *cobra.Command, args []string) error {
 
 	for _, pod := range report.Pods {
 		for _, l := range pod.Logs {
-			fmt.Fprintf(os.Stderr, l)
+			fmt.Fprint(os.Stderr, l)
 		}
 	}
 
 	ctrsFailed := 0
 
 	for _, pod := range report.Pods {
-		fmt.Printf("Pod:\n")
+		fmt.Println("Pod:")
 		fmt.Println(pod.ID)
 
 		switch len(pod.Containers) {
 		case 0:
 			continue
 		case 1:
-			fmt.Printf("Container:\n")
+			fmt.Println("Container:")
 		default:
-			fmt.Printf("Containers:\n")
+			fmt.Println("Containers:")
 		}
 		for _, ctr := range pod.Containers {
 			fmt.Println(ctr)
@@ -154,7 +154,7 @@ func kube(cmd *cobra.Command, args []string) error {
 			fmt.Println()
 		}
 		for _, err := range pod.ContainerErrors {
-			fmt.Fprintf(os.Stderr, err+"\n")
+			fmt.Fprintln(os.Stderr, err)
 		}
 		// Empty line for space for next block
 		fmt.Println()
diff --git a/cmd/podman/pods/inspect.go b/cmd/podman/pods/inspect.go
index 091094ff6..e809be0c9 100644
--- a/cmd/podman/pods/inspect.go
+++ b/cmd/podman/pods/inspect.go
@@ -2,7 +2,6 @@ package pods
 
 import (
 	"context"
-	"fmt"
 	"os"
 	"text/tabwriter"
 	"text/template"
@@ -21,9 +20,9 @@ var (
 )
 
 var (
-	inspectDescription = fmt.Sprintf(`Display the configuration for a pod by name or id
+	inspectDescription = `Display the configuration for a pod by name or id
 
-	By default, this will render all results in a JSON array.`)
+	By default, this will render all results in a JSON array.`
 
 	inspectCmd = &cobra.Command{
 		Use:               "inspect [options] POD [POD...]",
diff --git a/cmd/podman/pods/prune.go b/cmd/podman/pods/prune.go
index 965c36398..a040a21b6 100644
--- a/cmd/podman/pods/prune.go
+++ b/cmd/podman/pods/prune.go
@@ -20,7 +20,7 @@ var (
 )
 
 var (
-	pruneDescription = fmt.Sprintf(`podman pod prune Removes all exited pods`)
+	pruneDescription = `podman pod prune Removes all exited pods`
 
 	pruneCommand = &cobra.Command{
 		Use:               "prune [options]",
diff --git a/cmd/podman/pods/rm.go b/cmd/podman/pods/rm.go
index ff238aa20..109f18b78 100644
--- a/cmd/podman/pods/rm.go
+++ b/cmd/podman/pods/rm.go
@@ -25,9 +25,9 @@ type podRmOptionsWrapper struct {
 
 var (
 	rmOptions        = podRmOptionsWrapper{}
-	podRmDescription = fmt.Sprintf(`podman rm will remove one or more stopped pods and their containers from the host.
+	podRmDescription = `podman rm will remove one or more stopped pods and their containers from the host.
 
-  The pod name or ID can be used.  A pod with containers will not be removed without --force. If --force is specified, all containers will be stopped, then removed.`)
+  The pod name or ID can be used.  A pod with containers will not be removed without --force. If --force is specified, all containers will be stopped, then removed.`
 	rmCommand = &cobra.Command{
 		Use:   "rm [options] POD [POD...]",
 		Short: "Remove one or more pods",
diff --git a/cmd/podman/system/prune.go b/cmd/podman/system/prune.go
index 87bb947ed..5e96a654a 100644
--- a/cmd/podman/system/prune.go
+++ b/cmd/podman/system/prune.go
@@ -20,11 +20,11 @@ import (
 var (
 	pruneOptions     = entities.SystemPruneOptions{}
 	filters          []string
-	pruneDescription = fmt.Sprintf(`
+	pruneDescription = `
 	podman system prune
 
         Remove unused data
-`)
+`
 
 	pruneCommand = &cobra.Command{
 		Use:               "prune [options]",
diff --git a/cmd/podman/system/service.go b/cmd/podman/system/service.go
index f8bdbfa10..f5760e172 100644
--- a/cmd/podman/system/service.go
+++ b/cmd/podman/system/service.go
@@ -80,7 +80,7 @@ func service(cmd *cobra.Command, args []string) error {
 		}
 
 		// socket activation uses a unix:// socket in the shipped unit files but apiURI is coded as "" at this layer.
-		if "unix" == uri.Scheme && !registry.IsRemote() {
+		if uri.Scheme == "unix" && !registry.IsRemote() {
 			if err := syscall.Unlink(uri.Path); err != nil && !os.IsNotExist(err) {
 				return err
 			}
diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go
index 705086bda..575047f95 100644
--- a/libpod/container_internal_linux.go
+++ b/libpod/container_internal_linux.go
@@ -40,7 +40,6 @@ import (
 	"github.com/containers/storage/pkg/idtools"
 	securejoin "github.com/cyphar/filepath-securejoin"
 	runcuser "github.com/opencontainers/runc/libcontainer/user"
-	"github.com/opencontainers/runtime-spec/specs-go"
 	spec "github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/opencontainers/runtime-tools/generate"
 	"github.com/opencontainers/selinux/go-selinux/label"
@@ -284,7 +283,7 @@ func (c *Container) generateSpec(ctx context.Context) (*spec.Spec, error) {
 		return nil, err
 	}
 
-	g := generate.NewFromSpec(c.config.Spec)
+	g := generate.Generator{Config: c.config.Spec}
 
 	// If network namespace was requested, add it now
 	if c.config.CreateNetNS {
@@ -400,7 +399,7 @@ func (c *Container) generateSpec(ctx context.Context) (*spec.Spec, error) {
 			return nil, errors.Wrapf(err, "failed to create TempDir in the %s directory", c.config.StaticDir)
 		}
 
-		var overlayMount specs.Mount
+		var overlayMount spec.Mount
 		if volume.ReadWrite {
 			overlayMount, err = overlay.Mount(contentDir, mountPoint, volume.Dest, c.RootUID(), c.RootGID(), c.runtime.store.GraphOptions())
 		} else {
@@ -1519,18 +1518,14 @@ func (c *Container) makeBindMounts() error {
 	}
 	if newPasswd != "" {
 		// Make /etc/passwd
-		if _, ok := c.state.BindMounts["/etc/passwd"]; ok {
-			// If it already exists, delete so we can recreate
-			delete(c.state.BindMounts, "/etc/passwd")
-		}
+		// If it already exists, delete so we can recreate
+		delete(c.state.BindMounts, "/etc/passwd")
 		c.state.BindMounts["/etc/passwd"] = newPasswd
 	}
 	if newGroup != "" {
 		// Make /etc/group
-		if _, ok := c.state.BindMounts["/etc/group"]; ok {
-			// If it already exists, delete so we can recreate
-			delete(c.state.BindMounts, "/etc/group")
-		}
+		// If it already exists, delete so we can recreate
+		delete(c.state.BindMounts, "/etc/group")
 		c.state.BindMounts["/etc/group"] = newGroup
 	}
 
diff --git a/libpod/image/image.go b/libpod/image/image.go
index a9082b2c6..39d740b7a 100644
--- a/libpod/image/image.go
+++ b/libpod/image/image.go
@@ -17,7 +17,6 @@ import (
 	"github.com/containers/common/pkg/retry"
 	cp "github.com/containers/image/v5/copy"
 	"github.com/containers/image/v5/directory"
-	"github.com/containers/image/v5/docker/archive"
 	dockerarchive "github.com/containers/image/v5/docker/archive"
 	"github.com/containers/image/v5/docker/reference"
 	"github.com/containers/image/v5/image"
@@ -37,7 +36,6 @@ import (
 	"github.com/containers/podman/v2/pkg/util"
 	"github.com/containers/storage"
 	digest "github.com/opencontainers/go-digest"
-	imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1"
 	ociv1 "github.com/opencontainers/image-spec/specs-go/v1"
 	opentracing "github.com/opentracing/opentracing-go"
 	"github.com/pkg/errors"
@@ -185,7 +183,7 @@ func (ir *Runtime) SaveImages(ctx context.Context, namesOrIDs []string, format s
 
 	sys := GetSystemContext("", "", false)
 
-	archWriter, err := archive.NewWriter(sys, outputFile)
+	archWriter, err := dockerarchive.NewWriter(sys, outputFile)
 	if err != nil {
 		return err
 	}
@@ -291,7 +289,7 @@ func (ir *Runtime) LoadAllImagesFromDockerArchive(ctx context.Context, fileName
 	}
 
 	sc := GetSystemContext(signaturePolicyPath, "", false)
-	reader, err := archive.NewReader(sc, fileName)
+	reader, err := dockerarchive.NewReader(sc, fileName)
 	if err != nil {
 		return nil, err
 	}
@@ -1148,7 +1146,7 @@ func (i *Image) GetLabel(ctx context.Context, label string) (string, error) {
 	}
 
 	for k, v := range labels {
-		if strings.ToLower(k) == strings.ToLower(label) {
+		if strings.EqualFold(k, label) {
 			return v, nil
 		}
 	}
@@ -1326,7 +1324,7 @@ func (ir *Runtime) Import(ctx context.Context, path, reference string, writer io
 
 	annotations := make(map[string]string)
 
-	//	config imgspecv1.Image
+	//	config ociv1.Image
 	err = updater.ConfigUpdate(imageConfig, annotations)
 	if err != nil {
 		return nil, errors.Wrapf(err, "error updating image config")
@@ -1435,7 +1433,7 @@ func (i *Image) IsParent(ctx context.Context) (bool, error) {
 
 // historiesMatch returns the number of entries in the histories which have the
 // same contents
-func historiesMatch(a, b []imgspecv1.History) int {
+func historiesMatch(a, b []ociv1.History) int {
 	i := 0
 	for i < len(a) && i < len(b) {
 		if a[i].Created != nil && b[i].Created == nil {
@@ -1468,7 +1466,7 @@ func historiesMatch(a, b []imgspecv1.History) int {
 
 // areParentAndChild checks diff ID and history in the two images and return
 // true if the second should be considered to be directly based on the first
-func areParentAndChild(parent, child *imgspecv1.Image) bool {
+func areParentAndChild(parent, child *ociv1.Image) bool {
 	// the child and candidate parent should share all of the
 	// candidate parent's diff IDs, which together would have
 	// controlled which layers were used
@@ -1621,7 +1619,7 @@ func (i *Image) Save(ctx context.Context, source, format, output string, moreTag
 		if err != nil {
 			return errors.Wrapf(err, "error getting the OCI directory ImageReference for (%q, %q)", output, destImageName)
 		}
-		manifestType = imgspecv1.MediaTypeImageManifest
+		manifestType = ociv1.MediaTypeImageManifest
 	case "docker-dir":
 		destRef, err = directory.NewReference(output)
 		if err != nil {
diff --git a/libpod/image/prune.go b/libpod/image/prune.go
index 3c06a89c2..587c99333 100644
--- a/libpod/image/prune.go
+++ b/libpod/image/prune.go
@@ -29,7 +29,7 @@ func generatePruneFilterFuncs(filter, filterValue string) (ImageFilter, error) {
 				return false
 			}
 			for labelKey, labelValue := range labels {
-				if labelKey == filterKey && ("" == filterValue || labelValue == filterValue) {
+				if labelKey == filterKey && (filterValue == "" || labelValue == filterValue) {
 					return true
 				}
 			}
diff --git a/libpod/image/pull.go b/libpod/image/pull.go
index c37929927..996b5995a 100644
--- a/libpod/image/pull.go
+++ b/libpod/image/pull.go
@@ -11,7 +11,6 @@ import (
 	cp "github.com/containers/image/v5/copy"
 	"github.com/containers/image/v5/directory"
 	"github.com/containers/image/v5/docker"
-	"github.com/containers/image/v5/docker/archive"
 	dockerarchive "github.com/containers/image/v5/docker/archive"
 	ociarchive "github.com/containers/image/v5/oci/archive"
 	oci "github.com/containers/image/v5/oci/layout"
@@ -130,7 +129,7 @@ func (ir *Runtime) getSinglePullRefPairGoal(srcRef types.ImageReference, destNam
 
 // getPullRefPairsFromDockerArchiveReference returns a slice of pullRefPairs
 // for the specified docker reference and the corresponding archive.Reader.
-func (ir *Runtime) getPullRefPairsFromDockerArchiveReference(ctx context.Context, reader *archive.Reader, ref types.ImageReference, sc *types.SystemContext) ([]pullRefPair, error) {
+func (ir *Runtime) getPullRefPairsFromDockerArchiveReference(ctx context.Context, reader *dockerarchive.Reader, ref types.ImageReference, sc *types.SystemContext) ([]pullRefPair, error) {
 	destNames, err := reader.ManifestTagsForReference(ref)
 	if err != nil {
 		return nil, err
@@ -178,7 +177,7 @@ func (ir *Runtime) pullGoalFromImageReference(ctx context.Context, srcRef types.
 	// supports pulling from docker-archive, oci, and registries
 	switch srcRef.Transport().Name() {
 	case DockerArchive:
-		reader, readerRef, err := archive.NewReaderForReference(sc, srcRef)
+		reader, readerRef, err := dockerarchive.NewReaderForReference(sc, srcRef)
 		if err != nil {
 			return nil, err
 		}
@@ -432,7 +431,7 @@ func checkRemoteImageForLabel(ctx context.Context, label string, imageInfo pullR
 	}
 	// Labels are case insensitive; so we iterate instead of simple lookup
 	for k := range remoteInspect.Labels {
-		if strings.ToLower(label) == strings.ToLower(k) {
+		if strings.EqualFold(label, k) {
 			return nil
 		}
 	}
diff --git a/libpod/in_memory_state.go b/libpod/in_memory_state.go
index 6c0cde531..9285589b1 100644
--- a/libpod/in_memory_state.go
+++ b/libpod/in_memory_state.go
@@ -437,12 +437,8 @@ func (s *InMemoryState) RemoveContainer(ctr *Container) error {
 	}
 
 	// Remove our network aliases
-	if _, ok := s.ctrNetworkAliases[ctr.ID()]; ok {
-		delete(s.ctrNetworkAliases, ctr.ID())
-	}
-	if _, ok := s.ctrNetworks[ctr.ID()]; ok {
-		delete(s.ctrNetworks, ctr.ID())
-	}
+	delete(s.ctrNetworkAliases, ctr.ID())
+	delete(s.ctrNetworks, ctr.ID())
 
 	return nil
 }
@@ -680,9 +676,7 @@ func (s *InMemoryState) NetworkDisconnect(ctr *Container, network string) error
 		ctrAliases = make(map[string][]string)
 		s.ctrNetworkAliases[ctr.ID()] = ctrAliases
 	}
-	if _, ok := ctrAliases[network]; ok {
-		delete(ctrAliases, network)
-	}
+	delete(ctrAliases, network)
 
 	return nil
 }
@@ -1523,12 +1517,8 @@ func (s *InMemoryState) RemoveContainerFromPod(pod *Pod, ctr *Container) error {
 	}
 
 	// Remove our network aliases
-	if _, ok := s.ctrNetworkAliases[ctr.ID()]; ok {
-		delete(s.ctrNetworkAliases, ctr.ID())
-	}
-	if _, ok := s.ctrNetworks[ctr.ID()]; ok {
-		delete(s.ctrNetworks, ctr.ID())
-	}
+	delete(s.ctrNetworkAliases, ctr.ID())
+	delete(s.ctrNetworks, ctr.ID())
 
 	return nil
 }
diff --git a/libpod/network/netconflist.go b/libpod/network/netconflist.go
index bf7d03501..165a9067b 100644
--- a/libpod/network/netconflist.go
+++ b/libpod/network/netconflist.go
@@ -216,7 +216,7 @@ func IfPassesFilter(netconf *libcni.NetworkConfigList, filters map[string][]stri
 					filterValue = ""
 				}
 				for labelKey, labelValue := range labels {
-					if labelKey == filterKey && ("" == filterValue || labelValue == filterValue) {
+					if labelKey == filterKey && (filterValue == "" || labelValue == filterValue) {
 						result = true
 						continue outer
 					}
diff --git a/libpod/oci_conmon_linux.go b/libpod/oci_conmon_linux.go
index 70896cda4..23bfb29d7 100644
--- a/libpod/oci_conmon_linux.go
+++ b/libpod/oci_conmon_linux.go
@@ -1387,6 +1387,7 @@ func (r *ConmonOCIRuntime) sharedConmonArgs(ctr *Container, cuuid, bundlePath, p
 		logDriverArg = define.NoLogging
 	case define.JSONLogging:
 		fallthrough
+	//lint:ignore ST1015 the default case has to be here
 	default: //nolint-stylecheck
 		// No case here should happen except JSONLogging, but keep this here in case the options are extended
 		logrus.Errorf("%s logging specified but not supported. Choosing k8s-file logging instead", ctr.LogDriver())
diff --git a/libpod/options.go b/libpod/options.go
index ef7db3235..31c0b9ac9 100644
--- a/libpod/options.go
+++ b/libpod/options.go
@@ -910,7 +910,7 @@ func WithUserNSFrom(nsCtr *Container) CtrCreateOption {
 		ctr.config.UserNsCtr = nsCtr.ID()
 		ctr.config.IDMappings = nsCtr.config.IDMappings
 
-		g := generate.NewFromSpec(ctr.config.Spec)
+		g := generate.Generator{Config: ctr.config.Spec}
 
 		g.ClearLinuxUIDMappings()
 		for _, uidmap := range nsCtr.config.IDMappings.UIDMap {
diff --git a/pkg/api/handlers/libpod/images.go b/pkg/api/handlers/libpod/images.go
index 979a8adc4..b2b93de17 100644
--- a/pkg/api/handlers/libpod/images.go
+++ b/pkg/api/handlers/libpod/images.go
@@ -16,7 +16,6 @@ import (
 	"github.com/containers/podman/v2/libpod"
 	"github.com/containers/podman/v2/libpod/define"
 	"github.com/containers/podman/v2/libpod/image"
-	image2 "github.com/containers/podman/v2/libpod/image"
 	"github.com/containers/podman/v2/pkg/api/handlers"
 	"github.com/containers/podman/v2/pkg/api/handlers/utils"
 	"github.com/containers/podman/v2/pkg/auth"
@@ -524,7 +523,7 @@ func CommitContainer(w http.ResponseWriter, r *http.Request) {
 		utils.Error(w, "failed to get runtime config", http.StatusInternalServerError, errors.Wrap(err, "failed to get runtime config"))
 		return
 	}
-	sc := image2.GetSystemContext(rtc.Engine.SignaturePolicyPath, "", false)
+	sc := image.GetSystemContext(rtc.Engine.SignaturePolicyPath, "", false)
 	tag := "latest"
 	options := libpod.ContainerCommitOptions{
 		Pause: true,
diff --git a/pkg/domain/filters/containers.go b/pkg/domain/filters/containers.go
index 09ef6201a..1de5aca91 100644
--- a/pkg/domain/filters/containers.go
+++ b/pkg/domain/filters/containers.go
@@ -35,7 +35,7 @@ func GenerateContainerFilterFuncs(filter string, filterValues []string, r *libpo
 					filterValue = ""
 				}
 				for labelKey, labelValue := range labels {
-					if labelKey == filterKey && ("" == filterValue || labelValue == filterValue) {
+					if labelKey == filterKey && (filterValue == "" || labelValue == filterValue) {
 						matched = true
 						break
 					}
diff --git a/pkg/domain/filters/pods.go b/pkg/domain/filters/pods.go
index 685c182ba..ce7028d2a 100644
--- a/pkg/domain/filters/pods.go
+++ b/pkg/domain/filters/pods.go
@@ -124,7 +124,7 @@ func GeneratePodFilterFunc(filter string, filterValues []string) (
 					filterValue = ""
 				}
 				for labelKey, labelValue := range labels {
-					if labelKey == filterKey && ("" == filterValue || labelValue == filterValue) {
+					if labelKey == filterKey && (filterValue == "" || labelValue == filterValue) {
 						matched = true
 						break
 					}
diff --git a/pkg/domain/filters/volumes.go b/pkg/domain/filters/volumes.go
index 69bef4961..7890459f5 100644
--- a/pkg/domain/filters/volumes.go
+++ b/pkg/domain/filters/volumes.go
@@ -39,7 +39,7 @@ func GenerateVolumeFilters(filters url.Values) ([]libpod.VolumeFilter, error) {
 				}
 				vf = append(vf, func(v *libpod.Volume) bool {
 					for labelKey, labelValue := range v.Labels() {
-						if labelKey == filterKey && ("" == filterVal || labelValue == filterVal) {
+						if labelKey == filterKey && (filterVal == "" || labelValue == filterVal) {
 							return true
 						}
 					}
@@ -56,7 +56,7 @@ func GenerateVolumeFilters(filters url.Values) ([]libpod.VolumeFilter, error) {
 				}
 				vf = append(vf, func(v *libpod.Volume) bool {
 					for labelKey, labelValue := range v.Options() {
-						if labelKey == filterKey && ("" == filterVal || labelValue == filterVal) {
+						if labelKey == filterKey && (filterVal == "" || labelValue == filterVal) {
 							return true
 						}
 					}
diff --git a/pkg/domain/infra/abi/containers.go b/pkg/domain/infra/abi/containers.go
index 2c79b6187..b5f5a0e91 100644
--- a/pkg/domain/infra/abi/containers.go
+++ b/pkg/domain/infra/abi/containers.go
@@ -113,15 +113,7 @@ func (ic *ContainerEngine) ContainerWait(ctx context.Context, namesOrIds []strin
 }
 
 func (ic *ContainerEngine) ContainerPause(ctx context.Context, namesOrIds []string, options entities.PauseUnPauseOptions) ([]*entities.PauseUnpauseReport, error) {
-	var (
-		err error
-	)
-	ctrs := []*libpod.Container{} //nolint
-	if options.All {
-		ctrs, err = ic.Libpod.GetAllContainers()
-	} else {
-		ctrs, err = getContainersByContext(false, false, namesOrIds, ic.Libpod)
-	}
+	ctrs, err := getContainersByContext(options.All, false, namesOrIds, ic.Libpod)
 	if err != nil {
 		return nil, err
 	}
@@ -134,15 +126,7 @@ func (ic *ContainerEngine) ContainerPause(ctx context.Context, namesOrIds []stri
 }
 
 func (ic *ContainerEngine) ContainerUnpause(ctx context.Context, namesOrIds []string, options entities.PauseUnPauseOptions) ([]*entities.PauseUnpauseReport, error) {
-	var (
-		err error
-	)
-	ctrs := []*libpod.Container{} //nolint
-	if options.All {
-		ctrs, err = ic.Libpod.GetAllContainers()
-	} else {
-		ctrs, err = getContainersByContext(false, false, namesOrIds, ic.Libpod)
-	}
+	ctrs, err := getContainersByContext(options.All, false, namesOrIds, ic.Libpod)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/domain/infra/abi/images.go b/pkg/domain/infra/abi/images.go
index 19f081abb..3487dc3f4 100644
--- a/pkg/domain/infra/abi/images.go
+++ b/pkg/domain/infra/abi/images.go
@@ -22,7 +22,6 @@ import (
 	"github.com/containers/image/v5/types"
 	"github.com/containers/podman/v2/libpod/define"
 	"github.com/containers/podman/v2/libpod/image"
-	libpodImage "github.com/containers/podman/v2/libpod/image"
 	"github.com/containers/podman/v2/pkg/domain/entities"
 	"github.com/containers/podman/v2/pkg/domain/entities/reports"
 	domainUtils "github.com/containers/podman/v2/pkg/domain/utils"
@@ -206,7 +205,7 @@ func (ir *ImageEngine) Unmount(ctx context.Context, nameOrIDs []string, options
 	return reports, nil
 }
 
-func ToDomainHistoryLayer(layer *libpodImage.History) entities.ImageHistoryLayer {
+func ToDomainHistoryLayer(layer *image.History) entities.ImageHistoryLayer {
 	l := entities.ImageHistoryLayer{}
 	l.ID = layer.ID
 	l.Created = *layer.Created
diff --git a/pkg/domain/infra/abi/manifest.go b/pkg/domain/infra/abi/manifest.go
index 0c734d10d..a68ed8788 100644
--- a/pkg/domain/infra/abi/manifest.go
+++ b/pkg/domain/infra/abi/manifest.go
@@ -13,7 +13,6 @@ import (
 
 	"github.com/containers/buildah/manifests"
 	buildahManifests "github.com/containers/buildah/pkg/manifests"
-	"github.com/containers/buildah/util"
 	buildahUtil "github.com/containers/buildah/util"
 	cp "github.com/containers/image/v5/copy"
 	"github.com/containers/image/v5/docker"
@@ -60,7 +59,7 @@ func (ir *ImageEngine) ManifestInspect(ctx context.Context, name string) ([]byte
 		}
 	}
 	sc := ir.Libpod.SystemContext()
-	refs, err := util.ResolveNameToReferences(ir.Libpod.GetStore(), sc, name)
+	refs, err := buildahUtil.ResolveNameToReferences(ir.Libpod.GetStore(), sc, name)
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/domain/infra/abi/system.go b/pkg/domain/infra/abi/system.go
index 67c018122..97fa9d374 100644
--- a/pkg/domain/infra/abi/system.go
+++ b/pkg/domain/infra/abi/system.go
@@ -162,11 +162,6 @@ func movePauseProcessToScope(r *libpod.Runtime) error {
 	return utils.RunUnderSystemdScope(int(pid), "user.slice", "podman-pause.scope")
 }
 
-// checkInput can be used to verify any of the globalopt values
-func checkInput() error { // nolint:deadcode,unused
-	return nil
-}
-
 // SystemPrune removes unused data from the system. Pruning pods, containers, volumes and images.
 func (ic *ContainerEngine) SystemPrune(ctx context.Context, options entities.SystemPruneOptions) (*entities.SystemPruneReport, error) {
 	var systemPruneReport = new(entities.SystemPruneReport)
diff --git a/pkg/specgen/generate/config_linux.go b/pkg/specgen/generate/config_linux.go
index e0b039fb7..1290a8eb6 100644
--- a/pkg/specgen/generate/config_linux.go
+++ b/pkg/specgen/generate/config_linux.go
@@ -21,9 +21,6 @@ var (
 	errNotADevice = errors.New("not a device node")
 )
 
-func u32Ptr(i int64) *uint32     { u := uint32(i); return &u }
-func fmPtr(i int64) *os.FileMode { fm := os.FileMode(i); return &fm }
-
 func addPrivilegedDevices(g *generate.Generator) error {
 	hostDevices, err := getDevices("/dev")
 	if err != nil {
diff --git a/pkg/specgen/generate/oci.go b/pkg/specgen/generate/oci.go
index ba68de6fd..7dc32a314 100644
--- a/pkg/specgen/generate/oci.go
+++ b/pkg/specgen/generate/oci.go
@@ -110,7 +110,7 @@ func makeCommand(ctx context.Context, s *specgen.SpecGenerator, img *image.Image
 	// Only use image command if the user did not manually set an
 	// entrypoint.
 	command := s.Command
-	if (command == nil || len(command) == 0) && img != nil && (s.Entrypoint == nil || len(s.Entrypoint) == 0) {
+	if len(command) == 0 && img != nil && len(s.Entrypoint) == 0 {
 		newCmd, err := img.Cmd(ctx)
 		if err != nil {
 			return nil, err
diff --git a/pkg/specgen/generate/storage.go b/pkg/specgen/generate/storage.go
index f523ac5bf..63713726e 100644
--- a/pkg/specgen/generate/storage.go
+++ b/pkg/specgen/generate/storage.go
@@ -124,14 +124,10 @@ func finalizeMounts(ctx context.Context, s *specgen.SpecGenerator, rt *libpod.Ru
 	// named volumes, and vice versa.
 	// We'll delete the conflicts here as we supersede.
 	for dest := range unifiedMounts {
-		if _, ok := baseVolumes[dest]; ok {
-			delete(baseVolumes, dest)
-		}
+		delete(baseVolumes, dest)
 	}
 	for dest := range unifiedVolumes {
-		if _, ok := baseMounts[dest]; ok {
-			delete(baseMounts, dest)
-		}
+		delete(baseMounts, dest)
 	}
 
 	// Supersede volumes-from/image volumes with unified volumes from above.
diff --git a/pkg/specgen/generate/validate.go b/pkg/specgen/generate/validate.go
index f0ab4b994..77cccad3e 100644
--- a/pkg/specgen/generate/validate.go
+++ b/pkg/specgen/generate/validate.go
@@ -48,7 +48,7 @@ func verifyContainerResourcesCgroupV1(s *specgen.SpecGenerator) ([]string, error
 				warnings = append(warnings, "Your kernel does not support memory swappiness capabilities, or the cgroup is not mounted. Memory swappiness discarded.")
 				memory.Swappiness = nil
 			} else {
-				if *memory.Swappiness < 0 || *memory.Swappiness > 100 {
+				if *memory.Swappiness > 100 {
 					return warnings, errors.Errorf("invalid value: %v, valid memory swappiness range is 0-100", *memory.Swappiness)
 				}
 			}