authmate: Init authmate with layer.NeoFS interface

Signed-off-by: Evgenii Baidakov <[email protected]>
nspcc-dev · Aug 11, 2023 · 87362f9 · 87362f9
1 parent f946239
commit 87362f9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/cmd/s3-authmate/main.go b/cmd/s3-authmate/main.go
@@ -706,5 +706,7 @@ func createNeoFS(ctx context.Context, log *zap.Logger, cfg PoolConfig) (authmate
 		return nil, fmt.Errorf("dial pool: %w", err)
 	}
 
-	return neofs.NewAuthmateNeoFS(p, signer), nil
+	neoFS := neofs.NewNeoFS(p, signer)
+
+	return neofs.NewAuthmateNeoFS(neoFS), nil
 }
diff --git a/cmd/s3-gw/app.go b/cmd/s3-gw/app.go
@@ -91,9 +91,10 @@ func newApp(ctx context.Context, log *Logger, v *viper.Viper) *App {
 	conns, key, poolStat := getPool(ctx, log.logger, v)
 
 	signer := user.NewAutoIDSignerRFC6979(key.PrivateKey)
+	neoFS := neofs.NewNeoFS(conns, signer)
 
 	// prepare auth center
-	ctr := auth.New(neofs.NewAuthmateNeoFS(conns, signer), key, v.GetStringSlice(cfgAllowedAccessKeyIDPrefixes), getAccessBoxCacheConfig(v, log.logger))
+	ctr := auth.New(neofs.NewAuthmateNeoFS(neoFS), key, v.GetStringSlice(cfgAllowedAccessKeyIDPrefixes), getAccessBoxCacheConfig(v, log.logger))
 
 	app := &App{
 		ctr:      ctr,

diff --git a/internal/neofs/neofs.go b/internal/neofs/neofs.go
@@ -466,12 +466,12 @@ func (x *ResolverNeoFS) SystemDNS(ctx context.Context) (string, error) {
 
 // AuthmateNeoFS is a mediator which implements authmate.NeoFS through pool.Pool.
 type AuthmateNeoFS struct {
-	neoFS *NeoFS
+	neoFS layer.NeoFS
 }
 
 // NewAuthmateNeoFS creates new AuthmateNeoFS using provided pool.Pool.
-func NewAuthmateNeoFS(p *pool.Pool, signer user.Signer) *AuthmateNeoFS {
-	return &AuthmateNeoFS{neoFS: NewNeoFS(p, signer)}
+func NewAuthmateNeoFS(neoFS layer.NeoFS) *AuthmateNeoFS {
+	return &AuthmateNeoFS{neoFS: neoFS}
 }
 
 // ContainerExists implements authmate.NeoFS interface method.