Set default option values if not set in file mode

Signed-off-by: Tobias Brumhard <tobias.brumhard@mail.schwarz>
SchwarzIT · Oct 29, 2021 · 0e6ee55 · 0e6ee55
1 parent d09895c
commit 0e6ee55
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 1 deletion.
diff --git a/pkg/gotemplate/new.go b/pkg/gotemplate/new.go
@@ -77,9 +77,17 @@ func (gt *GT) LoadConfigValuesFromFile(file string) (*OptionValues, error) {
 	}
 
 	for _, category := range gt.Options.Extensions {
+		if optionValues.Extensions == nil {
+			optionValues.Extensions = map[string]OptionNameToValue{}
+		}
 		for _, option := range category.Options {
-			val, ok := optionValues.Base[option.Name()]
+			if optionValues.Extensions[category.Name] == nil {
+				optionValues.Extensions[category.Name] = OptionNameToValue{}
+			}
+			val, ok := optionValues.Extensions[category.Name][option.Name()]
 			if !ok {
+				// set defaults for all unset optionValues, no need to validate
+				optionValues.Extensions[category.Name][option.Name()] = option.Default(&optionValues)
 				continue
 			}
 

diff --git a/pkg/gotemplate/new_test.go b/pkg/gotemplate/new_test.go
@@ -121,6 +121,33 @@ base:
 		require.ErrorIs(t, err, gotemplate.ErrMalformedInput)
 	})
 
+	t.Run("sets default values for extensions", func(t *testing.T) {
+		gt.Options = &gotemplate.Options{
+			Extensions: []gotemplate.Category{
+				{
+					Name: "test",
+					Options: []gotemplate.Option{
+						gotemplate.NewOption(
+							"string",
+							gotemplate.StringValue("desc"),
+							gotemplate.StaticValue("default"),
+						),
+					},
+				},
+			},
+		}
+
+		optionValues, err := loadValueFromTestFile(t, gt, "")
+		require.NoError(t, err)
+		require.Equal(t, &gotemplate.OptionValues{
+			Extensions: map[string]gotemplate.OptionNameToValue{
+				"test": {
+					"string": "default",
+				},
+			},
+		}, optionValues)
+	})
+
 	t.Run("supports int, string, bool", func(t *testing.T) {
 		gt.Options = &gotemplate.Options{
 			Base: []gotemplate.Option{