Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5495 from thaJeztah/opts_remove_ErrBadKey 

opts: remove ErrBadKey as it's not used as a sentinel error
This commit is contained in:
Sebastiaan van Stijn 2024-10-03 17:52:56 +02:00 committed by GitHub
parent 7c85db6e1a 95e221ef4d
commit dac7319f10
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
opts/file.go
View File

@ -12,15 +12,6 @@ import (
const whiteSpaces = " \t" 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) { func parseKeyValueFile(filename string, emptyFn func(string) (string, bool)) ([]string, error) {
fh, err := os.Open(filename) fh, err := os.Open(filename)
if err != nil { if err != nil {
@ -51,10 +42,10 @@ func parseKeyValueFile(filename string, emptyFn func(string) (string, bool)) ([]
// trim the front of a variable, but nothing else // trim the front of a variable, but nothing else
variable = strings.TrimLeft(variable, whiteSpaces) variable = strings.TrimLeft(variable, whiteSpaces)
if strings.ContainsAny(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 { 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 { if hasValue {