avoid exporting notificationState and notificationStateSlice

pkg/services/alerting/interfaces.go

@@ -30,14 +30,14 @@ type Notifier interface {
 	GetFrequency() time.Duration
 	GetFrequency() time.Duration
 }
 }
 
 
-type NotifierState struct {
+type notifierState struct {
 	notifier Notifier
 	notifier Notifier
 	state    *models.AlertNotificationState
 	state    *models.AlertNotificationState
 }
 }
 
 
-type NotifierStateSlice []*NotifierState
+type notifierStateSlice []*notifierState
 
 
-func (notifiers NotifierStateSlice) ShouldUploadImage() bool {
+func (notifiers notifierStateSlice) ShouldUploadImage() bool {
 	for _, ns := range notifiers {
 	for _, ns := range notifiers {
 		if ns.notifier.NeedsImage() {
 		if ns.notifier.NeedsImage() {
 			return true
 			return true

pkg/services/alerting/notifier.go

@@ -58,7 +58,7 @@ func (n *notificationService) SendIfNeeded(context *EvalContext) error {
 	return n.sendNotifications(context, notifierStates)
 	return n.sendNotifications(context, notifierStates)
 }
 }
 
 
-func (n *notificationService) sendAndMarkAsComplete(evalContext *EvalContext, notifierState *NotifierState) error {
+func (n *notificationService) sendAndMarkAsComplete(evalContext *EvalContext, notifierState *notifierState) error {
 	not := notifierState.notifier
 	not := notifierState.notifier
 	n.log.Debug("Sending notification", "type", not.GetType(), "id", not.GetNotifierId(), "isDefault", not.GetIsDefault())
 	n.log.Debug("Sending notification", "type", not.GetType(), "id", not.GetNotifierId(), "isDefault", not.GetIsDefault())
 	metrics.M_Alerting_Notification_Sent.WithLabelValues(not.GetType()).Inc()
 	metrics.M_Alerting_Notification_Sent.WithLabelValues(not.GetType()).Inc()
@@ -92,7 +92,7 @@ func (n *notificationService) sendAndMarkAsComplete(evalContext *EvalContext, no
 	return nil
 	return nil
 }
 }
 
 
-func (n *notificationService) sendNotification(evalContext *EvalContext, notifierState *NotifierState) error {
+func (n *notificationService) sendNotification(evalContext *EvalContext, notifierState *notifierState) error {
 	if !evalContext.IsTestRun {
 	if !evalContext.IsTestRun {
 		setPendingCmd := &m.SetAlertNotificationStateToPendingCommand{
 		setPendingCmd := &m.SetAlertNotificationStateToPendingCommand{
 			Id:                           notifierState.state.NotifierId,
 			Id:                           notifierState.state.NotifierId,
@@ -117,7 +117,7 @@ func (n *notificationService) sendNotification(evalContext *EvalContext, notifie
 	return n.sendAndMarkAsComplete(evalContext, notifierState)
 	return n.sendAndMarkAsComplete(evalContext, notifierState)
 }
 }
 
 
-func (n *notificationService) sendNotifications(evalContext *EvalContext, notifierStates NotifierStateSlice) error {
+func (n *notificationService) sendNotifications(evalContext *EvalContext, notifierStates notifierStateSlice) error {
 	for _, notifierState := range notifierStates {
 	for _, notifierState := range notifierStates {
 		err := n.sendNotification(evalContext, notifierState)
 		err := n.sendNotification(evalContext, notifierState)
 		if err != nil {
 		if err != nil {
@@ -168,14 +168,14 @@ func (n *notificationService) uploadImage(context *EvalContext) (err error) {
 	return nil
 	return nil
 }
 }
 
 
-func (n *notificationService) getNeededNotifiers(orgId int64, notificationIds []int64, evalContext *EvalContext) (NotifierStateSlice, error) {
+func (n *notificationService) getNeededNotifiers(orgId int64, notificationIds []int64, evalContext *EvalContext) (notifierStateSlice, error) {
 	query := &m.GetAlertNotificationsToSendQuery{OrgId: orgId, Ids: notificationIds}
 	query := &m.GetAlertNotificationsToSendQuery{OrgId: orgId, Ids: notificationIds}
 
 
 	if err := bus.Dispatch(query); err != nil {
 	if err := bus.Dispatch(query); err != nil {
 		return nil, err
 		return nil, err
 	}
 	}
 
 
-	var result NotifierStateSlice
+	var result notifierStateSlice
 	for _, notification := range query.Result {
 	for _, notification := range query.Result {
 		not, err := n.createNotifierFor(notification)
 		not, err := n.createNotifierFor(notification)
 		if err != nil {
 		if err != nil {
@@ -196,7 +196,7 @@ func (n *notificationService) getNeededNotifiers(orgId int64, notificationIds []
 		}
 		}
 
 
 		if not.ShouldNotify(evalContext.Ctx, evalContext, query.Result) {
 		if not.ShouldNotify(evalContext.Ctx, evalContext, query.Result) {
-			result = append(result, &NotifierState{
+			result = append(result, &notifierState{
 				notifier: not,
 				notifier: not,
 				state:    query.Result,
 				state:    query.Result,
 			})
 			})

pkg/services/alerting/test_notification.go

@@ -39,7 +39,7 @@ func handleNotificationTestCommand(cmd *NotificationTestCommand) error {
 		return err
 		return err
 	}
 	}
 
 
-	return notifier.sendNotifications(createTestEvalContext(cmd), NotifierStateSlice{{notifier: notifiers}})
+	return notifier.sendNotifications(createTestEvalContext(cmd), notifierStateSlice{{notifier: notifiers}})
 }
 }
 
 
 func createTestEvalContext(cmd *NotificationTestCommand) *EvalContext {
 func createTestEvalContext(cmd *NotificationTestCommand) *EvalContext {