linter: enable nilerr

A number of cases looked suspicious, so I marked them with `FIXME`s to
leave some breadcrumbs.

Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>

21 files changed, 47 insertions, 33 deletions

diff --git a/.golangci.yml b/.golangci.yml
index 402738d25..da8a49e64 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -62,7 +62,6 @@ linters:
     - ireturn
     - varnamelen
     - maintidx
-    - nilerr
     - nilnil
 linters-settings:
   errcheck:
diff --git a/cmd/podman/containers/cp.go b/cmd/podman/containers/cp.go
index 7ac28b799..eb18dfce4 100644
--- a/cmd/podman/containers/cp.go
+++ b/cmd/podman/containers/cp.go
@@ -449,7 +449,7 @@ func resolvePathOnDestinationContainer(container string, containerPath string, i
 	containerInfo, err = registry.ContainerEngine().ContainerStat(registry.GetContext(), container, containerPath)
 	if err == nil {
 		baseName = filepath.Base(containerInfo.LinkTarget)
-		return
+		return // nolint: nilerr
 	}
 
 	if strings.HasSuffix(containerPath, "/") {
diff --git a/cmd/podman/images/scp.go b/cmd/podman/images/scp.go
index 1a1a9282f..007b9613e 100644
--- a/cmd/podman/images/scp.go
+++ b/cmd/podman/images/scp.go
@@ -264,7 +264,7 @@ func saveToRemote(image, localFile string, tag string, uri *urlP.URL, iden strin
 	run := podman + " image save " + image + " --format=oci-archive --output=" + remoteFile // run ssh image load of the file copied via scp. Files are reverse in this case...
 	_, err = connection.ExecRemoteCommand(dial, run)
 	if err != nil {
-		return nil
+		return err
 	}
 	n, err := scpD.CopyFrom(dial, remoteFile, localFile)
 	connection.ExecRemoteCommand(dial, "rm "+remoteFile)
diff --git a/cmd/podman/system/df.go b/cmd/podman/system/df.go
index 49918487a..dad14df6b 100644
--- a/cmd/podman/system/df.go
+++ b/cmd/podman/system/df.go
@@ -171,7 +171,7 @@ func printVerbose(cmd *cobra.Command, reports *entities.SystemDfReport) error {
 		return err
 	}
 	if err := writeTemplate(rpt, hdrs, dfImages); err != nil {
-		return nil
+		return err
 	}
 
 	fmt.Fprint(rpt.Writer(), "\nContainers space usage:\n\n")
@@ -191,7 +191,7 @@ func printVerbose(cmd *cobra.Command, reports *entities.SystemDfReport) error {
 		return err
 	}
 	if err := writeTemplate(rpt, hdrs, dfContainers); err != nil {
-		return nil
+		return err
 	}
 
 	fmt.Fprint(rpt.Writer(), "\nLocal Volumes space usage:\n\n")
diff --git a/libpod/boltdb_state.go b/libpod/boltdb_state.go
index 6389431ab..a826c663d 100644
--- a/libpod/boltdb_state.go
+++ b/libpod/boltdb_state.go
@@ -366,7 +366,8 @@ func (s *BoltState) GetDBConfig() (*DBConfig, error) {
 	err = db.View(func(tx *bolt.Tx) error {
 		configBucket, err := getRuntimeConfigBucket(tx)
 		if err != nil {
-			return nil
+			// FIXME: this error should probably be returned
+			return nil // nolint: nilerr
 		}
 
 		// Some of these may be nil
diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go
index 75250b9b1..de866f6b0 100644
--- a/libpod/container_internal_linux.go
+++ b/libpod/container_internal_linux.go
@@ -2587,7 +2587,7 @@ func (c *Container) generateUserGroupEntry(addedGID int) (string, int, error) {
 
 	gid, err := strconv.ParseUint(group, 10, 32)
 	if err != nil {
-		return "", 0, nil
+		return "", 0, nil // nolint: nilerr
 	}
 
 	if addedGID != 0 && addedGID == int(gid) {
@@ -2740,7 +2740,8 @@ func (c *Container) generateUserPasswdEntry(addedUID int) (string, int, int, err
 	// If a non numeric User, then don't generate passwd
 	uid, err := strconv.ParseUint(userspec, 10, 32)
 	if err != nil {
-		return "", 0, 0, nil
+		// FIXME: this error should probably be returned
+		return "", 0, 0, nil // nolint: nilerr
 	}
 
 	if addedUID != 0 && int(uid) == addedUID {
diff --git a/libpod/oci_conmon_linux.go b/libpod/oci_conmon_linux.go
index 66123dbf4..ba4079bed 100644
--- a/libpod/oci_conmon_linux.go
+++ b/libpod/oci_conmon_linux.go
@@ -750,7 +750,7 @@ func openControlFile(ctr *Container, parentDir string) (*os.File, error) {
 	for i := 0; i < 600; i++ {
 		controlFile, err := os.OpenFile(controlPath, unix.O_WRONLY|unix.O_NONBLOCK, 0)
 		if err == nil {
-			return controlFile, err
+			return controlFile, nil
 		}
 		if !isRetryable(err) {
 			return nil, errors.Wrapf(err, "could not open ctl file for terminal resize for container %s", ctr.ID())
@@ -1015,7 +1015,8 @@ func (r *ConmonOCIRuntime) getLogTag(ctr *Container) (string, error) {
 	}
 	data, err := ctr.inspectLocked(false)
 	if err != nil {
-		return "", nil
+		// FIXME: this error should probably be returned
+		return "", nil // nolint: nilerr
 	}
 	tmpl, err := template.New("container").Parse(logTag)
 	if err != nil {
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/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/checkpoint/crutils/checkpoint_restore_utils.go b/pkg/checkpoint/crutils/checkpoint_restore_utils.go
index 2765d18e8..5b2097a71 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 os.IsNotExist(err) {
+			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..e30013647 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.Cause(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..8eea8968d 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.Cause(err) == define.ErrNoSuchNetwork {
+					continue
+				}
+				return nil, err
 			}
 			inputNetNames = append(inputNetNames, net.Name)
 		}
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..8a65a22bf 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
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/machine/fedora.go b/pkg/machine/fedora.go
index b26921b52..bcf694def 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 os.IsNotExist(err) {
+			return false, nil
+		}
+		return false, err
 	}
 	return info.Size() == f.Size, nil
 }
diff --git a/pkg/machine/qemu/machine.go b/pkg/machine/qemu/machine.go
index 46f838f8b..ddb49124d 100644
--- a/pkg/machine/qemu/machine.go
+++ b/pkg/machine/qemu/machine.go
@@ -626,7 +626,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 +756,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
diff --git a/pkg/rootless/rootless.go b/pkg/rootless/rootless.go
index 93b4e2e9f..f526aa9e1 100644
--- a/pkg/rootless/rootless.go
+++ b/pkg/rootless/rootless.go
@@ -16,12 +16,15 @@ import (
 // file.
 func TryJoinPauseProcess(pausePidPath string) (bool, int, error) {
 	if _, err := os.Stat(pausePidPath); err != nil {
-		return false, -1, nil
+		if os.IsNotExist(err) {
+			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.
@@ -46,7 +49,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/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)
 }
diff --git a/test/utils/matchers.go b/test/utils/matchers.go
index 288779b63..85a89aa49 100644
--- a/test/utils/matchers.go
+++ b/test/utils/matchers.go
@@ -184,7 +184,7 @@ func (matcher *ValidJSONMatcher) Match(actual interface{}) (success bool, err er
 
 	var i interface{}
 	if err := json.Unmarshal([]byte(s), &i); err != nil {
-		return false, nil
+		return false, err
 	}
 	return true, nil
 }