bugfix: Populating trigger description when creating trigger

api/dto/triggers.go

@@ -510,20 +510,21 @@ func (*Trigger) Render(http.ResponseWriter, *http.Request) error {
 	return nil
 }
 
-func (trigger *Trigger) PopulatedDescription(events moira.NotificationEvents) error {
+// PopulatedDescription returns new trigger description after template populating.
+func (trigger *Trigger) PopulatedDescription(events moira.NotificationEvents) (*string, error) {
+	var emptyString = ""
+
 	if trigger.Desc == nil {
-		return nil
+		return &emptyString, nil
 	}
 
 	triggerDescriptionPopulater := templating.NewTriggerDescriptionPopulater(trigger.Name, events.ToTemplateEvents())
-	description, err := triggerDescriptionPopulater.Populate(*trigger.Desc)
+	newDescription, err := triggerDescriptionPopulater.Populate(*trigger.Desc)
 	if err != nil {
-		return fmt.Errorf("you have an error in your Go template: %v", err)
+		return &emptyString, fmt.Errorf("you have an error in your Go template: %v", err)
 	}
 
-	*trigger.Desc = description
-
-	return nil
+	return &newDescription, nil
 }
 
 type TriggerCheckResponse struct {

api/handler/trigger.go

@@ -164,7 +164,7 @@ func getTrigger(writer http.ResponseWriter, request *http.Request) {
 		return
 	}
 
-	if err := checkingTemplateFilling(request, *trigger); err != nil {
+	if err := fillTemplate(request, trigger); err != nil {
 		middleware.GetLoggerEntry(request).Warning().
 			Error(err.Err).
 			Msg("Failed to check template")
@@ -175,7 +175,7 @@ func getTrigger(writer http.ResponseWriter, request *http.Request) {
 	}
 }
 
-func checkingTemplateFilling(request *http.Request, trigger dto.Trigger) *api.ErrorResponse {
+func fillTemplate(request *http.Request, trigger *dto.Trigger) *api.ErrorResponse {
 	if !middleware.GetPopulated(request) {
 		return nil
 	}
@@ -190,15 +190,18 @@ func checkingTemplateFilling(request *http.Request, trigger dto.Trigger) *api.Er
 		allStates       map[string]struct{}
 	)
 
-	eventsList, err := controller.GetTriggerEvents(database, trigger.ID, page, size, eventDefaultFrom, eventDefaultTo, allMetricRegexp, allStates)
-	if err != nil {
-		return err
+	eventsList, errResponse := controller.GetTriggerEvents(database, trigger.ID, page, size, eventDefaultFrom, eventDefaultTo, allMetricRegexp, allStates)
+	if errResponse != nil {
+		return errResponse
 	}
 
-	if err := trigger.PopulatedDescription(eventsList.List); err != nil {
+	newDescription, err := trigger.PopulatedDescription(eventsList.List)
+	if err != nil {
 		return api.ErrorRender(err)
 	}
 
+	trigger.Desc = newDescription
+
 	return nil
 }
 

api/handler/triggers.go

@@ -133,7 +133,7 @@ func createTrigger(writer http.ResponseWriter, request *http.Request) {
 	}
 
 	if trigger.Desc != nil {
-		err := trigger.PopulatedDescription(moira.NotificationEvents{{}})
+		_, err := trigger.PopulatedDescription(moira.NotificationEvents{{}})
 		if err != nil {
 			render.Render(writer, request, api.ErrorRender(err)) //nolint
 			return