refactor web config validate

moira-alert · Sep 30, 2024 · a0eefbe · a0eefbe
1 parent 372c4c8
commit a0eefbe
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/cmd/api/config.go b/cmd/api/config.go
@@ -140,11 +140,13 @@ func (auth *authorization) toApiConfig(webConfig *webConfig) api.Authorization {
 
 func (config *webConfig) validate() error {
 	for _, contactTemplate := range config.ContactsTemplate {
-		ValidationRegex := contactTemplate.ValidationRegex
-		if ValidationRegex != "" {
-			if _, err := regexp.Compile(ValidationRegex); err != nil {
-				return fmt.Errorf("contact template regex error '%s': %w", ValidationRegex, err)
-			}
+		validationRegex := contactTemplate.ValidationRegex
+		if validationRegex == "" {
+			continue
+		}
+
+		if _, err := regexp.Compile(validationRegex); err != nil {
+			return fmt.Errorf("contact template regex error '%s': %w", validationRegex, err)
 		}
 	}
 

diff --git a/cmd/api/config_test.go b/cmd/api/config_test.go
@@ -270,7 +270,7 @@ func Test_webConfig_validate(t *testing.T) {
 		So(err, ShouldNotBeNil)
 	})
 
-	Convey("With invalid contact template pattern", t, func() {
+	Convey("With valid contact template pattern", t, func() {
 		config := webConfig{
 			ContactsTemplate: []webContact{
 				{