Allow an empty config file (#255)

stern · Apr 11, 2023 · c76ea87 · c76ea87
1 parent 2fdc298
commit c76ea87
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/cmd/cmd.go b/cmd/cmd.go
@@ -19,6 +19,7 @@ import (
 	"encoding/json"
 	goflag "flag"
 	"fmt"
+	"io"
 	"os"
 	"regexp"
 	"strconv"
@@ -321,7 +322,7 @@ func (o *options) overrideFlagSetDefaultFromConfig(fs *pflag.FlagSet) error {
 
 	data := make(map[string]interface{})
 
-	if err := yaml.NewDecoder(configFile).Decode(data); err != nil {
+	if err := yaml.NewDecoder(configFile).Decode(data); err != nil && err != io.EOF {
 		return err
 	}
 

diff --git a/cmd/cmd_test.go b/cmd/cmd_test.go
@@ -812,6 +812,12 @@ func TestOptionsOverrideFlagSetDefaultFromConfig(t *testing.T) {
 			expectedTailValue:       1,
 			wantErr:                 false,
 		},
+		{
+			name:                    "--config=testdata/config-empty.yaml",
+			flagConfigFilePathValue: filepath.Join(wd, "testdata/config-empty.yaml"),
+			expectedTailValue:       -1,
+			wantErr:                 false,
+		},
 		{
 			name:                    "--config=config-not-exist.yaml",
 			flagConfigFilePathValue: filepath.Join(wd, "config-not-exist.yaml"),

diff --git a/cmd/testdata/config-empty.yaml b/cmd/testdata/config-empty.yaml