Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(http): lookup task before clearing it's id from the notification rule

pull/15278/head
Michael Desa 2019-09-25 16:33:05 -04:00
parent 2bb8418575
commit ca937eaf11
No known key found for this signature in database
GPG Key ID: 87002651EC5DFFE6
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
http/notification_rule.go
View File

@ -178,6 +178,12 @@ type notificationRulesResponse struct {
} }
func (h *NotificationRuleHandler) newNotificationRuleResponse(ctx context.Context, nr influxdb.NotificationRule, labels []*influxdb.Label) (*notificationRuleResponse, error) { func (h *NotificationRuleHandler) newNotificationRuleResponse(ctx context.Context, nr influxdb.NotificationRule, labels []*influxdb.Label) (*notificationRuleResponse, error) {
// TODO(desa): this should be handled in the rule service and not exposed in http land, but is currently blocking the FE. https://github.com/influxdata/influxdb/issues/15259
t, err := h.TaskService.FindTaskByID(ctx, nr.GetTaskID())
if err != nil {
return nil, err
}
nr.ClearPrivateData() nr.ClearPrivateData()
res := &notificationRuleResponse{ res := &notificationRuleResponse{
NotificationRule: nr, NotificationRule: nr,
@ -188,19 +194,13 @@ func (h *NotificationRuleHandler) newNotificationRuleResponse(ctx context.Contex
Owners: fmt.Sprintf("/api/v2/notificationRules/%s/owners", nr.GetID()), Owners: fmt.Sprintf("/api/v2/notificationRules/%s/owners", nr.GetID()),
}, },
Labels: []influxdb.Label{}, Labels: []influxdb.Label{},
Status: t.Status,
} }
for _, l := range labels { for _, l := range labels {
res.Labels = append(res.Labels, *l) res.Labels = append(res.Labels, *l)
} }
t, err := h.TaskService.FindTaskByID(ctx, nr.GetTaskID())
if err != nil {
return nil, err
}
res.Status = t.Status
return res, nil return res, nil
} }