From d2d88ba21bbf7805ad259b08c5313f0edb8b5884 Mon Sep 17 00:00:00 2001 From: Alex Vanin Date: Tue, 7 Mar 2023 18:02:40 +0300 Subject: [PATCH] Rename package name Due to source code relocation from GitHub. Signed-off-by: Alex Vanin --- README.md | 8 +- cmd/frostfs-rest-gw/config.go | 8 +- cmd/frostfs-rest-gw/integration_test.go | 32 +++--- cmd/frostfs-rest-gw/main.go | 4 +- gen/restapi/operations/auth_parameters.go | 2 +- gen/restapi/operations/auth_responses.go | 2 +- gen/restapi/operations/delete_container.go | 2 +- .../operations/delete_container_responses.go | 2 +- gen/restapi/operations/delete_object.go | 2 +- .../operations/delete_object_responses.go | 2 +- gen/restapi/operations/form_binary_bearer.go | 2 +- .../form_binary_bearer_responses.go | 2 +- gen/restapi/operations/frostfs_rest_gw_api.go | 2 +- .../operations/get_balance_responses.go | 2 +- .../get_container_e_acl_responses.go | 2 +- .../operations/get_container_responses.go | 2 +- gen/restapi/operations/get_object_info.go | 2 +- .../operations/get_object_info_responses.go | 2 +- .../operations/list_containers_responses.go | 2 +- gen/restapi/operations/put_container.go | 2 +- gen/restapi/operations/put_container_e_acl.go | 2 +- .../put_container_e_acl_parameters.go | 2 +- .../put_container_e_acl_responses.go | 2 +- .../operations/put_container_parameters.go | 2 +- .../operations/put_container_responses.go | 2 +- gen/restapi/operations/put_object.go | 2 +- .../operations/put_object_parameters.go | 2 +- .../operations/put_object_responses.go | 2 +- gen/restapi/operations/search_objects.go | 2 +- .../operations/search_objects_parameters.go | 2 +- .../operations/search_objects_responses.go | 2 +- gen/restapi/server.go | 2 +- go.mod | 43 ++++---- go.sum | 97 ++++++++++++------- handlers/api.go | 14 +-- handlers/auth.go | 18 ++-- handlers/auth_test.go | 10 +- handlers/balance.go | 10 +- handlers/container_test.go | 2 +- handlers/containers.go | 28 +++--- handlers/objects.go | 20 ++-- handlers/objects_test.go | 4 +- handlers/preflight.go | 2 +- handlers/util.go | 12 +-- handlers/util_test.go | 2 +- internal/util/transformers.go | 14 +-- internal/util/transformers_test.go | 2 +- metrics/metrics.go | 2 +- 48 files changed, 211 insertions(+), 177 deletions(-) diff --git a/README.md b/README.md index 433fd83..dc72889 100644 --- a/README.md +++ b/README.md @@ -6,9 +6,7 @@

--- -[![Report](https://goreportcard.com/badge/github.com/TrueCloudLab/frostfs-rest-gw)](https://goreportcard.com/report/github.com/TrueCloudLab/frostfs-rest-gw) -![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/TrueCloudLab/frostfs-rest-gw?sort=semver) -![License](https://img.shields.io/github/license/TrueCloudLab/frostfs-rest-gw.svg?style=popout) +[![Report](https://goreportcard.com/badge/git.frostfs.info/TrueCloudLab/frostfs-rest-gw)](https://goreportcard.com/report/git.frostfs.info/TrueCloudLab/frostfs-rest-gw) # frostfs-rest-gw @@ -29,7 +27,7 @@ Before building make sure you have the following tools: First clone this repository: ```shell -$ git clone https://github.com/TrueCloudLab/frostfs-rest-gw +$ git clone https://git.frostfs.info/TrueCloudLab/frostfs-rest-gw ``` Then run make to build `bin/frostfs-rest-gw` binary: @@ -93,7 +91,7 @@ REST gateway itself is not a FrostFS node, so to access FrostFS it uses node's g node that it will connect to. This can be done either via `-p` parameter or via `REST_GW_POOL_PEERS__ADDRESS` and `REST_GW_POOL_PEERS__WEIGHT` environment variables (the gate supports multiple FrostFS nodes with weighted load balancing). -If you're launching REST gateway in bundle with [frostfs-dev-env](https://github.com/TrueCloudLab/frostfs-dev-env), you can get +If you're launching REST gateway in bundle with [frostfs-dev-env](https://git.frostfs.info/TrueCloudLab/frostfs-dev-env), you can get an IP address of the node in output of `make hosts` command (with s0*.frostfs.devenv name). diff --git a/cmd/frostfs-rest-gw/config.go b/cmd/frostfs-rest-gw/config.go index cf91382..d19a7ed 100644 --- a/cmd/frostfs-rest-gw/config.go +++ b/cmd/frostfs-rest-gw/config.go @@ -10,10 +10,10 @@ import ( "strings" "time" - "github.com/TrueCloudLab/frostfs-rest-gw/gen/restapi" - "github.com/TrueCloudLab/frostfs-rest-gw/handlers" - "github.com/TrueCloudLab/frostfs-rest-gw/metrics" - "github.com/TrueCloudLab/frostfs-sdk-go/pool" + "git.frostfs.info/TrueCloudLab/frostfs-rest-gw/gen/restapi" + "git.frostfs.info/TrueCloudLab/frostfs-rest-gw/handlers" + "git.frostfs.info/TrueCloudLab/frostfs-rest-gw/metrics" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/pool" "github.com/nspcc-dev/neo-go/cli/flags" "github.com/nspcc-dev/neo-go/cli/input" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" diff --git a/cmd/frostfs-rest-gw/integration_test.go b/cmd/frostfs-rest-gw/integration_test.go index 47f751a..0bb6a7b 100644 --- a/cmd/frostfs-rest-gw/integration_test.go +++ b/cmd/frostfs-rest-gw/integration_test.go @@ -14,22 +14,22 @@ import ( "testing" "time" - "github.com/TrueCloudLab/frostfs-rest-gw/gen/models" - "github.com/TrueCloudLab/frostfs-rest-gw/gen/restapi" - "github.com/TrueCloudLab/frostfs-rest-gw/gen/restapi/operations" - "github.com/TrueCloudLab/frostfs-rest-gw/handlers" - "github.com/TrueCloudLab/frostfs-rest-gw/internal/util" - "github.com/TrueCloudLab/frostfs-sdk-go/bearer" - "github.com/TrueCloudLab/frostfs-sdk-go/container" - "github.com/TrueCloudLab/frostfs-sdk-go/container/acl" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - frostfsecdsa "github.com/TrueCloudLab/frostfs-sdk-go/crypto/ecdsa" - "github.com/TrueCloudLab/frostfs-sdk-go/eacl" - "github.com/TrueCloudLab/frostfs-sdk-go/netmap" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" - "github.com/TrueCloudLab/frostfs-sdk-go/pool" - "github.com/TrueCloudLab/frostfs-sdk-go/user" + "git.frostfs.info/TrueCloudLab/frostfs-rest-gw/gen/models" + "git.frostfs.info/TrueCloudLab/frostfs-rest-gw/gen/restapi" + "git.frostfs.info/TrueCloudLab/frostfs-rest-gw/gen/restapi/operations" + "git.frostfs.info/TrueCloudLab/frostfs-rest-gw/handlers" + "git.frostfs.info/TrueCloudLab/frostfs-rest-gw/internal/util" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/bearer" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/acl" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + frostfsecdsa "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/crypto/ecdsa" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/eacl" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/pool" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" "github.com/go-openapi/loads" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/spf13/viper" diff --git a/cmd/frostfs-rest-gw/main.go b/cmd/frostfs-rest-gw/main.go index 534fe59..f142eae 100644 --- a/cmd/frostfs-rest-gw/main.go +++ b/cmd/frostfs-rest-gw/main.go @@ -5,8 +5,8 @@ import ( "os/signal" "syscall" - "github.com/TrueCloudLab/frostfs-rest-gw/gen/restapi" - "github.com/TrueCloudLab/frostfs-rest-gw/gen/restapi/operations" + "git.frostfs.info/TrueCloudLab/frostfs-rest-gw/gen/restapi" + "git.frostfs.info/TrueCloudLab/frostfs-rest-gw/gen/restapi/operations" "github.com/go-openapi/loads" "go.uber.org/zap" ) diff --git a/gen/restapi/operations/auth_parameters.go b/gen/restapi/operations/auth_parameters.go index 0ac370f..3efc71d 100644 --- a/gen/restapi/operations/auth_parameters.go +++ b/gen/restapi/operations/auth_parameters.go @@ -16,7 +16,7 @@ import ( "github.com/go-openapi/swag" "github.com/go-openapi/validate" - "github.com/TrueCloudLab/frostfs-rest-gw/gen/models" + "git.frostfs.info/TrueCloudLab/frostfs-rest-gw/gen/models" ) // NewAuthParams creates a new AuthParams object diff --git a/gen/restapi/operations/auth_responses.go b/gen/restapi/operations/auth_responses.go index e9505d5..6398535 100644 --- a/gen/restapi/operations/auth_responses.go +++ b/gen/restapi/operations/auth_responses.go @@ -10,7 +10,7 @@ import ( "github.com/go-openapi/runtime" - "github.com/TrueCloudLab/frostfs-rest-gw/gen/models" + "git.frostfs.info/TrueCloudLab/frostfs-rest-gw/gen/models" ) // AuthOKCode is the HTTP code returned for type AuthOK diff --git a/gen/restapi/operations/delete_container.go b/gen/restapi/operations/delete_container.go index 1da9e10..c8ef4ed 100644 --- a/gen/restapi/operations/delete_container.go +++ b/gen/restapi/operations/delete_container.go @@ -10,7 +10,7 @@ import ( "github.com/go-openapi/runtime/middleware" - "github.com/TrueCloudLab/frostfs-rest-gw/gen/models" + "git.frostfs.info/TrueCloudLab/frostfs-rest-gw/gen/models" ) // DeleteContainerHandlerFunc turns a function with the right signature into a delete container handler diff --git a/gen/restapi/operations/delete_container_responses.go b/gen/restapi/operations/delete_container_responses.go index 918caa2..165073b 100644 --- a/gen/restapi/operations/delete_container_responses.go +++ b/gen/restapi/operations/delete_container_responses.go @@ -10,7 +10,7 @@ import ( "github.com/go-openapi/runtime" - "github.com/TrueCloudLab/frostfs-rest-gw/gen/models" + "git.frostfs.info/TrueCloudLab/frostfs-rest-gw/gen/models" ) // DeleteContainerOKCode is the HTTP code returned for type DeleteContainerOK diff --git a/gen/restapi/operations/delete_object.go b/gen/restapi/operations/delete_object.go index 57e638e..2e165fc 100644 --- a/gen/restapi/operations/delete_object.go +++ b/gen/restapi/operations/delete_object.go @@ -10,7 +10,7 @@ import ( "github.com/go-openapi/runtime/middleware" - "github.com/TrueCloudLab/frostfs-rest-gw/gen/models" + "git.frostfs.info/TrueCloudLab/frostfs-rest-gw/gen/models" ) // DeleteObjectHandlerFunc turns a function with the right signature into a delete object handler diff --git a/gen/restapi/operations/delete_object_responses.go b/gen/restapi/operations/delete_object_responses.go index 937c2e3..601b3d7 100644 --- a/gen/restapi/operations/delete_object_responses.go +++ b/gen/restapi/operations/delete_object_responses.go @@ -10,7 +10,7 @@ import ( "github.com/go-openapi/runtime" - "github.com/TrueCloudLab/frostfs-rest-gw/gen/models" + "git.frostfs.info/TrueCloudLab/frostfs-rest-gw/gen/models" ) // DeleteObjectOKCode is the HTTP code returned for type DeleteObjectOK diff --git a/gen/restapi/operations/form_binary_bearer.go b/gen/restapi/operations/form_binary_bearer.go index 8abd628..8a46660 100644 --- a/gen/restapi/operations/form_binary_bearer.go +++ b/gen/restapi/operations/form_binary_bearer.go @@ -10,7 +10,7 @@ import ( "github.com/go-openapi/runtime/middleware" - "github.com/TrueCloudLab/frostfs-rest-gw/gen/models" + "git.frostfs.info/TrueCloudLab/frostfs-rest-gw/gen/models" ) // FormBinaryBearerHandlerFunc turns a function with the right signature into a form binary bearer handler diff --git a/gen/restapi/operations/form_binary_bearer_responses.go b/gen/restapi/operations/form_binary_bearer_responses.go index 2087e2d..f2ee17b 100644 --- a/gen/restapi/operations/form_binary_bearer_responses.go +++ b/gen/restapi/operations/form_binary_bearer_responses.go @@ -10,7 +10,7 @@ import ( "github.com/go-openapi/runtime" - "github.com/TrueCloudLab/frostfs-rest-gw/gen/models" + "git.frostfs.info/TrueCloudLab/frostfs-rest-gw/gen/models" ) // FormBinaryBearerOKCode is the HTTP code returned for type FormBinaryBearerOK diff --git a/gen/restapi/operations/frostfs_rest_gw_api.go b/gen/restapi/operations/frostfs_rest_gw_api.go index fe9ddbc..86b9e40 100644 --- a/gen/restapi/operations/frostfs_rest_gw_api.go +++ b/gen/restapi/operations/frostfs_rest_gw_api.go @@ -19,7 +19,7 @@ import ( "github.com/go-openapi/strfmt" "github.com/go-openapi/swag" - "github.com/TrueCloudLab/frostfs-rest-gw/gen/models" + "git.frostfs.info/TrueCloudLab/frostfs-rest-gw/gen/models" ) // NewFrostfsRestGwAPI creates a new FrostfsRestGw instance diff --git a/gen/restapi/operations/get_balance_responses.go b/gen/restapi/operations/get_balance_responses.go index 8fbf8fb..0a6be2a 100644 --- a/gen/restapi/operations/get_balance_responses.go +++ b/gen/restapi/operations/get_balance_responses.go @@ -10,7 +10,7 @@ import ( "github.com/go-openapi/runtime" - "github.com/TrueCloudLab/frostfs-rest-gw/gen/models" + "git.frostfs.info/TrueCloudLab/frostfs-rest-gw/gen/models" ) // GetBalanceOKCode is the HTTP code returned for type GetBalanceOK diff --git a/gen/restapi/operations/get_container_e_acl_responses.go b/gen/restapi/operations/get_container_e_acl_responses.go index 15654af..8cc03d5 100644 --- a/gen/restapi/operations/get_container_e_acl_responses.go +++ b/gen/restapi/operations/get_container_e_acl_responses.go @@ -10,7 +10,7 @@ import ( "github.com/go-openapi/runtime" - "github.com/TrueCloudLab/frostfs-rest-gw/gen/models" + "git.frostfs.info/TrueCloudLab/frostfs-rest-gw/gen/models" ) // GetContainerEACLOKCode is the HTTP code returned for type GetContainerEACLOK diff --git a/gen/restapi/operations/get_container_responses.go b/gen/restapi/operations/get_container_responses.go index 9315305..9ce3fb0 100644 --- a/gen/restapi/operations/get_container_responses.go +++ b/gen/restapi/operations/get_container_responses.go @@ -10,7 +10,7 @@ import ( "github.com/go-openapi/runtime" - "github.com/TrueCloudLab/frostfs-rest-gw/gen/models" + "git.frostfs.info/TrueCloudLab/frostfs-rest-gw/gen/models" ) // GetContainerOKCode is the HTTP code returned for type GetContainerOK diff --git a/gen/restapi/operations/get_object_info.go b/gen/restapi/operations/get_object_info.go index e26df64..1c62d24 100644 --- a/gen/restapi/operations/get_object_info.go +++ b/gen/restapi/operations/get_object_info.go @@ -10,7 +10,7 @@ import ( "github.com/go-openapi/runtime/middleware" - "github.com/TrueCloudLab/frostfs-rest-gw/gen/models" + "git.frostfs.info/TrueCloudLab/frostfs-rest-gw/gen/models" ) // GetObjectInfoHandlerFunc turns a function with the right signature into a get object info handler diff --git a/gen/restapi/operations/get_object_info_responses.go b/gen/restapi/operations/get_object_info_responses.go index 3baaba8..38276e3 100644 --- a/gen/restapi/operations/get_object_info_responses.go +++ b/gen/restapi/operations/get_object_info_responses.go @@ -10,7 +10,7 @@ import ( "github.com/go-openapi/runtime" - "github.com/TrueCloudLab/frostfs-rest-gw/gen/models" + "git.frostfs.info/TrueCloudLab/frostfs-rest-gw/gen/models" ) // GetObjectInfoOKCode is the HTTP code returned for type GetObjectInfoOK diff --git a/gen/restapi/operations/list_containers_responses.go b/gen/restapi/operations/list_containers_responses.go index 20575fb..5545a60 100644 --- a/gen/restapi/operations/list_containers_responses.go +++ b/gen/restapi/operations/list_containers_responses.go @@ -10,7 +10,7 @@ import ( "github.com/go-openapi/runtime" - "github.com/TrueCloudLab/frostfs-rest-gw/gen/models" + "git.frostfs.info/TrueCloudLab/frostfs-rest-gw/gen/models" ) // ListContainersOKCode is the HTTP code returned for type ListContainersOK diff --git a/gen/restapi/operations/put_container.go b/gen/restapi/operations/put_container.go index 4fa4423..a2d4d08 100644 --- a/gen/restapi/operations/put_container.go +++ b/gen/restapi/operations/put_container.go @@ -15,7 +15,7 @@ import ( "github.com/go-openapi/swag" "github.com/go-openapi/validate" - "github.com/TrueCloudLab/frostfs-rest-gw/gen/models" + "git.frostfs.info/TrueCloudLab/frostfs-rest-gw/gen/models" ) // PutContainerHandlerFunc turns a function with the right signature into a put container handler diff --git a/gen/restapi/operations/put_container_e_acl.go b/gen/restapi/operations/put_container_e_acl.go index 09d9f1e..ae182c3 100644 --- a/gen/restapi/operations/put_container_e_acl.go +++ b/gen/restapi/operations/put_container_e_acl.go @@ -10,7 +10,7 @@ import ( "github.com/go-openapi/runtime/middleware" - "github.com/TrueCloudLab/frostfs-rest-gw/gen/models" + "git.frostfs.info/TrueCloudLab/frostfs-rest-gw/gen/models" ) // PutContainerEACLHandlerFunc turns a function with the right signature into a put container e ACL handler diff --git a/gen/restapi/operations/put_container_e_acl_parameters.go b/gen/restapi/operations/put_container_e_acl_parameters.go index 674c887..8727e2d 100644 --- a/gen/restapi/operations/put_container_e_acl_parameters.go +++ b/gen/restapi/operations/put_container_e_acl_parameters.go @@ -17,7 +17,7 @@ import ( "github.com/go-openapi/swag" "github.com/go-openapi/validate" - "github.com/TrueCloudLab/frostfs-rest-gw/gen/models" + "git.frostfs.info/TrueCloudLab/frostfs-rest-gw/gen/models" ) // NewPutContainerEACLParams creates a new PutContainerEACLParams object diff --git a/gen/restapi/operations/put_container_e_acl_responses.go b/gen/restapi/operations/put_container_e_acl_responses.go index 528be7c..410f745 100644 --- a/gen/restapi/operations/put_container_e_acl_responses.go +++ b/gen/restapi/operations/put_container_e_acl_responses.go @@ -10,7 +10,7 @@ import ( "github.com/go-openapi/runtime" - "github.com/TrueCloudLab/frostfs-rest-gw/gen/models" + "git.frostfs.info/TrueCloudLab/frostfs-rest-gw/gen/models" ) // PutContainerEACLOKCode is the HTTP code returned for type PutContainerEACLOK diff --git a/gen/restapi/operations/put_container_parameters.go b/gen/restapi/operations/put_container_parameters.go index cbc443e..0ca72a1 100644 --- a/gen/restapi/operations/put_container_parameters.go +++ b/gen/restapi/operations/put_container_parameters.go @@ -17,7 +17,7 @@ import ( "github.com/go-openapi/swag" "github.com/go-openapi/validate" - "github.com/TrueCloudLab/frostfs-rest-gw/gen/models" + "git.frostfs.info/TrueCloudLab/frostfs-rest-gw/gen/models" ) // NewPutContainerParams creates a new PutContainerParams object diff --git a/gen/restapi/operations/put_container_responses.go b/gen/restapi/operations/put_container_responses.go index 913aa2e..7359017 100644 --- a/gen/restapi/operations/put_container_responses.go +++ b/gen/restapi/operations/put_container_responses.go @@ -10,7 +10,7 @@ import ( "github.com/go-openapi/runtime" - "github.com/TrueCloudLab/frostfs-rest-gw/gen/models" + "git.frostfs.info/TrueCloudLab/frostfs-rest-gw/gen/models" ) // PutContainerOKCode is the HTTP code returned for type PutContainerOK diff --git a/gen/restapi/operations/put_object.go b/gen/restapi/operations/put_object.go index fa4d7f0..e2ea04b 100644 --- a/gen/restapi/operations/put_object.go +++ b/gen/restapi/operations/put_object.go @@ -10,7 +10,7 @@ import ( "github.com/go-openapi/runtime/middleware" - "github.com/TrueCloudLab/frostfs-rest-gw/gen/models" + "git.frostfs.info/TrueCloudLab/frostfs-rest-gw/gen/models" ) // PutObjectHandlerFunc turns a function with the right signature into a put object handler diff --git a/gen/restapi/operations/put_object_parameters.go b/gen/restapi/operations/put_object_parameters.go index 18e0113..1793bff 100644 --- a/gen/restapi/operations/put_object_parameters.go +++ b/gen/restapi/operations/put_object_parameters.go @@ -17,7 +17,7 @@ import ( "github.com/go-openapi/swag" "github.com/go-openapi/validate" - "github.com/TrueCloudLab/frostfs-rest-gw/gen/models" + "git.frostfs.info/TrueCloudLab/frostfs-rest-gw/gen/models" ) // NewPutObjectParams creates a new PutObjectParams object diff --git a/gen/restapi/operations/put_object_responses.go b/gen/restapi/operations/put_object_responses.go index 7314cdb..41462df 100644 --- a/gen/restapi/operations/put_object_responses.go +++ b/gen/restapi/operations/put_object_responses.go @@ -10,7 +10,7 @@ import ( "github.com/go-openapi/runtime" - "github.com/TrueCloudLab/frostfs-rest-gw/gen/models" + "git.frostfs.info/TrueCloudLab/frostfs-rest-gw/gen/models" ) // PutObjectOKCode is the HTTP code returned for type PutObjectOK diff --git a/gen/restapi/operations/search_objects.go b/gen/restapi/operations/search_objects.go index fee8f67..cb522bd 100644 --- a/gen/restapi/operations/search_objects.go +++ b/gen/restapi/operations/search_objects.go @@ -10,7 +10,7 @@ import ( "github.com/go-openapi/runtime/middleware" - "github.com/TrueCloudLab/frostfs-rest-gw/gen/models" + "git.frostfs.info/TrueCloudLab/frostfs-rest-gw/gen/models" ) // SearchObjectsHandlerFunc turns a function with the right signature into a search objects handler diff --git a/gen/restapi/operations/search_objects_parameters.go b/gen/restapi/operations/search_objects_parameters.go index 59922e1..6742e8b 100644 --- a/gen/restapi/operations/search_objects_parameters.go +++ b/gen/restapi/operations/search_objects_parameters.go @@ -17,7 +17,7 @@ import ( "github.com/go-openapi/swag" "github.com/go-openapi/validate" - "github.com/TrueCloudLab/frostfs-rest-gw/gen/models" + "git.frostfs.info/TrueCloudLab/frostfs-rest-gw/gen/models" ) // NewSearchObjectsParams creates a new SearchObjectsParams object diff --git a/gen/restapi/operations/search_objects_responses.go b/gen/restapi/operations/search_objects_responses.go index 6ad3ced..57301a9 100644 --- a/gen/restapi/operations/search_objects_responses.go +++ b/gen/restapi/operations/search_objects_responses.go @@ -10,7 +10,7 @@ import ( "github.com/go-openapi/runtime" - "github.com/TrueCloudLab/frostfs-rest-gw/gen/models" + "git.frostfs.info/TrueCloudLab/frostfs-rest-gw/gen/models" ) // SearchObjectsOKCode is the HTTP code returned for type SearchObjectsOK diff --git a/gen/restapi/server.go b/gen/restapi/server.go index 2f8e62c..7c6a439 100644 --- a/gen/restapi/server.go +++ b/gen/restapi/server.go @@ -22,7 +22,7 @@ import ( "github.com/go-openapi/swag" "golang.org/x/net/netutil" - "github.com/TrueCloudLab/frostfs-rest-gw/gen/restapi/operations" + "git.frostfs.info/TrueCloudLab/frostfs-rest-gw/gen/restapi/operations" ) const ( diff --git a/go.mod b/go.mod index 2516a16..b9e7257 100644 --- a/go.mod +++ b/go.mod @@ -1,10 +1,11 @@ -module github.com/TrueCloudLab/frostfs-rest-gw +module git.frostfs.info/TrueCloudLab/frostfs-rest-gw go 1.17 require ( - github.com/TrueCloudLab/frostfs-api-go/v2 v2.0.0-20221212144048-1351b6656d68 - github.com/TrueCloudLab/frostfs-sdk-go v0.0.0-20221214065929-4c779423f556 + git.frostfs.info/TrueCloudLab/frostfs-api-go/v2 v2.11.2-0.20230307104236-f69d2ad83c51 + git.frostfs.info/TrueCloudLab/frostfs-crypto v0.6.0 + git.frostfs.info/TrueCloudLab/frostfs-sdk-go v0.0.0-20230307124721-94476f905599 github.com/go-openapi/errors v0.20.2 github.com/go-openapi/loads v0.21.1 github.com/go-openapi/runtime v0.23.3 @@ -13,12 +14,22 @@ require ( github.com/go-openapi/swag v0.21.1 github.com/go-openapi/validate v0.21.0 github.com/google/uuid v1.3.0 - github.com/nspcc-dev/neo-go v0.99.4 + github.com/nspcc-dev/neo-go v0.100.1 github.com/spf13/pflag v1.0.5 - github.com/stretchr/testify v1.8.0 + github.com/stretchr/testify v1.8.1 github.com/testcontainers/testcontainers-go v0.13.0 - go.uber.org/zap v1.23.0 - golang.org/x/net v0.0.0-20220403103023-749bd193bc2b + go.uber.org/zap v1.24.0 + golang.org/x/net v0.3.0 +) + +require ( + git.frostfs.info/TrueCloudLab/hrw v1.2.0 // indirect + git.frostfs.info/TrueCloudLab/rfc6979 v0.4.0 // indirect + git.frostfs.info/TrueCloudLab/tzhash v1.8.0 // indirect + github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20221202181307-76fa05c21b12 // indirect + github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // indirect + github.com/hashicorp/golang-lru/v2 v2.0.1 // indirect + golang.org/x/exp v0.0.0-20221227203929-1b447090c38c // indirect ) require ( @@ -27,14 +38,8 @@ require ( github.com/Microsoft/hcsshim v0.8.23 // indirect github.com/PuerkitoBio/purell v1.1.1 // indirect github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect - github.com/TrueCloudLab/frostfs-crypto v0.5.0 - github.com/TrueCloudLab/hrw v1.1.0 // indirect - github.com/TrueCloudLab/rfc6979 v0.3.0 // indirect - github.com/TrueCloudLab/tzhash v1.7.0 // indirect - github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect github.com/beorn7/perks v1.0.1 // indirect - github.com/btcsuite/btcd v0.22.0-beta // indirect github.com/cenkalti/backoff/v4 v4.1.2 // indirect github.com/cespare/xxhash/v2 v2.1.2 // indirect github.com/containerd/cgroups v1.0.1 // indirect @@ -53,7 +58,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/protobuf v1.5.2 // indirect - github.com/hashicorp/golang-lru v0.5.4 // indirect + github.com/hashicorp/golang-lru v0.6.0 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/magiconair/properties v1.8.5 // indirect @@ -90,11 +95,11 @@ require ( go.mongodb.org/mongo-driver v1.8.4 // indirect go.opencensus.io v0.23.0 // indirect go.uber.org/atomic v1.10.0 // indirect - go.uber.org/multierr v1.8.0 // indirect - golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect - golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect - golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect - golang.org/x/text v0.3.7 // indirect + go.uber.org/multierr v1.9.0 // indirect + golang.org/x/crypto v0.4.0 // indirect + golang.org/x/sys v0.3.0 // indirect + golang.org/x/term v0.3.0 // indirect + golang.org/x/text v0.5.0 // indirect google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect google.golang.org/grpc v1.48.0 // indirect google.golang.org/protobuf v1.28.1 // indirect diff --git a/go.sum b/go.sum index 0371c1c..4947e37 100644 --- a/go.sum +++ b/go.sum @@ -46,6 +46,19 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +git.frostfs.info/TrueCloudLab/frostfs-api-go/v2 v2.11.2-0.20230307104236-f69d2ad83c51 h1:l4+K1hN+NuWNtlZZoV8yRRP3Uu7PifL05ukEqKcb0Ks= +git.frostfs.info/TrueCloudLab/frostfs-api-go/v2 v2.11.2-0.20230307104236-f69d2ad83c51/go.mod h1:n0DxKYulu2Ar73R6OcNF34LiL/Xa+iDR7GZuaOChbLE= +git.frostfs.info/TrueCloudLab/frostfs-contract v0.0.0-20230307110621-19a8ef2d02fb/go.mod h1:nkR5gaGeez3Zv2SE7aceP0YwxG2FzIB5cGKpQO2vV2o= +git.frostfs.info/TrueCloudLab/frostfs-crypto v0.6.0 h1:FxqFDhQYYgpe41qsIHVOcdzSVCB8JNSfPG7Uk4r2oSk= +git.frostfs.info/TrueCloudLab/frostfs-crypto v0.6.0/go.mod h1:RUIKZATQLJ+TaYQa60X2fTDwfuhMfm8Ar60bQ5fr+vU= +git.frostfs.info/TrueCloudLab/frostfs-sdk-go v0.0.0-20230307124721-94476f905599 h1:mzGX2RX8R8H/tUqrUu1TcYk4QRDBcBIWGYscPncfLOQ= +git.frostfs.info/TrueCloudLab/frostfs-sdk-go v0.0.0-20230307124721-94476f905599/go.mod h1:z7zcpGY+puI5puyy5oyFbf20vWp84WtslCxcr6/kv5c= +git.frostfs.info/TrueCloudLab/hrw v1.2.0 h1:KvAES7xIqmQBGd2q8KanNosD9+4BhU/zqD5Kt5KSflk= +git.frostfs.info/TrueCloudLab/hrw v1.2.0/go.mod h1:mq2sbvYfO+BB6iFZwYBkgC0yc6mJNx+qZi4jW918m+Y= +git.frostfs.info/TrueCloudLab/rfc6979 v0.4.0 h1:M2KR3iBj7WpY3hP10IevfIB9MURr4O9mwVfJ+SjT3HA= +git.frostfs.info/TrueCloudLab/rfc6979 v0.4.0/go.mod h1:okpbKfVYf/BpejtfFTfhZqFP+sZ8rsHrP8Rr/jYPNRc= +git.frostfs.info/TrueCloudLab/tzhash v1.8.0 h1:UFMnUIk0Zh17m8rjGHJMqku2hCgaXDqjqZzS4gsb4UA= +git.frostfs.info/TrueCloudLab/tzhash v1.8.0/go.mod h1:dhY+oy274hV8wGvGL4MwwMpdL3GYvaX1a8GQZQHvlF8= github.com/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= @@ -94,19 +107,6 @@ github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbt github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ= -github.com/TrueCloudLab/frostfs-api-go/v2 v2.0.0-20221212144048-1351b6656d68 h1:mwZr15qCuIcWojIOmH6LILPohbWIkknZe9vhBRapmfQ= -github.com/TrueCloudLab/frostfs-api-go/v2 v2.0.0-20221212144048-1351b6656d68/go.mod h1:u3P6aL/NpAIY5IFRsJhmV+61Q3pJ3BkLENqySkf5zZQ= -github.com/TrueCloudLab/frostfs-contract v0.0.0-20221213081248-6c805c1b4e42/go.mod h1:qmf648elr+FWBZH3hqND8KVrXMnqu/e0z48k+sX8C2s= -github.com/TrueCloudLab/frostfs-crypto v0.5.0 h1:ZoLjixSkQv3j1EwZ1WJzMEJY2NR+9nO4Pd8WSyM/RRI= -github.com/TrueCloudLab/frostfs-crypto v0.5.0/go.mod h1:775MUewpH8AWpXrimAG2NYWOXB6lpKOI5kqgu+eI5zs= -github.com/TrueCloudLab/frostfs-sdk-go v0.0.0-20221214065929-4c779423f556 h1:Cc1jjYxKPfyw7TIJh3Bje7m8DOSn2dx+2zmr0yusWGw= -github.com/TrueCloudLab/frostfs-sdk-go v0.0.0-20221214065929-4c779423f556/go.mod h1:4ZiG4jNLzrqeJbmZUrPI7wDZhQVPaf0zEIWa/eBsqBg= -github.com/TrueCloudLab/hrw v1.1.0 h1:2U69PpUX1UtMWgh/RAg6D8mQW+/WsxbLNE+19EUhLhY= -github.com/TrueCloudLab/hrw v1.1.0/go.mod h1:Pzi8Hy3qx12cew+ajVxgbtDVM4sRG9/gJnJLcL/yRyY= -github.com/TrueCloudLab/rfc6979 v0.3.0 h1:0SYMAfQWh/TjnofqYQHy+s3rmQ5gi0fvOaDbqd60/Ic= -github.com/TrueCloudLab/rfc6979 v0.3.0/go.mod h1:qylxFXFQ/sMvpZC/8JyWp+mfzk5Zj/KDT5FAbekhobc= -github.com/TrueCloudLab/tzhash v1.7.0 h1:btGORepc7Dg+n4MxgJxv73c9eYhwSBI5HqsqUBRmJiw= -github.com/TrueCloudLab/tzhash v1.7.0/go.mod h1:gDQxqjhTqhR58Qfx0gxGtuyGAkixOukwbFGX9O6UGg4= github.com/Workiva/go-datastructures v1.0.50/go.mod h1:Z+F2Rca0qCsVYDS8z7bAGm8f3UkzuWYS/oBZz5a7VVA= github.com/abiosoft/ishell v2.0.0+incompatible/go.mod h1:HQR9AqF2R3P4XXpMpI0NAzgHf/aS6+zVXRj14cVk9qg= github.com/abiosoft/ishell/v2 v2.0.2/go.mod h1:E4oTCXfo6QjoCart0QYa5m9w4S+deXs/P/9jA77A9Bs= @@ -121,9 +121,10 @@ github.com/alexflint/go-filemutex v0.0.0-20171022225611-72bdc8eae2ae/go.mod h1:C github.com/alicebob/gopher-json v0.0.0-20180125190556-5a6b3ba71ee6/go.mod h1:SGnFV6hVsYE877CKEZ6tDNTjaSXYUk6QqoIK6PrAtcc= github.com/alicebob/miniredis v2.5.0+incompatible/go.mod h1:8HZjEj4yU0dwhYHky+DxYx+6BMjkBbe5ONFIF1MXffk= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= +github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20210521073959-f0d4d129b7f1 h1:zFRi26YWd7NIorBXe8UkevRl0dIvk/AnXHWaAiZG+Yk= github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20210521073959-f0d4d129b7f1/go.mod h1:F7bn7fEU90QkQ3tnmaTx3LTKLEDqnwWODIYppRQ5hnY= -github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 h1:yL7+Jz0jTC6yykIK/Wh74gnTJnrGr5AyrNMXuA0gves= -github.com/antlr/antlr4/runtime/Go/antlr v1.4.10/go.mod h1:F7bn7fEU90QkQ3tnmaTx3LTKLEDqnwWODIYppRQ5hnY= +github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20221202181307-76fa05c21b12 h1:npHgfD4Tl2WJS3AJaMUi5ynGDPUBfkg3U3fCzDyXZ+4= +github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20221202181307-76fa05c21b12/go.mod h1:pSwJ0fSY5KhvocuWSx4fz3BA8OrA1bQn+K1Eli3BRwM= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= @@ -150,7 +151,6 @@ github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnweb github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4= github.com/bshuster-repo/logrus-logstash-hook v0.4.1/go.mod h1:zsTqEiSzDgAa/8GZR7E1qaXrhYNDKBYy5/dWPTIflbk= github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ= -github.com/btcsuite/btcd v0.22.0-beta h1:LTDpDKUM5EeOFBPM8IXpinEcmZ6FWfNZbE3lfrfdnWo= github.com/btcsuite/btcd v0.22.0-beta/go.mod h1:9n5ntfhhHQBIhUvlhDvD3Qg6fRUj4jkN0VB8L8svzOA= github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA= github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg= @@ -293,7 +293,6 @@ github.com/coreos/go-iptables v0.4.5/go.mod h1:/mVI274lEDI2ns62jHCDnCyBF9Iwsmeka github.com/coreos/go-iptables v0.5.0/go.mod h1:/mVI274lEDI2ns62jHCDnCyBF9Iwsmekav8Dbxlm1MU= github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd v0.0.0-20161114122254-48702e0da86b/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= @@ -319,6 +318,9 @@ github.com/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod h1:J7Y8YcW2 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/decred/dcrd/crypto/blake256 v1.0.0/go.mod h1:sQl2p6Y26YV+ZOcSTP6thNdn47hh8kt6rqSlvmrXFAc= +github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 h1:YLtO71vCjJRCBcrPMtQ9nqBsqpA1m5sE92cU+pd5Mcc= +github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1/go.mod h1:hyedUtir6IdtD/7lIxGeCxkaw7y45JueMRL4DIyJDKs= github.com/decred/dcrd/lru v1.0.0/go.mod h1:mxKOwFd7lFjN2GZYsiz/ecgqR6kkYAl+0pz0tEMk218= github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0= github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= @@ -598,8 +600,11 @@ github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/b github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc= github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= +github.com/hashicorp/golang-lru v0.6.0 h1:uL2shRDx7RTrOrTCUZEGP/wJUFiUI8QT6E7z5o8jga4= +github.com/hashicorp/golang-lru v0.6.0/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= +github.com/hashicorp/golang-lru/v2 v2.0.1 h1:5pv5N1lT1fjLg2VQ5KWc7kmucp2x/kvFOnxuVTqZ6x4= +github.com/hashicorp/golang-lru/v2 v2.0.1/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= @@ -749,15 +754,18 @@ github.com/nspcc-dev/dbft v0.0.0-20200117124306-478e5cfbf03a/go.mod h1:/YFK+XOxx github.com/nspcc-dev/dbft v0.0.0-20200219114139-199d286ed6c1/go.mod h1:O0qtn62prQSqizzoagHmuuKoz8QMkU3SzBoKdEvm3aQ= github.com/nspcc-dev/dbft v0.0.0-20210721160347-1b03241391ac/go.mod h1:U8MSnEShH+o5hexfWJdze6uMFJteP0ko7J2frO7Yu1Y= github.com/nspcc-dev/dbft v0.0.0-20220902113116-58a5e763e647/go.mod h1:g9xisXmX9NP9MjioaTe862n9SlZTrP+6PVUWLBYOr98= +github.com/nspcc-dev/dbft v0.0.0-20221020093431-31c1bbdc74f2/go.mod h1:g9xisXmX9NP9MjioaTe862n9SlZTrP+6PVUWLBYOr98= github.com/nspcc-dev/go-ordered-json v0.0.0-20210915112629-e1b6cce73d02/go.mod h1:79bEUDEviBHJMFV6Iq6in57FEOCMcRhfQnfaf0ETA5U= github.com/nspcc-dev/go-ordered-json v0.0.0-20220111165707-25110be27d22 h1:n4ZaFCKt1pQJd7PXoMJabZWK9ejjbLOVrkl/lOUmshg= github.com/nspcc-dev/go-ordered-json v0.0.0-20220111165707-25110be27d22/go.mod h1:79bEUDEviBHJMFV6Iq6in57FEOCMcRhfQnfaf0ETA5U= github.com/nspcc-dev/hrw v1.0.9/go.mod h1:l/W2vx83vMQo6aStyx2AuZrJ+07lGv2JQGlVkPG06MU= github.com/nspcc-dev/neo-go v0.73.1-pre.0.20200303142215-f5a1b928ce09/go.mod h1:pPYwPZ2ks+uMnlRLUyXOpLieaDQSEaf4NM3zHVbRjmg= github.com/nspcc-dev/neo-go v0.98.0/go.mod h1:E3cc1x6RXSXrJb2nDWXTXjnXk3rIqVN8YdFyWv+FrqM= -github.com/nspcc-dev/neo-go v0.99.4 h1:8Y+SdRxksC72a4PNkcGCh/aaQinh9Gu+c5LilbcsXOI= github.com/nspcc-dev/neo-go v0.99.4/go.mod h1:mKTolfRUfKjFso5HPvGSQtUZc70n0VKBMs16eGuC5gA= +github.com/nspcc-dev/neo-go v0.100.1 h1:yugxbQRdzM+ObVa5mtr9/n4rYjxSIrryne8MVr9NBwU= +github.com/nspcc-dev/neo-go v0.100.1/go.mod h1:Nnp7F4e9IBccsgtCeLtUWV+0T6gk1PtP5HRtA13hUfc= github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220927123257-24c107e3a262/go.mod h1:23bBw0v6pBYcrWs8CBEEDIEDJNbcFoIh8pGGcf2Vv8s= +github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20221202075445-cb5c18dc73eb/go.mod h1:23bBw0v6pBYcrWs8CBEEDIEDJNbcFoIh8pGGcf2Vv8s= github.com/nspcc-dev/neofs-api-go/v2 v2.11.0-pre.0.20211201134523-3604d96f3fe1/go.mod h1:oS8dycEh8PPf2Jjp6+8dlwWyEv2Dy77h/XhhcdxYEFs= github.com/nspcc-dev/neofs-api-go/v2 v2.11.1/go.mod h1:oS8dycEh8PPf2Jjp6+8dlwWyEv2Dy77h/XhhcdxYEFs= github.com/nspcc-dev/neofs-crypto v0.2.0/go.mod h1:F/96fUzPM3wR+UGsPi3faVNmFlA9KAEAUQR7dMxZmNA= @@ -945,6 +953,7 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v0.0.0-20180303142811-b89eecf5ca5d/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= @@ -953,8 +962,9 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= @@ -1002,6 +1012,7 @@ github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/yuin/gopher-lua v0.0.0-20190514113301-1cd887cd7036/go.mod h1:gqRgreBUhTSL0GeU64rtZ3Uq3wtjOa/TB2YfrtkCbVQ= github.com/yuin/gopher-lua v0.0.0-20191128022950-c6266f4fe8d7/go.mod h1:gqRgreBUhTSL0GeU64rtZ3Uq3wtjOa/TB2YfrtkCbVQ= github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod h1:aX5oPXxHm3bOH+xeAttToC8pqch2ScQN/JoXYupl6xs= @@ -1041,13 +1052,13 @@ go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI= go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= -go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= -go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= +go.uber.org/multierr v1.9.0 h1:7fIwc/ZtS0q++VgcfqFDxSBZVv/Xo49/SYnDFupUwlI= +go.uber.org/multierr v1.9.0/go.mod h1:X2jQV1h+kxSjClGpnseKVIxpmcjrj7MNnI0bnlfKTVQ= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= go.uber.org/zap v1.18.1/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= -go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= @@ -1071,8 +1082,10 @@ golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f/go.mod h1:jdWPYTVW3xRLrWP golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20220214200702-86341886e292 h1:f+lwQ+GtmgoY+A2YaQxlSOnDjXcQ7ZRLWOHbC6HtRqE= -golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= +golang.org/x/crypto v0.4.0 h1:UVQgzMY87xqpKNgb+kDsll2Igd33HszWHFLmpaRMq/8= +golang.org/x/crypto v0.4.0/go.mod h1:3quD/ATkf6oY+rnes5c3ExXTbLc8mueNue5/DoinL80= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -1083,6 +1096,9 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= +golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e/go.mod h1:Kr81I6Kryrl9sr8s2FK3vxD90NdsKWRuOIl2O4CvYbA= +golang.org/x/exp v0.0.0-20221227203929-1b447090c38c h1:Govq2W3bnHJimHT2ium65kXcI7ZzTniZHcFATnLJM0Q= +golang.org/x/exp v0.0.0-20221227203929-1b447090c38c/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -1110,6 +1126,9 @@ golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= +golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI= golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1167,11 +1186,12 @@ golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211108170745-6635138e15ea/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.0.0-20220403103023-749bd193bc2b h1:vI32FkLJNAWtGD4BwkThwEy6XS7ZLLMHkSkYfF8M0W0= -golang.org/x/net v0.0.0-20220403103023-749bd193bc2b/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= +golang.org/x/net v0.3.0 h1:VWL6FNY2bEEmsGVKabSlHu5Irp34xmMRoqb/9lF9lxk= +golang.org/x/net v0.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1202,8 +1222,9 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f h1:Ax0t5p6N38Ga0dThY21weqDEyz2oklo4IvDkpigvkD8= golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 h1:uVc8UZUe6tr40fFVnUP5Oj+veunVezqYl9z7DYw9xzw= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -1317,13 +1338,18 @@ golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a h1:dGzPydgVsqGcTRVwiLJ1jVbufYwmzD3LfVPLKsKg+0k= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ= +golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210429154555-c04ba851c2a4/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.3.0 h1:qoo4akIqOcDME5bhc/NgxUdovd6BSS2uMsVjB56q1xI= +golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1332,8 +1358,10 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM= +golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -1407,6 +1435,9 @@ golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.8/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= +golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/handlers/api.go b/handlers/api.go index 67af39f..144d20c 100644 --- a/handlers/api.go +++ b/handlers/api.go @@ -7,13 +7,13 @@ import ( "strings" "time" - sessionv2 "github.com/TrueCloudLab/frostfs-api-go/v2/session" - "github.com/TrueCloudLab/frostfs-rest-gw/gen/models" - "github.com/TrueCloudLab/frostfs-rest-gw/gen/restapi/operations" - "github.com/TrueCloudLab/frostfs-rest-gw/internal/util" - "github.com/TrueCloudLab/frostfs-rest-gw/metrics" - "github.com/TrueCloudLab/frostfs-sdk-go/pool" - "github.com/TrueCloudLab/frostfs-sdk-go/user" + sessionv2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/session" + "git.frostfs.info/TrueCloudLab/frostfs-rest-gw/gen/models" + "git.frostfs.info/TrueCloudLab/frostfs-rest-gw/gen/restapi/operations" + "git.frostfs.info/TrueCloudLab/frostfs-rest-gw/internal/util" + "git.frostfs.info/TrueCloudLab/frostfs-rest-gw/metrics" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/pool" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" "github.com/go-openapi/errors" "github.com/google/uuid" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" diff --git a/handlers/auth.go b/handlers/auth.go index 4c8b6f7..aefed3e 100644 --- a/handlers/auth.go +++ b/handlers/auth.go @@ -5,15 +5,15 @@ import ( "encoding/base64" "fmt" - "github.com/TrueCloudLab/frostfs-api-go/v2/acl" - "github.com/TrueCloudLab/frostfs-api-go/v2/refs" - sessionv2 "github.com/TrueCloudLab/frostfs-api-go/v2/session" - "github.com/TrueCloudLab/frostfs-rest-gw/gen/models" - "github.com/TrueCloudLab/frostfs-rest-gw/gen/restapi/operations" - "github.com/TrueCloudLab/frostfs-rest-gw/internal/util" - frostfsecdsa "github.com/TrueCloudLab/frostfs-sdk-go/crypto/ecdsa" - "github.com/TrueCloudLab/frostfs-sdk-go/pool" - "github.com/TrueCloudLab/frostfs-sdk-go/user" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/acl" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/refs" + sessionv2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/session" + "git.frostfs.info/TrueCloudLab/frostfs-rest-gw/gen/models" + "git.frostfs.info/TrueCloudLab/frostfs-rest-gw/gen/restapi/operations" + "git.frostfs.info/TrueCloudLab/frostfs-rest-gw/internal/util" + frostfsecdsa "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/crypto/ecdsa" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/pool" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" "github.com/go-openapi/runtime/middleware" "github.com/google/uuid" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" diff --git a/handlers/auth_test.go b/handlers/auth_test.go index 0d733fa..e400d0e 100644 --- a/handlers/auth_test.go +++ b/handlers/auth_test.go @@ -7,11 +7,11 @@ import ( "math" "testing" - "github.com/TrueCloudLab/frostfs-api-go/v2/acl" - crypto "github.com/TrueCloudLab/frostfs-crypto" - "github.com/TrueCloudLab/frostfs-rest-gw/gen/models" - "github.com/TrueCloudLab/frostfs-rest-gw/internal/util" - "github.com/TrueCloudLab/frostfs-sdk-go/user" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/acl" + crypto "git.frostfs.info/TrueCloudLab/frostfs-crypto" + "git.frostfs.info/TrueCloudLab/frostfs-rest-gw/gen/models" + "git.frostfs.info/TrueCloudLab/frostfs-rest-gw/internal/util" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/stretchr/testify/require" ) diff --git a/handlers/balance.go b/handlers/balance.go index cd8c23c..5d0598f 100644 --- a/handlers/balance.go +++ b/handlers/balance.go @@ -3,11 +3,11 @@ package handlers import ( "strconv" - "github.com/TrueCloudLab/frostfs-rest-gw/gen/models" - "github.com/TrueCloudLab/frostfs-rest-gw/gen/restapi/operations" - "github.com/TrueCloudLab/frostfs-rest-gw/internal/util" - "github.com/TrueCloudLab/frostfs-sdk-go/pool" - "github.com/TrueCloudLab/frostfs-sdk-go/user" + "git.frostfs.info/TrueCloudLab/frostfs-rest-gw/gen/models" + "git.frostfs.info/TrueCloudLab/frostfs-rest-gw/gen/restapi/operations" + "git.frostfs.info/TrueCloudLab/frostfs-rest-gw/internal/util" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/pool" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" "github.com/go-openapi/runtime/middleware" ) diff --git a/handlers/container_test.go b/handlers/container_test.go index 55ecf1a..7d7cfca 100644 --- a/handlers/container_test.go +++ b/handlers/container_test.go @@ -3,7 +3,7 @@ package handlers import ( "testing" - sessionv2 "github.com/TrueCloudLab/frostfs-api-go/v2/session" + sessionv2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/session" "github.com/stretchr/testify/require" ) diff --git a/handlers/containers.go b/handlers/containers.go index 645cb31..0366569 100644 --- a/handlers/containers.go +++ b/handlers/containers.go @@ -9,20 +9,20 @@ import ( "strings" "time" - containerv2 "github.com/TrueCloudLab/frostfs-api-go/v2/container" - "github.com/TrueCloudLab/frostfs-api-go/v2/refs" - sessionv2 "github.com/TrueCloudLab/frostfs-api-go/v2/session" - "github.com/TrueCloudLab/frostfs-rest-gw/gen/models" - "github.com/TrueCloudLab/frostfs-rest-gw/gen/restapi/operations" - "github.com/TrueCloudLab/frostfs-rest-gw/internal/util" - "github.com/TrueCloudLab/frostfs-sdk-go/container" - "github.com/TrueCloudLab/frostfs-sdk-go/container/acl" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - "github.com/TrueCloudLab/frostfs-sdk-go/netmap" - "github.com/TrueCloudLab/frostfs-sdk-go/pool" - "github.com/TrueCloudLab/frostfs-sdk-go/session" - "github.com/TrueCloudLab/frostfs-sdk-go/user" - "github.com/TrueCloudLab/frostfs-sdk-go/version" + containerv2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/container" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/refs" + sessionv2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/session" + "git.frostfs.info/TrueCloudLab/frostfs-rest-gw/gen/models" + "git.frostfs.info/TrueCloudLab/frostfs-rest-gw/gen/restapi/operations" + "git.frostfs.info/TrueCloudLab/frostfs-rest-gw/internal/util" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/acl" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/pool" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/session" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/version" "github.com/go-openapi/runtime/middleware" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "go.uber.org/zap" diff --git a/handlers/objects.go b/handlers/objects.go index 1426622..a583a05 100644 --- a/handlers/objects.go +++ b/handlers/objects.go @@ -9,16 +9,16 @@ import ( "io" "strings" - "github.com/TrueCloudLab/frostfs-api-go/v2/acl" - "github.com/TrueCloudLab/frostfs-api-go/v2/refs" - "github.com/TrueCloudLab/frostfs-rest-gw/gen/models" - "github.com/TrueCloudLab/frostfs-rest-gw/gen/restapi/operations" - "github.com/TrueCloudLab/frostfs-rest-gw/internal/util" - "github.com/TrueCloudLab/frostfs-sdk-go/bearer" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" - "github.com/TrueCloudLab/frostfs-sdk-go/pool" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/acl" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/refs" + "git.frostfs.info/TrueCloudLab/frostfs-rest-gw/gen/models" + "git.frostfs.info/TrueCloudLab/frostfs-rest-gw/gen/restapi/operations" + "git.frostfs.info/TrueCloudLab/frostfs-rest-gw/internal/util" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/bearer" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/pool" "github.com/go-openapi/runtime/middleware" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "go.uber.org/zap" diff --git a/handlers/objects_test.go b/handlers/objects_test.go index f4ce378..5acf453 100644 --- a/handlers/objects_test.go +++ b/handlers/objects_test.go @@ -3,8 +3,8 @@ package handlers import ( "testing" - "github.com/TrueCloudLab/frostfs-rest-gw/gen/restapi/operations" - "github.com/TrueCloudLab/frostfs-rest-gw/internal/util" + "git.frostfs.info/TrueCloudLab/frostfs-rest-gw/gen/restapi/operations" + "git.frostfs.info/TrueCloudLab/frostfs-rest-gw/internal/util" "github.com/stretchr/testify/require" ) diff --git a/handlers/preflight.go b/handlers/preflight.go index de4f3c3..63dba5a 100644 --- a/handlers/preflight.go +++ b/handlers/preflight.go @@ -1,7 +1,7 @@ package handlers import ( - "github.com/TrueCloudLab/frostfs-rest-gw/gen/restapi/operations" + "git.frostfs.info/TrueCloudLab/frostfs-rest-gw/gen/restapi/operations" "github.com/go-openapi/runtime/middleware" ) diff --git a/handlers/util.go b/handlers/util.go index e76e12f..0a9ab6c 100644 --- a/handlers/util.go +++ b/handlers/util.go @@ -9,12 +9,12 @@ import ( "strings" "time" - objectv2 "github.com/TrueCloudLab/frostfs-api-go/v2/object" - sessionv2 "github.com/TrueCloudLab/frostfs-api-go/v2/session" - "github.com/TrueCloudLab/frostfs-rest-gw/gen/models" - "github.com/TrueCloudLab/frostfs-sdk-go/container/acl" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - "github.com/TrueCloudLab/frostfs-sdk-go/pool" + objectv2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object" + sessionv2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/session" + "git.frostfs.info/TrueCloudLab/frostfs-rest-gw/gen/models" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/acl" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/pool" ) // PrmAttributes groups parameters to form attributes from request headers. diff --git a/handlers/util_test.go b/handlers/util_test.go index 6c6efc1..6951f95 100644 --- a/handlers/util_test.go +++ b/handlers/util_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - objectv2 "github.com/TrueCloudLab/frostfs-api-go/v2/object" + objectv2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object" "github.com/stretchr/testify/require" ) diff --git a/internal/util/transformers.go b/internal/util/transformers.go index 4b84c6f..3a268b2 100644 --- a/internal/util/transformers.go +++ b/internal/util/transformers.go @@ -5,13 +5,13 @@ import ( "errors" "fmt" - "github.com/TrueCloudLab/frostfs-rest-gw/gen/models" - "github.com/TrueCloudLab/frostfs-sdk-go/bearer" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - "github.com/TrueCloudLab/frostfs-sdk-go/eacl" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - "github.com/TrueCloudLab/frostfs-sdk-go/session" + "git.frostfs.info/TrueCloudLab/frostfs-rest-gw/gen/models" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/bearer" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/eacl" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/session" ) // ToNativeAction converts models.Action to appropriate eacl.Action. diff --git a/internal/util/transformers_test.go b/internal/util/transformers_test.go index d2a1e89..5c4a735 100644 --- a/internal/util/transformers_test.go +++ b/internal/util/transformers_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" "github.com/stretchr/testify/require" ) diff --git a/metrics/metrics.go b/metrics/metrics.go index d9a141e..8e36385 100644 --- a/metrics/metrics.go +++ b/metrics/metrics.go @@ -3,7 +3,7 @@ package metrics import ( "net/http" - "github.com/TrueCloudLab/frostfs-sdk-go/pool" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/pool" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" "go.uber.org/zap"