diff options
author | Steve Moyer <smoyer1@selesy.com> | 2022-11-28 15:15:41 -0500 |
---|---|---|
committer | Steve Moyer <smoyer1@selesy.com> | 2022-11-28 15:15:41 -0500 |
commit | 0cd2f3b4bda294b040e31337ddb380fb72192a63 (patch) | |
tree | d77017782735cb992f037a3c0e263b31068d8a41 | |
parent | 49929c034f52272986ea6ac7457e64dbaa9454cb (diff) | |
download | git-bug-0cd2f3b4bda294b040e31337ddb380fb72192a63.tar.gz |
fix: remove repeated use of the same fmt.Errorf() calls
-rw-r--r-- | repository/config.go | 9 | ||||
-rw-r--r-- | repository/config_mem.go | 2 | ||||
-rw-r--r-- | repository/gogit_config.go | 12 |
3 files changed, 16 insertions, 7 deletions
diff --git a/repository/config.go b/repository/config.go index 781a0c1d..7e1ee6e8 100644 --- a/repository/config.go +++ b/repository/config.go @@ -2,6 +2,7 @@ package repository import ( "errors" + "fmt" "strconv" "time" ) @@ -11,6 +12,14 @@ var ( ErrMultipleConfigEntry = errors.New("multiple config entry for the given key") ) +func newErrNoConfigEntry(key string) error { + return fmt.Errorf("%w: missing key %s", ErrNoConfigEntry, key) +} + +func newErrMultipleConfigEntry(key string) error { + return fmt.Errorf("%w: duplicated key %s", ErrMultipleConfigEntry, key) +} + // Config represent the common function interacting with the repository config storage type Config interface { ConfigRead diff --git a/repository/config_mem.go b/repository/config_mem.go index bc532373..55b12fd7 100644 --- a/repository/config_mem.go +++ b/repository/config_mem.go @@ -49,7 +49,7 @@ func (mc *MemConfig) ReadString(key string) (string, error) { key = normalizeKey(key) val, ok := mc.config[key] if !ok { - return "", fmt.Errorf("%w: missing key %s", ErrNoConfigEntry, key) + return "", newErrNoConfigEntry(key) } return val, nil diff --git a/repository/gogit_config.go b/repository/gogit_config.go index 2bdbadc0..afa652b1 100644 --- a/repository/gogit_config.go +++ b/repository/gogit_config.go @@ -119,7 +119,7 @@ func (cr *goGitConfigReader) ReadString(key string) (string, error) { sectionName := split[0] if !cfg.Raw.HasSection(sectionName) { - return "", fmt.Errorf("%w: missing key %s", ErrNoConfigEntry, key) + return "", newErrNoConfigEntry(key) } section := cfg.Raw.Section(sectionName) @@ -127,24 +127,24 @@ func (cr *goGitConfigReader) ReadString(key string) (string, error) { case len(split) == 2: optionName := split[1] if !section.HasOption(optionName) { - return "", fmt.Errorf("%w: missing key %s", ErrNoConfigEntry, key) + return "", newErrNoConfigEntry(key) } if len(section.OptionAll(optionName)) > 1 { - return "", fmt.Errorf("%w: duplicated key %s", ErrMultipleConfigEntry, key) + return "", newErrMultipleConfigEntry(key) } return section.Option(optionName), nil default: subsectionName := strings.Join(split[1:len(split)-1], ".") optionName := split[len(split)-1] if !section.HasSubsection(subsectionName) { - return "", fmt.Errorf("%w: missing key %s", ErrNoConfigEntry, key) + return "", newErrNoConfigEntry(key) } subsection := section.Subsection(subsectionName) if !subsection.HasOption(optionName) { - return "", fmt.Errorf("%w: missing key %s", ErrNoConfigEntry, key) + return "", newErrNoConfigEntry(key) } if len(subsection.OptionAll(optionName)) > 1 { - return "", fmt.Errorf("%w: duplicated key %s", ErrMultipleConfigEntry, key) + return "", newErrMultipleConfigEntry(key) } return subsection.Option(optionName), nil } |