carpawell/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Issues Pull requests Projects Releases Packages Wiki Activity

[#1278] acl: Return netmap.Source interface

Browse source 
Application can provide cached netmap source in this case.

Signed-off-by: Alex Vanin <alexey@nspcc.ru>
This commit is contained in:
Alex Vanin 2022-03-29 15:49:39 +03:00 committed by Alex Vanin
parent cf119e4ca9
commit 7ed84d1755
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmd/neofs-node/object.go
View file

@ -358,7 +358,7 @@ func initObjectService(c *cfg) {
aclSvc := v2.New( aclSvc := v2.New(
v2.WithLogger(c.log), v2.WithLogger(c.log),
v2.WithIRFetcher(irFetcher), v2.WithIRFetcher(irFetcher),
v2.WithNetmapClient(c.cfgNetmap.wrapper), v2.WithNetmapSource(c.cfgNetmap.wrapper),
v2.WithContainerSource( v2.WithContainerSource(
c.cfgObject.cnrSource, c.cfgObject.cnrSource,
), ),

8
pkg/services/object/acl/v2/opts.go
View file

@ -2,7 +2,7 @@ package v2
import ( import (
"github.com/nspcc-dev/neofs-node/pkg/core/container" "github.com/nspcc-dev/neofs-node/pkg/core/container"
netmapClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap" "github.com/nspcc-dev/neofs-node/pkg/core/netmap"
objectSvc "github.com/nspcc-dev/neofs-node/pkg/services/object" objectSvc "github.com/nspcc-dev/neofs-node/pkg/services/object"
"go.uber.org/zap" "go.uber.org/zap"
) )
@ -14,9 +14,9 @@ func WithLogger(v *zap.Logger) Option {
} }
} }
// WithNetmapClient return option to set // WithNetmapSource return option to set
// netmap client. // netmap source.
func WithNetmapClient(v *netmapClient.Client) Option { func WithNetmapSource(v netmap.Source) Option {
return func(c *cfg) { return func(c *cfg) {
c.nm = v c.nm = v
} }

4
pkg/services/object/acl/v2/service.go
View file

@ -7,7 +7,7 @@ import (
objectV2 "github.com/nspcc-dev/neofs-api-go/v2/object" objectV2 "github.com/nspcc-dev/neofs-api-go/v2/object"
"github.com/nspcc-dev/neofs-node/pkg/core/container" "github.com/nspcc-dev/neofs-node/pkg/core/container"
netmapClient "github.com/nspcc-dev/neofs-node/pkg/morph/client/netmap" "github.com/nspcc-dev/neofs-node/pkg/core/netmap"
"github.com/nspcc-dev/neofs-node/pkg/services/object" "github.com/nspcc-dev/neofs-node/pkg/services/object"
cidSDK "github.com/nspcc-dev/neofs-sdk-go/container/id" cidSDK "github.com/nspcc-dev/neofs-sdk-go/container/id"
eaclSDK "github.com/nspcc-dev/neofs-sdk-go/eacl" eaclSDK "github.com/nspcc-dev/neofs-sdk-go/eacl"
@ -63,7 +63,7 @@ type cfg struct {
irFetcher InnerRingFetcher irFetcher InnerRingFetcher
nm *netmapClient.Client nm netmap.Source
next object.ServiceServer next object.ServiceServer
} }