From 6d1ec19fe9a75f57ebc8be63bfa4ab8149f20df0 Mon Sep 17 00:00:00 2001
From: Pavel Bakulev <p.bakulev@bilderlings.eu>
Date: Wed, 5 Dec 2018 18:17:47 +0200
Subject: [PATCH] Renamed validation funcs for alert notification

---
 .../alert_notifications/config_reader.go             | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkg/services/provisioning/alert_notifications/config_reader.go b/pkg/services/provisioning/alert_notifications/config_reader.go
index 058159e49a4..ee99ae2d6e8 100644
--- a/pkg/services/provisioning/alert_notifications/config_reader.go
+++ b/pkg/services/provisioning/alert_notifications/config_reader.go
@@ -41,12 +41,9 @@ func (cr *configReader) readConfig(path string) ([]*notificationsAsConfig, error
 	}
 
 	cr.log.Debug("Validating alert notifications")
-	err = validateDefaultUniqueness(notifications)
-	if err != nil {
-		return nil, err
-	}
+	validateOrgIdAndSet(notifications)
 
-	err = validateType(notifications)
+	err = validateNotifications(notifications)
 	if err != nil {
 		return nil, err
 	}
@@ -70,7 +67,7 @@ func (cr *configReader) parseNotificationConfig(path string, file os.FileInfo) (
 	return cfg.mapToNotificationFromConfig(), nil
 }
 
-func validateDefaultUniqueness(notifications []*notificationsAsConfig) error {
+func validateOrgIdAndSet(notifications []*notificationsAsConfig) {
 	for i := range notifications {
 		for _, notification := range notifications[i].Notifications {
 			if notification.OrgId < 1 {
@@ -93,10 +90,9 @@ func validateDefaultUniqueness(notifications []*notificationsAsConfig) error {
 		}
 	}
 
-	return nil
 }
 
-func validateType(notifications []*notificationsAsConfig) error {
+func validateNotifications(notifications []*notificationsAsConfig) error {
 	notifierTypes := alerting.GetNotifiers()
 
 	for i := range notifications {