Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(kv): fix patching panics #16733

Merged
merged 1 commit into from
Feb 5, 2020
Merged

fix(kv): fix patching panics #16733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## Undecided

### Bug Fixes

1. [16733](https://github.com/influxdata/influxdb/pull/16733): Fix notification rule renaming panics from UI

## v2.0.0-beta.2 [2020-01-24]

### Features
Expand Down
6 changes: 5 additions & 1 deletion kv/notification_rule.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,14 +240,18 @@ func (s *Service) patchNotificationRule(ctx context.Context, tx Tx, id influxdb.
if upd.Description != nil {
nr.SetDescription(*upd.Description)
}
var status *string
if upd.Status != nil {
status = strPtr(string(*upd.Status))
}

nr.SetUpdatedAt(s.TimeGenerator.Now())

if err := nr.Valid(); err != nil {
return nil, err
}

_, err = s.updateNotificationTask(ctx, tx, nr, strPtr(string(*upd.Status)))
_, err = s.updateNotificationTask(ctx, tx, nr, status)
if err != nil {
return nil, err
}
Expand Down
139 changes: 139 additions & 0 deletions testing/notification_rule.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2002,6 +2002,145 @@ func PatchNotificationRule(
},
},
},
{
name: "patch without status",
fields: NotificationRuleFields{
TimeGenerator: fakeGenerator,
IDGenerator: mock.NewIDGenerator(twoID, t),
Tasks: []influxdb.TaskCreate{
{
OwnerID: MustIDBase16(sixID),
OrganizationID: MustIDBase16(fourID),
Flux: `from(bucket: "foo") |> range(start: -1m)
option task = {name: "bar", every: 1m}
`,
},
},
UserResourceMappings: []*influxdb.UserResourceMapping{
{
ResourceID: MustIDBase16(oneID),
UserID: MustIDBase16(sixID),
UserType: influxdb.Owner,
ResourceType: influxdb.NotificationRuleResourceType,
},
{
ResourceID: MustIDBase16(twoID),
UserID: MustIDBase16(sixID),
UserType: influxdb.Member,
ResourceType: influxdb.NotificationRuleResourceType,
},
},
Endpoints: []influxdb.NotificationEndpoint{
&endpoint.Slack{
URL: "http://localhost:7777",
Token: influxdb.SecretField{
// TODO(desa): not sure why this has to end in token, but it does
Key: "020f755c3c082001-token",
Value: strPtr("abc123"),
},
Base: endpoint.Base{
OrgID: MustIDBase16Ptr(fourID),
Name: "foo",
Status: influxdb.Active,
},
},
},
NotificationRules: []influxdb.NotificationRule{
&rule.Slack{
Base: rule.Base{
ID: MustIDBase16(oneID),
Name: "name1",
OwnerID: MustIDBase16(sixID),
OrgID: MustIDBase16(fourID),
EndpointID: MustIDBase16(twoID),
RunbookLink: "runbooklink1",
SleepUntil: &time3,
Every: mustDuration("1h"),
StatusRules: []notification.StatusRule{
{
CurrentLevel: notification.Critical,
},
{
CurrentLevel: notification.Info,
},
},
CRUDLog: influxdb.CRUDLog{
CreatedAt: timeGen1.Now(),
UpdatedAt: timeGen2.Now(),
},
},
Channel: "channel1",
MessageTemplate: "msg1",
},
&rule.Slack{
Base: rule.Base{
ID: MustIDBase16(twoID),
Name: "name2",
OwnerID: MustIDBase16(sixID),
EndpointID: MustIDBase16(twoID),
TaskID: MustIDBase16(twoID),
StatusRules: []notification.StatusRule{
{
CurrentLevel: notification.Critical,
},
{
CurrentLevel: notification.Info,
},
},
OrgID: MustIDBase16(fourID),
RunbookLink: "runbooklink2",
SleepUntil: &time3,
Every: mustDuration("1h"),
CRUDLog: influxdb.CRUDLog{
CreatedAt: timeGen1.Now(),
UpdatedAt: timeGen2.Now(),
},
},
MessageTemplate: "msg",
},
},
Orgs: []*influxdb.Organization{
{
ID: MustIDBase16(fourID),
Name: "foo",
},
},
},
args: args{
id: MustIDBase16(twoID),
upd: influxdb.NotificationRuleUpdate{
Name: &name3,
},
},
wants: wants{
notificationRule: &rule.Slack{
Base: rule.Base{
ID: MustIDBase16(twoID),
Name: name3,
OwnerID: MustIDBase16(sixID),
OrgID: MustIDBase16(fourID),
EndpointID: MustIDBase16(twoID),
TaskID: MustIDBase16(twoID),
StatusRules: []notification.StatusRule{
{
CurrentLevel: notification.Critical,
},
{
CurrentLevel: notification.Info,
},
},
RunbookLink: "runbooklink2",
SleepUntil: &time3,
Every: mustDuration("1h"),
CRUDLog: influxdb.CRUDLog{
CreatedAt: timeGen1.Now(),
UpdatedAt: fakeDate,
},
},
MessageTemplate: "msg",
},
},
},
{
name: "regular patch",
fields: NotificationRuleFields{
Expand Down