summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
Diffstat (limited to 'pkg')
-rw-r--r--pkg/cgroups/cgroups.go12
-rw-r--r--pkg/cgroups/cgroups_supported.go2
-rw-r--r--pkg/cgroups/cpu.go2
-rw-r--r--pkg/checkpoint/checkpoint_restore.go12
-rw-r--r--pkg/domain/infra/abi/containers.go2
-rw-r--r--pkg/domain/infra/abi/cp.go6
-rw-r--r--pkg/domain/infra/abi/images.go2
-rw-r--r--pkg/domain/infra/abi/play.go6
-rw-r--r--pkg/domain/infra/abi/trust.go4
-rw-r--r--pkg/domain/infra/tunnel/containers.go4
-rw-r--r--pkg/rootless/rootless_linux.go2
-rw-r--r--pkg/spec/config_linux_cgo.go2
-rw-r--r--pkg/specgen/generate/config_linux_cgo.go2
-rw-r--r--pkg/trust/trust.go4
-rw-r--r--pkg/util/utils.go4
-rw-r--r--pkg/util/utils_supported.go4
-rw-r--r--pkg/varlinkapi/images.go4
17 files changed, 34 insertions, 40 deletions
diff --git a/pkg/cgroups/cgroups.go b/pkg/cgroups/cgroups.go
index f23787bd4..3cf736bdc 100644
--- a/pkg/cgroups/cgroups.go
+++ b/pkg/cgroups/cgroups.go
@@ -131,7 +131,7 @@ func getAvailableControllers(exclude map[string]controllerHandler, cgroup2 bool)
infos, err := ioutil.ReadDir(cgroupRoot)
if err != nil {
- return nil, errors.Wrapf(err, "read directory %s", cgroupRoot)
+ return nil, err
}
controllers := []controller{}
for _, i := range infos {
@@ -157,7 +157,7 @@ func (c *CgroupControl) getCgroupv1Path(name string) string {
func createCgroupv2Path(path string) (deferredError error) {
content, err := ioutil.ReadFile("/sys/fs/cgroup/cgroup.controllers")
if err != nil {
- return errors.Wrapf(err, "read /sys/fs/cgroup/cgroup.controllers")
+ return err
}
if !strings.HasPrefix(path, "/sys/fs/cgroup/") {
return fmt.Errorf("invalid cgroup path %s", path)
@@ -180,7 +180,7 @@ func createCgroupv2Path(path string) (deferredError error) {
if i > 0 {
if err := os.Mkdir(current, 0755); err != nil {
if !os.IsExist(err) {
- return errors.Wrapf(err, "mkdir %s", path)
+ return err
}
} else {
// If the directory was created, be sure it is not left around on errors.
@@ -237,7 +237,7 @@ func (c *CgroupControl) initialize() (err error) {
}
path := c.getCgroupv1Path(ctr.name)
if err := os.MkdirAll(path, 0755); err != nil {
- return errors.Wrapf(err, "error creating cgroup path %s for %s", path, ctr.name)
+ return errors.Wrapf(err, "error creating cgroup path for %s", ctr.name)
}
}
}
@@ -265,7 +265,7 @@ func (c *CgroupControl) createCgroupDirectory(controller string) (bool, error) {
func readFileAsUint64(path string) (uint64, error) {
data, err := ioutil.ReadFile(path)
if err != nil {
- return 0, errors.Wrapf(err, "open %s", path)
+ return 0, err
}
v := cleanString(string(data))
if v == "max" {
@@ -425,7 +425,7 @@ func rmDirRecursively(path string) error {
}
entries, err := ioutil.ReadDir(path)
if err != nil {
- return errors.Wrapf(err, "read %s", path)
+ return err
}
for _, i := range entries {
if i.IsDir() {
diff --git a/pkg/cgroups/cgroups_supported.go b/pkg/cgroups/cgroups_supported.go
index a9fef38b9..fe17db7f7 100644
--- a/pkg/cgroups/cgroups_supported.go
+++ b/pkg/cgroups/cgroups_supported.go
@@ -46,7 +46,7 @@ func UserOwnsCurrentSystemdCgroup() (bool, error) {
f, err := os.Open("/proc/self/cgroup")
if err != nil {
- return false, errors.Wrapf(err, "open file /proc/self/cgroup")
+ return false, err
}
defer f.Close()
diff --git a/pkg/cgroups/cpu.go b/pkg/cgroups/cpu.go
index 3745c6e50..a73187dc8 100644
--- a/pkg/cgroups/cpu.go
+++ b/pkg/cgroups/cpu.go
@@ -134,7 +134,7 @@ func GetSystemCPUUsage() (uint64, error) {
files, err := ioutil.ReadDir(cgroupRoot)
if err != nil {
- return 0, errors.Wrapf(err, "read directory %q", cgroupRoot)
+ return 0, err
}
var total uint64
for _, file := range files {
diff --git a/pkg/checkpoint/checkpoint_restore.go b/pkg/checkpoint/checkpoint_restore.go
index 2a73efe36..e1f6703f4 100644
--- a/pkg/checkpoint/checkpoint_restore.go
+++ b/pkg/checkpoint/checkpoint_restore.go
@@ -22,15 +22,9 @@ import (
// crImportFromJSON imports the JSON files stored in the exported
// checkpoint tarball
func crImportFromJSON(filePath string, v interface{}) error {
- jsonFile, err := os.Open(filePath)
+ content, err := ioutil.ReadFile(filePath)
if err != nil {
- return errors.Wrapf(err, "Failed to open container definition %s for restore", filePath)
- }
- defer errorhandling.CloseQuiet(jsonFile)
-
- content, err := ioutil.ReadAll(jsonFile)
- if err != nil {
- return errors.Wrapf(err, "Failed to read container definition %s for restore", filePath)
+ return errors.Wrap(err, "Failed to read container definition for restore")
}
json := jsoniter.ConfigCompatibleWithStandardLibrary
if err = json.Unmarshal(content, v); err != nil {
@@ -47,7 +41,7 @@ func CRImportCheckpoint(ctx context.Context, runtime *libpod.Runtime, input stri
// tarball to a temporary directory
archiveFile, err := os.Open(input)
if err != nil {
- return nil, errors.Wrapf(err, "Failed to open checkpoint archive %s for import", input)
+ return nil, errors.Wrap(err, "Failed to open checkpoint archive for import")
}
defer errorhandling.CloseQuiet(archiveFile)
options := &archive.TarOptions{
diff --git a/pkg/domain/infra/abi/containers.go b/pkg/domain/infra/abi/containers.go
index 8b0d53940..bd6380f75 100644
--- a/pkg/domain/infra/abi/containers.go
+++ b/pkg/domain/infra/abi/containers.go
@@ -604,7 +604,7 @@ func checkExecPreserveFDs(options entities.ExecOptions) error {
if options.PreserveFDs > 0 {
entries, err := ioutil.ReadDir("/proc/self/fd")
if err != nil {
- return errors.Wrapf(err, "unable to read /proc/self/fd")
+ return err
}
m := make(map[int]bool)
diff --git a/pkg/domain/infra/abi/cp.go b/pkg/domain/infra/abi/cp.go
index 0cd2ac8ca..a0bfcc90c 100644
--- a/pkg/domain/infra/abi/cp.go
+++ b/pkg/domain/infra/abi/cp.go
@@ -115,7 +115,7 @@ func (ic *ContainerEngine) ContainerCp(ctx context.Context, source, dest string,
return nil, err
}
if err = idtools.MkdirAllAndChownNew(ctrWorkDir, 0755, hostOwner); err != nil {
- return nil, errors.Wrapf(err, "error creating directory %q", destPath)
+ return nil, err
}
cleanedPath, err := securejoin.SecureJoin(mountPoint, filepath.Join(ctr.WorkingDir(), destPath))
if err != nil {
@@ -249,7 +249,7 @@ func containerCopy(srcPath, destPath, src, dest string, idMappingOpts storage.ID
}
destDirIsExist := err == nil
if err = os.MkdirAll(destdir, 0755); err != nil {
- return errors.Wrapf(err, "error creating directory %q", destdir)
+ return err
}
// return functions for copying items
@@ -351,7 +351,7 @@ func streamFileToStdout(srcPath string, srcfi os.FileInfo) error {
file, err := os.Open(srcPath)
if err != nil {
- return errors.Wrapf(err, "error opening file %s", srcPath)
+ return err
}
defer file.Close()
if !archive.IsArchivePath(srcPath) {
diff --git a/pkg/domain/infra/abi/images.go b/pkg/domain/infra/abi/images.go
index 965c63bec..3bb7de83c 100644
--- a/pkg/domain/infra/abi/images.go
+++ b/pkg/domain/infra/abi/images.go
@@ -770,7 +770,7 @@ func (ir *ImageEngine) Sign(ctx context.Context, names []string, options entitie
if err := os.MkdirAll(signatureDir, 0751); err != nil {
// The directory is allowed to exist
if !os.IsExist(err) {
- logrus.Errorf("error creating directory %s: %s", signatureDir, err)
+ logrus.Error(err)
continue
}
}
diff --git a/pkg/domain/infra/abi/play.go b/pkg/domain/infra/abi/play.go
index aa6aeede2..02bf91d53 100644
--- a/pkg/domain/infra/abi/play.go
+++ b/pkg/domain/infra/abi/play.go
@@ -248,7 +248,7 @@ func (ic *ContainerEngine) playKubePod(ctx context.Context, podName string, podY
case v1.HostPathDirectoryOrCreate:
if _, err := os.Stat(hostPath.Path); os.IsNotExist(err) {
if err := os.Mkdir(hostPath.Path, kubeDirectoryPermission); err != nil {
- return nil, errors.Errorf("Error creating HostPath %s at %s", volume.Name, hostPath.Path)
+ return nil, errors.Errorf("Error creating HostPath %s", volume.Name)
}
}
// Label a newly created volume
@@ -259,7 +259,7 @@ func (ic *ContainerEngine) playKubePod(ctx context.Context, podName string, podY
if _, err := os.Stat(hostPath.Path); os.IsNotExist(err) {
f, err := os.OpenFile(hostPath.Path, os.O_RDONLY|os.O_CREATE, kubeFilePermission)
if err != nil {
- return nil, errors.Errorf("Error creating HostPath %s at %s", volume.Name, hostPath.Path)
+ return nil, errors.Errorf("Error creating HostPath %s", volume.Name)
}
if err := f.Close(); err != nil {
logrus.Warnf("Error in closing newly created HostPath file: %v", err)
@@ -272,7 +272,7 @@ func (ic *ContainerEngine) playKubePod(ctx context.Context, podName string, podY
case v1.HostPathSocket:
st, err := os.Stat(hostPath.Path)
if err != nil {
- return nil, errors.Wrapf(err, "Error checking HostPathSocket")
+ return nil, errors.Wrap(err, "Error checking HostPathSocket")
}
if st.Mode()&os.ModeSocket != os.ModeSocket {
return nil, errors.Errorf("Error checking HostPathSocket: path %s is not a socket", hostPath.Path)
diff --git a/pkg/domain/infra/abi/trust.go b/pkg/domain/infra/abi/trust.go
index c697722ee..4a12297f9 100644
--- a/pkg/domain/infra/abi/trust.go
+++ b/pkg/domain/infra/abi/trust.go
@@ -24,7 +24,7 @@ func (ir *ImageEngine) ShowTrust(ctx context.Context, args []string, options ent
}
report.Raw, err = ioutil.ReadFile(policyPath)
if err != nil {
- return nil, errors.Wrapf(err, "unable to read %s", policyPath)
+ return nil, err
}
if options.Raw {
return &report, nil
@@ -67,7 +67,7 @@ func (ir *ImageEngine) SetTrust(ctx context.Context, args []string, options enti
if !os.IsNotExist(err) {
policyContent, err := ioutil.ReadFile(policyPath)
if err != nil {
- return errors.Wrapf(err, "unable to read %s", policyPath)
+ return err
}
if err := json.Unmarshal(policyContent, &policyContentStruct); err != nil {
return errors.Errorf("could not read trust policies")
diff --git a/pkg/domain/infra/tunnel/containers.go b/pkg/domain/infra/tunnel/containers.go
index 194bb4b48..1bb4e68ac 100644
--- a/pkg/domain/infra/tunnel/containers.go
+++ b/pkg/domain/infra/tunnel/containers.go
@@ -84,7 +84,7 @@ func (ic *ContainerEngine) ContainerStop(ctx context.Context, namesOrIds []strin
for _, cidFile := range options.CIDFiles {
content, err := ioutil.ReadFile(cidFile)
if err != nil {
- return nil, errors.Wrapf(err, "error reading CIDFile %s", cidFile)
+ return nil, errors.Wrap(err, "error reading CIDFile")
}
id := strings.Split(string(content), "\n")[0]
namesOrIds = append(namesOrIds, id)
@@ -164,7 +164,7 @@ func (ic *ContainerEngine) ContainerRm(ctx context.Context, namesOrIds []string,
for _, cidFile := range options.CIDFiles {
content, err := ioutil.ReadFile(cidFile)
if err != nil {
- return nil, errors.Wrapf(err, "error reading CIDFile %s", cidFile)
+ return nil, errors.Wrap(err, "error reading CIDFile")
}
id := strings.Split(string(content), "\n")[0]
namesOrIds = append(namesOrIds, id)
diff --git a/pkg/rootless/rootless_linux.go b/pkg/rootless/rootless_linux.go
index 3025825db..f029f24cb 100644
--- a/pkg/rootless/rootless_linux.go
+++ b/pkg/rootless/rootless_linux.go
@@ -453,7 +453,7 @@ func TryJoinFromFilePaths(pausePidPath string, needNewNamespace bool, paths []st
func ReadMappingsProc(path string) ([]idtools.IDMap, error) {
file, err := os.Open(path)
if err != nil {
- return nil, errors.Wrapf(err, "cannot open %s", path)
+ return nil, err
}
defer file.Close()
diff --git a/pkg/spec/config_linux_cgo.go b/pkg/spec/config_linux_cgo.go
index da92f511f..bc8fc4e29 100644
--- a/pkg/spec/config_linux_cgo.go
+++ b/pkg/spec/config_linux_cgo.go
@@ -29,7 +29,7 @@ func getSeccompConfig(config *SecurityConfig, configSpec *spec.Spec) (*spec.Linu
logrus.Debugf("Loading seccomp profile from %q", config.SeccompProfilePath)
seccompProfile, err := ioutil.ReadFile(config.SeccompProfilePath)
if err != nil {
- return nil, errors.Wrapf(err, "opening seccomp profile (%s) failed", config.SeccompProfilePath)
+ return nil, errors.Wrap(err, "opening seccomp profile failed")
}
seccompConfig, err = goSeccomp.LoadProfile(string(seccompProfile), configSpec)
if err != nil {
diff --git a/pkg/specgen/generate/config_linux_cgo.go b/pkg/specgen/generate/config_linux_cgo.go
index 21a1c910d..7a53cb01c 100644
--- a/pkg/specgen/generate/config_linux_cgo.go
+++ b/pkg/specgen/generate/config_linux_cgo.go
@@ -47,7 +47,7 @@ func getSeccompConfig(s *specgen.SpecGenerator, configSpec *spec.Spec, img *imag
logrus.Debugf("Loading seccomp profile from %q", s.SeccompProfilePath)
seccompProfile, err := ioutil.ReadFile(s.SeccompProfilePath)
if err != nil {
- return nil, errors.Wrapf(err, "opening seccomp profile (%s) failed", s.SeccompProfilePath)
+ return nil, errors.Wrap(err, "opening seccomp profile failed")
}
seccompConfig, err = goSeccomp.LoadProfile(string(seccompProfile), configSpec)
if err != nil {
diff --git a/pkg/trust/trust.go b/pkg/trust/trust.go
index 2348bc410..073b46c8d 100644
--- a/pkg/trust/trust.go
+++ b/pkg/trust/trust.go
@@ -226,10 +226,10 @@ func GetPolicy(policyPath string) (PolicyContent, error) {
var policyContentStruct PolicyContent
policyContent, err := ioutil.ReadFile(policyPath)
if err != nil {
- return policyContentStruct, errors.Wrapf(err, "unable to read policy file %s", policyPath)
+ return policyContentStruct, errors.Wrap(err, "unable to read policy file")
}
if err := json.Unmarshal(policyContent, &policyContentStruct); err != nil {
- return policyContentStruct, errors.Wrapf(err, "could not parse trust policies")
+ return policyContentStruct, errors.Wrapf(err, "could not parse trust policies from %s", policyPath)
}
return policyContentStruct, nil
}
diff --git a/pkg/util/utils.go b/pkg/util/utils.go
index 7612d3012..c3a70e2fb 100644
--- a/pkg/util/utils.go
+++ b/pkg/util/utils.go
@@ -490,14 +490,14 @@ func WriteStorageConfigFile(storageOpts *storage.StoreOptions, storageConf strin
}
storageFile, err := os.OpenFile(storageConf, os.O_RDWR|os.O_TRUNC, 0600)
if err != nil {
- return errors.Wrapf(err, "cannot open %s", storageConf)
+ return err
}
tomlConfiguration := getTomlStorage(storageOpts)
defer errorhandling.CloseQuiet(storageFile)
enc := toml.NewEncoder(storageFile)
if err := enc.Encode(tomlConfiguration); err != nil {
if err := os.Remove(storageConf); err != nil {
- logrus.Errorf("unable to remove file %s", storageConf)
+ logrus.Error(err)
}
return err
}
diff --git a/pkg/util/utils_supported.go b/pkg/util/utils_supported.go
index d627208d8..e08fd6dda 100644
--- a/pkg/util/utils_supported.go
+++ b/pkg/util/utils_supported.go
@@ -30,7 +30,7 @@ func GetRuntimeDir() (string, error) {
if runtimeDir == "" {
tmpDir := filepath.Join("/run", "user", uid)
if err := os.MkdirAll(tmpDir, 0700); err != nil {
- logrus.Debugf("unable to make temp dir %s", tmpDir)
+ logrus.Debug(err)
}
st, err := os.Stat(tmpDir)
if err == nil && int(st.Sys().(*syscall.Stat_t).Uid) == os.Geteuid() && (st.Mode().Perm()&0700 == 0700) {
@@ -40,7 +40,7 @@ func GetRuntimeDir() (string, error) {
if runtimeDir == "" {
tmpDir := filepath.Join(os.TempDir(), fmt.Sprintf("run-%s", uid))
if err := os.MkdirAll(tmpDir, 0700); err != nil {
- logrus.Debugf("unable to make temp dir %s", tmpDir)
+ logrus.Debug(err)
}
st, err := os.Stat(tmpDir)
if err == nil && int(st.Sys().(*syscall.Stat_t).Uid) == os.Geteuid() && (st.Mode().Perm()&0700 == 0700) {
diff --git a/pkg/varlinkapi/images.go b/pkg/varlinkapi/images.go
index 4bcf70b0d..ef310d590 100644
--- a/pkg/varlinkapi/images.go
+++ b/pkg/varlinkapi/images.go
@@ -155,7 +155,7 @@ func (i *VarlinkAPI) BuildImage(call iopodman.VarlinkCall, config iopodman.Build
reader, err := os.Open(contextDir)
if err != nil {
- logrus.Errorf("failed to open the context dir tar file %s", contextDir)
+ logrus.Errorf("failed to open the context dir tar file")
return call.ReplyErrorOccurred(fmt.Sprintf("unable to open context dir tar file %s", contextDir))
}
defer reader.Close()
@@ -166,7 +166,7 @@ func (i *VarlinkAPI) BuildImage(call iopodman.VarlinkCall, config iopodman.Build
logrus.Debugf("untar of %s successful", contextDir)
defer func() {
if err := os.Remove(contextDir); err != nil {
- logrus.Errorf("unable to delete file '%s': %q", contextDir, err)
+ logrus.Error(err)
}
if err := os.RemoveAll(newContextDir); err != nil {
logrus.Errorf("unable to delete directory '%s': %q", newContextDir, err)
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-10-01 04:17:40 +0000