From bd907ec74dd7b51251fd37c0405ed6486636a0d6 Mon Sep 17 00:00:00 2001
From: vilmibm <vilmibm@neongrid.space>
Date: Mon, 20 Apr 2020 12:22:12 -0500
Subject: [PATCH] favor %w over %s for error wrapping

---
 command/config.go      | 4 ++--
 context/config_file.go | 4 ++--
 context/config_type.go | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/command/config.go b/command/config.go
index 872731dad..aaabecc6d 100644
--- a/command/config.go
+++ b/command/config.go
@@ -99,12 +99,12 @@ func configSet(cmd *cobra.Command, args []string) error {
 
 	err = cfg.Set(hostname, key, value)
 	if err != nil {
-		return fmt.Errorf("failed to set %q to %q: %s", key, value, err)
+		return fmt.Errorf("failed to set %q to %q: %w", key, value, err)
 	}
 
 	err = cfg.Write()
 	if err != nil {
-		return fmt.Errorf("failed to write config to disk: %s", err)
+		return fmt.Errorf("failed to write config to disk: %w", err)
 	}
 
 	return nil
diff --git a/context/config_file.go b/context/config_file.go
index 01df62a4a..33294717a 100644
--- a/context/config_file.go
+++ b/context/config_file.go
@@ -142,7 +142,7 @@ func migrateConfig(fn string, root *yaml.Node) error {
 
 	err = BackupConfigFile(fn)
 	if err != nil {
-		return fmt.Errorf("failed to back up existing config: %s", err)
+		return fmt.Errorf("failed to back up existing config: %w", err)
 	}
 
 	return WriteConfigFile(fn, newConfig)
@@ -162,7 +162,7 @@ func ParseConfig(fn string) (Config, error) {
 
 		_, root, err = parseConfigFile(fn)
 		if err != nil {
-			return nil, fmt.Errorf("failed to reparse migrated config: %s", err)
+			return nil, fmt.Errorf("failed to reparse migrated config: %w", err)
 		}
 	}
 
diff --git a/context/config_type.go b/context/config_type.go
index 4eb6e136e..23967684f 100644
--- a/context/config_type.go
+++ b/context/config_type.go
@@ -132,7 +132,7 @@ func (c *fileConfig) Set(hostname, key, value string) error {
 func (c *fileConfig) configForHost(hostname string) (*HostConfig, error) {
 	hosts, err := c.Hosts()
 	if err != nil {
-		return nil, fmt.Errorf("failed to parse hosts config: %s", err)
+		return nil, fmt.Errorf("failed to parse hosts config: %w", err)
 	}
 
 	for _, hc := range hosts {
@@ -159,12 +159,12 @@ func (c *fileConfig) Hosts() ([]*HostConfig, error) {
 
 	_, hostsEntry, err := c.FindEntry("hosts")
 	if err != nil {
-		return nil, fmt.Errorf("could not find hosts config: %s", err)
+		return nil, fmt.Errorf("could not find hosts config: %w", err)
 	}
 
 	hostConfigs, err := c.parseHosts(hostsEntry)
 	if err != nil {
-		return nil, fmt.Errorf("could not parse hosts config: %s", err)
+		return nil, fmt.Errorf("could not parse hosts config: %w", err)
 	}
 
 	c.hosts = hostConfigs