Rename YAMLFlag to ConfigFileLoader

The `YAMLFlag` function is solely used for loading config files.

Signed-off-by: Christian Haudum <[email protected]>

pkg/util/cfg/cfg.go

@@ -47,7 +47,7 @@ func Unmarshal(dst Cloneable, sources ...Source) error {
 func DefaultUnmarshal(dst Cloneable, args []string, fs *flag.FlagSet) error {
 	return Unmarshal(dst,
 		Defaults(fs),
-		YAMLFlag(args, "config.file"),
+		ConfigFileLoader(args, "config.file"),
 		Flags(args, fs),
 	)
 }

pkg/util/cfg/dynamic.go

@@ -20,16 +20,16 @@ func DynamicUnmarshal(dst DynamicCloneable, args []string, fs *flag.FlagSet) err
 		// First populate the config with defaults including flags from the command line
 		Defaults(fs),
 		// Next populate the config from the config file, we do this to populate the `common`
-		// section of the config file by taking advantage of the code in YAMLFlag which will load
+		// section of the config file by taking advantage of the code in ConfigFileLoader which will load
 		// and process the config file.
-		YAMLFlag(args, "config.file"),
+		ConfigFileLoader(args, "config.file"),
 		// Apply any dynamic logic to set other defaults in the config. This function is called after parsing the
 		// config files so that values from a common, or shared, section can be used in
 		// the dynamic evaluation
 		dst.ApplyDynamicConfig(),
 		// Load configs from the config file a second time, this will supersede anything set by the common
 		// config with values specified in the config file.
-		YAMLFlag(args, "config.file"),
+		ConfigFileLoader(args, "config.file"),
 		// Load the flags again, this will supersede anything set from config file with flags from the command line.
 		Flags(args, fs),
 	)

pkg/util/cfg/files.go

@@ -66,7 +66,7 @@ func dYAML(y []byte) Source {
 	}
 }
 
-func YAMLFlag(args []string, name string) Source {
+func ConfigFileLoader(args []string, name string) Source {
 
 	return func(dst Cloneable) error {
 		freshFlags := flag.NewFlagSet("config-file-loader", flag.ContinueOnError)

pkg/util/cfg/files_test.go

@@ -22,9 +22,9 @@ func (cfg *testCfg) Clone() flagext.Registerer {
 	}(*cfg)
 }
 
-func TestYAMLFlagDoesNotMutate(t *testing.T) {
+func TestConfigFileLoaderDoesNotMutate(t *testing.T) {
 	cfg := &testCfg{}
-	err := YAMLFlag(nil, "something")(cfg)
+	err := ConfigFileLoader(nil, "something")(cfg)
 	require.Nil(t, err)
 	require.Equal(t, 0, cfg.v)