Skip to content

Commit

Permalink
fix: Skip EOF error when default empty yaml file (#37445)
Browse files Browse the repository at this point in the history
Related to #37404

---------

Signed-off-by: Congqi Xia <[email protected]>
  • Loading branch information
congqixia authored Nov 5, 2024
1 parent 9a9de3d commit 0645d46
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 1 deletion.
3 changes: 2 additions & 1 deletion pkg/config/file_source.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package config
import (
"bytes"
"fmt"
"io"
"os"
"path/filepath"
"sync"
Expand Down Expand Up @@ -146,7 +147,7 @@ func (fs *FileSource) loadFromFile() error {

var node yaml.Node
decoder := yaml.NewDecoder(bytes.NewReader(data))
if err := decoder.Decode(&node); err != nil {
if err := decoder.Decode(&node); err != nil && !errors.Is(err, io.EOF) {
return errors.Wrap(err, "YAML unmarshal failed: "+configFile)
}

Expand Down
32 changes: 32 additions & 0 deletions pkg/config/file_source_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package config

import (
"os"
"testing"
"time"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)

func TestEmptyYaml(t *testing.T) {
file, err := os.CreateTemp(os.TempDir(), "milvus_ut_config_fs_*.yaml")
require.NoError(t, err)

filepath := file.Name()

file.WriteString("#")
file.Close()

defer os.Remove(filepath)

fs := NewFileSource(&FileInfo{
Files: []string{filepath},
RefreshInterval: time.Hour,
})

_, err = fs.GetConfigurations()
assert.NoError(t, err)

fs.Close()
}

0 comments on commit 0645d46

Please sign in to comment.