Merge pull request #13580 from vrothberg/enable-linters

enable linters

38 files changed, 131 insertions, 107 deletions

diff --git a/pkg/annotations/annotations.go b/pkg/annotations/annotations.go
index 8badab20d..a22222f10 100644
--- a/pkg/annotations/annotations.go
+++ b/pkg/annotations/annotations.go
@@ -1,122 +1,122 @@
 package annotations
 
 const (
-	// Annotations carries the received Kubelet annotations
+	// Annotations carries the received Kubelet annotations.
 	Annotations = "io.kubernetes.cri-o.Annotations"
 
-	// ContainerID is the container ID annotation
+	// ContainerID is the container ID annotation.
 	ContainerID = "io.kubernetes.cri-o.ContainerID"
 
-	// ContainerName is the container name annotation
+	// ContainerName is the container name annotation.
 	ContainerName = "io.kubernetes.cri-o.ContainerName"
 
-	// ContainerType is the container type (sandbox or container) annotation
+	// ContainerType is the container type (sandbox or container) annotation.
 	ContainerType = "io.kubernetes.cri-o.ContainerType"
 
-	// Created is the container creation time annotation
+	// Created is the container creation time annotation.
 	Created = "io.kubernetes.cri-o.Created"
 
-	// HostName is the container host name annotation
+	// HostName is the container host name annotation.
 	HostName = "io.kubernetes.cri-o.HostName"
 
-	// CgroupParent is the sandbox cgroup parent
+	// CgroupParent is the sandbox cgroup parent.
 	CgroupParent = "io.kubernetes.cri-o.CgroupParent"
 
-	// IP is the container ipv4 or ipv6 address
+	// IP is the container ipv4 or ipv6 address.
 	IP = "io.kubernetes.cri-o.IP"
 
-	// NamespaceOptions store the options for namespaces
+	// NamespaceOptions store the options for namespaces.
 	NamespaceOptions = "io.kubernetes.cri-o.NamespaceOptions"
 
-	// SeccompProfilePath is the node seccomp profile path
+	// SeccompProfilePath is the node seccomp profile path.
 	SeccompProfilePath = "io.kubernetes.cri-o.SeccompProfilePath"
 
-	// Image is the container image ID annotation
+	// Image is the container image ID annotation.
 	Image = "io.kubernetes.cri-o.Image"
 
-	// ImageName is the container image name annotation
+	// ImageName is the container image name annotation.
 	ImageName = "io.kubernetes.cri-o.ImageName"
 
-	// ImageRef is the container image ref annotation
+	// ImageRef is the container image ref annotation.
 	ImageRef = "io.kubernetes.cri-o.ImageRef"
 
-	// KubeName is the kubernetes name annotation
+	// KubeName is the kubernetes name annotation.
 	KubeName = "io.kubernetes.cri-o.KubeName"
 
-	// PortMappings holds the port mappings for the sandbox
+	// PortMappings holds the port mappings for the sandbox.
 	PortMappings = "io.kubernetes.cri-o.PortMappings"
 
-	// Labels are the kubernetes labels annotation
+	// Labels are the kubernetes labels annotation.
 	Labels = "io.kubernetes.cri-o.Labels"
 
-	// LogPath is the container logging path annotation
+	// LogPath is the container logging path annotation.
 	LogPath = "io.kubernetes.cri-o.LogPath"
 
-	// Metadata is the container metadata annotation
+	// Metadata is the container metadata annotation.
 	Metadata = "io.kubernetes.cri-o.Metadata"
 
-	// Name is the pod name annotation
+	// Name is the pod name annotation.
 	Name = "io.kubernetes.cri-o.Name"
 
-	// Namespace is the pod namespace annotation
+	// Namespace is the pod namespace annotation.
 	Namespace = "io.kubernetes.cri-o.Namespace"
 
-	// PrivilegedRuntime is the annotation for the privileged runtime path
+	// PrivilegedRuntime is the annotation for the privileged runtime path.
 	PrivilegedRuntime = "io.kubernetes.cri-o.PrivilegedRuntime"
 
-	// ResolvPath is the resolver configuration path annotation
+	// ResolvPath is the resolver configuration path annotation.
 	ResolvPath = "io.kubernetes.cri-o.ResolvPath"
 
-	// HostnamePath is the path to /etc/hostname to bind mount annotation
+	// HostnamePath is the path to /etc/hostname to bind mount annotation.
 	HostnamePath = "io.kubernetes.cri-o.HostnamePath"
 
-	// SandboxID is the sandbox ID annotation
+	// SandboxID is the sandbox ID annotation.
 	SandboxID = "io.kubernetes.cri-o.SandboxID"
 
-	// SandboxName is the sandbox name annotation
+	// SandboxName is the sandbox name annotation.
 	SandboxName = "io.kubernetes.cri-o.SandboxName"
 
-	// ShmPath is the shared memory path annotation
+	// ShmPath is the shared memory path annotation.
 	ShmPath = "io.kubernetes.cri-o.ShmPath"
 
-	// MountPoint is the mount point of the container rootfs
+	// MountPoint is the mount point of the container rootfs.
 	MountPoint = "io.kubernetes.cri-o.MountPoint"
 
-	// RuntimeHandler is the annotation for runtime handler
+	// RuntimeHandler is the annotation for runtime handler.
 	RuntimeHandler = "io.kubernetes.cri-o.RuntimeHandler"
 
-	// TTY is the terminal path annotation
+	// TTY is the terminal path annotation.
 	TTY = "io.kubernetes.cri-o.TTY"
 
-	// Stdin is the stdin annotation
+	// Stdin is the stdin annotation.
 	Stdin = "io.kubernetes.cri-o.Stdin"
 
-	// StdinOnce is the stdin_once annotation
+	// StdinOnce is the stdin_once annotation.
 	StdinOnce = "io.kubernetes.cri-o.StdinOnce"
 
-	// Volumes is the volumes annotation
+	// Volumes is the volumes annotation.
 	Volumes = "io.kubernetes.cri-o.Volumes"
 
-	// HostNetwork indicates whether the host network namespace is used or not
+	// HostNetwork indicates whether the host network namespace is used or not.
 	HostNetwork = "io.kubernetes.cri-o.HostNetwork"
 
-	// CNIResult is the JSON string representation of the Result from CNI
+	// CNIResult is the JSON string representation of the Result from CNI.
 	CNIResult = "io.kubernetes.cri-o.CNIResult"
 
 	// ContainerManager is the annotation key for indicating the creator and
-	// manager of the container
+	// manager of the container.
 	ContainerManager = "io.container.manager"
 )
 
 // ContainerType values
 const (
-	// ContainerTypeSandbox represents a pod sandbox container
+	// ContainerTypeSandbox represents a pod sandbox container.
 	ContainerTypeSandbox = "sandbox"
 
-	// ContainerTypeContainer represents a container running within a pod
+	// ContainerTypeContainer represents a container running within a pod.
 	ContainerTypeContainer = "container"
 )
 
 // ContainerManagerLibpod indicates that libpod created and manages the
-// container
+// container.
 const ContainerManagerLibpod = "libpod"
diff --git a/pkg/api/handlers/compat/images_prune.go b/pkg/api/handlers/compat/images_prune.go
index 88776dc49..c0be9da7d 100644
--- a/pkg/api/handlers/compat/images_prune.go
+++ b/pkg/api/handlers/compat/images_prune.go
@@ -43,7 +43,7 @@ func PruneImages(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	idr := make([]types.ImageDeleteResponseItem, len(imagePruneReports))
+	idr := make([]types.ImageDeleteResponseItem, 0, len(imagePruneReports))
 	var reclaimedSpace uint64
 	var errorMsg bytes.Buffer
 	for _, p := range imagePruneReports {
diff --git a/pkg/api/handlers/utils/images.go b/pkg/api/handlers/utils/images.go
index 15b16bc43..7154f5616 100644
--- a/pkg/api/handlers/utils/images.go
+++ b/pkg/api/handlers/utils/images.go
@@ -63,7 +63,7 @@ func IsRegistryReference(name string) error {
 	imageRef, err := alltransports.ParseImageName(name)
 	if err != nil {
 		// No supported transport -> assume a docker-stype reference.
-		return nil
+		return nil // nolint: nilerr
 	}
 	if imageRef.Transport().Name() == docker.Transport.Name() {
 		return nil
diff --git a/pkg/bindings/containers/attach.go b/pkg/bindings/containers/attach.go
index f410606e4..0c6ebdd2f 100644
--- a/pkg/bindings/containers/attach.go
+++ b/pkg/bindings/containers/attach.go
@@ -279,7 +279,7 @@ func DemuxFrame(r io.Reader, buffer []byte, length int) (frame []byte, err error
 
 	n, err := io.ReadFull(r, buffer[0:length])
 	if err != nil {
-		return nil, nil
+		return nil, err
 	}
 	if n < length {
 		err = io.ErrUnexpectedEOF
diff --git a/pkg/bindings/test/attach_test.go b/pkg/bindings/test/attach_test.go
index 670566882..dcebe0809 100644
--- a/pkg/bindings/test/attach_test.go
+++ b/pkg/bindings/test/attach_test.go
@@ -44,7 +44,8 @@ var _ = Describe("Podman containers attach", func() {
 			timeout := uint(5)
 			err := containers.Stop(bt.conn, id, new(containers.StopOptions).WithTimeout(timeout))
 			if err != nil {
-				GinkgoWriter.Write([]byte(err.Error()))
+				_, writeErr := GinkgoWriter.Write([]byte(err.Error()))
+				Expect(writeErr).ShouldNot(HaveOccurred())
 			}
 		}()
 
diff --git a/pkg/bindings/test/auth_test.go b/pkg/bindings/test/auth_test.go
index b421f0797..c4c4b16d8 100644
--- a/pkg/bindings/test/auth_test.go
+++ b/pkg/bindings/test/auth_test.go
@@ -40,7 +40,8 @@ var _ = Describe("Podman images", func() {
 	AfterEach(func() {
 		s.Kill()
 		bt.cleanup()
-		registry.Stop()
+		err := registry.Stop()
+		Expect(err).To(BeNil())
 	})
 
 	// Test using credentials.
diff --git a/pkg/bindings/test/common_test.go b/pkg/bindings/test/common_test.go
index f51e5f404..f2602967b 100644
--- a/pkg/bindings/test/common_test.go
+++ b/pkg/bindings/test/common_test.go
@@ -211,7 +211,7 @@ func (b *bindingTest) RunTopContainer(containerName *string, podName *string) (s
 	}
 	ctr, err := containers.CreateWithSpec(b.conn, s, nil)
 	if err != nil {
-		return "", nil
+		return "", err
 	}
 	err = containers.Start(b.conn, ctr.ID, nil)
 	if err != nil {
diff --git a/pkg/bindings/test/containers_test.go b/pkg/bindings/test/containers_test.go
index 9411d8a5f..bf627fdba 100644
--- a/pkg/bindings/test/containers_test.go
+++ b/pkg/bindings/test/containers_test.go
@@ -322,7 +322,8 @@ var _ = Describe("Podman containers ", func() {
 
 		// a container that has no healthcheck should be a 409
 		var name = "top"
-		bt.RunTopContainer(&name, nil)
+		_, err = bt.RunTopContainer(&name, nil)
+		Expect(err).To(BeNil())
 		_, err = containers.RunHealthCheck(bt.conn, name, nil)
 		Expect(err).ToNot(BeNil())
 		code, _ = bindings.CheckResponseCode(err)
diff --git a/pkg/checkpoint/crutils/checkpoint_restore_utils.go b/pkg/checkpoint/crutils/checkpoint_restore_utils.go
index 2765d18e8..6a8a7894a 100644
--- a/pkg/checkpoint/crutils/checkpoint_restore_utils.go
+++ b/pkg/checkpoint/crutils/checkpoint_restore_utils.go
@@ -99,13 +99,12 @@ func CRRemoveDeletedFiles(id, baseDirectory, containerRootDirectory string) erro
 // root file system changes on top of containerRootDirectory
 func CRApplyRootFsDiffTar(baseDirectory, containerRootDirectory string) error {
 	rootfsDiffPath := filepath.Join(baseDirectory, metadata.RootFsDiffTar)
-	if _, err := os.Stat(rootfsDiffPath); err != nil {
-		// Only do this if a rootfs-diff.tar actually exists
-		return nil
-	}
-
+	// Only do this if a rootfs-diff.tar actually exists
 	rootfsDiffFile, err := os.Open(rootfsDiffPath)
 	if err != nil {
+		if errors.Is(err, os.ErrNotExist) {
+			return nil
+		}
 		return errors.Wrap(err, "failed to open root file-system diff file")
 	}
 	defer rootfsDiffFile.Close()
diff --git a/pkg/domain/filters/containers.go b/pkg/domain/filters/containers.go
index 85ba4f84f..4c6964a00 100644
--- a/pkg/domain/filters/containers.go
+++ b/pkg/domain/filters/containers.go
@@ -213,8 +213,10 @@ func GenerateContainerFilterFuncs(filter string, filterValues []string, r *libpo
 		for _, val := range filterValues {
 			net, err := r.Network().NetworkInspect(val)
 			if err != nil {
-				// ignore not found errors
-				break
+				if errors.Is(err, define.ErrNoSuchNetwork) {
+					continue
+				}
+				return nil, err
 			}
 			inputNetNames = append(inputNetNames, net.Name)
 		}
diff --git a/pkg/domain/filters/pods.go b/pkg/domain/filters/pods.go
index 2f9442dff..e22480006 100644
--- a/pkg/domain/filters/pods.go
+++ b/pkg/domain/filters/pods.go
@@ -131,8 +131,10 @@ func GeneratePodFilterFunc(filter string, filterValues []string, r *libpod.Runti
 		for _, val := range filterValues {
 			net, err := r.Network().NetworkInspect(val)
 			if err != nil {
-				// ignore not found errors
-				break
+				if errors.Is(err, define.ErrNoSuchNetwork) {
+					continue
+				}
+				return nil, err
 			}
 			inputNetNames = append(inputNetNames, net.Name)
 		}
diff --git a/pkg/domain/infra/abi/images.go b/pkg/domain/infra/abi/images.go
index 0b07901d4..3fdfa8f3a 100644
--- a/pkg/domain/infra/abi/images.go
+++ b/pkg/domain/infra/abi/images.go
@@ -848,13 +848,12 @@ func execPodman(execUser *user.User, command []string) error {
 	if err != nil {
 		return err
 	}
-	defer func() error {
-		err := cmdLogin.Process.Kill()
-		if err != nil {
-			return err
-		}
-		return cmdLogin.Wait()
+
+	defer func() {
+		_ = cmdLogin.Process.Kill()
+		_ = cmdLogin.Wait()
 	}()
+
 	cmd := exec.Command(command[0], command[1:]...)
 	cmd.Env = []string{"PATH=" + os.Getenv("PATH"), "TERM=" + os.Getenv("TERM")}
 	cmd.Stderr = os.Stderr
diff --git a/pkg/domain/infra/abi/play.go b/pkg/domain/infra/abi/play.go
index 4d8c5a381..236d56053 100644
--- a/pkg/domain/infra/abi/play.go
+++ b/pkg/domain/infra/abi/play.go
@@ -215,7 +215,7 @@ func (ic *ContainerEngine) playKubePod(ctx context.Context, podName string, podY
 	// FIXME This is very hard to support properly with a good ux
 	if len(options.StaticIPs) > *ipIndex {
 		if !podOpt.Net.Network.IsBridge() {
-			errors.Wrap(define.ErrInvalidArg, "static ip addresses can only be set when the network mode is bridge")
+			return nil, errors.Wrap(define.ErrInvalidArg, "static ip addresses can only be set when the network mode is bridge")
 		}
 		if len(podOpt.Net.Networks) != 1 {
 			return nil, errors.Wrap(define.ErrInvalidArg, "cannot set static ip addresses for more than network, use netname:ip=<ip> syntax to specify ips for more than network")
@@ -230,7 +230,7 @@ func (ic *ContainerEngine) playKubePod(ctx context.Context, podName string, podY
 	}
 	if len(options.StaticMACs) > *ipIndex {
 		if !podOpt.Net.Network.IsBridge() {
-			errors.Wrap(define.ErrInvalidArg, "static mac address can only be set when the network mode is bridge")
+			return nil, errors.Wrap(define.ErrInvalidArg, "static mac address can only be set when the network mode is bridge")
 		}
 		if len(podOpt.Net.Networks) != 1 {
 			return nil, errors.Wrap(define.ErrInvalidArg, "cannot set static mac address for more than network, use netname:mac=<mac> syntax to specify mac for more than network")
diff --git a/pkg/domain/infra/abi/terminal/sigproxy_linux.go b/pkg/domain/infra/abi/terminal/sigproxy_linux.go
index 206ded091..fe2c268c0 100644
--- a/pkg/domain/infra/abi/terminal/sigproxy_linux.go
+++ b/pkg/domain/infra/abi/terminal/sigproxy_linux.go
@@ -20,7 +20,7 @@ const signalBufferSize = 2048
 func ProxySignals(ctr *libpod.Container) {
 	// Stop catching the shutdown signals (SIGINT, SIGTERM) - they're going
 	// to the container now.
-	shutdown.Stop()
+	shutdown.Stop() // nolint: errcheck
 
 	sigBuffer := make(chan os.Signal, signalBufferSize)
 	signal.CatchAll(sigBuffer)
diff --git a/pkg/domain/infra/abi/terminal/terminal_linux.go b/pkg/domain/infra/abi/terminal/terminal_linux.go
index 78c792d2b..153b19fdb 100644
--- a/pkg/domain/infra/abi/terminal/terminal_linux.go
+++ b/pkg/domain/infra/abi/terminal/terminal_linux.go
@@ -39,7 +39,7 @@ func ExecAttachCtr(ctx context.Context, ctr *libpod.Container, execConfig *libpo
 // StartAttachCtr starts and (if required) attaches to a container
 // if you change the signature of this function from os.File to io.Writer, it will trigger a downstream
 // error. we may need to just lint disable this one.
-func StartAttachCtr(ctx context.Context, ctr *libpod.Container, stdout, stderr, stdin *os.File, detachKeys string, sigProxy bool, startContainer bool) error { //nolint-interfacer
+func StartAttachCtr(ctx context.Context, ctr *libpod.Container, stdout, stderr, stdin *os.File, detachKeys string, sigProxy bool, startContainer bool) error { //nolint: interfacer
 	resize := make(chan define.TerminalSize)
 
 	haveTerminal := terminal.IsTerminal(int(os.Stdin.Fd()))
diff --git a/pkg/domain/infra/abi/volumes.go b/pkg/domain/infra/abi/volumes.go
index 19fc6d2d3..f59f11e20 100644
--- a/pkg/domain/infra/abi/volumes.go
+++ b/pkg/domain/infra/abi/volumes.go
@@ -171,7 +171,8 @@ func (ic *ContainerEngine) VolumeMounted(ctx context.Context, nameOrID string) (
 	}
 	mountCount, err := vol.MountCount()
 	if err != nil {
-		return &entities.BoolReport{Value: false}, nil
+		// FIXME: this error should probably be returned
+		return &entities.BoolReport{Value: false}, nil // nolint: nilerr
 	}
 	if mountCount > 0 {
 		return &entities.BoolReport{Value: true}, nil
diff --git a/pkg/domain/infra/tunnel/containers.go b/pkg/domain/infra/tunnel/containers.go
index 046c2509d..10bfb3984 100644
--- a/pkg/domain/infra/tunnel/containers.go
+++ b/pkg/domain/infra/tunnel/containers.go
@@ -840,7 +840,7 @@ func (ic *ContainerEngine) ContainerRun(ctx context.Context, opts entities.Conta
 	if eventsErr != nil || lastEvent == nil {
 		logrus.Errorf("Cannot get exit code: %v", err)
 		report.ExitCode = define.ExecErrorCodeNotFound
-		return &report, nil // compat with local client
+		return &report, nil // nolint: nilerr
 	}
 
 	report.ExitCode = lastEvent.ContainerExitCode
@@ -938,7 +938,7 @@ func (ic *ContainerEngine) ContainerStat(ctx context.Context, nameOrID string, p
 	return containers.Stat(ic.ClientCtx, nameOrID, path)
 }
 
-// Shutdown Libpod engine
+// Shutdown Libpod engine.
 func (ic *ContainerEngine) Shutdown(_ context.Context) {
 }
 
@@ -949,7 +949,7 @@ func (ic *ContainerEngine) ContainerStats(ctx context.Context, namesOrIds []stri
 	return containers.Stats(ic.ClientCtx, namesOrIds, new(containers.StatsOptions).WithStream(options.Stream).WithInterval(options.Interval))
 }
 
-// ShouldRestart reports back whether the container will restart
+// ShouldRestart reports back whether the container will restart.
 func (ic *ContainerEngine) ShouldRestart(_ context.Context, id string) (bool, error) {
 	return containers.ShouldRestart(ic.ClientCtx, id, nil)
 }
diff --git a/pkg/domain/infra/tunnel/events.go b/pkg/domain/infra/tunnel/events.go
index 1f27cdff8..b472ad03a 100644
--- a/pkg/domain/infra/tunnel/events.go
+++ b/pkg/domain/infra/tunnel/events.go
@@ -34,7 +34,7 @@ func (ic *ContainerEngine) Events(ctx context.Context, opts entities.EventsOptio
 }
 
 // GetLastContainerEvent takes a container name or ID and an event status and returns
-// the last occurrence of the container event
+// the last occurrence of the container event.
 func (ic *ContainerEngine) GetLastContainerEvent(ctx context.Context, nameOrID string, containerEvent events.Status) (*events.Event, error) {
 	// check to make sure the event.Status is valid
 	if _, err := events.StringToStatus(containerEvent.String()); err != nil {
diff --git a/pkg/env/env.go b/pkg/env/env.go
index ecd2d62a5..5989d0da5 100644
--- a/pkg/env/env.go
+++ b/pkg/env/env.go
@@ -26,7 +26,7 @@ func DefaultEnvVariables() map[string]string {
 // Slice transforms the specified map of environment variables into a
 // slice. If a value is non-empty, the key and value are joined with '='.
 func Slice(m map[string]string) []string {
-	env := make([]string, len(m))
+	env := make([]string, 0, len(m))
 	for k, v := range m {
 		var s string
 		if len(v) > 0 {
diff --git a/pkg/errorhandling/errorhandling.go b/pkg/errorhandling/errorhandling.go
index 04110b62a..e33c26032 100644
--- a/pkg/errorhandling/errorhandling.go
+++ b/pkg/errorhandling/errorhandling.go
@@ -28,7 +28,7 @@ func JoinErrors(errs []error) error {
 
 	finalErr := multiE.ErrorOrNil()
 	if finalErr == nil {
-		return finalErr
+		return nil
 	}
 	return errors.New(strings.TrimSpace(finalErr.Error()))
 }
diff --git a/pkg/inspect/inspect.go b/pkg/inspect/inspect.go
index cd26db6b0..767d86daf 100644
--- a/pkg/inspect/inspect.go
+++ b/pkg/inspect/inspect.go
@@ -9,7 +9,7 @@ import (
 	v1 "github.com/opencontainers/image-spec/specs-go/v1"
 )
 
-// ImageData holds the inspect information of an image
+// ImageData holds the inspect information of an image.
 type ImageData struct {
 	ID           string                        `json:"Id"`
 	Digest       digest.Digest                 `json:"Digest"`
@@ -36,13 +36,13 @@ type ImageData struct {
 	HealthCheck  *manifest.Schema2HealthConfig `json:"Healthcheck,omitempty"`
 }
 
-// RootFS holds the root fs information of an image
+// RootFS holds the root fs information of an image.
 type RootFS struct {
 	Type   string          `json:"Type"`
 	Layers []digest.Digest `json:"Layers"`
 }
 
-// ImageResult is used for podman images for collection and output
+// ImageResult is used for podman images for collection and output.
 type ImageResult struct {
 	Tag          string
 	Repository   string
diff --git a/pkg/k8s.io/apimachinery/pkg/api/resource/quantity.go b/pkg/k8s.io/apimachinery/pkg/api/resource/quantity.go
index fccddc3e0..352cc028f 100644
--- a/pkg/k8s.io/apimachinery/pkg/api/resource/quantity.go
+++ b/pkg/k8s.io/apimachinery/pkg/api/resource/quantity.go
@@ -579,9 +579,9 @@ func (q Quantity) MarshalJSON() ([]byte, error) {
 	// if CanonicalizeBytes needed more space than our slice provided, we may need to allocate again so use
 	// append
 	result = result[:1]
-	result = append(result, number...)
-	result = append(result, suffix...)
-	result = append(result, '"')
+	result = append(result, number...) // nolint: makezero
+	result = append(result, suffix...) // nolint: makezero
+	result = append(result, '"')       // nolint: makezero
 	return result, nil
 }
 
diff --git a/pkg/lookup/lookup.go b/pkg/lookup/lookup.go
index 0b22a1974..0601e829d 100644
--- a/pkg/lookup/lookup.go
+++ b/pkg/lookup/lookup.go
@@ -14,7 +14,7 @@ const (
 	etcgroup  = "/etc/group"
 )
 
-// Overrides allows you to override defaults in GetUserGroupInfo
+// Overrides allows you to override defaults in GetUserGroupInfo.
 type Overrides struct {
 	DefaultUser            *user.ExecUser
 	ContainerEtcPasswdPath string
diff --git a/pkg/machine/config.go b/pkg/machine/config.go
index b3b105150..aaf8da872 100644
--- a/pkg/machine/config.go
+++ b/pkg/machine/config.go
@@ -36,9 +36,9 @@ type InitOptions struct {
 type QemuMachineStatus = string
 
 const (
-	// Running indicates the qemu vm is running
+	// Running indicates the qemu vm is running.
 	Running QemuMachineStatus = "running"
-	//	Stopped indicates the vm has stopped
+	// Stopped indicates the vm has stopped.
 	Stopped            QemuMachineStatus = "stopped"
 	DefaultMachineName string            = "podman-machine-default"
 )
@@ -147,7 +147,7 @@ func (rc RemoteConnectionType) MakeSSHURL(host, path, port, userName string) url
 }
 
 // GetDataDir returns the filepath where vm images should
-// live for podman-machine
+// live for podman-machine.
 func GetDataDir(vmType string) (string, error) {
 	data, err := homedir.GetDataHome()
 	if err != nil {
diff --git a/pkg/machine/fedora.go b/pkg/machine/fedora.go
index b26921b52..bed45c6da 100644
--- a/pkg/machine/fedora.go
+++ b/pkg/machine/fedora.go
@@ -59,7 +59,10 @@ func (f FedoraDownload) Get() *Download {
 func (f FedoraDownload) HasUsableCache() (bool, error) {
 	info, err := os.Stat(f.LocalPath)
 	if err != nil {
-		return false, nil
+		if errors.Is(err, os.ErrNotExist) {
+			return false, nil
+		}
+		return false, err
 	}
 	return info.Size() == f.Size, nil
 }
diff --git a/pkg/machine/qemu/config.go b/pkg/machine/qemu/config.go
index b39334be0..211d96ccb 100644
--- a/pkg/machine/qemu/config.go
+++ b/pkg/machine/qemu/config.go
@@ -61,6 +61,6 @@ type Monitor struct {
 
 var (
 	// defaultQMPTimeout is the timeout duration for the
-	// qmp monitor interactions
+	// qmp monitor interactions.
 	defaultQMPTimeout time.Duration = 2 * time.Second
 )
diff --git a/pkg/machine/qemu/machine.go b/pkg/machine/qemu/machine.go
index 46f838f8b..1bd9fb51b 100644
--- a/pkg/machine/qemu/machine.go
+++ b/pkg/machine/qemu/machine.go
@@ -34,7 +34,7 @@ import (
 
 var (
 	qemuProvider = &Provider{}
-	// vmtype refers to qemu (vs libvirt, krun, etc)
+	// vmtype refers to qemu (vs libvirt, krun, etc).
 	vmtype = "qemu"
 )
 
@@ -278,7 +278,9 @@ func (v *MachineVM) Init(opts machine.InitOptions) (bool, error) {
 		fmt.Println("An ignition path was provided.  No SSH connection was added to Podman")
 	}
 	// Write the JSON file
-	v.writeConfig()
+	if err := v.writeConfig(); err != nil {
+		return false, fmt.Errorf("writing JSON file: %w", err)
+	}
 
 	// User has provided ignition file so keygen
 	// will be skipped.
@@ -626,7 +628,8 @@ func (v *MachineVM) Stop(name string, _ machine.StopOptions) error {
 	}
 
 	if err := qmpMonitor.Disconnect(); err != nil {
-		return nil
+		// FIXME: this error should probably be returned
+		return nil // nolint: nilerr
 	}
 
 	disconnected = true
@@ -755,7 +758,8 @@ func (v *MachineVM) isRunning() (bool, error) {
 	// Check if we can dial it
 	monitor, err := qmp.NewSocketMonitor(v.QMPMonitor.Network, v.QMPMonitor.Address, v.QMPMonitor.Timeout)
 	if err != nil {
-		return false, nil
+		// FIXME: this error should probably be returned
+		return false, nil // nolint: nilerr
 	}
 	if err := monitor.Connect(); err != nil {
 		return false, err
@@ -1097,10 +1101,13 @@ func waitAndPingAPI(sock string) {
 		Transport: &http.Transport{
 			DialContext: func(context.Context, string, string) (net.Conn, error) {
 				con, err := net.DialTimeout("unix", sock, apiUpTimeout)
-				if err == nil {
-					con.SetDeadline(time.Now().Add(apiUpTimeout))
+				if err != nil {
+					return nil, err
+				}
+				if err := con.SetDeadline(time.Now().Add(apiUpTimeout)); err != nil {
+					return nil, err
 				}
-				return con, err
+				return con, nil
 			},
 		},
 	}
diff --git a/pkg/rootless/rootless.go b/pkg/rootless/rootless.go
index 93b4e2e9f..13f8078e2 100644
--- a/pkg/rootless/rootless.go
+++ b/pkg/rootless/rootless.go
@@ -1,6 +1,8 @@
 package rootless
 
 import (
+	"errors"
+	"fmt"
 	"os"
 	"sort"
 	"sync"
@@ -8,7 +10,6 @@ import (
 	"github.com/containers/storage/pkg/lockfile"
 	"github.com/opencontainers/runc/libcontainer/user"
 	spec "github.com/opencontainers/runtime-spec/specs-go"
-	"github.com/pkg/errors"
 )
 
 // TryJoinPauseProcess attempts to join the namespaces of the pause PID via
@@ -16,12 +17,15 @@ import (
 // file.
 func TryJoinPauseProcess(pausePidPath string) (bool, int, error) {
 	if _, err := os.Stat(pausePidPath); err != nil {
-		return false, -1, nil
+		if errors.Is(err, os.ErrNotExist) {
+			return false, -1, nil
+		}
+		return false, -1, err
 	}
 
 	became, ret, err := TryJoinFromFilePaths("", false, []string{pausePidPath})
 	if err == nil {
-		return became, ret, err
+		return became, ret, nil
 	}
 
 	// It could not join the pause process, let's lock the file before trying to delete it.
@@ -31,7 +35,7 @@ func TryJoinPauseProcess(pausePidPath string) (bool, int, error) {
 		if os.IsNotExist(err) {
 			return false, -1, nil
 		}
-		return false, -1, errors.Wrapf(err, "error acquiring lock on %s", pausePidPath)
+		return false, -1, fmt.Errorf("error acquiring lock on %s: %w", pausePidPath, err)
 	}
 
 	pidFileLock.Lock()
@@ -46,7 +50,7 @@ func TryJoinPauseProcess(pausePidPath string) (bool, int, error) {
 	if err != nil {
 		// It is still failing.  We can safely remove it.
 		os.Remove(pausePidPath)
-		return false, -1, nil
+		return false, -1, nil // nolint: nilerr
 	}
 	return became, ret, err
 }
diff --git a/pkg/signal/signal_common.go b/pkg/signal/signal_common.go
index 8ff4b4dbf..5ea67843a 100644
--- a/pkg/signal/signal_common.go
+++ b/pkg/signal/signal_common.go
@@ -25,7 +25,7 @@ func ParseSignal(rawSignal string) (syscall.Signal, error) {
 }
 
 // ParseSignalNameOrNumber translates a string to a valid syscall signal.  Input
-// can be a name or number representation i.e. "KILL" "9"
+// can be a name or number representation i.e. "KILL" "9".
 func ParseSignalNameOrNumber(rawSignal string) (syscall.Signal, error) {
 	basename := strings.TrimPrefix(rawSignal, "-")
 	s, err := ParseSignal(basename)
diff --git a/pkg/specgen/generate/config_linux.go b/pkg/specgen/generate/config_linux.go
index a5772bc6a..35d7f0252 100644
--- a/pkg/specgen/generate/config_linux.go
+++ b/pkg/specgen/generate/config_linux.go
@@ -262,8 +262,8 @@ func addDevice(g *generate.Generator, device string) error {
 
 // ParseDevice parses device mapping string to a src, dest & permissions string
 func ParseDevice(device string) (string, string, string, error) { //nolint
-	src := ""
-	dst := ""
+	var src string
+	var dst string
 	permissions := "rwm"
 	arr := strings.Split(device, ":")
 	switch len(arr) {
diff --git a/pkg/specgen/generate/ports_bench_test.go b/pkg/specgen/generate/ports_bench_test.go
index f208a34c5..f65cd2f15 100644
--- a/pkg/specgen/generate/ports_bench_test.go
+++ b/pkg/specgen/generate/ports_bench_test.go
@@ -9,7 +9,7 @@ import (
 
 func benchmarkParsePortMapping(b *testing.B, ports []types.PortMapping) {
 	for n := 0; n < b.N; n++ {
-		ParsePortMapping(ports, nil)
+		_, _ = ParsePortMapping(ports, nil)
 	}
 }
 
diff --git a/pkg/specgenutil/specgen.go b/pkg/specgenutil/specgen.go
index b87da61fb..688cc2337 100644
--- a/pkg/specgenutil/specgen.go
+++ b/pkg/specgenutil/specgen.go
@@ -847,7 +847,8 @@ func makeHealthCheckFromCli(inCmd, interval string, retries uint, timeout, start
 	if len(cmdArr) == 0 {
 		return nil, errors.New("Must define a healthcheck command for all healthchecks")
 	}
-	concat := ""
+
+	var concat string
 	if cmdArr[0] == "CMD" || cmdArr[0] == "none" { // this is for compat, we are already split properly for most compat cases
 		cmdArr = strings.Fields(inCmd)
 	} else if cmdArr[0] != "CMD-SHELL" { // this is for podman side of things, won't contain the keywords
diff --git a/pkg/systemd/dbus.go b/pkg/systemd/dbus.go
index 1b1bc8be9..44feb8308 100644
--- a/pkg/systemd/dbus.go
+++ b/pkg/systemd/dbus.go
@@ -24,7 +24,6 @@ func IsSystemdSessionValid(uid int) bool {
 
 	if rootless.IsRootless() {
 		conn, err = GetLogindConnection(rootless.GetRootlessUID())
-		object = conn.Object(dbusDest, godbus.ObjectPath(dbusPath))
 		if err != nil {
 			//unable to fetch systemd object for logind
 			logrus.Debugf("systemd-logind: %s", err)
diff --git a/pkg/systemd/generate/containers.go b/pkg/systemd/generate/containers.go
index c01bb1baf..e11aed771 100644
--- a/pkg/systemd/generate/containers.go
+++ b/pkg/systemd/generate/containers.go
@@ -362,7 +362,9 @@ func executeContainerTemplate(info *containerInfo, options entities.GenerateSyst
 		fs.StringArrayP("env", "e", nil, "")
 		fs.String("sdnotify", "", "")
 		fs.String("restart", "", "")
-		fs.Parse(remainingCmd)
+		if err := fs.Parse(remainingCmd); err != nil {
+			return "", fmt.Errorf("parsing remaining command-line arguments: %w", err)
+		}
 
 		remainingCmd = filterCommonContainerFlags(remainingCmd, fs.NArg())
 		// If the container is in a pod, make sure that the
diff --git a/pkg/systemd/generate/pods.go b/pkg/systemd/generate/pods.go
index 78ae6391b..15b598ae8 100644
--- a/pkg/systemd/generate/pods.go
+++ b/pkg/systemd/generate/pods.go
@@ -335,7 +335,9 @@ func executePodTemplate(info *podInfo, options entities.GenerateSystemdOptions)
 		fs.SetInterspersed(false)
 		fs.String("name", "", "")
 		fs.Bool("replace", false, "")
-		fs.Parse(podCreateArgs)
+		if err := fs.Parse(podCreateArgs); err != nil {
+			return "", fmt.Errorf("parsing remaining command-line arguments: %w", err)
+		}
 
 		hasNameParam := fs.Lookup("name").Changed
 		hasReplaceParam, err := fs.GetBool("replace")
diff --git a/pkg/terminal/console_unix.go b/pkg/terminal/console_unix.go
index e6c0442c9..53290be24 100644
--- a/pkg/terminal/console_unix.go
+++ b/pkg/terminal/console_unix.go
@@ -3,7 +3,7 @@
 
 package terminal
 
-// SetConsole for non-windows environments is a no-op
+// SetConsole for non-windows environments is a no-op.
 func SetConsole() error {
 	return nil
 }
diff --git a/pkg/util/camelcase/camelcase.go b/pkg/util/camelcase/camelcase.go
index d27ac00d6..eaf7c0178 100644
--- a/pkg/util/camelcase/camelcase.go
+++ b/pkg/util/camelcase/camelcase.go
@@ -51,10 +51,10 @@ func Split(src string) (entries []string) {
 	}
 	entries = []string{}
 	var runes [][]rune
-	lastClass := 0
-	class := 0
+	var lastClass int
 	// split into fields based on class of unicode character
 	for _, r := range src {
+		var class int
 		switch {
 		case unicode.IsLower(r):
 			class = 1
diff --git a/pkg/util/utils.go b/pkg/util/utils.go
index 925ff9830..1beb3b28e 100644
--- a/pkg/util/utils.go
+++ b/pkg/util/utils.go
@@ -727,7 +727,7 @@ func SocketPath() (string, error) {
 func LookupUser(name string) (*user.User, error) {
 	// Assume UID look up first, if it fails lookup by username
 	if u, err := user.LookupId(name); err == nil {
-		return u, err
+		return u, nil
 	}
 	return user.Lookup(name)
 }