diff --git a/accounts/pkg/service/v0/groups.go b/accounts/pkg/service/v0/groups.go index 357ba5550..d6d8302d0 100644 --- a/accounts/pkg/service/v0/groups.go +++ b/accounts/pkg/service/v0/groups.go @@ -195,7 +195,6 @@ func (s Service) DeleteGroup(c context.Context, in *proto.DeleteGroupRequest, ou if storage.IsNotFoundErr(err) { return merrors.NotFound(s.id, "group not found: %v", err.Error()) } - s.log.Error().Err(err).Str("id", id).Msg("could not load group") return merrors.InternalServerError(s.id, "could not load group: %v", err.Error()) } @@ -246,7 +245,6 @@ func (s Service) AddMember(c context.Context, in *proto.AddMemberRequest, out *p if storage.IsNotFoundErr(err) { return merrors.NotFound(s.id, "group not found: %v", err.Error()) } - s.log.Error().Err(err).Str("id", accountID).Msg("could not load account") return merrors.InternalServerError(s.id, "could not load group: %v", err.Error()) } @@ -255,7 +253,6 @@ func (s Service) AddMember(c context.Context, in *proto.AddMemberRequest, out *p if storage.IsNotFoundErr(err) { return merrors.NotFound(s.id, "could not load group: %v", err.Error()) } - s.log.Error().Err(err).Str("id", groupID).Msg("could not load group") return merrors.InternalServerError(s.id, "could not load group: %v", err.Error()) } @@ -283,11 +280,9 @@ func (s Service) AddMember(c context.Context, in *proto.AddMemberRequest, out *p } if err = s.repo.WriteAccount(c, a); err != nil { - s.log.Error().Err(err).Interface("account", a).Msg("could not persist account") - return merrors.InternalServerError(s.id, "could not persist updated account: %v", err.Error()) + return merrors.InternalServerError(s.id, "could not persist account: %v", err.Error()) } if err = s.repo.WriteGroup(c, g); err != nil { - s.log.Error().Err(err).Interface("group", g).Msg("could not persist group") return merrors.InternalServerError(s.id, "could not persist group: %v", err.Error()) } // FIXME update index! diff --git a/accounts/pkg/service/v0/service.go b/accounts/pkg/service/v0/service.go index b5283c7c2..772210253 100644 --- a/accounts/pkg/service/v0/service.go +++ b/accounts/pkg/service/v0/service.go @@ -48,14 +48,13 @@ func New(opts ...Option) (s *Service, err error) { roleManager = &m } - serviceID := cfg.GRPC.Namespace + "." + cfg.Server.Name s = &Service{ - id: serviceID, + id: cfg.GRPC.Namespace + "." + cfg.Server.Name, log: logger, Config: cfg, RoleService: roleService, RoleManager: roleManager, - repo: createMetadataStorage(serviceID, cfg, logger), + repo: createMetadataStorage(cfg, logger), } if s.index, err = s.buildIndex(); err != nil { @@ -357,13 +356,13 @@ func assignRoleToUser(accountID, roleID string, rs settings.RoleService, logger return true } -func createMetadataStorage(serviceID string, cfg *config.Config, logger log.Logger) storage.Repo { +func createMetadataStorage(cfg *config.Config, logger log.Logger) storage.Repo { // for now we detect the used storage implementation based on which storage is configured // the config with defaults needs to be checked last if cfg.Repo.Disk.Path != "" { - return storage.NewDiskRepo(serviceID, cfg, logger) + return storage.NewDiskRepo(cfg, logger) } - repo, err := storage.NewCS3Repo(serviceID, cfg) + repo, err := storage.NewCS3Repo(cfg) if err != nil { logger.Fatal().Err(err).Msg("cs3 storage was configured but failed to start") } diff --git a/accounts/pkg/storage/cs3.go b/accounts/pkg/storage/cs3.go index b1b51fe2a..edf23ba0c 100644 --- a/accounts/pkg/storage/cs3.go +++ b/accounts/pkg/storage/cs3.go @@ -24,7 +24,6 @@ import ( // CS3Repo provides a cs3 implementation of the Repo interface type CS3Repo struct { - serviceID string cfg *config.Config tm token.Manager storageProvider provider.ProviderAPIClient @@ -32,7 +31,7 @@ type CS3Repo struct { } // NewCS3Repo creates a new cs3 repo -func NewCS3Repo(serviceID string, cfg *config.Config) (Repo, error) { +func NewCS3Repo(cfg *config.Config) (Repo, error) { tokenManager, err := jwt.New(map[string]interface{}{ "secret": cfg.TokenManager.JWTSecret, }) @@ -47,7 +46,6 @@ func NewCS3Repo(serviceID string, cfg *config.Config) (Repo, error) { } return CS3Repo{ - serviceID: serviceID, cfg: cfg, tm: tokenManager, storageProvider: client, diff --git a/accounts/pkg/storage/disk.go b/accounts/pkg/storage/disk.go index df3288936..3490424a6 100644 --- a/accounts/pkg/storage/disk.go +++ b/accounts/pkg/storage/disk.go @@ -17,13 +17,12 @@ var groupLock sync.Mutex // DiskRepo provides a local filesystem implementation of the Repo interface type DiskRepo struct { - serviceID string cfg *config.Config log olog.Logger } // NewDiskRepo creates a new disk repo -func NewDiskRepo(serviceID string, cfg *config.Config, log olog.Logger) DiskRepo { +func NewDiskRepo(cfg *config.Config, log olog.Logger) DiskRepo { paths := []string{ filepath.Join(cfg.Repo.Disk.Path, accountsFolder), filepath.Join(cfg.Repo.Disk.Path, groupsFolder), @@ -38,7 +37,6 @@ func NewDiskRepo(serviceID string, cfg *config.Config, log olog.Logger) DiskRepo } } return DiskRepo{ - serviceID: serviceID, cfg: cfg, log: log, }