fix: allow loading of empty config files

Fixes #3113. Signed-off-by: Alexey Palazhchenko <alexey.palazhchenko@gmail.com>
siderolabs · Feb 6, 2021 · 33de89e · 33de89e
1 parent 757cc20
commit 33de89e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/pkg/machinery/client/config/config.go b/pkg/machinery/client/config/config.go
@@ -123,6 +123,10 @@ func (r *Rename) String() string {
 //
 // Current context is overridden from passed in config.
 func (c *Config) Merge(cfg *Config) []Rename {
+	if c.Contexts == nil {
+		c.Contexts = map[string]*Context{}
+	}
+
 	mappedContexts := map[string]string{}
 	renames := []Rename{}
 

diff --git a/pkg/machinery/client/config/config_test.go b/pkg/machinery/client/config/config_test.go
@@ -25,10 +25,8 @@ func TestConfigMerge(t *testing.T) {
 		expectedContexts map[string]*config.Context
 	}{
 		{
-			name: "IntoEmpty",
-			config: &config.Config{
-				Contexts: map[string]*config.Context{},
-			},
+			name:   "IntoEmpty",
+			config: &config.Config{},
 			configToMerge: &config.Config{
 				Context: "foo",
 				Contexts: map[string]*config.Context{