Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions internal/grpc/services/usershareprovider/usershareprovider.go
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,9 @@ type service struct {
allowedPathsForShares []*regexp.Regexp
}

func getShareManager(c *config) (share.Manager, error) {
func getShareManager(c *config, logger *zerolog.Logger) (share.Manager, error) {
if f, ok := registry.NewFuncs[c.Driver]; ok {
return f(c.Drivers[c.Driver])
return f(c.Drivers[c.Driver], logger)
}
return nil, errtypes.NotFound("driver not found: " + c.Driver)
}
Expand Down Expand Up @@ -114,7 +114,7 @@ func parseConfig(m map[string]interface{}) (*config, error) {
}

// New creates a new user share provider svc initialized from defaults
func NewDefault(m map[string]interface{}, ss *grpc.Server, _ *zerolog.Logger) (rgrpc.Service, error) {
func NewDefault(m map[string]any, ss *grpc.Server, logger *zerolog.Logger) (rgrpc.Service, error) {

c, err := parseConfig(m)
if err != nil {
Expand All @@ -123,7 +123,7 @@ func NewDefault(m map[string]interface{}, ss *grpc.Server, _ *zerolog.Logger) (r

c.init()

sm, err := getShareManager(c)
sm, err := getShareManager(c, logger)
if err != nil {
return nil, err
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import (
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/pkg/errors"
"github.com/rs/zerolog"
"github.com/stretchr/testify/mock"
"google.golang.org/grpc"
"google.golang.org/protobuf/types/known/fieldmaskpb"
Expand Down Expand Up @@ -91,7 +92,7 @@ var _ = Describe("user share provider service", func() {
BeforeEach(func() {
manager = &mocks.Manager{}

registry.Register("mockManager", func(m map[string]interface{}) (share.Manager, error) {
registry.Register("mockManager", func(m map[string]interface{}, l *zerolog.Logger) (share.Manager, error) {
return manager, nil
})
manager.On("UpdateShare", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(&collaborationpb.Share{}, nil)
Expand Down
Loading