From 2d595ec15f516dda5b66bd85d8c08c6136e514ad Mon Sep 17 00:00:00 2001
From: Anton Nikiforov <an.nikiforov@yadro.com>
Date: Thu, 7 Mar 2024 19:21:18 +0300
Subject: [PATCH] [#976] ape: Update dependency

Signed-off-by: Anton Nikiforov <an.nikiforov@yadro.com>
---
 go.mod                      |   4 ++--
 go.sum                      | Bin 42022 -> 41962 bytes
 pkg/ape/chainbase/boltdb.go |  37 ++++++++++++++++++++++++++----------
 3 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/go.mod b/go.mod
index 6ba1ed73d..2c2eac68f 100644
--- a/go.mod
+++ b/go.mod
@@ -5,11 +5,11 @@ go 1.20
 require (
 	code.gitea.io/sdk/gitea v0.17.1
 	git.frostfs.info/TrueCloudLab/frostfs-api-go/v2 v2.16.1-0.20240215124401-634e24aba715
-	git.frostfs.info/TrueCloudLab/frostfs-contract v0.18.1-0.20240115082915-f2a82aa635aa
+	git.frostfs.info/TrueCloudLab/frostfs-contract v0.19.0
 	git.frostfs.info/TrueCloudLab/frostfs-observability v0.0.0-20231101111734-b3ad3335ff65
 	git.frostfs.info/TrueCloudLab/frostfs-sdk-go v0.0.0-20240301150205-6fe4e2541d0b
 	git.frostfs.info/TrueCloudLab/hrw v1.2.1
-	git.frostfs.info/TrueCloudLab/policy-engine v0.0.0-20240304151211-839f22e1a36d
+	git.frostfs.info/TrueCloudLab/policy-engine v0.0.0-20240307151106-2ec958cbfdfd
 	git.frostfs.info/TrueCloudLab/tzhash v1.8.0
 	git.frostfs.info/TrueCloudLab/zapjournald v0.0.0-20240124114243-cb2e66427d02
 	github.com/cheggaaa/pb v1.0.29
diff --git a/go.sum b/go.sum
index 24120b20a3f352e7f7274353c17647a134184d57..d90bf0f6a5ed881e6779ffbbcb54401101efd301 100644
GIT binary patch
delta 237
zcmZ2>g6Y+9rVVcyjV$#H6fz90+^R~8vRrdQ%bm?V^CB(FOpB@_f>OPc(wuxuD}%he
zgTuW73eB9nGdv6?%d==qe!$4f4Ai=LGLsmKv$>(Ep`n49u2E{TrKv@7Qd&w{3dqoc
zO3xh2G?P5fBJ<R2FLUE?%j{Gi&p^|Zf_(2Ji+r;Rzuf$k;)qC7?R=o23X^-;WW2DM
zrJtU!2UH0%(nH@d+`=@dB(fqbBq=$)+#}rF%%w0Q)jOv+)7jHM)i1&$ps>=#sVFUQ
O@_BZ>%?sGu<^TY0YD}X5

delta 293
zcmaELoN3t!rVVcy11$6mbq(~442(<+3=K^UEQ~A-O?A_Z5-p4p6U~fG6B89O46RB_
z{VWZN%}p{>LNYueGWE0E^gVMzQrt3g{XL7dJ)J^LOo~!MT=k<;@+W^}(wywU#G^>i
z;LYJoVl2)khNgx_hK9Np#+GSDMyZC0#%3uXD=W>t1I){cB21l=DlCJH@~WKOvdn$5
zvWgS+y|crkf=%)QJtI6^Q@vBlCmXWacwsX~KRsVBHy><VWSEb6rCVZ%L7-o7fuli{
oc92JDiceXQPkD%TPO)30d!<uwSh8Vhafv6;2MU|R*r&_^0LzzGU;qFB

diff --git a/pkg/ape/chainbase/boltdb.go b/pkg/ape/chainbase/boltdb.go
index 27bfd8468..5f3c342c1 100644
--- a/pkg/ape/chainbase/boltdb.go
+++ b/pkg/ape/chainbase/boltdb.go
@@ -100,7 +100,7 @@ func (cs *boltLocalOverrideStorage) Close() error {
 	return err
 }
 
-func getTargetBucket(tx *bbolt.Tx, name chain.Name, target policyengine.Target) (*bbolt.Bucket, error) {
+func getTypeBucket(tx *bbolt.Tx, name chain.Name, target policyengine.Target) (*bbolt.Bucket, error) {
 	cbucket := tx.Bucket(chainBucket)
 	if cbucket == nil {
 		return nil, ErrRootBucketNotFound
@@ -110,16 +110,25 @@ func getTargetBucket(tx *bbolt.Tx, name chain.Name, target policyengine.Target)
 	if nbucket == nil {
 		return nil, fmt.Errorf("%w: %w: %s", policyengine.ErrChainNotFound, ErrGlobalNamespaceBucketNotFound, name)
 	}
+	return nbucket.Bucket([]byte{byte(target.Type)}), nil
+}
 
-	typeBucket := nbucket.Bucket([]byte{byte(target.Type)})
+func normalizeTargetName(target *policyengine.Target) {
+	if target.Type == policyengine.Namespace && target.Name == "" {
+		target.Name = "root"
+	}
+}
+
+func getTargetBucket(tx *bbolt.Tx, name chain.Name, target policyengine.Target) (*bbolt.Bucket, error) {
+	typeBucket, err := getTypeBucket(tx, name, target)
+	if err != nil {
+		return nil, err
+	}
 	if typeBucket == nil {
 		return nil, fmt.Errorf("%w: %w: %c", policyengine.ErrChainNotFound, ErrTargetTypeBucketNotFound, target.Type)
 	}
 
-	if target.Type == policyengine.Namespace && target.Name == "" {
-		target.Name = "root"
-	}
-
+	normalizeTargetName(&target)
 	rbucket := typeBucket.Bucket([]byte(target.Name))
 	if rbucket == nil {
 		return nil, fmt.Errorf("%w: %w: %s", policyengine.ErrChainNotFound, ErrTargetNameBucketNotFound, target.Name)
@@ -151,10 +160,7 @@ func getTargetBucketCreateIfEmpty(tx *bbolt.Tx, name chain.Name, target policyen
 		}
 	}
 
-	if target.Type == policyengine.Namespace && target.Name == "" {
-		target.Name = "root"
-	}
-
+	normalizeTargetName(&target)
 	rbucket := typeBucket.Bucket([]byte(target.Name))
 	if rbucket == nil {
 		var err error
@@ -220,6 +226,17 @@ func (cs *boltLocalOverrideStorage) RemoveOverride(name chain.Name, target polic
 	})
 }
 
+func (cs *boltLocalOverrideStorage) RemoveOverridesByTarget(name chain.Name, target policyengine.Target) error {
+	return cs.db.Update(func(tx *bbolt.Tx) error {
+		typeBucket, err := getTypeBucket(tx, name, target)
+		if err != nil {
+			return err
+		}
+		normalizeTargetName(&target)
+		return typeBucket.DeleteBucket([]byte(target.Name))
+	})
+}
+
 func (cs *boltLocalOverrideStorage) ListOverrides(name chain.Name, target policyengine.Target) ([]*chain.Chain, error) {
 	var serializedChains [][]byte
 	var serializedChain []byte