From 140befc1de86104688525c8471888101f3a0f53a Mon Sep 17 00:00:00 2001
From: Anton Nikiforov <an.nikiforov@yadro.com>
Date: Mon, 29 Jan 2024 11:23:56 +0300
Subject: [PATCH] [#922] go.mod: Update APE

Signed-off-by: Anton Nikiforov <an.nikiforov@yadro.com>
---
 go.mod                                       |   4 +-
 go.sum                                       | Bin 39484 -> 39828 bytes
 pkg/ape/chainbase/boltdb.go                  |  49 ++++++++++++++++++-
 pkg/services/control/server/policy_engine.go |   2 +-
 4 files changed, 51 insertions(+), 4 deletions(-)

diff --git a/go.mod b/go.mod
index a5cffc28c..07097c547 100644
--- a/go.mod
+++ b/go.mod
@@ -8,7 +8,7 @@ require (
 	git.frostfs.info/TrueCloudLab/frostfs-observability v0.0.0-20231101111734-b3ad3335ff65
 	git.frostfs.info/TrueCloudLab/frostfs-sdk-go v0.0.0-20240126141009-65b4525b3bf0
 	git.frostfs.info/TrueCloudLab/hrw v1.2.1
-	git.frostfs.info/TrueCloudLab/policy-engine v0.0.0-20240122104724-06cbfe8691ad
+	git.frostfs.info/TrueCloudLab/policy-engine v0.0.0-20240129064140-8d21ab2d99d9
 	git.frostfs.info/TrueCloudLab/tzhash v1.8.0
 	github.com/cheggaaa/pb v1.0.29
 	github.com/chzyer/readline v1.5.1
@@ -76,8 +76,10 @@ require (
 	github.com/holiman/uint256 v1.2.4 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/ipfs/go-cid v0.4.1 // indirect
+	github.com/josharian/intern v1.0.0 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.6 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
+	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-runewidth v0.0.15 // indirect
 	github.com/minio/sha256-simd v1.0.1 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
diff --git a/go.sum b/go.sum
index 4462c3575136bfba18ab55cc88457e01e25afd30..5243ac4350b2d7d5edf3cc8fa3ebd24be41d10ff 100644
GIT binary patch
delta 502
zcmZ|Jy>8k-003YGDH%GYLo>A!89F(&?}80>r4A7A53z8;!PIR2_Zgcb=RbT)9)dhb
zBr0|3kf+Jgu`kfDB~tnVpT6HeTlc?O53Q3c33PeLgD;|g2_5&+mn2_m$M9>s8fsCu
zq89YvrYVFnkw$2MR_g7wM?*Z>e2?oz^~0Hj;_m%Xd-rtwQG3hcBFtvkKajSi_Zr!`
z0n>@O=>y8l)Y8{0qSrS}n#;D*3{1;|WnSz~kIwghPCk6TOK=`L1UYLCt&4!H+ZAL1
z3l3bBnmiSFZ2CzC+$fo$NMjVJZe*s=7>SGoU8hDQs+s-mU4)9bbXgB)+<(XyQDKM!
z%K~{fIUhTodo@B`nAX0MaE_IdX+>38_C>XhIL_YxWzLT8P)bTJaPlU}@$(U|J+^l^
z&K0{~U2lU<KFCKyYKY5VVVJ2l4Ht5{b*a7#dT}k!X9T=DX3ksUi{h4sBq-BPM;P}P
lx1R*Oq)lcRE?N0hn6KyjN(skf-IgY)w|nfI?N8wa`Ug&CrVs!C

delta 183
zcmbQTooUY&rVUJN&PIj?Cgw&ax&~&+NolDTW|oGDDGC{eR@yF>W}&490p;4Jrp`qb
z0ouhyiB%;TB~gwU27!i_P9<LXh5@-I8U6tVlLZ+SCO>19@xo@7etN!MZa&z^f?~6L
zZ-0Z_io^h~DsSV&l-v*}<IM7WrwH$CkGx=W<2;i9=c2*_52tjHk(*z$iK=d1tHa4U
Nd9RV!=5iz1OaS!PISv2-

diff --git a/pkg/ape/chainbase/boltdb.go b/pkg/ape/chainbase/boltdb.go
index 4e15050b3..c26156c7a 100644
--- a/pkg/ape/chainbase/boltdb.go
+++ b/pkg/ape/chainbase/boltdb.go
@@ -167,8 +167,8 @@ func getTargetBucketCreateIfEmpty(tx *bbolt.Tx, name chain.Name, target policyen
 }
 
 func (cs *boltLocalOverrideStorage) AddOverride(name chain.Name, target policyengine.Target, c *chain.Chain) (chain.ID, error) {
-	if c.ID == "" {
-		return "", fmt.Errorf("chain ID is not set")
+	if len(c.ID) == 0 {
+		return chain.ID{}, fmt.Errorf("chain ID is not set")
 	}
 
 	serializedChain := c.Bytes()
@@ -264,3 +264,48 @@ func (cs *boltLocalOverrideStorage) DropAllOverrides(name chain.Name) error {
 		return tx.DeleteBucket([]byte(name))
 	})
 }
+
+func (cs *boltLocalOverrideStorage) ListOverrideDefinedTargets(name chain.Name) ([]policyengine.Target, error) {
+	var targets []policyengine.Target
+	if err := cs.db.View(func(tx *bbolt.Tx) error {
+		var err error
+		targets, err = getTargets(tx, name)
+		if err != nil {
+			return err
+		}
+		return nil
+	}); err != nil {
+		return nil, err
+	}
+	return targets, nil
+}
+
+func getTargets(tx *bbolt.Tx, name chain.Name) ([]policyengine.Target, error) {
+	var targets []policyengine.Target
+	cbucket := tx.Bucket(chainBucket)
+	if cbucket == nil {
+		return nil, ErrRootBucketNotFound
+	}
+
+	nbucket := cbucket.Bucket([]byte(name))
+	if nbucket == nil {
+		return nil, fmt.Errorf("%w: %w: %s", policyengine.ErrChainNotFound, ErrGlobalNamespaceBucketNotFound, name)
+	}
+
+	if err := nbucket.ForEachBucket(func(k []byte) error {
+		ttype := policyengine.TargetType(k[0])
+		if err := nbucket.Bucket(k).ForEachBucket(func(k []byte) error {
+			targets = append(targets, policyengine.Target{
+				Type: ttype,
+				Name: string(slice.Copy(k)),
+			})
+			return nil
+		}); err != nil {
+			return err
+		}
+		return nil
+	}); err != nil {
+		return nil, err
+	}
+	return targets, nil
+}
diff --git a/pkg/services/control/server/policy_engine.go b/pkg/services/control/server/policy_engine.go
index 6bf600748..bd7f35f46 100644
--- a/pkg/services/control/server/policy_engine.go
+++ b/pkg/services/control/server/policy_engine.go
@@ -44,7 +44,7 @@ func (s *Server) AddChainLocalOverride(_ context.Context, req *control.AddChainL
 
 	s.apeChainCounter.Add(1)
 	// TODO (aarifullin): the such chain id is not well-designed yet.
-	if chain.ID == "" {
+	if len(chain.ID) == 0 {
 		chain.ID = apechain.ID(fmt.Sprintf("%s:%d", apechain.Ingress, s.apeChainCounter.Load()))
 	}