From 7eab7529234bd9e00fb1b3a0fcc9dcc1830eff32 Mon Sep 17 00:00:00 2001 From: Angira Kekteeva Date: Fri, 21 May 2021 16:35:24 +0300 Subject: [PATCH] [#116] *: Replace pkg policy by neofs-sdk policy Processing transfer of policy pkg to neofs-sdk repository. Replace local dependency in neofs-cli. Signed-off-by: Angira Kekteeva --- cmd/neofs-cli/modules/container.go | 2 +- go.mod | 2 +- go.sum | Bin 60600 -> 60841 bytes pkg/policy/doc.go | 20 -- pkg/policy/encode.go | 140 -------------- pkg/policy/encode_test.go | 36 ---- pkg/policy/grammar.ebnf | 55 ------ pkg/policy/grammar.go | 59 ------ pkg/policy/json.go | 225 ----------------------- pkg/policy/json_test.go | 84 --------- pkg/policy/query.go | 173 ------------------ pkg/policy/query_test.go | 284 ----------------------------- 12 files changed, 2 insertions(+), 1078 deletions(-) delete mode 100644 pkg/policy/doc.go delete mode 100644 pkg/policy/encode.go delete mode 100644 pkg/policy/encode_test.go delete mode 100644 pkg/policy/grammar.ebnf delete mode 100644 pkg/policy/grammar.go delete mode 100644 pkg/policy/json.go delete mode 100644 pkg/policy/json_test.go delete mode 100644 pkg/policy/query.go delete mode 100644 pkg/policy/query_test.go diff --git a/cmd/neofs-cli/modules/container.go b/cmd/neofs-cli/modules/container.go index 8b2f50d7f..6a7b9c89b 100644 --- a/cmd/neofs-cli/modules/container.go +++ b/cmd/neofs-cli/modules/container.go @@ -22,7 +22,7 @@ import ( "github.com/nspcc-dev/neofs-api-go/pkg/netmap" "github.com/nspcc-dev/neofs-api-go/pkg/object" "github.com/nspcc-dev/neofs-api-go/pkg/owner" - "github.com/nspcc-dev/neofs-node/pkg/policy" + "github.com/nspcc-dev/neofs-sdk-go/pkg/policy" "github.com/spf13/cobra" ) diff --git a/go.mod b/go.mod index 8f43e5a17..3c595127d 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,6 @@ go 1.14 require ( code.cloudfoundry.org/bytefmt v0.0.0-20200131002437-cf55d5288a48 - github.com/alecthomas/participle v0.6.0 github.com/golang/protobuf v1.4.3 github.com/google/uuid v1.1.1 github.com/hashicorp/golang-lru v0.5.4 @@ -16,6 +15,7 @@ require ( github.com/nspcc-dev/neo-go v0.95.0 github.com/nspcc-dev/neofs-api-go v1.26.1 github.com/nspcc-dev/neofs-crypto v0.3.0 + github.com/nspcc-dev/neofs-sdk-go v0.0.0-20210520210714-9dee13f0d556 github.com/nspcc-dev/tzhash v1.4.0 github.com/panjf2000/ants/v2 v2.3.0 github.com/paulmach/orb v0.2.1 diff --git a/go.sum b/go.sum index ad9a71ae50e0719bdf61b1bb4986498d4e62d51e..2e1e83bd1add280012e60a7b238f2e5cfd20e020 100644 GIT binary patch delta 283 zcmdmSlX>NB<_)j7jm-576*3I1jFSA!i&8_%_4Q5D43bOJy^=%x^CI>ABBPSS1N{>d zv%f8ddre21Hl8K`x$E01LIvarCA;P4c?T!uJ9`9s6dB}{c_mgvrsVmg z8HN>A=DKBsdALpvED#4-5KpuP`sw+4x%nv|dy4h7&5g1Qz1&mFys}cwO}#Vxi$Zg& gaw{z&jU$W#6Mcfpvx`D