Revert "feat(http): add label service" (#1667)

This reverts commit 70a430c.
influxdata · Dec 3, 2018 · 873aae3 · 873aae3
1 parent 70a430c
commit 873aae3
Show file tree

Hide file tree

Showing 23 changed files with 65 additions and 1,269 deletions.
diff --git a/bolt/bbolt.go b/bolt/bbolt.go
@@ -148,11 +148,6 @@ func (c *Client) initialize(ctx context.Context) error {
 			return err
 		}
 
-		// Always create labels bucket.
-		if err := c.initializeLabels(ctx, tx); err != nil {
-			return err
-		}
-
 		// Always create Session bucket.
 		if err := c.initializeSessions(ctx, tx); err != nil {
 			return err

diff --git a/bolt/bucket.go b/bolt/bucket.go
@@ -560,12 +560,6 @@ func (c *Client) deleteBucket(ctx context.Context, tx *bolt.Tx, id platform.ID)
 			Err: err,
 		}
 	}
-
-	if err := c.deleteLabels(ctx, tx, platform.LabelFilter{ResourceID: id}); err != nil {
-		return &platform.Error{
-			Err: err,
-		}
-	}
 	return nil
 }
 

diff --git a/bolt/dashboard.go b/bolt/dashboard.go
@@ -469,12 +469,6 @@ func (c *Client) deleteDashboard(ctx context.Context, tx *bolt.Tx, id platform.I
 	if err := tx.Bucket(dashboardBucket).Delete(encodedID); err != nil {
 		return err
 	}
-
-	err = c.deleteLabels(ctx, tx, platform.LabelFilter{ResourceID: id})
-	if err != nil {
-		return err
-	}
-
 	// TODO(desa): add DeleteKeyValueLog method and use it here.
 	return c.deleteUserResourceMappings(ctx, tx, platform.UserResourceMappingFilter{
 		ResourceID:   id,

diff --git a/bolt/label.go b/bolt/label.go
diff --git a/bolt/label_test.go b/bolt/label_test.go
diff --git a/cmd/influxd/main.go b/cmd/influxd/main.go
@@ -252,7 +252,6 @@ func (m *Main) run(ctx context.Context) (err error) {
 		scraperTargetSvc platform.ScraperTargetStoreService       = m.boltClient
 		telegrafSvc      platform.TelegrafConfigStore             = m.boltClient
 		userResourceSvc  platform.UserResourceMappingService      = m.boltClient
-		labelSvc         platform.LabelService                    = m.boltClient
 	)
 
 	chronografSvc, err := server.NewServiceV2(ctx, m.boltClient.DB())
@@ -371,7 +370,6 @@ func (m *Main) run(ctx context.Context) (err error) {
 		UserService:                     userSvc,
 		OrganizationService:             orgSvc,
 		UserResourceMappingService:      userResourceSvc,
-		LabelService:                    labelSvc,
 		DashboardService:                dashboardSvc,
 		DashboardOperationLogService:    dashboardLogSvc,
 		BucketOperationLogService:       bucketLogSvc,

diff --git a/http/api_handler.go b/http/api_handler.go
@@ -46,7 +46,6 @@ type APIBackend struct {
 	UserService                     platform.UserService
 	OrganizationService             platform.OrganizationService
 	UserResourceMappingService      platform.UserResourceMappingService
-	LabelService                    platform.LabelService
 	DashboardService                platform.DashboardService
 	DashboardOperationLogService    platform.DashboardOperationLogService
 	BucketOperationLogService       platform.BucketOperationLogService
@@ -72,7 +71,7 @@ func NewAPIHandler(b *APIBackend) *APIHandler {
 	h.SessionHandler.SessionService = b.SessionService
 	h.SessionHandler.Logger = b.Logger.With(zap.String("handler", "basicAuth"))
 
-	h.BucketHandler = NewBucketHandler(b.UserResourceMappingService, b.LabelService)
+	h.BucketHandler = NewBucketHandler(b.UserResourceMappingService)
 	h.BucketHandler.BucketService = b.BucketService
 	h.BucketHandler.BucketOperationLogService = b.BucketOperationLogService
 
@@ -86,7 +85,7 @@ func NewAPIHandler(b *APIBackend) *APIHandler {
 	h.UserHandler.BasicAuthService = b.BasicAuthService
 	h.UserHandler.UserOperationLogService = b.UserOperationLogService
 
-	h.DashboardHandler = NewDashboardHandler(b.UserResourceMappingService, b.LabelService)
+	h.DashboardHandler = NewDashboardHandler(b.UserResourceMappingService)
 	h.DashboardHandler.DashboardService = b.DashboardService
 	h.DashboardHandler.DashboardOperationLogService = b.DashboardOperationLogService
 
@@ -108,7 +107,7 @@ func NewAPIHandler(b *APIBackend) *APIHandler {
 	h.SetupHandler = NewSetupHandler()
 	h.SetupHandler.OnboardingService = b.OnboardingService
 
-	h.TaskHandler = NewTaskHandler(b.UserResourceMappingService, b.LabelService, b.Logger)
+	h.TaskHandler = NewTaskHandler(b.UserResourceMappingService, b.Logger)
 	h.TaskHandler.TaskService = b.TaskService
 	h.TaskHandler.AuthorizationService = b.AuthorizationService
 	h.TaskHandler.UserResourceMappingService = b.UserResourceMappingService

diff --git a/http/bucket_service.go b/http/bucket_service.go
@@ -22,27 +22,23 @@ type BucketHandler struct {
 	BucketService              platform.BucketService
 	BucketOperationLogService  platform.BucketOperationLogService
 	UserResourceMappingService platform.UserResourceMappingService
-	LabelService               platform.LabelService
 }
 
 const (
-	bucketsPath             = "/api/v2/buckets"
-	bucketsIDPath           = "/api/v2/buckets/:id"
-	bucketsIDLogPath        = "/api/v2/buckets/:id/log"
-	bucketsIDMembersPath    = "/api/v2/buckets/:id/members"
-	bucketsIDMembersIDPath  = "/api/v2/buckets/:id/members/:userID"
-	bucketsIDOwnersPath     = "/api/v2/buckets/:id/owners"
-	bucketsIDOwnersIDPath   = "/api/v2/buckets/:id/owners/:userID"
-	bucketsIDLabelsPath     = "/api/v2/buckets/:id/labels"
-	bucketsIDLabelsNamePath = "/api/v2/buckets/:id/labels/:name"
+	bucketsPath            = "/api/v2/buckets"
+	bucketsIDPath          = "/api/v2/buckets/:id"
+	bucketsIDLogPath       = "/api/v2/buckets/:id/log"
+	bucketsIDMembersPath   = "/api/v2/buckets/:id/members"
+	bucketsIDMembersIDPath = "/api/v2/buckets/:id/members/:userID"
+	bucketsIDOwnersPath    = "/api/v2/buckets/:id/owners"
+	bucketsIDOwnersIDPath  = "/api/v2/buckets/:id/owners/:userID"
 )
 
 // NewBucketHandler returns a new instance of BucketHandler.
-func NewBucketHandler(mappingService platform.UserResourceMappingService, labelService platform.LabelService) *BucketHandler {
+func NewBucketHandler(mappingService platform.UserResourceMappingService) *BucketHandler {
 	h := &BucketHandler{
 		Router:                     httprouter.New(),
 		UserResourceMappingService: mappingService,
-		LabelService:               labelService,
 	}
 
 	h.HandlerFunc("POST", bucketsPath, h.handlePostBucket)
@@ -60,10 +56,6 @@ func NewBucketHandler(mappingService platform.UserResourceMappingService, labelS
 	h.HandlerFunc("GET", bucketsIDOwnersPath, newGetMembersHandler(h.UserResourceMappingService, platform.Owner))
 	h.HandlerFunc("DELETE", bucketsIDOwnersIDPath, newDeleteMemberHandler(h.UserResourceMappingService, platform.Owner))
 
-	h.HandlerFunc("GET", bucketsIDLabelsPath, newGetLabelsHandler(h.LabelService))
-	h.HandlerFunc("POST", bucketsIDLabelsPath, newPostLabelHandler(h.LabelService))
-	h.HandlerFunc("DELETE", bucketsIDLabelsNamePath, newDeleteLabelHandler(h.LabelService))
-
 	return h
 }