Skip to content

Commit

Permalink
Merge pull request #5495 from thaJeztah/opts_remove_ErrBadKey
Browse files Browse the repository at this point in the history
opts: remove ErrBadKey as it's not used as a sentinel error
  • Loading branch information
thaJeztah authored Oct 3, 2024
2 parents 7c85db6 + 95e221e commit dac7319
Showing 1 changed file with 2 additions and 11 deletions.
13 changes: 2 additions & 11 deletions opts/file.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,6 @@ import (

const whiteSpaces = " \t"

// ErrBadKey typed error for bad environment variable
type ErrBadKey struct {
msg string
}

func (e ErrBadKey) Error() string {
return "poorly formatted environment: " + e.msg
}

func parseKeyValueFile(filename string, emptyFn func(string) (string, bool)) ([]string, error) {
fh, err := os.Open(filename)
if err != nil {
Expand Down Expand Up @@ -51,10 +42,10 @@ func parseKeyValueFile(filename string, emptyFn func(string) (string, bool)) ([]
// trim the front of a variable, but nothing else
variable = strings.TrimLeft(variable, whiteSpaces)
if strings.ContainsAny(variable, whiteSpaces) {
return []string{}, ErrBadKey{fmt.Sprintf("variable '%s' contains whitespaces", variable)}
return []string{}, fmt.Errorf("variable '%s' contains whitespaces", variable)
}
if len(variable) == 0 {
return []string{}, ErrBadKey{fmt.Sprintf("no variable name on line '%s'", line)}
return []string{}, fmt.Errorf("no variable name on line '%s'", line)
}

if hasValue {
Expand Down

0 comments on commit dac7319

Please sign in to comment.