From e319bf403e7ddd24d9527829a9d5863643635ff8 Mon Sep 17 00:00:00 2001
From: Dmitrii Stepanov <d.stepanov@yadro.com>
Date: Mon, 23 Sep 2024 09:08:11 +0300
Subject: [PATCH] [#1388] apeSvc: Drop unused and make annotations

Signed-off-by: Dmitrii Stepanov <d.stepanov@yadro.com>
---
 cmd/frostfs-node/config.go         |  1 -
 cmd/frostfs-node/object.go         |  1 -
 cmd/frostfs-node/policy_engine.go  |  4 +++-
 pkg/ape/chainbase/option.go        | 10 ----------
 pkg/services/object/ape/service.go |  6 +-----
 5 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/cmd/frostfs-node/config.go b/cmd/frostfs-node/config.go
index 63f410b89..0ffa8c45b 100644
--- a/cmd/frostfs-node/config.go
+++ b/cmd/frostfs-node/config.go
@@ -1082,7 +1082,6 @@ func initAccessPolicyEngine(_ context.Context, c *cfg) {
 		localOverrideDB = chainbase.NewInmemoryLocalOverrideDatabase()
 	} else {
 		localOverrideDB = chainbase.NewBoltLocalOverrideDatabase(
-			chainbase.WithLogger(c.log),
 			chainbase.WithPath(nodeconfig.PersistentPolicyRules(c.appCfg).Path()),
 			chainbase.WithPerm(nodeconfig.PersistentPolicyRules(c.appCfg).Perm()),
 			chainbase.WithNoSync(nodeconfig.PersistentPolicyRules(c.appCfg).NoSync()),
diff --git a/cmd/frostfs-node/object.go b/cmd/frostfs-node/object.go
index 610e2c363..9d4e35ca8 100644
--- a/cmd/frostfs-node/object.go
+++ b/cmd/frostfs-node/object.go
@@ -473,7 +473,6 @@ func createACLServiceV2(c *cfg, apeSvc *objectAPE.Service, irFetcher *cachedIRFe
 
 func createAPEService(c *cfg, splitSvc *objectService.TransportSplitter) *objectAPE.Service {
 	return objectAPE.NewService(
-		c.log,
 		objectAPE.NewChecker(
 			c.cfgObject.cfgAccessPolicyEngine.accessPolicyEngine.LocalStorage(),
 			c.cfgObject.cfgAccessPolicyEngine.accessPolicyEngine.MorphRuleChainStorage(),
diff --git a/cmd/frostfs-node/policy_engine.go b/cmd/frostfs-node/policy_engine.go
index 22fda2b4c..55f76cc76 100644
--- a/cmd/frostfs-node/policy_engine.go
+++ b/cmd/frostfs-node/policy_engine.go
@@ -21,7 +21,9 @@ type accessPolicyEngine struct {
 var _ engine.MorphRuleChainStorageReader = (*morphAPEChainCache)(nil)
 
 type morphAPEChainCacheKey struct {
-	name   chain.Name
+	// nolint:unused
+	name chain.Name
+	// nolint:unused
 	target engine.Target
 }
 
diff --git a/pkg/ape/chainbase/option.go b/pkg/ape/chainbase/option.go
index e547701fb..590b7a885 100644
--- a/pkg/ape/chainbase/option.go
+++ b/pkg/ape/chainbase/option.go
@@ -5,9 +5,7 @@ import (
 	"os"
 	"time"
 
-	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger"
 	"go.etcd.io/bbolt"
-	"go.uber.org/zap"
 )
 
 type Option func(*cfg)
@@ -18,7 +16,6 @@ type cfg struct {
 	noSync        bool
 	maxBatchDelay time.Duration
 	maxBatchSize  int
-	log           *logger.Logger
 }
 
 func defaultCfg() *cfg {
@@ -26,7 +23,6 @@ func defaultCfg() *cfg {
 		perm:          os.ModePerm,
 		maxBatchDelay: bbolt.DefaultMaxBatchDelay,
 		maxBatchSize:  bbolt.DefaultMaxBatchSize,
-		log:           &logger.Logger{Logger: zap.L()},
 	}
 }
 
@@ -59,9 +55,3 @@ func WithMaxBatchSize(maxBatchSize int) Option {
 		c.maxBatchSize = maxBatchSize
 	}
 }
-
-func WithLogger(l *logger.Logger) Option {
-	return func(c *cfg) {
-		c.log = l
-	}
-}
diff --git a/pkg/services/object/ape/service.go b/pkg/services/object/ape/service.go
index a1634e7c5..6eedaf99e 100644
--- a/pkg/services/object/ape/service.go
+++ b/pkg/services/object/ape/service.go
@@ -12,7 +12,6 @@ import (
 	objectSvc "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object"
 	getsvc "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/get"
 	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/services/object/util"
-	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/util/logger"
 	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/bearer"
 	cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id"
 	objectSDK "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
@@ -24,8 +23,6 @@ import (
 var errFailedToCastToRequestContext = errors.New("failed cast to RequestContext")
 
 type Service struct {
-	log *logger.Logger
-
 	apeChecker Checker
 
 	next objectSvc.ServiceServer
@@ -67,9 +64,8 @@ func NewStorageEngineHeaderProvider(e *engine.StorageEngine, s *getsvc.Service)
 	}
 }
 
-func NewService(log *logger.Logger, apeChecker Checker, next objectSvc.ServiceServer) *Service {
+func NewService(apeChecker Checker, next objectSvc.ServiceServer) *Service {
 	return &Service{
-		log:        log,
 		apeChecker: apeChecker,
 		next:       next,
 	}