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

feat(http): construct bucket handler by BucketBackend

pull/11700/head
zhulongcheng 2019-01-16 11:11:22 +08:00 committed by Leo Di Donato
parent 4dbfae4628
commit e29f925679
3 changed files with 78 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
http/api_handler.go
View File

@ -80,10 +80,8 @@ func NewAPIHandler(b *APIBackend) *APIHandler {
h.SessionHandler = NewSessionHandler(sessionBackend)
b.UserResourceMappingService = authorizer.NewURMService(b.OrgLookupService, b.UserResourceMappingService)
h.BucketHandler = NewBucketHandler(b.UserResourceMappingService, b.LabelService, b.UserService)
h.BucketHandler.BucketService = authorizer.NewBucketService(b.BucketService)
h.BucketHandler.OrganizationService = b.OrganizationService
h.BucketHandler.BucketOperationLogService = b.BucketOperationLogService
bucketBackend := NewBucketBackend(b)
h.BucketHandler = NewBucketHandler(bucketBackend)
h.LabelHandler = NewLabelHandler()
h.LabelHandler.LabelService = b.LabelService

39
http/bucket_service.go
View File

@ -14,6 +14,32 @@ import (
"go.uber.org/zap"
)
// BucketBackend is all services and associated parameters required to construct
// the BucketHandler.
type BucketBackend struct {
Logger *zap.Logger
BucketService platform.BucketService
BucketOperationLogService platform.BucketOperationLogService
UserResourceMappingService platform.UserResourceMappingService
LabelService platform.LabelService
UserService platform.UserService
OrganizationService platform.OrganizationService
}
func NewBucketBackend(b *APIBackend) *BucketBackend {
return &BucketBackend{
Logger: b.Logger.With(zap.String("handler", "bucket")),
BucketService: b.BucketService,
BucketOperationLogService: b.BucketOperationLogService,
UserResourceMappingService: b.UserResourceMappingService,
LabelService: b.LabelService,
UserService: b.UserService,
OrganizationService: b.OrganizationService,
}
}
// BucketHandler represents an HTTP API handler for buckets.
type BucketHandler struct {
*httprouter.Router
@ -41,14 +67,17 @@ const (
)
// NewBucketHandler returns a new instance of BucketHandler.
func NewBucketHandler(mappingService platform.UserResourceMappingService, labelService platform.LabelService, userService platform.UserService) *BucketHandler {
func NewBucketHandler(b *BucketBackend) *BucketHandler {
h := &BucketHandler{
Router: NewRouter(),
Logger: zap.NewNop(),
Logger: b.Logger,
UserResourceMappingService: mappingService,
LabelService: labelService,
UserService: userService,
BucketService: b.BucketService,
BucketOperationLogService: b.BucketOperationLogService,
UserResourceMappingService: b.UserResourceMappingService,
LabelService: b.LabelService,
UserService: b.UserService,
OrganizationService: b.OrganizationService,
}
h.HandlerFunc("POST", bucketsPath, h.handlePostBucket)

77
http/bucket_test.go
View File

@ -16,8 +16,23 @@ import (
"github.com/influxdata/influxdb/mock"
platformtesting "github.com/influxdata/influxdb/testing"
"github.com/julienschmidt/httprouter"
"go.uber.org/zap"
)
// NewMockBucketBackend returns a BucketBackend with mock services.
func NewMockBucketBackend() *BucketBackend {
return &BucketBackend{
Logger: zap.NewNop().With(zap.String("handler", "bucket")),
BucketService: mock.NewBucketService(),
BucketOperationLogService: mock.NewBucketOperationLogService(),
UserResourceMappingService: mock.NewUserResourceMappingService(),
LabelService: mock.NewLabelService(),
UserService: mock.NewUserService(),
OrganizationService: &mock.OrganizationService{},
}
}
func TestService_handleGetBuckets(t *testing.T) {
type fields struct {
BucketService platform.BucketService
@ -167,11 +182,10 @@ func TestService_handleGetBuckets(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
mappingService := mock.NewUserResourceMappingService()
labelService := tt.fields.LabelService
userService := mock.NewUserService()
h := NewBucketHandler(mappingService, labelService, userService)
h.BucketService = tt.fields.BucketService
bucketBackend := NewMockBucketBackend()
bucketBackend.BucketService = tt.fields.BucketService
bucketBackend.LabelService = tt.fields.LabelService
h := NewBucketHandler(bucketBackend)
r := httptest.NewRequest("GET", "http://any.url", nil)
@ -287,11 +301,9 @@ func TestService_handleGetBucket(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
mappingService := mock.NewUserResourceMappingService()
labelService := mock.NewLabelService()
userService := mock.NewUserService()
h := NewBucketHandler(mappingService, labelService, userService)
h.BucketService = tt.fields.BucketService
bucketBackend := NewMockBucketBackend()
bucketBackend.BucketService = tt.fields.BucketService
h := NewBucketHandler(bucketBackend)
r := httptest.NewRequest("GET", "http://any.url", nil)
@ -392,12 +404,10 @@ func TestService_handlePostBucket(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
mappingService := mock.NewUserResourceMappingService()
labelService := mock.NewLabelService()
userService := mock.NewUserService()
h := NewBucketHandler(mappingService, labelService, userService)
h.BucketService = tt.fields.BucketService
h.OrganizationService = tt.fields.OrganizationService
bucketBackend := NewMockBucketBackend()
bucketBackend.BucketService = tt.fields.BucketService
bucketBackend.OrganizationService = tt.fields.OrganizationService
h := NewBucketHandler(bucketBackend)
b, err := json.Marshal(newBucket(tt.args.bucket))
if err != nil {
@ -488,11 +498,9 @@ func TestService_handleDeleteBucket(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
mappingService := mock.NewUserResourceMappingService()
labelService := mock.NewLabelService()
userService := mock.NewUserService()
h := NewBucketHandler(mappingService, labelService, userService)
h.BucketService = tt.fields.BucketService
bucketBackend := NewMockBucketBackend()
bucketBackend.BucketService = tt.fields.BucketService
h := NewBucketHandler(bucketBackend)
r := httptest.NewRequest("GET", "http://any.url", nil)
@ -770,11 +778,9 @@ func TestService_handlePatchBucket(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
mappingService := mock.NewUserResourceMappingService()
labelService := mock.NewLabelService()
userService := mock.NewUserService()
h := NewBucketHandler(mappingService, labelService, userService)
h.BucketService = tt.fields.BucketService
bucketBackend := NewMockBucketBackend()
bucketBackend.BucketService = tt.fields.BucketService
h := NewBucketHandler(bucketBackend)
upd := platform.BucketUpdate{}
if tt.args.name != "" {
@ -881,7 +887,9 @@ func TestService_handlePostBucketMember(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
h := NewBucketHandler(mock.NewUserResourceMappingService(), mock.NewLabelService(), tt.fields.UserService)
bucketBackend := NewMockBucketBackend()
bucketBackend.UserService = tt.fields.UserService
h := NewBucketHandler(bucketBackend)
b, err := json.Marshal(tt.args.user)
if err != nil {
@ -969,7 +977,9 @@ func TestService_handlePostBucketOwner(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
h := NewBucketHandler(mock.NewUserResourceMappingService(), mock.NewLabelService(), tt.fields.UserService)
bucketBackend := NewMockBucketBackend()
bucketBackend.UserService = tt.fields.UserService
h := NewBucketHandler(bucketBackend)
b, err := json.Marshal(tt.args.user)
if err != nil {
@ -1015,13 +1025,10 @@ func initBucketService(f platformtesting.BucketFields, t *testing.T) (platform.B
}
}
mappingService := mock.NewUserResourceMappingService()
labelService := mock.NewLabelService()
userService := mock.NewUserService()
handler := NewBucketHandler(mappingService, labelService, userService)
handler.BucketService = svc
handler.OrganizationService = svc
bucketBackend := NewMockBucketBackend()
bucketBackend.BucketService = svc
bucketBackend.OrganizationService = svc
handler := NewBucketHandler(bucketBackend)
server := httptest.NewServer(handler)
client := BucketService{
Addr: server.URL,