f

Author: emosbaugh

api/internal/managers/app/config/config.go

@@ -12,8 +12,7 @@ import (
 )
 
 var (
-	ErrConfigItemRequired  = errors.New("item is required")
-	ErrConfigValueNotFound = errors.New("value not found")
+	ErrConfigItemRequired = errors.New("item is required")
 )
 
 func (m *appConfigManager) GetConfig(config kotsv1beta1.Config) (kotsv1beta1.Config, error) {
@@ -27,37 +26,19 @@ func (m *appConfigManager) GetConfigValues() (map[string]string, error) {
 func (m *appConfigManager) ValidateConfigValues(config kotsv1beta1.Config, configValues map[string]string) error {
 	var ve *types.APIError
 
-	configItems := make(map[string]kotsv1beta1.ConfigItem)
-	configChildItems := make(map[string]kotsv1beta1.ConfigChildItem)
+	filteredConfig, err := filterAppConfig(config)
+	if err != nil {
+		return fmt.Errorf("filter app config: %w", err)
+	}
 
-	// first check required items
-	for _, group := range config.Spec.Groups {
-		if !isItemEnabled(group.When) {
-			continue
-		}
+	// check required items
+	for _, group := range filteredConfig.Spec.Groups {
 		for _, item := range group.Items {
-			configItems[item.Name] = item
-
 			configValue := getConfigValueFromItem(item, configValues)
 			if isRequiredItem(item) && isUnsetItem(configValue) {
 				ve = types.AppendFieldError(ve, item.Name, ErrConfigItemRequired)
 			}
-
-			for _, childItem := range item.Items {
-				configChildItems[childItem.Name] = childItem
-			}
-		}
-	}
-
-	// then check if all the config values are present
-	for name := range configValues {
-		if _, ok := configItems[name]; ok {
-			continue
-		}
-		if _, ok := configChildItems[name]; ok {
-			continue
 		}
-		ve = types.AppendFieldError(ve, name, ErrConfigValueNotFound)
 	}
 
 	return ve.ErrorOrNil()

api/internal/managers/app/config/config_test.go

@@ -1633,32 +1633,6 @@ func TestValidateConfigValues(t *testing.T) {
 			wantErr:     true,
 			errorFields: []string{"required_item"},
 		},
-		{
-			name: "unknown config value",
-			config: kotsv1beta1.Config{
-				Spec: kotsv1beta1.ConfigSpec{
-					Groups: []kotsv1beta1.ConfigGroup{
-						{
-							Name: "group1",
-							Items: []kotsv1beta1.ConfigItem{
-								{
-									Name:     "known_item",
-									Required: false,
-									Value:    multitype.BoolOrString{},
-									Default:  multitype.BoolOrString{},
-								},
-							},
-						},
-					},
-				},
-			},
-			configValues: map[string]string{
-				"known_item":   "value1",
-				"unknown_item": "value2",
-			},
-			wantErr:     true,
-			errorFields: []string{"unknown_item"},
-		},
 		{
 			name: "required item with default value should not be required",
 			config: kotsv1beta1.Config{
@@ -1800,34 +1774,6 @@ func TestValidateConfigValues(t *testing.T) {
 			},
 			wantErr: false,
 		},
-		{
-			name: "unknown child item",
-			config: kotsv1beta1.Config{
-				Spec: kotsv1beta1.ConfigSpec{
-					Groups: []kotsv1beta1.ConfigGroup{
-						{
-							Name: "group1",
-							Items: []kotsv1beta1.ConfigItem{
-								{
-									Name: "parent_item",
-									Items: []kotsv1beta1.ConfigChildItem{
-										{
-											Name: "known_child",
-										},
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-			configValues: map[string]string{
-				"known_child":   "value1",
-				"unknown_child": "value2",
-			},
-			wantErr:     true,
-			errorFields: []string{"unknown_child"},
-		},
 		{
 			name: "multiple validation errors",
 			config: kotsv1beta1.Config{
@@ -1858,7 +1804,7 @@ func TestValidateConfigValues(t *testing.T) {
 				"unknown_item2": "value2",
 			},
 			wantErr:     true,
-			errorFields: []string{"required_item1", "required_item2", "unknown_item1", "unknown_item2"},
+			errorFields: []string{"required_item1", "required_item2"},
 		},
 		{
 			name: "empty config and values",
@@ -1880,8 +1826,7 @@ func TestValidateConfigValues(t *testing.T) {
 			configValues: map[string]string{
 				"unknown_item": "value1",
 			},
-			wantErr:     true,
-			errorFields: []string{"unknown_item"},
+			wantErr: false,
 		},
 	}