Addressing comments final chapter

ubuntu · Aug 29, 2023 · f8cbb0f · f8cbb0f
1 parent 89241af
commit f8cbb0f
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/internal/brokers/broker.go b/internal/brokers/broker.go
@@ -207,7 +207,10 @@ func generateValidators(ctx context.Context, sessionID string, supportedUILayout
 				required:        (required == "required"),
 			}
 			if supportedValues != "" {
-				validator.supportedValues = strings.Split(supportedValues, ",")
+				values := strings.Split(supportedValues, ",")
+				for _, value := range values {
+					validator.supportedValues = append(validator.supportedValues, strings.TrimSpace(value))
+				}
 			}
 			layoutValidator[key] = validator
 		}

diff --git a/internal/brokers/broker_test.go b/internal/brokers/broker_test.go
@@ -31,6 +31,10 @@ var supportedLayouts = map[string]map[string]string{
 		"type":  "misconfigured-layout",
 		"value": "required-but-misformatted",
 	},
+	"layout-with-spaces": {
+		"type":  "layout-with-spaces",
+		"value": "required: value_type, other_value_type",
+	},
 }
 
 func TestNewBroker(t *testing.T) {
@@ -95,9 +99,10 @@ func TestGetAuthenticationModes(t *testing.T) {
 
 		wantErr bool
 	}{
-		"Get authentication modes and generate validators":          {sessionID: "success", supportedUILayouts: []string{"required-value", "optional-value"}},
-		"Get authentication modes and ignores invalid UI layout":    {sessionID: "success", supportedUILayouts: []string{"required-value", "missing-type"}},
-		"Get multiple authentication modes and generate validators": {sessionID: "GAM_multiple_modes", supportedUILayouts: []string{"required-value", "optional-value"}},
+		"Get authentication modes and generate validators":                     {sessionID: "success", supportedUILayouts: []string{"required-value", "optional-value"}},
+		"Get authentication modes and generate validator ignoring whitespaces": {sessionID: "success", supportedUILayouts: []string{"layout-with-spaces"}},
+		"Get authentication modes and ignores invalid UI layout":               {sessionID: "success", supportedUILayouts: []string{"required-value", "missing-type"}},
+		"Get multiple authentication modes and generate validators":            {sessionID: "GAM_multiple_modes", supportedUILayouts: []string{"required-value", "optional-value"}},
 
 		"Does not error out when no authentication modes are returned": {sessionID: "GAM_empty"},
 

diff --git a/...ticationModes/golden/get_authentication_modes_and_generate_validator_ignoring_whitespaces b/...ticationModes/golden/get_authentication_modes_and_generate_validator_ignoring_whitespaces
@@ -0,0 +1,6 @@
+MODES:
+[{"id":"mode1","label":"Mode 1"}]
+
+VALIDATORS:
+	layout-with-spaces:
+		value: { required: true, supportedValues: [value_type other_value_type] }