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

Merge pull request #15278 from influxdata/fix/rule-encoding 

fix(http): lookup task before clearing it's id from the rule
pull/15286/head
kelwang 2019-09-25 17:33:38 -04:00 committed by GitHub
parent 270d39224c ca937eaf11
commit 8af36d5aae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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) {
// 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()
res := &notificationRuleResponse{
NotificationRule: nr,
@ -188,19 +194,13 @@ func (h *NotificationRuleHandler) newNotificationRuleResponse(ctx context.Contex
Owners: fmt.Sprintf("/api/v2/notificationRules/%s/owners", nr.GetID()),
},
Labels: []influxdb.Label{},
Status: t.Status,
}
for _, l := range labels {
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
}