From 0e8d1ad811bcc50a0c210061556f78695aafb31e Mon Sep 17 00:00:00 2001
From: Giuseppe Scrivano <gscrivan@redhat.com>
Date: Wed, 10 Apr 2024 18:36:20 +0200
Subject: [PATCH] pkg/trust: use fileutils.(Le|E)xists

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
---
 pkg/trust/policy.go     | 5 +++--
 pkg/trust/registries.go | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkg/trust/policy.go b/pkg/trust/policy.go
index 1424ffe91e..42532e6132 100644
--- a/pkg/trust/policy.go
+++ b/pkg/trust/policy.go
@@ -15,6 +15,7 @@ import (
 
 	"github.com/containers/common/pkg/config"
 	"github.com/containers/image/v5/types"
+	"github.com/containers/storage/pkg/fileutils"
 	"github.com/containers/storage/pkg/homedir"
 	"github.com/sirupsen/logrus"
 )
@@ -61,7 +62,7 @@ func DefaultPolicyPath(sys *types.SystemContext) string {
 	}
 
 	userPolicyFilePath := filepath.Join(homedir.Get(), filepath.FromSlash(".config/containers/policy.json"))
-	_, err := os.Stat(userPolicyFilePath)
+	err := fileutils.Exists(userPolicyFilePath)
 	if err == nil {
 		return userPolicyFilePath
 	}
@@ -218,7 +219,7 @@ func AddPolicyEntries(policyPath string, input AddPolicyEntriesInput) error {
 		return err
 	}
 
-	_, err = os.Stat(policyPath)
+	err = fileutils.Exists(policyPath)
 	if !os.IsNotExist(err) {
 		policyContent, err := os.ReadFile(policyPath)
 		if err != nil {
diff --git a/pkg/trust/registries.go b/pkg/trust/registries.go
index 959feb7267..d4516f7fcf 100644
--- a/pkg/trust/registries.go
+++ b/pkg/trust/registries.go
@@ -7,6 +7,7 @@ import (
 	"strings"
 
 	"github.com/containers/image/v5/types"
+	"github.com/containers/storage/pkg/fileutils"
 	"github.com/docker/docker/pkg/homedir"
 	"sigs.k8s.io/yaml"
 )
@@ -39,7 +40,7 @@ func RegistriesDirPath(sys *types.SystemContext) string {
 		return sys.RegistriesDirPath
 	}
 	userRegistriesDirPath := filepath.Join(homedir.Get(), userRegistriesDir)
-	if _, err := os.Stat(userRegistriesDirPath); err == nil {
+	if err := fileutils.Exists(userRegistriesDirPath); err == nil {
 		return userRegistriesDirPath
 	}
 	if sys != nil && sys.RootForImplicitAbsolutePaths != "" {