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

Merge pull request #2581 from thaJeztah/config_simplify 

config: remove redundant os.Stat()
This commit is contained in:
Silvin Lubecki 2020-06-25 15:29:52 +02:00 committed by GitHub
parent 7365ad15d1 89089fb419
commit a03c2c65a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
cli/config/config.go
View File

@ -95,11 +95,7 @@ func Load(configDir string) (*configfile.ConfigFile, error) {
configFile := configfile.New(filename) configFile := configfile.New(filename)
// Try happy path first - latest config file // Try happy path first - latest config file
if _, err := os.Stat(filename); err == nil { if file, err := os.Open(filename); err == nil {
file, err := os.Open(filename)
if err != nil {
return configFile, errors.Wrap(err, filename)
}
defer file.Close() defer file.Close()
err = configFile.LoadFromReader(file) err = configFile.LoadFromReader(file)
if err != nil { if err != nil {
@ -113,22 +109,16 @@ func Load(configDir string) (*configfile.ConfigFile, error) {
} }
// Can't find latest config file so check for the old one // Can't find latest config file so check for the old one
homedir, err := os.UserHomeDir() home, err := os.UserHomeDir()
if err != nil { if err != nil {
return configFile, errors.Wrap(err, oldConfigfile) return configFile, errors.Wrap(err, oldConfigfile)
} }
filename = filepath.Join(homedir, oldConfigfile) filename = filepath.Join(home, oldConfigfile)
if _, err := os.Stat(filename); err != nil { if file, err := os.Open(filename); err == nil {
return configFile, nil // missing file is not an error defer file.Close()
} if err := configFile.LegacyLoadFromReader(file); err != nil {
file, err := os.Open(filename) return configFile, errors.Wrap(err, filename)
if err != nil { }
return configFile, errors.Wrap(err, filename)
}
defer file.Close()
err = configFile.LegacyLoadFromReader(file)
if err != nil {
return configFile, errors.Wrap(err, filename)
} }
return configFile, nil return configFile, nil
} }

1
cli/config/config_test.go
View File

@ -385,6 +385,7 @@ func TestJSONWithCredentialHelpers(t *testing.T) {
// Save it and make sure it shows up in new form // Save it and make sure it shows up in new form
func saveConfigAndValidateNewFormat(t *testing.T, config *configfile.ConfigFile, configDir string) string { func saveConfigAndValidateNewFormat(t *testing.T, config *configfile.ConfigFile, configDir string) string {
t.Helper()
assert.NilError(t, config.Save()) assert.NilError(t, config.Save())
buf, err := ioutil.ReadFile(filepath.Join(configDir, ConfigFileName)) buf, err := ioutil.ReadFile(filepath.Join(configDir, ConfigFileName))