From e50e4f92266ca681524f93bd4389da8f87b6c30b Mon Sep 17 00:00:00 2001 From: zhulongcheng Date: Mon, 14 Jan 2019 11:53:31 +0800 Subject: [PATCH] log dashboard removed event --- bolt/dashboard.go | 9 ++++++++- bolt/dashboard_test.go | 6 ++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/bolt/dashboard.go b/bolt/dashboard.go index 525dd7332e..48a926a847 100644 --- a/bolt/dashboard.go +++ b/bolt/dashboard.go @@ -21,6 +21,7 @@ var ( const ( dashboardCreatedEvent = "Dashboard Created" dashboardUpdatedEvent = "Dashboard Updated" + dashboardRemovedEvent = "Dashboard Removed" dashboardCellsReplacedEvent = "Dashboard Cells Replaced" dashboardCellAddedEvent = "Dashboard Cell Added" @@ -688,7 +689,6 @@ func (c *Client) deleteDashboard(ctx context.Context, tx *bolt.Tx, id platform.I } } - // TODO(desa): add DeleteKeyValueLog method and use it here. err = c.deleteUserResourceMappings(ctx, tx, platform.UserResourceMappingFilter{ ResourceID: id, Resource: platform.DashboardsResource, @@ -698,6 +698,13 @@ func (c *Client) deleteDashboard(ctx context.Context, tx *bolt.Tx, id platform.I Err: err, } } + + if err := c.appendDashboardEventToLog(ctx, tx, d.ID, dashboardRemovedEvent); err != nil { + return &platform.Error{ + Err: err, + } + } + return nil } diff --git a/bolt/dashboard_test.go b/bolt/dashboard_test.go index f265089e84..3e6b84983b 100644 --- a/bolt/dashboard_test.go +++ b/bolt/dashboard_test.go @@ -3,6 +3,7 @@ package bolt_test import ( "context" "testing" + "time" platform "github.com/influxdata/influxdb" "github.com/influxdata/influxdb/bolt" @@ -14,6 +15,11 @@ func initDashboardService(f platformtesting.DashboardFields, t *testing.T) (plat if err != nil { t.Fatalf("failed to create new bolt client: %v", err) } + + if f.NowFn == nil { + f.NowFn = time.Now + } + c.IDGenerator = f.IDGenerator c.WithTime(f.NowFn) ctx := context.TODO()