diff --git a/cli/config/config_test.go b/cli/config/config_test.go index f558022342..bb9450667e 100644 --- a/cli/config/config_test.go +++ b/cli/config/config_test.go @@ -3,7 +3,6 @@ package config import ( "bytes" "fmt" - "io" "io/ioutil" "os" "path/filepath" @@ -13,7 +12,6 @@ import ( "github.com/docker/cli/cli/config/configfile" "github.com/docker/cli/cli/config/credentials" - "github.com/pkg/errors" "gotest.tools/v3/assert" is "gotest.tools/v3/assert/cmp" "gotest.tools/v3/env" @@ -89,8 +87,7 @@ func TestEmptyFile(t *testing.T) { assert.NilError(t, err) _, err = Load(tmpHome) - assert.Assert(t, errors.Is(err, io.EOF)) - assert.ErrorContains(t, err, ConfigFileName) + assert.NilError(t, err) } func TestEmptyJSON(t *testing.T) { diff --git a/cli/config/configfile/file.go b/cli/config/configfile/file.go index a4e97a5caa..2d759e9882 100644 --- a/cli/config/configfile/file.go +++ b/cli/config/configfile/file.go @@ -118,7 +118,7 @@ func (configFile *ConfigFile) LegacyLoadFromReader(configData io.Reader) error { // LoadFromReader reads the configuration data given and sets up the auth config // information with given directory and populates the receiver object func (configFile *ConfigFile) LoadFromReader(configData io.Reader) error { - if err := json.NewDecoder(configData).Decode(&configFile); err != nil { + if err := json.NewDecoder(configData).Decode(&configFile); err != nil && !errors.Is(err, io.EOF) { return err } var err error