Skip to content

Commit 11b9932

Browse files
authored
fix: use %w for errors (#376)
Signed-off-by: Chris Gianelloni <[email protected]>
1 parent 07037fc commit 11b9932

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

pkgmgr/config.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ func NewDefaultConfig() (Config, error) {
3939
userHomeDir, err := os.UserHomeDir()
4040
if err != nil {
4141
return Config{}, fmt.Errorf(
42-
"could not determine user home directory: %s",
42+
"could not determine user home directory: %w",
4343
err,
4444
)
4545
}
@@ -48,14 +48,14 @@ func NewDefaultConfig() (Config, error) {
4848
userCacheDir, err := os.UserCacheDir()
4949
if err != nil {
5050
return Config{}, fmt.Errorf(
51-
"could not determine user cache directory: %s",
51+
"could not determine user cache directory: %w",
5252
err,
5353
)
5454
}
5555
userConfigDir, err := os.UserConfigDir()
5656
if err != nil {
5757
return Config{}, fmt.Errorf(
58-
"could not determine user config directory: %s",
58+
"could not determine user config directory: %w",
5959
err,
6060
)
6161
}

pkgmgr/error.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ func NewNoPackageAvailableForUpgradeError(pkgSpec string) error {
138138

139139
func NewInstallStepConditionError(condition string, err error) error {
140140
return fmt.Errorf(
141-
"failure evaluating install step condition %q: %s",
141+
"failure evaluating install step condition %q: %w",
142142
condition,
143143
err,
144144
)

pkgmgr/package.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ func (p Package) install(
159159
}
160160
if installStep.Docker != nil {
161161
if err := installStep.Docker.preflight(cfg, pkgName); err != nil {
162-
return "", nil, fmt.Errorf("pre-flight check failed: %s", err)
162+
return "", nil, fmt.Errorf("pre-flight check failed: %w", err)
163163
}
164164
}
165165
}
@@ -453,7 +453,7 @@ func (p Package) validate(cfg Config) error {
453453
}
454454
// Check version is well formed
455455
if _, err := version.NewVersion(p.Version); err != nil {
456-
return fmt.Errorf("package version is malformed: %s", err)
456+
return fmt.Errorf("package version is malformed: %w", err)
457457
}
458458
// Check if package path matches package name/version
459459
expectedFilePath := filepath.Join(
@@ -638,19 +638,19 @@ func (p Package) services(
638638
func (p Package) runHookScript(cfg Config, hookScript string) error {
639639
renderedScript, err := cfg.Template.Render(hookScript, nil)
640640
if err != nil {
641-
return fmt.Errorf("failed to render hook script template: %s", err)
641+
return fmt.Errorf("failed to render hook script template: %w", err)
642642
}
643643
cmd := exec.Command("/bin/sh", "-c", renderedScript)
644644
cmd.Stdout = os.Stdout
645645
cmd.Stderr = os.Stderr
646646
// We won't be reading or writing, so throw away the PTY file
647647
err = cmd.Start()
648648
if err != nil {
649-
return fmt.Errorf("failed to run hook script: %s", err)
649+
return fmt.Errorf("failed to run hook script: %w", err)
650650
}
651651
err = cmd.Wait()
652652
if err != nil {
653-
return fmt.Errorf("run hook script exited with error: %s", err)
653+
return fmt.Errorf("run hook script exited with error: %w", err)
654654
}
655655
return nil
656656
}

pkgmgr/pkgmgr.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func NewDefaultPackageManager() (*PackageManager, error) {
5656

5757
func (p *PackageManager) init() error {
5858
if err := p.state.Load(); err != nil {
59-
return fmt.Errorf("failed to load state: %s", err)
59+
return fmt.Errorf("failed to load state: %w", err)
6060
}
6161
// Setup templating
6262
p.initTemplate()

0 commit comments

Comments
 (0)