STACKITGit/cli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

favor %w over %s for error wrapping

Browse source
This commit is contained in:
vilmibm 2020-04-20 12:22:12 -05:00
parent e823ad0c6c
commit bd907ec74d
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
command/config.go
View file

@ -99,12 +99,12 @@ func configSet(cmd *cobra.Command, args []string) error {
err = cfg.Set(hostname, key, value) err = cfg.Set(hostname, key, value)
if err != nil { 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() err = cfg.Write()
if err != nil { 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 return nil

4
context/config_file.go
View file

@ -142,7 +142,7 @@ func migrateConfig(fn string, root *yaml.Node) error {
err = BackupConfigFile(fn) err = BackupConfigFile(fn)
if err != nil { 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) return WriteConfigFile(fn, newConfig)
@ -162,7 +162,7 @@ func ParseConfig(fn string) (Config, error) {
_, root, err = parseConfigFile(fn) _, root, err = parseConfigFile(fn)
if err != nil { 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)
} }
} }

6
context/config_type.go
View file

@ -132,7 +132,7 @@ func (c *fileConfig) Set(hostname, key, value string) error {
func (c *fileConfig) configForHost(hostname string) (*HostConfig, error) { func (c *fileConfig) configForHost(hostname string) (*HostConfig, error) {
hosts, err := c.Hosts() hosts, err := c.Hosts()
if err != nil { 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 { for _, hc := range hosts {
@ -159,12 +159,12 @@ func (c *fileConfig) Hosts() ([]*HostConfig, error) {
_, hostsEntry, err := c.FindEntry("hosts") _, hostsEntry, err := c.FindEntry("hosts")
if err != nil { 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) hostConfigs, err := c.parseHosts(hostsEntry)
if err != nil { 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 c.hosts = hostConfigs