Merge pull request #2161 from Ace-Tang/config

config: remove check unknow flag in config file

Author: allencloud

daemon/config/config.go

@@ -165,12 +165,7 @@ func (cfg *Config) MergeConfigurations(flagSet *pflag.FlagSet) error {
 	}
 
 	fileFlags := make(map[string]interface{}, 0)
-	iterateConfig(origin, fileFlags)
-
-	// check if invalid or unknown flag exist in config file
-	if err = getUnknownFlags(flagSet, fileFlags); err != nil {
-		return err
-	}
+	flattenConfig(origin, fileFlags)
 
 	// check conflict in command line flags and config file
 	if err = getConflictConfigurations(flagSet, fileFlags); err != nil {
@@ -225,35 +220,19 @@ func (cfg *Config) delValue(flagSet *pflag.FlagSet, fileFlags map[string]interfa
 	return cfg
 }
 
-// iterateConfig resolves key-value from config file iteratly.
-func iterateConfig(origin map[string]interface{}, config map[string]interface{}) {
+// flattenConfig flattens key-value config.
+func flattenConfig(origin map[string]interface{}, config map[string]interface{}) {
 	for k, v := range origin {
-		if c, ok := v.(map[string]interface{}); ok && k != "add-runtime" {
-			iterateConfig(c, config)
+		if c, ok := v.(map[string]interface{}); ok {
+			for fk, fv := range c {
+				config[fk] = fv
+			}
 		} else {
 			config[k] = v
 		}
 	}
 }
 
-// find unknown flag in config file
-func getUnknownFlags(flagSet *pflag.FlagSet, fileFlags map[string]interface{}) error {
-	var unknownFlags []string
-
-	for k := range fileFlags {
-		f := flagSet.Lookup(k)
-		if f == nil {
-			unknownFlags = append(unknownFlags, k)
-		}
-	}
-
-	if len(unknownFlags) > 0 {
-		return fmt.Errorf("unknown flags: %s", strings.Join(unknownFlags, ", "))
-	}
-
-	return nil
-}
-
 // find conflict in command line flags and config file, note that if flag value
 // is slice type, we will skip it and merge it from flags and config file later.
 func getConflictConfigurations(flagSet *pflag.FlagSet, fileFlags map[string]interface{}) error {

daemon/config/config_test.go

@@ -7,7 +7,7 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func TestIterateConfig(t *testing.T) {
+func TestFlattenConfig(t *testing.T) {
 	assert := assert.New(t)
 	origin := map[string]interface{}{
 		"a": "a",
@@ -26,22 +26,24 @@ func TestIterateConfig(t *testing.T) {
 	}
 
 	expect := map[string]interface{}{
-		"a":    "a",
-		"b":    "b",
-		"c":    "c",
-		"i1":   "i1",
-		"i2":   "i2",
-		"iii1": "iii1",
-		"iii2": "iii2",
+		"a":  "a",
+		"b":  "b",
+		"c":  "c",
+		"i1": "i1",
+		"i2": "i2",
+		"ii1": map[string]interface{}{
+			"iii1": "iii1",
+			"iii2": "iii2",
+		},
 	}
 
 	config := make(map[string]interface{})
-	iterateConfig(origin, config)
+	flattenConfig(origin, config)
 	assert.Equal(config, expect)
 
 	// test nil map will not cause panic
 	config = make(map[string]interface{})
-	iterateConfig(nil, config)
+	flattenConfig(nil, config)
 	assert.Equal(config, map[string]interface{}{})
 }
 
@@ -78,46 +80,3 @@ func TestGetConflictConfigurations(t *testing.T) {
 	assert.Equal("found conflict flags in command line and config file: from flag: a1 and from config file: a1",
 		getConflictConfigurations(flags, fileflags).Error())
 }
-
-func TestGetUnknownFlags(t *testing.T) {
-
-	flagSet := new(pflag.FlagSet)
-	flagSet.String("a", "a", "a")
-	flagSet.Bool("b", false, "b")
-	flagSet.Int("c", -500, "c")
-
-	flagSetNil := new(pflag.FlagSet)
-
-	assert := assert.New(t)
-
-	fileFlagsKnown := map[string]interface{}{
-		"a": "a",
-		"b": true,
-	}
-
-	fileFlagsUnknown := map[string]interface{}{
-		"c": 100,
-		"d": "d",
-	}
-
-	fileFlagsNil := map[string]interface{}{}
-
-	error := getUnknownFlags(flagSet, fileFlagsKnown)
-	assert.Equal(error, nil)
-
-	error = getUnknownFlags(flagSet, fileFlagsUnknown)
-	assert.NotNil(error)
-
-	error = getUnknownFlags(flagSet, fileFlagsNil)
-	assert.Equal(error, nil)
-
-	error = getUnknownFlags(flagSetNil, fileFlagsUnknown)
-	assert.NotNil(error)
-
-	error = getUnknownFlags(flagSetNil, fileFlagsKnown)
-	assert.NotNil(error)
-
-	error = getUnknownFlags(flagSetNil, fileFlagsNil)
-	assert.Equal(error, nil)
-
-}

test/z_cli_daemon_test.go

@@ -182,23 +182,6 @@ func (suite *PouchDaemonSuite) TestDaemonSliceFlagNotConflict(c *check.C) {
 	c.Assert(err, check.IsNil)
 }
 
-// TestDaemonConfigFileUnknownFlag tests start daemon with unknown flags in configure file.
-func (suite *PouchDaemonSuite) TestDaemonConfigFileUnknownFlag(c *check.C) {
-	path := "/tmp/pouch.json"
-	cfg := struct {
-		Adsj string `json:"adsj"`
-	}{
-		Adsj: "xxx",
-	}
-	err := CreateConfigFile(path, cfg)
-	c.Assert(err, check.IsNil)
-	defer os.Remove(path)
-
-	dcfg, err := StartDefaultDaemon("--debug", "--config-file="+path)
-	c.Assert(err, check.NotNil)
-	dcfg.KillDaemon()
-}
-
 // TestDaemonConfigFileAndCli tests start daemon with configure file and CLI .
 func (suite *PouchDaemonSuite) TestDaemonConfigFileAndCli(c *check.C) {
 	// Check default configure file could work