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

fix(notification/rule): fixed http NotificationRule (#15245) 

* Fixed handler path for a list of all labels for a notification rule
* Fixed filtering NotificationRules by limit and offset
pull/15322/head
Jakub Bednář 2019-10-07 09:36:55 +02:00 committed by GitHub
parent 9be0de2f7f
commit ea9cf13af6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 205 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
http/notification_rule.go
View File

@ -129,7 +129,7 @@ func NewNotificationRuleHandler(b *NotificationRuleBackend) *NotificationRuleHan
LabelService: b.LabelService, LabelService: b.LabelService,
ResourceType: influxdb.TelegrafsResourceType, ResourceType: influxdb.TelegrafsResourceType,
} }
h.HandlerFunc("GET", notificationRulesIDLabelsIDPath, newGetLabelsHandler(labelBackend)) h.HandlerFunc("GET", notificationRulesIDLabelsPath, newGetLabelsHandler(labelBackend))
h.HandlerFunc("POST", notificationRulesIDLabelsPath, newPostLabelHandler(labelBackend)) h.HandlerFunc("POST", notificationRulesIDLabelsPath, newPostLabelHandler(labelBackend))
h.HandlerFunc("DELETE", notificationRulesIDLabelsIDPath, newDeleteLabelHandler(labelBackend)) h.HandlerFunc("DELETE", notificationRulesIDLabelsIDPath, newDeleteLabelHandler(labelBackend))

2
kv/notification_rule.go
View File

@ -335,7 +335,7 @@ func (s *Service) findNotificationRuleByID(ctx context.Context, tx Tx, id influx
// Additional options provide pagination & sorting. // Additional options provide pagination & sorting.
func (s *Service) FindNotificationRules(ctx context.Context, filter influxdb.NotificationRuleFilter, opt ...influxdb.FindOptions) (nrs []influxdb.NotificationRule, n int, err error) { func (s *Service) FindNotificationRules(ctx context.Context, filter influxdb.NotificationRuleFilter, opt ...influxdb.FindOptions) (nrs []influxdb.NotificationRule, n int, err error) {
err = s.kv.View(ctx, func(tx Tx) error { err = s.kv.View(ctx, func(tx Tx) error {
nrs, n, err = s.findNotificationRules(ctx, tx, filter) nrs, n, err = s.findNotificationRules(ctx, tx, filter, opt...)
return err return err
}) })
return nrs, n, err return nrs, n, err

204
testing/notification_rule.go
View File

@ -608,6 +608,7 @@ func FindNotificationRules(
) { ) {
type args struct { type args struct {
filter influxdb.NotificationRuleFilter filter influxdb.NotificationRuleFilter
opts influxdb.FindOptions
} }
type wants struct { type wants struct {
@ -1338,6 +1339,207 @@ func FindNotificationRules(
notificationRules: []influxdb.NotificationRule{}, notificationRules: []influxdb.NotificationRule{},
}, },
}, },
{
name: "find options limit",
fields: NotificationRuleFields{
Orgs: []*influxdb.Organization{
{
ID: MustIDBase16(oneID),
Name: "org1",
},
{
ID: MustIDBase16(fourID),
Name: "org4",
},
},
UserResourceMappings: []*influxdb.UserResourceMapping{
{
ResourceID: MustIDBase16(oneID),
ResourceType: influxdb.NotificationRuleResourceType,
UserID: MustIDBase16(sixID),
UserType: influxdb.Owner,
},
{
ResourceID: MustIDBase16(twoID),
ResourceType: influxdb.NotificationRuleResourceType,
UserID: MustIDBase16(sixID),
UserType: influxdb.Member,
},
{
ResourceID: MustIDBase16(fourID),
ResourceType: influxdb.NotificationRuleResourceType,
UserID: MustIDBase16(sixID),
UserType: influxdb.Owner,
},
},
NotificationRules: []influxdb.NotificationRule{
&rule.Slack{
Base: rule.Base{
ID: MustIDBase16(oneID),
OrgID: MustIDBase16(oneID),
EndpointID: 1,
OwnerID: MustIDBase16(sixID),
Name: "nr1",
},
Channel: "ch1",
MessageTemplate: "msg1",
},
&rule.Slack{
Base: rule.Base{
ID: MustIDBase16(twoID),
OrgID: MustIDBase16(oneID),
EndpointID: 1,
OwnerID: MustIDBase16(sixID),
Name: "nr2",
},
MessageTemplate: "body2",
},
&rule.Slack{
Base: rule.Base{
ID: MustIDBase16(fourID),
OrgID: MustIDBase16(oneID),
EndpointID: 1,
OwnerID: MustIDBase16(sixID),
Name: "nr3",
},
MessageTemplate: "msg",
},
},
},
args: args{
filter: influxdb.NotificationRuleFilter{
OrgID: idPtr(MustIDBase16(oneID)),
},
opts: influxdb.FindOptions{
Limit: 2,
},
},
wants: wants{
notificationRules: []influxdb.NotificationRule{
&rule.Slack{
Base: rule.Base{
ID: MustIDBase16(oneID),
OrgID: MustIDBase16(oneID),
EndpointID: 1,
OwnerID: MustIDBase16(sixID),
Name: "nr1",
},
Channel: "ch1",
MessageTemplate: "msg1",
},
&rule.Slack{
Base: rule.Base{
ID: MustIDBase16(twoID),
OrgID: MustIDBase16(oneID),
EndpointID: 1,
OwnerID: MustIDBase16(sixID),
Name: "nr2",
},
MessageTemplate: "body2",
},
},
},
},
{
name: "find options offset",
fields: NotificationRuleFields{
Orgs: []*influxdb.Organization{
{
ID: MustIDBase16(oneID),
Name: "org1",
},
{
ID: MustIDBase16(fourID),
Name: "org4",
},
},
UserResourceMappings: []*influxdb.UserResourceMapping{
{
ResourceID: MustIDBase16(oneID),
ResourceType: influxdb.NotificationRuleResourceType,
UserID: MustIDBase16(sixID),
UserType: influxdb.Owner,
},
{
ResourceID: MustIDBase16(twoID),
ResourceType: influxdb.NotificationRuleResourceType,
UserID: MustIDBase16(sixID),
UserType: influxdb.Member,
},
{
ResourceID: MustIDBase16(fourID),
ResourceType: influxdb.NotificationRuleResourceType,
UserID: MustIDBase16(sixID),
UserType: influxdb.Owner,
},
},
NotificationRules: []influxdb.NotificationRule{
&rule.Slack{
Base: rule.Base{
ID: MustIDBase16(oneID),
OrgID: MustIDBase16(oneID),
EndpointID: 1,
OwnerID: MustIDBase16(sixID),
Name: "nr1",
},
Channel: "ch1",
MessageTemplate: "msg1",
},
&rule.Slack{
Base: rule.Base{
ID: MustIDBase16(twoID),
OrgID: MustIDBase16(oneID),
EndpointID: 1,
OwnerID: MustIDBase16(sixID),
Name: "nr2",
},
MessageTemplate: "body2",
},
&rule.Slack{
Base: rule.Base{
ID: MustIDBase16(fourID),
OrgID: MustIDBase16(oneID),
EndpointID: 1,
OwnerID: MustIDBase16(sixID),
Name: "nr3",
},
MessageTemplate: "msg",
},
},
},
args: args{
filter: influxdb.NotificationRuleFilter{
OrgID: idPtr(MustIDBase16(oneID)),
},
opts: influxdb.FindOptions{
Offset: 1,
},
},
wants: wants{
notificationRules: []influxdb.NotificationRule{
&rule.Slack{
Base: rule.Base{
ID: MustIDBase16(twoID),
OrgID: MustIDBase16(oneID),
EndpointID: 1,
OwnerID: MustIDBase16(sixID),
Name: "nr2",
},
MessageTemplate: "body2",
},
&rule.Slack{
Base: rule.Base{
ID: MustIDBase16(fourID),
OrgID: MustIDBase16(oneID),
EndpointID: 1,
OwnerID: MustIDBase16(sixID),
Name: "nr3",
},
MessageTemplate: "msg",
},
},
},
},
{ {
name: "find nothing", name: "find nothing",
fields: NotificationRuleFields{ fields: NotificationRuleFields{
@ -1423,7 +1625,7 @@ func FindNotificationRules(
defer done() defer done()
ctx := context.Background() ctx := context.Background()
nrs, n, err := s.FindNotificationRules(ctx, tt.args.filter) nrs, n, err := s.FindNotificationRules(ctx, tt.args.filter, tt.args.opts)
ErrorsEqual(t, err, tt.wants.err) ErrorsEqual(t, err, tt.wants.err)
if n != len(tt.wants.notificationRules) { if n != len(tt.wants.notificationRules) {
t.Fatalf("notification rules length is different got %d, want %d", n, len(tt.wants.notificationRules)) t.Fatalf("notification rules length is different got %d, want %d", n, len(tt.wants.notificationRules))