Merge pull request #28753 from kolyshkin/os-is

Stop using os.Is{Exist,NotExist,Permission} checks

.golangci.yml

@@ -22,6 +22,7 @@ linters:
     - errchkjson
     - exptostd
     - fatcontext
+    - forbidigo
     - ginkgolinter
     - gocheckcompilerdirectives
     - gochecksumtype
@@ -54,6 +55,17 @@ linters:
     - wastedassign
     - whitespace
   settings:
+    forbidigo:
+      forbid:
+        # os.Is* error checking functions predate errors.Is. Therefore, they
+        # only support errors returned by the os package and subtly fail
+        # to deal with other wrapped error types.
+        # New code should use errors.Is(err, error-type) instead.
+        - pattern: ^os\.Is(Exist|NotExist|Permission|Timeout)$
+          pkg: ^os$
+          msg: Use errors.Is instead.
+      analyze-types: true
+
     staticcheck:
       checks:
         - all

cmd/podman-mac-helper/service.go

@@ -3,6 +3,7 @@
 package main
 
 import (
+	"errors"
 	"fmt"
 	"io"
 	"io/fs"
@@ -70,7 +71,7 @@ func service() int {
 	}
 
 	err := os.Remove(dockerSock)
-	if err == nil || os.IsNotExist(err) {
+	if err == nil || errors.Is(err, os.ErrNotExist) {
 		err = os.Symlink(target, dockerSock)
 	}
 

cmd/podman-mac-helper/uninstall.go

@@ -48,7 +48,7 @@ func uninstall(_ *cobra.Command, _ []string) error {
 	}
 
 	if err := os.Remove(fileName); err != nil {
-		if !os.IsNotExist(err) {
+		if !errors.Is(err, os.ErrNotExist) {
 			return fmt.Errorf("could not remove plist file: %s", fileName)
 		}
 	}

cmd/podman/system/service.go

@@ -3,6 +3,7 @@
 package system
 
 import (
+	"errors"
 	"fmt"
 	"net/url"
 	"os"
@@ -107,7 +108,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 uri.Scheme == "unix" && !registry.IsRemote() {
-			if err := syscall.Unlink(uri.Path); err != nil && !os.IsNotExist(err) {
+			if err := syscall.Unlink(uri.Path); err != nil && !errors.Is(err, os.ErrNotExist) {
 				return err
 			}
 			mask := syscall.Umask(0o177)

contrib/cirrus/check_go_changes.sh

@@ -1,63 +0,0 @@
-#!/bin/bash
-
-set -eo pipefail
-
-# This script is intended to confirm new go code conforms to certain
-# conventions and/or does not introduce use of old/deprecated packages
-# or functions.  It needs to run in the Cirrus CI environment, on behalf
-# of PRs, via runner.sh.  This ensures a consistent and predictable
-# environment not easily reproduced by a `Makefile`.
-
-# shellcheck source=contrib/cirrus/lib.sh
-source $(dirname $0)/lib.sh
-
-check_msg() {
-    msg "#####"  # Cirrus-CI logs automatically squash empty lines
-    msg "##### $1"  # Complains if $1 is empty
-}
-
-# First arg is check description, second is regex to search $diffs for.
-check_diffs() {
-    local check regex
-    check="$1"
-    regex="$2"
-    check_msg "Confirming changes have no $check"
-    req_env_vars check regex diffs
-    if grep -E -q "$regex"<<<"$diffs"; then
-        # Show 5 context lines before/after as compromise for script simplicity
-        die "Found $check:
-$(grep -E -B 5 -A 5 "$regex"<<<"$diffs")"
-    fi
-}
-
-# Defined by Cirrus-CI
-# shellcheck disable=SC2154
-if [[ "$CIRRUS_BRANCH" =~ pull ]]; then
-    for var in CIRRUS_CHANGE_IN_REPO CIRRUS_PR DEST_BRANCH; do
-        if [[ -z "${!var}" ]]; then
-            warn "Skipping: Golang code checks require non-empty '\$$var'"
-            exit 0
-        fi
-    done
-else
-    warn "Skipping: Golang code checks in tag and branch contexts"
-    exit 0
-fi
-
-# Defined by/in Cirrus-CI config.
-# shellcheck disable=SC2154
-base=$(git merge-base $DEST_BRANCH $CIRRUS_CHANGE_IN_REPO)
-diffs=$(git diff $base $CIRRUS_CHANGE_IN_REPO -- '*.go' ':^vendor/' ':^test/tools/vendor/')
-
-if [[ -z "$diffs" ]]; then
-    check_msg "There are no golang diffs to check between $base...$CIRRUS_CHANGE_IN_REPO"
-    exit 0
-fi
-
-check_diffs \
-    "use of deprecated ioutil vs recommended io or os packages." \
-    "^(\\+[^#]+io/ioutil)|(\\+.+ioutil\\..+)"
-
-check_diffs \
-    "use of os.IsNotExist(err) vs recommended errors.Is(err, fs.ErrNotExist)" \
-    "^\\+[^#]*os\\.IsNotExist\\("

contrib/cirrus/postbuild.sh

@@ -40,7 +40,3 @@ SUGGESTION="run 'make vendor', 'make -C test/tools vendor' and 'make completions
 
 showrun make generate-bindings
 SUGGESTION="run 'make generate-bindings' and commit all changes" ./hack/tree_status.sh
-
-# Defined in Cirrus-CI config.
-# shellcheck disable=SC2154
-$SCRIPT_BASE/check_go_changes.sh

libpod/container.go

@@ -404,7 +404,7 @@ func (c *Container) specFromState() (*spec.Spec, error) {
 			logrus.Warnf("Error unmarshalling container %s config: %v", c.ID(), err)
 			return c.config.Spec, nil
 		}
-	} else if !os.IsNotExist(err) {
+	} else if !errors.Is(err, os.ErrNotExist) {
 		// ignore when the file does not exist
 		return nil, fmt.Errorf("opening container config: %w", err)
 	}

libpod/container_exec.go

@@ -907,7 +907,7 @@ func (c *Container) cleanupExecBundle(sessionID string) (err error) {
 	path := c.execBundlePath(sessionID)
 	for range 50 {
 		err = os.RemoveAll(path)
-		if err == nil || os.IsNotExist(err) {
+		if err == nil || errors.Is(err, os.ErrNotExist) {
 			return nil
 		}
 		if pathErr, ok := err.(*os.PathError); ok {
@@ -990,7 +990,7 @@ func (c *Container) createExecBundle(sessionID string) (retErr error) {
 	}()
 	if err := os.MkdirAll(c.execExitFileDir(sessionID), execDirPermission); err != nil {
 		// The directory is allowed to exist
-		if !os.IsExist(err) {
+		if !errors.Is(err, os.ErrExist) {
 			return fmt.Errorf("creating OCI runtime exit file path %s: %w", c.execExitFileDir(sessionID), err)
 		}
 	}

libpod/container_internal.go

@@ -738,17 +738,17 @@ func (c *Container) removeConmonFiles() error {
 		return fmt.Errorf("failed to get attach socket path for container %s: %w", c.ID(), err)
 	}
 
-	if err := os.Remove(attachFile); err != nil && !os.IsNotExist(err) {
+	if err := os.Remove(attachFile); err != nil && !errors.Is(err, os.ErrNotExist) {
 		return fmt.Errorf("removing container %s attach file: %w", c.ID(), err)
 	}
 
 	ctlFile := filepath.Join(c.bundlePath(), "ctl")
-	if err := os.Remove(ctlFile); err != nil && !os.IsNotExist(err) {
+	if err := os.Remove(ctlFile); err != nil && !errors.Is(err, os.ErrNotExist) {
 		return fmt.Errorf("removing container %s ctl file: %w", c.ID(), err)
 	}
 
 	winszFile := filepath.Join(c.bundlePath(), "winsz")
-	if err := os.Remove(winszFile); err != nil && !os.IsNotExist(err) {
+	if err := os.Remove(winszFile); err != nil && !errors.Is(err, os.ErrNotExist) {
 		return fmt.Errorf("removing container %s winsz file: %w", c.ID(), err)
 	}
 
@@ -757,7 +757,7 @@ func (c *Container) removeConmonFiles() error {
 	if err != nil {
 		return err
 	}
-	if err := os.Remove(exitFile); err != nil && !os.IsNotExist(err) {
+	if err := os.Remove(exitFile); err != nil && !errors.Is(err, os.ErrNotExist) {
 		return fmt.Errorf("removing container %s exit file: %w", c.ID(), err)
 	}
 
@@ -1826,7 +1826,7 @@ func (c *Container) mountStorage() (_ string, deferredErr error) {
 	defer unix.Close(dirfd)
 
 	err = unix.Mkdirat(dirfd, "etc", 0o755)
-	if err != nil && !os.IsExist(err) {
+	if err != nil && !errors.Is(err, os.ErrExist) {
 		return "", fmt.Errorf("create /etc: %w", err)
 	}
 	// If the etc directory was created, chown it to root in the container
@@ -1926,7 +1926,7 @@ func (c *Container) mountNamedVolume(v *ContainerNamedVolume, mountpoint string)
 		// Skip the rest if it exists.
 		srcStat, err := os.Lstat(srcDir)
 		if err != nil {
-			if os.IsNotExist(err) {
+			if errors.Is(err, os.ErrNotExist) {
 				// Source does not exist, don't bother copying
 				// up.
 				return vol, nil
@@ -2386,7 +2386,7 @@ func (c *Container) postDeleteHooks(ctx context.Context) error {
 func (c *Container) writeStringToRundir(destFile, contents string) (string, error) {
 	destFileName := filepath.Join(c.state.RunDir, destFile)
 
-	if err := os.Remove(destFileName); err != nil && !os.IsNotExist(err) {
+	if err := os.Remove(destFileName); err != nil && !errors.Is(err, os.ErrNotExist) {
 		return "", fmt.Errorf("removing %s for container %s: %w", destFile, c.ID(), err)
 	}
 
@@ -2420,7 +2420,7 @@ func (c *Container) saveSpec(spec *spec.Spec) error {
 	// paths
 	jsonPath := filepath.Join(c.bundlePath(), "config.json")
 	if err := fileutils.Exists(jsonPath); err != nil {
-		if !os.IsNotExist(err) {
+		if !errors.Is(err, os.ErrNotExist) {
 			return fmt.Errorf("doing stat on container %s spec: %w", c.ID(), err)
 		}
 		// The spec does not exist, we're fine
@@ -2456,7 +2456,7 @@ func (c *Container) setupOCIHooks(ctx context.Context, config *spec.Spec) (map[s
 		for _, hDir := range []string{hooks.DefaultDir, hooks.OverrideDir} {
 			manager, err := hooks.New(ctx, []string{hDir}, []string{"precreate", "poststop"})
 			if err != nil {
-				if os.IsNotExist(err) {
+				if errors.Is(err, os.ErrNotExist) {
 					continue
 				}
 				return nil, err
@@ -2718,7 +2718,7 @@ func (c *Container) checkExitFile() error {
 	// Check for the exit file
 	info, err := os.Stat(exitFile)
 	if err != nil {
-		if os.IsNotExist(err) {
+		if errors.Is(err, os.ErrNotExist) {
 			// Container is still running, no error
 			return nil
 		}

libpod/container_internal_common.go

@@ -979,7 +979,7 @@ func (c *Container) mountNotifySocket(g generate.Generator) error {
 	notifyDir := filepath.Join(c.bundlePath(), "notify")
 	logrus.Debugf("Checking notify %q dir", notifyDir)
 	if err := os.MkdirAll(notifyDir, 0o755); err != nil {
-		if !os.IsExist(err) {
+		if !errors.Is(err, os.ErrExist) {
 			return fmt.Errorf("unable to create notify %q dir: %w", notifyDir, err)
 		}
 	}
@@ -1958,13 +1958,13 @@ func (c *Container) makeBindMounts() error {
 		// another container.
 		if c.config.NetNsCtr == "" {
 			if resolvePath, ok := c.state.BindMounts[resolvconf.DefaultResolvConf]; ok {
-				if err := os.Remove(resolvePath); err != nil && !os.IsNotExist(err) {
+				if err := os.Remove(resolvePath); err != nil && !errors.Is(err, os.ErrNotExist) {
 					return fmt.Errorf("container %s: %w", c.ID(), err)
 				}
 				delete(c.state.BindMounts, resolvconf.DefaultResolvConf)
 			}
 			if hostsPath, ok := c.state.BindMounts[config.DefaultHostsFile]; ok {
-				if err := os.Remove(hostsPath); err != nil && !os.IsNotExist(err) {
+				if err := os.Remove(hostsPath); err != nil && !errors.Is(err, os.ErrNotExist) {
 					return fmt.Errorf("container %s: %w", c.ID(), err)
 				}
 				delete(c.state.BindMounts, config.DefaultHostsFile)
@@ -2843,7 +2843,7 @@ func (c *Container) generatePasswdAndGroup() (string, string, error) {
 				return "", "", fmt.Errorf("creating path to container %s /etc/passwd: %w", c.ID(), err)
 			}
 			orig, err := os.ReadFile(originPasswdFile)
-			if err != nil && !os.IsNotExist(err) {
+			if err != nil && !errors.Is(err, os.ErrNotExist) {
 				return "", "", err
 			}
 			passwdFile, err := c.writeStringToStaticDir("passwd", string(orig)+passwdEntry)
@@ -2889,7 +2889,7 @@ func (c *Container) generatePasswdAndGroup() (string, string, error) {
 				return "", "", fmt.Errorf("creating path to container %s /etc/group: %w", c.ID(), err)
 			}
 			orig, err := os.ReadFile(originGroupFile)
-			if err != nil && !os.IsNotExist(err) {
+			if err != nil && !errors.Is(err, os.ErrNotExist) {
 				return "", "", err
 			}
 			groupFile, err := c.writeStringToStaticDir("group", string(orig)+groupEntry)
@@ -2932,7 +2932,7 @@ func (c *Container) cleanupOverlayMounts() error {
 func (c *Container) createSecretMountDir(runPath string) error {
 	src := filepath.Join(c.state.RunDir, "/run/secrets")
 	err := fileutils.Exists(src)
-	if os.IsNotExist(err) {
+	if errors.Is(err, os.ErrNotExist) {
 		if err := umask.MkdirAllIgnoreUmask(src, os.FileMode(0o755)); err != nil {
 			return err
 		}
@@ -3087,7 +3087,7 @@ func (c *Container) fixVolumePermissionsUnlocked(v *ContainerNamedVolume, vol *V
 			if err := setVolumeAtime(mountPoint, st); err != nil {
 				return err
 			}
-		} else if !os.IsNotExist(err) {
+		} else if !errors.Is(err, os.ErrNotExist) {
 			return err
 		}
 	}

libpod/container_internal_freebsd.go

@@ -4,6 +4,7 @@ package libpod
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"os"
 	"path/filepath"
@@ -236,7 +237,7 @@ func (c *Container) addSharedNamespaces(g *generate.Generator) error {
 
 	availableUIDs, availableGIDs, err := rootless.GetAvailableIDMaps()
 	if err != nil {
-		if os.IsNotExist(err) {
+		if errors.Is(err, os.ErrNotExist) {
 			// The kernel-provided files only exist if user namespaces are supported
 			logrus.Debugf("User or group ID mappings not available: %s", err)
 		} else {

libpod/container_internal_linux.go

@@ -3,6 +3,7 @@
 package libpod
 
 import (
+	"errors"
 	"fmt"
 	"io/fs"
 	"os"
@@ -436,7 +437,7 @@ func (c *Container) addSharedNamespaces(g *generate.Generator) error {
 
 	availableUIDs, availableGIDs, err := rootless.GetAvailableIDMaps()
 	if err != nil {
-		if os.IsNotExist(err) {
+		if errors.Is(err, os.ErrNotExist) {
 			// The kernel-provided files only exist if user namespaces are supported
 			logrus.Debugf("User or group ID mappings not available: %s", err)
 		} else {
@@ -687,7 +688,7 @@ func (c *Container) makePlatformMtabLink(etcInTheContainerFd, rootUID, rootGID i
 	// If /etc/mtab does not exist in container image, then we need to
 	// create it, so that mount command within the container will work.
 	err := unix.Symlinkat("/proc/mounts", etcInTheContainerFd, "mtab")
-	if err != nil && !os.IsExist(err) {
+	if err != nil && !errors.Is(err, os.ErrExist) {
 		return fmt.Errorf("creating /etc/mtab symlink: %w", err)
 	}
 	// If the symlink was created, then also chown it to root in the container

libpod/container_stat_common.go

@@ -61,7 +61,7 @@ func (c *Container) stat(containerMountPoint string, containerPath string) (*def
 		// have to look into the error string.  Turning it into an
 		// ENOENT lets the API handlers return the correct status code
 		// which is crucial for the remote client.
-		if os.IsNotExist(statErr) || strings.Contains(statErr.Error(), "o such file or directory") {
+		if errors.Is(statErr, os.ErrNotExist) || strings.Contains(statErr.Error(), "o such file or directory") {
 			statErr = copy.ErrENOENT
 		}
 	}

libpod/lock/file/file_lock.go

@@ -83,7 +83,7 @@ func (locks *FileLocks) AllocateLock() (uint32, error) {
 		path := locks.getLockPath(id)
 		f, err := os.OpenFile(path, os.O_RDWR|os.O_CREATE|os.O_EXCL, 0o666)
 		if err != nil {
-			if os.IsExist(err) {
+			if errors.Is(err, os.ErrExist) {
 				continue
 			}
 			return 0, fmt.Errorf("creating lock file: %w", err)

libpod/oci_conmon_common.go

@@ -124,7 +124,7 @@ func newConmonOCIRuntime(name string, paths []string, conmonPath string, runtime
 	for _, path := range paths {
 		stat, err := os.Stat(path)
 		if err != nil {
-			if os.IsNotExist(err) {
+			if errors.Is(err, os.ErrNotExist) {
 				continue
 			}
 			return nil, fmt.Errorf("cannot stat OCI runtime %s path: %w", name, err)

libpod/plugin/volume_api.go

@@ -183,7 +183,7 @@ func (p *VolumePlugin) getURI() string {
 // Does not actually ping the API, just verifies that the socket still exists.
 func (p *VolumePlugin) verifyReachable() error {
 	if err := fileutils.Exists(p.SocketPath); err != nil {
-		if os.IsNotExist(err) {
+		if errors.Is(err, os.ErrNotExist) {
 			pluginsLock.Lock()
 			defer pluginsLock.Unlock()
 			delete(plugins, p.Name)

libpod/runtime_ctr.go

@@ -599,7 +599,7 @@ func (r *Runtime) setupContainer(ctx context.Context, ctr *Container) (_ *Contai
 	if useDevShm && !MountExists(ctr.config.Spec.Mounts, "/dev/shm") && ctr.config.ShmDir == "" && !ctr.config.NoShm {
 		ctr.config.ShmDir = filepath.Join(ctr.bundlePath(), "shm")
 		if err := os.MkdirAll(ctr.config.ShmDir, 0o700); err != nil {
-			if !os.IsExist(err) {
+			if !errors.Is(err, os.ErrExist) {
 				return nil, fmt.Errorf("unable to create shm dir: %w", err)
 			}
 		}

libpod/runtime_migrate_linux.go

@@ -29,7 +29,7 @@ func (r *Runtime) stopPauseProcess() error {
 		pausePidPath := rootless.GetPausePidPath(stateDir)
 		data, err := os.ReadFile(pausePidPath)
 		if err != nil {
-			if os.IsNotExist(err) {
+			if errors.Is(err, os.ErrNotExist) {
 				return nil
 			}
 			return fmt.Errorf("cannot read pause process pid file: %w", err)

libpod/util.go

@@ -88,11 +88,11 @@ func DefaultSeccompPath() (string, error) {
 	if err == nil {
 		return config.SeccompOverridePath, nil
 	}
-	if !os.IsNotExist(err) {
+	if !errors.Is(err, os.ErrNotExist) {
 		return "", err
 	}
 	if err := fileutils.Exists(config.SeccompDefaultPath); err != nil {
-		if !os.IsNotExist(err) {
+		if !errors.Is(err, os.ErrNotExist) {
 			return "", err
 		}
 		return "", nil

pkg/api/handlers/compat/containers_archive.go

@@ -131,7 +131,7 @@ func handlePut(w http.ResponseWriter, r *http.Request, decoder *schema.Decoder,
 		})
 	if err != nil {
 		switch {
-		case errors.Is(err, define.ErrNoSuchCtr) || os.IsNotExist(err):
+		case errors.Is(err, define.ErrNoSuchCtr) || errors.Is(err, os.ErrNotExist):
 			// 404 is returned for an absent container and path.  The
 			// clients must deal with it accordingly.
 			utils.Error(w, http.StatusNotFound, fmt.Errorf("the container does not exist: %w", err))

pkg/api/handlers/compat/containers_create.go

@@ -541,7 +541,7 @@ func cliOpts(cc handlers.CreateContainerConfig, rtc *config.Config) (*entities.C
 			continue
 		}
 		if err := os.MkdirAll(vol, 0o755); err != nil {
-			if !os.IsExist(err) {
+			if !errors.Is(err, os.ErrExist) {
 				return nil, nil, fmt.Errorf("making volume mountpoint for volume %s: %w", vol, err)
 			}
 		}

pkg/bindings/images/build.go

@@ -621,7 +621,7 @@ func prepareContainerFiles(containerFiles []string, contextDir string, stdinDest
 		} else {
 			// If Containerfile does not exist, assume it is in context directory and do Not add to tarfile
 			if err := fileutils.Lexists(containerfile); err != nil {
-				if !os.IsNotExist(err) {
+				if !errors.Is(err, os.ErrNotExist) {
 					return nil, err
 				}
 				containerfile = c

pkg/bindings/test/common_test.go

@@ -2,6 +2,7 @@ package bindings_test
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"os"
 	"os/exec"
@@ -31,7 +32,7 @@ const (
 
 func getPodmanBinary() string {
 	_, err := os.Stat(devPodmanBinaryLocation)
-	if os.IsNotExist(err) {
+	if errors.Is(err, os.ErrNotExist) {
 		return defaultPodmanBinaryLocation
 	}
 	return devPodmanBinaryLocation
@@ -152,7 +153,7 @@ func (b *bindingTest) startAPIService() *Session {
 	sock := strings.TrimPrefix(b.sock, "unix://")
 	for range 10 {
 		if _, err := os.Stat(sock); err != nil {
-			if !os.IsNotExist(err) {
+			if !errors.Is(err, os.ErrNotExist) {
 				break
 			}
 			time.Sleep(time.Second)
@@ -264,7 +265,7 @@ func createCache() {
 	b := newBindingTest()
 	for _, i := range CACHE_IMAGES {
 		_, err := os.Stat(filepath.Join(ImageCacheDir, i.tarballName))
-		if os.IsNotExist(err) {
+		if errors.Is(err, os.ErrNotExist) {
 			//	pull the image
 			b.Pull(i.name)
 			b.Save(i)

pkg/bindings/test/resource_test.go

@@ -4,6 +4,7 @@ package bindings_test
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"io/fs"
 	"os"
@@ -103,7 +104,7 @@ func readProc() ([]string, error) {
 				name += err.Error()
 			case d.Type()&fs.ModeSymlink != 0:
 				n, err := os.Readlink(path)
-				if err != nil && !os.IsNotExist(err) {
+				if err != nil && !errors.Is(err, os.ErrNotExist) {
 					return err
 				}
 				if n == "" {

pkg/checkpoint/crutils/checkpoint_restore_utils.go

@@ -77,7 +77,7 @@ func CRImportCheckpointConfigOnly(destination, input string) error {
 // it exists deletes all files listed.
 func CRRemoveDeletedFiles(id, baseDirectory, containerRootDirectory string) error {
 	deletedFiles, _, err := metadata.ReadContainerCheckpointDeletedFiles(baseDirectory)
-	if os.IsNotExist(err) {
+	if errors.Is(err, os.ErrNotExist) {
 		// No files to delete. Just return
 		return nil
 	}

pkg/copy/fileinfo.go

@@ -63,7 +63,7 @@ func ResolveHostPath(path string) (*FileInfo, error) {
 
 	statInfo, err := os.Stat(resolvedHostPath)
 	if err != nil {
-		if os.IsNotExist(err) {
+		if errors.Is(err, os.ErrNotExist) {
 			return nil, ErrENOENT
 		}
 		return nil, err

pkg/domain/infra/tunnel/images.go

@@ -360,7 +360,7 @@ func (ir *ImageEngine) Save(_ context.Context, nameOrID string, tags []string, o
 		if info.Mode().IsRegular() {
 			return fmt.Errorf("%q already exists as a regular file", opts.Output)
 		}
-	case os.IsNotExist(err):
+	case errors.Is(err, os.ErrNotExist):
 		if err := os.Mkdir(opts.Output, 0o755); err != nil {
 			return err
 		}

pkg/lookup/lookup.go

@@ -1,6 +1,7 @@
 package lookup
 
 import (
+	"errors"
 	"os"
 	"strconv"
 
@@ -123,7 +124,7 @@ func GetUser(containerMount, userIDorName string) (*user.User, error) {
 		}
 		return u.Uid == uid
 	})
-	if err != nil && !os.IsNotExist(err) {
+	if err != nil && !errors.Is(err, os.ErrNotExist) {
 		return nil, err
 	}
 	if len(users) > 0 {
@@ -158,7 +159,7 @@ func GetGroup(containerMount, groupIDorName string) (*user.Group, error) {
 		}
 		return g.Gid == gid
 	})
-	if err != nil && !os.IsNotExist(err) {
+	if err != nil && !errors.Is(err, os.ErrNotExist) {
 		return nil, err
 	}
 	if len(groups) > 0 {

pkg/rootless/rootless.go

@@ -52,7 +52,7 @@ func TryJoinPauseProcess(stateDir string) (bool, int, error) {
 	pidFileLock, err := lockfile.GetLockFile(pausePidPath)
 	if err != nil {
 		// The file was deleted by another process.
-		if os.IsNotExist(err) {
+		if errors.Is(err, os.ErrNotExist) {
 			return false, -1, nil
 		}
 		return false, -1, fmt.Errorf("acquiring lock on %s: %w", pausePidPath, err)

pkg/trust/policy.go

@@ -193,7 +193,7 @@ func AddPolicyEntries(policyPath string, input AddPolicyEntriesInput) error {
 	}
 
 	err = fileutils.Exists(policyPath)
-	if !os.IsNotExist(err) {
+	if !errors.Is(err, os.ErrNotExist) {
 		policyContent, err := os.ReadFile(policyPath)
 		if err != nil {
 			return err

pkg/trust/registries.go

@@ -1,6 +1,7 @@
 package trust
 
 import (
+	"errors"
 	"fmt"
 	"os"
 	"path/filepath"
@@ -58,7 +59,7 @@ func loadAndMergeConfig(dirPath string) (*registryConfiguration, error) {
 
 	dir, err := os.Open(dirPath)
 	if err != nil {
-		if os.IsNotExist(err) {
+		if errors.Is(err, os.ErrNotExist) {
 			return &mergedConfig, nil
 		}
 		return nil, err

pkg/util/utils.go

@@ -102,7 +102,7 @@ func ParseDockerignore(containerfiles []string, root string) ([]string, string,
 				}
 			}
 		}
-		if dockerIgnoreErr != nil && !os.IsNotExist(dockerIgnoreErr) {
+		if dockerIgnoreErr != nil && !errors.Is(dockerIgnoreErr, os.ErrNotExist) {
 			return nil, ignoreFile, err
 		}
 	}

pkg/util/utils_linux.go

@@ -180,7 +180,7 @@ func AddPrivilegedDevices(g *generate.Generator, systemdMode bool) error {
 func getDevices(path string) ([]spec.LinuxDevice, error) {
 	files, err := os.ReadDir(path)
 	if err != nil {
-		if rootless.IsRootless() && os.IsPermission(err) {
+		if rootless.IsRootless() && errors.Is(err, os.ErrPermission) {
 			return nil, nil
 		}
 		return nil, err

test/e2e/build_test.go

@@ -4,6 +4,7 @@ package integration
 
 import (
 	"bytes"
+	"errors"
 	"fmt"
 	"os"
 	"os/exec"
@@ -464,7 +465,7 @@ RUN exit 5`, CITEST_IMAGE)
 		// Write target and fake files
 		targetSubPath := filepath.Join(podmanTest.TempDir, "emptydir")
 		if _, err = os.Stat(targetSubPath); err != nil {
-			if os.IsNotExist(err) {
+			if errors.Is(err, os.ErrNotExist) {
 				err = os.Mkdir(targetSubPath, 0o755)
 				Expect(err).ToNot(HaveOccurred())
 			}

test/e2e/common_test.go

@@ -621,7 +621,7 @@ func (p *PodmanTestIntegration) createArtifact(image string) {
 		return
 	}
 	destName := imageTarPath(image)
-	if _, err := os.Stat(destName); os.IsNotExist(err) {
+	if _, err := os.Stat(destName); errors.Is(err, os.ErrNotExist) {
 		GinkgoWriter.Printf("Caching %s at %s...\n", image, destName)
 
 		p.pullImage(image, false)