From 96dff367dbab97a069474e9c309e88a19d35e4f7 Mon Sep 17 00:00:00 2001 From: Alex Vanin Date: Wed, 14 Dec 2022 19:58:00 +0300 Subject: [PATCH] [#1] Build S3 Gateway with FrostFS dependencies Signed-off-by: Alex Vanin --- api/auth/center.go | 12 +++++----- api/auth/center_test.go | 2 +- api/cache/access_control.go | 2 +- api/cache/accessbox.go | 4 ++-- api/cache/buckets.go | 2 +- api/cache/cache_test.go | 8 +++---- api/cache/names.go | 2 +- api/cache/objects.go | 4 ++-- api/cache/objects_test.go | 6 ++--- api/cache/objectslist.go | 4 ++-- api/cache/objectslist_test.go | 6 ++--- api/cache/system.go | 2 +- api/data/info.go | 6 ++--- api/data/tree.go | 6 ++--- api/handler/acl.go | 18 +++++++------- api/handler/acl_test.go | 16 ++++++------- api/handler/api.go | 6 ++--- api/handler/attributes.go | 8 +++---- api/handler/attributes_test.go | 2 +- api/handler/copy.go | 12 +++++----- api/handler/copy_test.go | 2 +- api/handler/cors.go | 6 ++--- api/handler/delete.go | 14 +++++------ api/handler/delete_test.go | 4 ++-- api/handler/encryption_test.go | 4 ++-- api/handler/get.go | 8 +++---- api/handler/get_test.go | 6 ++--- api/handler/handlers_test.go | 18 +++++++------- api/handler/head.go | 8 +++---- api/handler/head_test.go | 8 +++---- api/handler/info.go | 2 +- api/handler/list.go | 4 ++-- api/handler/locking.go | 8 +++---- api/handler/locking_test.go | 6 ++--- api/handler/multipart_upload.go | 10 ++++---- api/handler/not_support.go | 4 ++-- api/handler/notifications.go | 10 ++++---- api/handler/notifications_test.go | 4 ++-- api/handler/object_list.go | 10 ++++---- api/handler/object_list_test.go | 2 +- api/handler/put.go | 18 +++++++------- api/handler/put_test.go | 4 ++-- api/handler/tagging.go | 8 +++---- api/handler/unimplemented.go | 4 ++-- api/handler/util.go | 10 ++++---- api/handler/versioning.go | 8 +++---- api/layer/cache.go | 10 ++++---- api/layer/compound.go | 4 ++-- api/layer/container.go | 16 ++++++------- api/layer/cors.go | 4 ++-- api/layer/layer.go | 24 +++++++++---------- api/layer/locking_test.go | 2 +- api/layer/multipart_upload.go | 10 ++++---- api/layer/neofs.go | 20 ++++++++-------- api/layer/neofs_mock.go | 24 +++++++++---------- api/layer/notifications.go | 4 ++-- api/layer/object.go | 16 ++++++------- api/layer/system_object.go | 6 ++--- api/layer/tagging.go | 10 ++++---- api/layer/tree_mock.go | 4 ++-- api/layer/tree_service.go | 4 ++-- api/layer/util.go | 10 ++++---- api/layer/util_test.go | 10 ++++---- api/layer/versioning.go | 2 +- api/layer/versioning_test.go | 14 +++++------ api/max_clients.go | 2 +- api/metrics/collector.go | 2 +- api/notifications/controller.go | 4 ++-- api/resolver/resolver.go | 6 ++--- api/response.go | 4 ++-- api/router.go | 4 ++-- api/user_auth.go | 4 ++-- authmate/authmate.go | 22 ++++++++--------- authmate/session_tokens.go | 6 ++--- authmate/session_tokens_test.go | 2 +- cmd/s3-authmate/main.go | 14 +++++------ cmd/s3-gw/app.go | 24 +++++++++---------- cmd/s3-gw/app_metrics.go | 2 +- cmd/s3-gw/app_settings.go | 6 ++--- creds/accessbox/accessbox.go | 6 ++--- creds/accessbox/accessbox.pb.go | 19 +++++++-------- creds/accessbox/accessbox.proto | 2 +- creds/accessbox/bearer_token_test.go | 8 +++---- creds/tokens/credentials.go | 10 ++++---- go.mod | 20 ++++++++-------- go.sum | 36 ++++++++++++++-------------- internal/neofs/neofs.go | 28 +++++++++++----------- internal/neofs/neofs_test.go | 4 ++-- internal/neofs/tree.go | 16 ++++++------- internal/neofs/tree_signature.go | 2 +- internal/neofs/tree_test.go | 4 ++-- 91 files changed, 384 insertions(+), 385 deletions(-) diff --git a/api/auth/center.go b/api/auth/center.go index a2ccb789..6ea80e2a 100644 --- a/api/auth/center.go +++ b/api/auth/center.go @@ -14,14 +14,14 @@ import ( "strings" "time" + v4 "github.com/TrueCloudLab/frostfs-s3-gw/api/auth/signer/v4" + "github.com/TrueCloudLab/frostfs-s3-gw/api/cache" + apiErrors "github.com/TrueCloudLab/frostfs-s3-gw/api/errors" + "github.com/TrueCloudLab/frostfs-s3-gw/creds/accessbox" + "github.com/TrueCloudLab/frostfs-s3-gw/creds/tokens" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/aws/aws-sdk-go/aws/credentials" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" - v4 "github.com/nspcc-dev/neofs-s3-gw/api/auth/signer/v4" - "github.com/nspcc-dev/neofs-s3-gw/api/cache" - apiErrors "github.com/nspcc-dev/neofs-s3-gw/api/errors" - "github.com/nspcc-dev/neofs-s3-gw/creds/accessbox" - "github.com/nspcc-dev/neofs-s3-gw/creds/tokens" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" ) // authorizationFieldRegexp -- is regexp for credentials with Base58 encoded cid and oid and '0' (zero) as delimiter. diff --git a/api/auth/center_test.go b/api/auth/center_test.go index 8b7a8d8a..cfe721e1 100644 --- a/api/auth/center_test.go +++ b/api/auth/center_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/nspcc-dev/neofs-s3-gw/api/errors" + "github.com/TrueCloudLab/frostfs-s3-gw/api/errors" "github.com/stretchr/testify/require" ) diff --git a/api/cache/access_control.go b/api/cache/access_control.go index 4600df59..725b4d00 100644 --- a/api/cache/access_control.go +++ b/api/cache/access_control.go @@ -4,8 +4,8 @@ import ( "fmt" "time" + "github.com/TrueCloudLab/frostfs-sdk-go/user" "github.com/bluele/gcache" - "github.com/nspcc-dev/neofs-sdk-go/user" "go.uber.org/zap" ) diff --git a/api/cache/accessbox.go b/api/cache/accessbox.go index e23dbd84..22770d37 100644 --- a/api/cache/accessbox.go +++ b/api/cache/accessbox.go @@ -4,9 +4,9 @@ import ( "fmt" "time" + "github.com/TrueCloudLab/frostfs-s3-gw/creds/accessbox" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/bluele/gcache" - "github.com/nspcc-dev/neofs-s3-gw/creds/accessbox" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" "go.uber.org/zap" ) diff --git a/api/cache/buckets.go b/api/cache/buckets.go index bb719600..8b020058 100644 --- a/api/cache/buckets.go +++ b/api/cache/buckets.go @@ -4,8 +4,8 @@ import ( "fmt" "time" + "github.com/TrueCloudLab/frostfs-s3-gw/api/data" "github.com/bluele/gcache" - "github.com/nspcc-dev/neofs-s3-gw/api/data" "go.uber.org/zap" ) diff --git a/api/cache/cache_test.go b/api/cache/cache_test.go index 38cae725..ff6a1b72 100644 --- a/api/cache/cache_test.go +++ b/api/cache/cache_test.go @@ -3,10 +3,10 @@ package cache import ( "testing" - "github.com/nspcc-dev/neofs-s3-gw/api/data" - "github.com/nspcc-dev/neofs-s3-gw/creds/accessbox" - cidtest "github.com/nspcc-dev/neofs-sdk-go/container/id/test" - oidtest "github.com/nspcc-dev/neofs-sdk-go/object/id/test" + "github.com/TrueCloudLab/frostfs-s3-gw/api/data" + "github.com/TrueCloudLab/frostfs-s3-gw/creds/accessbox" + cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" + oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" "github.com/stretchr/testify/require" "go.uber.org/zap" "go.uber.org/zap/zaptest/observer" diff --git a/api/cache/names.go b/api/cache/names.go index f27226bf..ba459463 100644 --- a/api/cache/names.go +++ b/api/cache/names.go @@ -4,8 +4,8 @@ import ( "fmt" "time" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/bluele/gcache" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" "go.uber.org/zap" ) diff --git a/api/cache/objects.go b/api/cache/objects.go index 2c719503..38baa1d5 100644 --- a/api/cache/objects.go +++ b/api/cache/objects.go @@ -4,9 +4,9 @@ import ( "fmt" "time" + "github.com/TrueCloudLab/frostfs-s3-gw/api/data" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/bluele/gcache" - "github.com/nspcc-dev/neofs-s3-gw/api/data" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" "go.uber.org/zap" ) diff --git a/api/cache/objects_test.go b/api/cache/objects_test.go index 9e63a2c3..afe1479e 100644 --- a/api/cache/objects_test.go +++ b/api/cache/objects_test.go @@ -4,9 +4,9 @@ import ( "testing" "time" - "github.com/nspcc-dev/neofs-s3-gw/api/data" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" - objecttest "github.com/nspcc-dev/neofs-sdk-go/object/test" + "github.com/TrueCloudLab/frostfs-s3-gw/api/data" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + objecttest "github.com/TrueCloudLab/frostfs-sdk-go/object/test" "github.com/stretchr/testify/require" "go.uber.org/zap" ) diff --git a/api/cache/objectslist.go b/api/cache/objectslist.go index e9827ce5..6fca270d 100644 --- a/api/cache/objectslist.go +++ b/api/cache/objectslist.go @@ -6,9 +6,9 @@ import ( "strings" "time" + "github.com/TrueCloudLab/frostfs-s3-gw/api/data" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" "github.com/bluele/gcache" - "github.com/nspcc-dev/neofs-s3-gw/api/data" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" "go.uber.org/zap" ) diff --git a/api/cache/objectslist_test.go b/api/cache/objectslist_test.go index 040eb18b..6d9b691c 100644 --- a/api/cache/objectslist_test.go +++ b/api/cache/objectslist_test.go @@ -4,9 +4,9 @@ import ( "testing" "time" - "github.com/nspcc-dev/neofs-s3-gw/api/data" - cidtest "github.com/nspcc-dev/neofs-sdk-go/container/id/test" - oidtest "github.com/nspcc-dev/neofs-sdk-go/object/id/test" + "github.com/TrueCloudLab/frostfs-s3-gw/api/data" + cidtest "github.com/TrueCloudLab/frostfs-sdk-go/container/id/test" + oidtest "github.com/TrueCloudLab/frostfs-sdk-go/object/id/test" "github.com/stretchr/testify/require" "go.uber.org/zap" ) diff --git a/api/cache/system.go b/api/cache/system.go index fca798af..094fb183 100644 --- a/api/cache/system.go +++ b/api/cache/system.go @@ -4,8 +4,8 @@ import ( "fmt" "time" + "github.com/TrueCloudLab/frostfs-s3-gw/api/data" "github.com/bluele/gcache" - "github.com/nspcc-dev/neofs-s3-gw/api/data" "go.uber.org/zap" ) diff --git a/api/data/info.go b/api/data/info.go index 8088b57c..c8f93516 100644 --- a/api/data/info.go +++ b/api/data/info.go @@ -4,9 +4,9 @@ import ( "encoding/xml" "time" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" - "github.com/nspcc-dev/neofs-sdk-go/user" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "github.com/TrueCloudLab/frostfs-sdk-go/user" ) const ( diff --git a/api/data/tree.go b/api/data/tree.go index 801040b4..96c8ea2d 100644 --- a/api/data/tree.go +++ b/api/data/tree.go @@ -4,9 +4,9 @@ import ( "strconv" "time" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" - "github.com/nspcc-dev/neofs-sdk-go/user" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "github.com/TrueCloudLab/frostfs-sdk-go/user" ) const ( diff --git a/api/handler/acl.go b/api/handler/acl.go index 8e74cd20..05545687 100644 --- a/api/handler/acl.go +++ b/api/handler/acl.go @@ -14,16 +14,16 @@ import ( "strconv" "strings" + v2acl "github.com/TrueCloudLab/frostfs-api-go/v2/acl" + "github.com/TrueCloudLab/frostfs-s3-gw/api" + "github.com/TrueCloudLab/frostfs-s3-gw/api/data" + "github.com/TrueCloudLab/frostfs-s3-gw/api/errors" + "github.com/TrueCloudLab/frostfs-s3-gw/api/layer" + "github.com/TrueCloudLab/frostfs-sdk-go/eacl" + "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "github.com/TrueCloudLab/frostfs-sdk-go/session" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" - v2acl "github.com/nspcc-dev/neofs-api-go/v2/acl" - "github.com/nspcc-dev/neofs-s3-gw/api" - "github.com/nspcc-dev/neofs-s3-gw/api/data" - "github.com/nspcc-dev/neofs-s3-gw/api/errors" - "github.com/nspcc-dev/neofs-s3-gw/api/layer" - "github.com/nspcc-dev/neofs-sdk-go/eacl" - "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" - "github.com/nspcc-dev/neofs-sdk-go/session" "go.uber.org/zap" ) diff --git a/api/handler/acl_test.go b/api/handler/acl_test.go index 42e2e496..a47b169b 100644 --- a/api/handler/acl_test.go +++ b/api/handler/acl_test.go @@ -13,15 +13,15 @@ import ( "net/http" "testing" + "github.com/TrueCloudLab/frostfs-s3-gw/api" + "github.com/TrueCloudLab/frostfs-s3-gw/api/data" + "github.com/TrueCloudLab/frostfs-s3-gw/creds/accessbox" + "github.com/TrueCloudLab/frostfs-sdk-go/bearer" + "github.com/TrueCloudLab/frostfs-sdk-go/eacl" + "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "github.com/TrueCloudLab/frostfs-sdk-go/session" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" - "github.com/nspcc-dev/neofs-s3-gw/api" - "github.com/nspcc-dev/neofs-s3-gw/api/data" - "github.com/nspcc-dev/neofs-s3-gw/creds/accessbox" - "github.com/nspcc-dev/neofs-sdk-go/bearer" - "github.com/nspcc-dev/neofs-sdk-go/eacl" - "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" - "github.com/nspcc-dev/neofs-sdk-go/session" "github.com/stretchr/testify/require" ) diff --git a/api/handler/api.go b/api/handler/api.go index 572c7628..d85d3c53 100644 --- a/api/handler/api.go +++ b/api/handler/api.go @@ -4,9 +4,9 @@ import ( "errors" "time" - "github.com/nspcc-dev/neofs-s3-gw/api" - "github.com/nspcc-dev/neofs-s3-gw/api/layer" - "github.com/nspcc-dev/neofs-sdk-go/netmap" + "github.com/TrueCloudLab/frostfs-s3-gw/api" + "github.com/TrueCloudLab/frostfs-s3-gw/api/layer" + "github.com/TrueCloudLab/frostfs-sdk-go/netmap" "go.uber.org/zap" ) diff --git a/api/handler/attributes.go b/api/handler/attributes.go index 6ed11d0f..4d1b440f 100644 --- a/api/handler/attributes.go +++ b/api/handler/attributes.go @@ -6,10 +6,10 @@ import ( "strconv" "strings" - "github.com/nspcc-dev/neofs-s3-gw/api" - "github.com/nspcc-dev/neofs-s3-gw/api/data" - "github.com/nspcc-dev/neofs-s3-gw/api/errors" - "github.com/nspcc-dev/neofs-s3-gw/api/layer" + "github.com/TrueCloudLab/frostfs-s3-gw/api" + "github.com/TrueCloudLab/frostfs-s3-gw/api/data" + "github.com/TrueCloudLab/frostfs-s3-gw/api/errors" + "github.com/TrueCloudLab/frostfs-s3-gw/api/layer" "go.uber.org/zap" ) diff --git a/api/handler/attributes_test.go b/api/handler/attributes_test.go index c80e6419..7fc42416 100644 --- a/api/handler/attributes_test.go +++ b/api/handler/attributes_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "github.com/nspcc-dev/neofs-s3-gw/api" + "github.com/TrueCloudLab/frostfs-s3-gw/api" "github.com/stretchr/testify/require" ) diff --git a/api/handler/copy.go b/api/handler/copy.go index a0f12733..02d48576 100644 --- a/api/handler/copy.go +++ b/api/handler/copy.go @@ -6,12 +6,12 @@ import ( "regexp" "time" - "github.com/nspcc-dev/neofs-s3-gw/api" - "github.com/nspcc-dev/neofs-s3-gw/api/auth" - "github.com/nspcc-dev/neofs-s3-gw/api/data" - "github.com/nspcc-dev/neofs-s3-gw/api/errors" - "github.com/nspcc-dev/neofs-s3-gw/api/layer" - "github.com/nspcc-dev/neofs-sdk-go/session" + "github.com/TrueCloudLab/frostfs-s3-gw/api" + "github.com/TrueCloudLab/frostfs-s3-gw/api/auth" + "github.com/TrueCloudLab/frostfs-s3-gw/api/data" + "github.com/TrueCloudLab/frostfs-s3-gw/api/errors" + "github.com/TrueCloudLab/frostfs-s3-gw/api/layer" + "github.com/TrueCloudLab/frostfs-sdk-go/session" "go.uber.org/zap" ) diff --git a/api/handler/copy_test.go b/api/handler/copy_test.go index 1d5cba71..1e4a6941 100644 --- a/api/handler/copy_test.go +++ b/api/handler/copy_test.go @@ -6,7 +6,7 @@ import ( "net/url" "testing" - "github.com/nspcc-dev/neofs-s3-gw/api" + "github.com/TrueCloudLab/frostfs-s3-gw/api" "github.com/stretchr/testify/require" ) diff --git a/api/handler/cors.go b/api/handler/cors.go index 8a57ac40..556ce8e5 100644 --- a/api/handler/cors.go +++ b/api/handler/cors.go @@ -5,9 +5,9 @@ import ( "strconv" "strings" - "github.com/nspcc-dev/neofs-s3-gw/api" - "github.com/nspcc-dev/neofs-s3-gw/api/errors" - "github.com/nspcc-dev/neofs-s3-gw/api/layer" + "github.com/TrueCloudLab/frostfs-s3-gw/api" + "github.com/TrueCloudLab/frostfs-s3-gw/api/errors" + "github.com/TrueCloudLab/frostfs-s3-gw/api/layer" "go.uber.org/zap" ) diff --git a/api/handler/delete.go b/api/handler/delete.go index 0711462c..49f34850 100644 --- a/api/handler/delete.go +++ b/api/handler/delete.go @@ -6,13 +6,13 @@ import ( "strconv" "strings" - "github.com/nspcc-dev/neofs-s3-gw/api" - "github.com/nspcc-dev/neofs-s3-gw/api/data" - "github.com/nspcc-dev/neofs-s3-gw/api/errors" - "github.com/nspcc-dev/neofs-s3-gw/api/layer" - apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" - "github.com/nspcc-dev/neofs-sdk-go/session" + "github.com/TrueCloudLab/frostfs-s3-gw/api" + "github.com/TrueCloudLab/frostfs-s3-gw/api/data" + "github.com/TrueCloudLab/frostfs-s3-gw/api/errors" + "github.com/TrueCloudLab/frostfs-s3-gw/api/layer" + apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "github.com/TrueCloudLab/frostfs-sdk-go/session" "go.uber.org/zap" "go.uber.org/zap/zapcore" ) diff --git a/api/handler/delete_test.go b/api/handler/delete_test.go index 8c1b9937..a9a08b18 100644 --- a/api/handler/delete_test.go +++ b/api/handler/delete_test.go @@ -6,8 +6,8 @@ import ( "net/url" "testing" - "github.com/nspcc-dev/neofs-s3-gw/api" - "github.com/nspcc-dev/neofs-s3-gw/api/data" + "github.com/TrueCloudLab/frostfs-s3-gw/api" + "github.com/TrueCloudLab/frostfs-s3-gw/api/data" "github.com/stretchr/testify/require" ) diff --git a/api/handler/encryption_test.go b/api/handler/encryption_test.go index a523cb75..b8d9bbac 100644 --- a/api/handler/encryption_test.go +++ b/api/handler/encryption_test.go @@ -12,8 +12,8 @@ import ( "strings" "testing" - "github.com/nspcc-dev/neofs-s3-gw/api" - "github.com/nspcc-dev/neofs-s3-gw/api/layer" + "github.com/TrueCloudLab/frostfs-s3-gw/api" + "github.com/TrueCloudLab/frostfs-s3-gw/api/layer" "github.com/stretchr/testify/require" ) diff --git a/api/handler/get.go b/api/handler/get.go index 357cd8e9..735ba13d 100644 --- a/api/handler/get.go +++ b/api/handler/get.go @@ -8,10 +8,10 @@ import ( "strings" "time" - "github.com/nspcc-dev/neofs-s3-gw/api" - "github.com/nspcc-dev/neofs-s3-gw/api/data" - "github.com/nspcc-dev/neofs-s3-gw/api/errors" - "github.com/nspcc-dev/neofs-s3-gw/api/layer" + "github.com/TrueCloudLab/frostfs-s3-gw/api" + "github.com/TrueCloudLab/frostfs-s3-gw/api/data" + "github.com/TrueCloudLab/frostfs-s3-gw/api/errors" + "github.com/TrueCloudLab/frostfs-s3-gw/api/layer" "go.uber.org/zap" ) diff --git a/api/handler/get_test.go b/api/handler/get_test.go index 30e065ff..99a986ff 100644 --- a/api/handler/get_test.go +++ b/api/handler/get_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" - "github.com/nspcc-dev/neofs-s3-gw/api/data" - "github.com/nspcc-dev/neofs-s3-gw/api/errors" - "github.com/nspcc-dev/neofs-s3-gw/api/layer" + "github.com/TrueCloudLab/frostfs-s3-gw/api/data" + "github.com/TrueCloudLab/frostfs-s3-gw/api/errors" + "github.com/TrueCloudLab/frostfs-s3-gw/api/layer" "github.com/stretchr/testify/require" ) diff --git a/api/handler/handlers_test.go b/api/handler/handlers_test.go index aed9363e..276ecf4e 100644 --- a/api/handler/handlers_test.go +++ b/api/handler/handlers_test.go @@ -13,16 +13,16 @@ import ( "testing" "time" + "github.com/TrueCloudLab/frostfs-s3-gw/api" + "github.com/TrueCloudLab/frostfs-s3-gw/api/data" + "github.com/TrueCloudLab/frostfs-s3-gw/api/layer" + "github.com/TrueCloudLab/frostfs-s3-gw/api/resolver" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + "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/user" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" - "github.com/nspcc-dev/neofs-s3-gw/api" - "github.com/nspcc-dev/neofs-s3-gw/api/data" - "github.com/nspcc-dev/neofs-s3-gw/api/layer" - "github.com/nspcc-dev/neofs-s3-gw/api/resolver" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - "github.com/nspcc-dev/neofs-sdk-go/netmap" - "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" - "github.com/nspcc-dev/neofs-sdk-go/user" "github.com/stretchr/testify/require" "go.uber.org/zap" ) diff --git a/api/handler/head.go b/api/handler/head.go index 40a95399..2bfce705 100644 --- a/api/handler/head.go +++ b/api/handler/head.go @@ -4,10 +4,10 @@ import ( "bytes" "net/http" - "github.com/nspcc-dev/neofs-s3-gw/api" - "github.com/nspcc-dev/neofs-s3-gw/api/data" - "github.com/nspcc-dev/neofs-s3-gw/api/errors" - "github.com/nspcc-dev/neofs-s3-gw/api/layer" + "github.com/TrueCloudLab/frostfs-s3-gw/api" + "github.com/TrueCloudLab/frostfs-s3-gw/api/data" + "github.com/TrueCloudLab/frostfs-s3-gw/api/errors" + "github.com/TrueCloudLab/frostfs-s3-gw/api/layer" "go.uber.org/zap" ) diff --git a/api/handler/head_test.go b/api/handler/head_test.go index c6552cdd..f9d01ad0 100644 --- a/api/handler/head_test.go +++ b/api/handler/head_test.go @@ -6,11 +6,11 @@ import ( "testing" "time" + "github.com/TrueCloudLab/frostfs-s3-gw/api" + "github.com/TrueCloudLab/frostfs-s3-gw/creds/accessbox" + "github.com/TrueCloudLab/frostfs-sdk-go/bearer" + "github.com/TrueCloudLab/frostfs-sdk-go/eacl" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" - "github.com/nspcc-dev/neofs-s3-gw/api" - "github.com/nspcc-dev/neofs-s3-gw/creds/accessbox" - "github.com/nspcc-dev/neofs-sdk-go/bearer" - "github.com/nspcc-dev/neofs-sdk-go/eacl" "github.com/stretchr/testify/require" ) diff --git a/api/handler/info.go b/api/handler/info.go index 78c257dd..d5550b57 100644 --- a/api/handler/info.go +++ b/api/handler/info.go @@ -3,7 +3,7 @@ package handler import ( "net/http" - "github.com/nspcc-dev/neofs-s3-gw/api" + "github.com/TrueCloudLab/frostfs-s3-gw/api" ) func (h *handler) GetBucketLocationHandler(w http.ResponseWriter, r *http.Request) { diff --git a/api/handler/list.go b/api/handler/list.go index f8636e3a..1fa3379c 100644 --- a/api/handler/list.go +++ b/api/handler/list.go @@ -4,8 +4,8 @@ import ( "net/http" "time" - "github.com/nspcc-dev/neofs-s3-gw/api" - "github.com/nspcc-dev/neofs-sdk-go/user" + "github.com/TrueCloudLab/frostfs-s3-gw/api" + "github.com/TrueCloudLab/frostfs-sdk-go/user" ) const maxObjectList = 1000 // Limit number of objects in a listObjectsResponse/listObjectsVersionsResponse. diff --git a/api/handler/locking.go b/api/handler/locking.go index 5bf18c8b..1130e4f0 100644 --- a/api/handler/locking.go +++ b/api/handler/locking.go @@ -8,10 +8,10 @@ import ( "strconv" "time" - "github.com/nspcc-dev/neofs-s3-gw/api" - "github.com/nspcc-dev/neofs-s3-gw/api/data" - apiErrors "github.com/nspcc-dev/neofs-s3-gw/api/errors" - "github.com/nspcc-dev/neofs-s3-gw/api/layer" + "github.com/TrueCloudLab/frostfs-s3-gw/api" + "github.com/TrueCloudLab/frostfs-s3-gw/api/data" + apiErrors "github.com/TrueCloudLab/frostfs-s3-gw/api/errors" + "github.com/TrueCloudLab/frostfs-s3-gw/api/layer" ) const ( diff --git a/api/handler/locking_test.go b/api/handler/locking_test.go index 55710f9f..1c0f28f8 100644 --- a/api/handler/locking_test.go +++ b/api/handler/locking_test.go @@ -10,9 +10,9 @@ import ( "testing" "time" - "github.com/nspcc-dev/neofs-s3-gw/api" - "github.com/nspcc-dev/neofs-s3-gw/api/data" - apiErrors "github.com/nspcc-dev/neofs-s3-gw/api/errors" + "github.com/TrueCloudLab/frostfs-s3-gw/api" + "github.com/TrueCloudLab/frostfs-s3-gw/api/data" + apiErrors "github.com/TrueCloudLab/frostfs-s3-gw/api/errors" "github.com/stretchr/testify/require" ) diff --git a/api/handler/multipart_upload.go b/api/handler/multipart_upload.go index c6538016..5e5706cf 100644 --- a/api/handler/multipart_upload.go +++ b/api/handler/multipart_upload.go @@ -7,12 +7,12 @@ import ( "strconv" "time" + "github.com/TrueCloudLab/frostfs-s3-gw/api" + "github.com/TrueCloudLab/frostfs-s3-gw/api/data" + "github.com/TrueCloudLab/frostfs-s3-gw/api/errors" + "github.com/TrueCloudLab/frostfs-s3-gw/api/layer" + "github.com/TrueCloudLab/frostfs-sdk-go/session" "github.com/google/uuid" - "github.com/nspcc-dev/neofs-s3-gw/api" - "github.com/nspcc-dev/neofs-s3-gw/api/data" - "github.com/nspcc-dev/neofs-s3-gw/api/errors" - "github.com/nspcc-dev/neofs-s3-gw/api/layer" - "github.com/nspcc-dev/neofs-sdk-go/session" "go.uber.org/zap" ) diff --git a/api/handler/not_support.go b/api/handler/not_support.go index d747bd8c..2d4d3e27 100644 --- a/api/handler/not_support.go +++ b/api/handler/not_support.go @@ -3,8 +3,8 @@ package handler import ( "net/http" - "github.com/nspcc-dev/neofs-s3-gw/api" - "github.com/nspcc-dev/neofs-s3-gw/api/errors" + "github.com/TrueCloudLab/frostfs-s3-gw/api" + "github.com/TrueCloudLab/frostfs-s3-gw/api/errors" ) func (h *handler) DeleteBucketPolicyHandler(w http.ResponseWriter, r *http.Request) { diff --git a/api/handler/notifications.go b/api/handler/notifications.go index b8d0b242..a48f475b 100644 --- a/api/handler/notifications.go +++ b/api/handler/notifications.go @@ -8,12 +8,12 @@ import ( "strings" "time" + "github.com/TrueCloudLab/frostfs-s3-gw/api" + "github.com/TrueCloudLab/frostfs-s3-gw/api/data" + "github.com/TrueCloudLab/frostfs-s3-gw/api/errors" + "github.com/TrueCloudLab/frostfs-s3-gw/api/layer" + "github.com/TrueCloudLab/frostfs-sdk-go/bearer" "github.com/google/uuid" - "github.com/nspcc-dev/neofs-s3-gw/api" - "github.com/nspcc-dev/neofs-s3-gw/api/data" - "github.com/nspcc-dev/neofs-s3-gw/api/errors" - "github.com/nspcc-dev/neofs-s3-gw/api/layer" - "github.com/nspcc-dev/neofs-sdk-go/bearer" ) type ( diff --git a/api/handler/notifications_test.go b/api/handler/notifications_test.go index c0e1c3a5..22de9c63 100644 --- a/api/handler/notifications_test.go +++ b/api/handler/notifications_test.go @@ -3,8 +3,8 @@ package handler import ( "testing" - "github.com/nspcc-dev/neofs-s3-gw/api/data" - "github.com/nspcc-dev/neofs-s3-gw/api/errors" + "github.com/TrueCloudLab/frostfs-s3-gw/api/data" + "github.com/TrueCloudLab/frostfs-s3-gw/api/errors" "github.com/stretchr/testify/require" ) diff --git a/api/handler/object_list.go b/api/handler/object_list.go index d1aa95dd..8fe35e55 100644 --- a/api/handler/object_list.go +++ b/api/handler/object_list.go @@ -6,11 +6,11 @@ import ( "strconv" "time" - "github.com/nspcc-dev/neofs-s3-gw/api" - "github.com/nspcc-dev/neofs-s3-gw/api/data" - "github.com/nspcc-dev/neofs-s3-gw/api/errors" - "github.com/nspcc-dev/neofs-s3-gw/api/layer" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + "github.com/TrueCloudLab/frostfs-s3-gw/api" + "github.com/TrueCloudLab/frostfs-s3-gw/api/data" + "github.com/TrueCloudLab/frostfs-s3-gw/api/errors" + "github.com/TrueCloudLab/frostfs-s3-gw/api/layer" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" ) // ListObjectsV1Handler handles objects listing requests for API version 1. diff --git a/api/handler/object_list_test.go b/api/handler/object_list_test.go index e4b0c897..0a1bdeee 100644 --- a/api/handler/object_list_test.go +++ b/api/handler/object_list_test.go @@ -6,7 +6,7 @@ import ( "strconv" "testing" - "github.com/nspcc-dev/neofs-s3-gw/api/data" + "github.com/TrueCloudLab/frostfs-s3-gw/api/data" "github.com/stretchr/testify/require" ) diff --git a/api/handler/put.go b/api/handler/put.go index e90d8bec..884545a4 100644 --- a/api/handler/put.go +++ b/api/handler/put.go @@ -16,15 +16,15 @@ import ( "strings" "time" - "github.com/nspcc-dev/neofs-s3-gw/api" - "github.com/nspcc-dev/neofs-s3-gw/api/auth" - "github.com/nspcc-dev/neofs-s3-gw/api/data" - "github.com/nspcc-dev/neofs-s3-gw/api/errors" - "github.com/nspcc-dev/neofs-s3-gw/api/layer" - "github.com/nspcc-dev/neofs-s3-gw/api/layer/encryption" - "github.com/nspcc-dev/neofs-s3-gw/creds/accessbox" - "github.com/nspcc-dev/neofs-sdk-go/eacl" - "github.com/nspcc-dev/neofs-sdk-go/session" + "github.com/TrueCloudLab/frostfs-s3-gw/api" + "github.com/TrueCloudLab/frostfs-s3-gw/api/auth" + "github.com/TrueCloudLab/frostfs-s3-gw/api/data" + "github.com/TrueCloudLab/frostfs-s3-gw/api/errors" + "github.com/TrueCloudLab/frostfs-s3-gw/api/layer" + "github.com/TrueCloudLab/frostfs-s3-gw/api/layer/encryption" + "github.com/TrueCloudLab/frostfs-s3-gw/creds/accessbox" + "github.com/TrueCloudLab/frostfs-sdk-go/eacl" + "github.com/TrueCloudLab/frostfs-sdk-go/session" "go.uber.org/zap" ) diff --git a/api/handler/put_test.go b/api/handler/put_test.go index b0057f3b..1de45653 100644 --- a/api/handler/put_test.go +++ b/api/handler/put_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "github.com/nspcc-dev/neofs-s3-gw/api" - "github.com/nspcc-dev/neofs-s3-gw/api/layer" + "github.com/TrueCloudLab/frostfs-s3-gw/api" + "github.com/TrueCloudLab/frostfs-s3-gw/api/layer" "github.com/stretchr/testify/require" ) diff --git a/api/handler/tagging.go b/api/handler/tagging.go index 4af1172e..6298ef17 100644 --- a/api/handler/tagging.go +++ b/api/handler/tagging.go @@ -8,10 +8,10 @@ import ( "strings" "unicode" - "github.com/nspcc-dev/neofs-s3-gw/api" - "github.com/nspcc-dev/neofs-s3-gw/api/data" - "github.com/nspcc-dev/neofs-s3-gw/api/errors" - "github.com/nspcc-dev/neofs-s3-gw/api/layer" + "github.com/TrueCloudLab/frostfs-s3-gw/api" + "github.com/TrueCloudLab/frostfs-s3-gw/api/data" + "github.com/TrueCloudLab/frostfs-s3-gw/api/errors" + "github.com/TrueCloudLab/frostfs-s3-gw/api/layer" "go.uber.org/zap" ) diff --git a/api/handler/unimplemented.go b/api/handler/unimplemented.go index 6bbc9c0d..05f2970c 100644 --- a/api/handler/unimplemented.go +++ b/api/handler/unimplemented.go @@ -3,8 +3,8 @@ package handler import ( "net/http" - "github.com/nspcc-dev/neofs-s3-gw/api" - "github.com/nspcc-dev/neofs-s3-gw/api/errors" + "github.com/TrueCloudLab/frostfs-s3-gw/api" + "github.com/TrueCloudLab/frostfs-s3-gw/api/errors" ) func (h *handler) SelectObjectContentHandler(w http.ResponseWriter, r *http.Request) { diff --git a/api/handler/util.go b/api/handler/util.go index d43818b0..4516cf8a 100644 --- a/api/handler/util.go +++ b/api/handler/util.go @@ -7,11 +7,11 @@ import ( "strconv" "strings" - "github.com/nspcc-dev/neofs-s3-gw/api" - "github.com/nspcc-dev/neofs-s3-gw/api/data" - "github.com/nspcc-dev/neofs-s3-gw/api/errors" - "github.com/nspcc-dev/neofs-s3-gw/api/layer" - "github.com/nspcc-dev/neofs-sdk-go/session" + "github.com/TrueCloudLab/frostfs-s3-gw/api" + "github.com/TrueCloudLab/frostfs-s3-gw/api/data" + "github.com/TrueCloudLab/frostfs-s3-gw/api/errors" + "github.com/TrueCloudLab/frostfs-s3-gw/api/layer" + "github.com/TrueCloudLab/frostfs-sdk-go/session" "go.uber.org/zap" ) diff --git a/api/handler/versioning.go b/api/handler/versioning.go index 6235a7bd..b262a25f 100644 --- a/api/handler/versioning.go +++ b/api/handler/versioning.go @@ -4,10 +4,10 @@ import ( "encoding/xml" "net/http" - "github.com/nspcc-dev/neofs-s3-gw/api" - "github.com/nspcc-dev/neofs-s3-gw/api/data" - "github.com/nspcc-dev/neofs-s3-gw/api/errors" - "github.com/nspcc-dev/neofs-s3-gw/api/layer" + "github.com/TrueCloudLab/frostfs-s3-gw/api" + "github.com/TrueCloudLab/frostfs-s3-gw/api/data" + "github.com/TrueCloudLab/frostfs-s3-gw/api/errors" + "github.com/TrueCloudLab/frostfs-s3-gw/api/layer" ) func (h *handler) PutBucketVersioningHandler(w http.ResponseWriter, r *http.Request) { diff --git a/api/layer/cache.go b/api/layer/cache.go index e118aa76..a68ed5d0 100644 --- a/api/layer/cache.go +++ b/api/layer/cache.go @@ -1,11 +1,11 @@ package layer import ( - "github.com/nspcc-dev/neofs-s3-gw/api/cache" - "github.com/nspcc-dev/neofs-s3-gw/api/data" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" - "github.com/nspcc-dev/neofs-sdk-go/user" + "github.com/TrueCloudLab/frostfs-s3-gw/api/cache" + "github.com/TrueCloudLab/frostfs-s3-gw/api/data" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "github.com/TrueCloudLab/frostfs-sdk-go/user" "go.uber.org/zap" ) diff --git a/api/layer/compound.go b/api/layer/compound.go index b668942c..1c77e1f3 100644 --- a/api/layer/compound.go +++ b/api/layer/compound.go @@ -4,8 +4,8 @@ import ( "context" errorsStd "errors" - "github.com/nspcc-dev/neofs-s3-gw/api/data" - "github.com/nspcc-dev/neofs-s3-gw/api/errors" + "github.com/TrueCloudLab/frostfs-s3-gw/api/data" + "github.com/TrueCloudLab/frostfs-s3-gw/api/errors" ) func (n *layer) GetObjectTaggingAndLock(ctx context.Context, objVersion *ObjectVersion, nodeVersion *data.NodeVersion) (map[string]string, *data.LockInfo, error) { diff --git a/api/layer/container.go b/api/layer/container.go index e84053a9..45b4afee 100644 --- a/api/layer/container.go +++ b/api/layer/container.go @@ -5,14 +5,14 @@ import ( "fmt" "strconv" - "github.com/nspcc-dev/neofs-s3-gw/api" - "github.com/nspcc-dev/neofs-s3-gw/api/data" - "github.com/nspcc-dev/neofs-s3-gw/api/errors" - "github.com/nspcc-dev/neofs-sdk-go/client" - "github.com/nspcc-dev/neofs-sdk-go/container" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - "github.com/nspcc-dev/neofs-sdk-go/eacl" - "github.com/nspcc-dev/neofs-sdk-go/session" + "github.com/TrueCloudLab/frostfs-s3-gw/api" + "github.com/TrueCloudLab/frostfs-s3-gw/api/data" + "github.com/TrueCloudLab/frostfs-s3-gw/api/errors" + "github.com/TrueCloudLab/frostfs-sdk-go/client" + "github.com/TrueCloudLab/frostfs-sdk-go/container" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + "github.com/TrueCloudLab/frostfs-sdk-go/eacl" + "github.com/TrueCloudLab/frostfs-sdk-go/session" "go.uber.org/zap" ) diff --git a/api/layer/cors.go b/api/layer/cors.go index acea5b47..baaac62a 100644 --- a/api/layer/cors.go +++ b/api/layer/cors.go @@ -8,8 +8,8 @@ import ( "fmt" "io" - "github.com/nspcc-dev/neofs-s3-gw/api/data" - "github.com/nspcc-dev/neofs-s3-gw/api/errors" + "github.com/TrueCloudLab/frostfs-s3-gw/api/data" + "github.com/TrueCloudLab/frostfs-s3-gw/api/errors" "go.uber.org/zap" ) diff --git a/api/layer/layer.go b/api/layer/layer.go index ec6b3777..36913661 100644 --- a/api/layer/layer.go +++ b/api/layer/layer.go @@ -11,20 +11,20 @@ import ( "strings" "time" + "github.com/TrueCloudLab/frostfs-s3-gw/api" + "github.com/TrueCloudLab/frostfs-s3-gw/api/data" + "github.com/TrueCloudLab/frostfs-s3-gw/api/errors" + "github.com/TrueCloudLab/frostfs-s3-gw/api/layer/encryption" + "github.com/TrueCloudLab/frostfs-s3-gw/creds/accessbox" + "github.com/TrueCloudLab/frostfs-sdk-go/bearer" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + "github.com/TrueCloudLab/frostfs-sdk-go/eacl" + "github.com/TrueCloudLab/frostfs-sdk-go/netmap" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "github.com/TrueCloudLab/frostfs-sdk-go/session" + "github.com/TrueCloudLab/frostfs-sdk-go/user" "github.com/nats-io/nats.go" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" - "github.com/nspcc-dev/neofs-s3-gw/api" - "github.com/nspcc-dev/neofs-s3-gw/api/data" - "github.com/nspcc-dev/neofs-s3-gw/api/errors" - "github.com/nspcc-dev/neofs-s3-gw/api/layer/encryption" - "github.com/nspcc-dev/neofs-s3-gw/creds/accessbox" - "github.com/nspcc-dev/neofs-sdk-go/bearer" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - "github.com/nspcc-dev/neofs-sdk-go/eacl" - "github.com/nspcc-dev/neofs-sdk-go/netmap" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" - "github.com/nspcc-dev/neofs-sdk-go/session" - "github.com/nspcc-dev/neofs-sdk-go/user" "go.uber.org/zap" ) diff --git a/api/layer/locking_test.go b/api/layer/locking_test.go index c9e0bb90..bf1cb454 100644 --- a/api/layer/locking_test.go +++ b/api/layer/locking_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/nspcc-dev/neofs-s3-gw/api/data" + "github.com/TrueCloudLab/frostfs-s3-gw/api/data" "github.com/stretchr/testify/require" ) diff --git a/api/layer/multipart_upload.go b/api/layer/multipart_upload.go index e3f61ed0..19294325 100644 --- a/api/layer/multipart_upload.go +++ b/api/layer/multipart_upload.go @@ -11,12 +11,12 @@ import ( "strings" "time" + "github.com/TrueCloudLab/frostfs-s3-gw/api/data" + "github.com/TrueCloudLab/frostfs-s3-gw/api/errors" + "github.com/TrueCloudLab/frostfs-s3-gw/api/layer/encryption" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "github.com/TrueCloudLab/frostfs-sdk-go/user" "github.com/minio/sio" - "github.com/nspcc-dev/neofs-s3-gw/api/data" - "github.com/nspcc-dev/neofs-s3-gw/api/errors" - "github.com/nspcc-dev/neofs-s3-gw/api/layer/encryption" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" - "github.com/nspcc-dev/neofs-sdk-go/user" "go.uber.org/zap" ) diff --git a/api/layer/neofs.go b/api/layer/neofs.go index 8583b491..3cebd90e 100644 --- a/api/layer/neofs.go +++ b/api/layer/neofs.go @@ -7,16 +7,16 @@ import ( "io" "time" - "github.com/nspcc-dev/neofs-sdk-go/bearer" - "github.com/nspcc-dev/neofs-sdk-go/container" - "github.com/nspcc-dev/neofs-sdk-go/container/acl" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - "github.com/nspcc-dev/neofs-sdk-go/eacl" - "github.com/nspcc-dev/neofs-sdk-go/netmap" - "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" - "github.com/nspcc-dev/neofs-sdk-go/session" - "github.com/nspcc-dev/neofs-sdk-go/user" + "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" + "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/session" + "github.com/TrueCloudLab/frostfs-sdk-go/user" ) // PrmContainerCreate groups parameters of NeoFS.CreateContainer operation. diff --git a/api/layer/neofs_mock.go b/api/layer/neofs_mock.go index 645ec131..3be31b77 100644 --- a/api/layer/neofs_mock.go +++ b/api/layer/neofs_mock.go @@ -10,18 +10,18 @@ import ( "io" "time" - objectv2 "github.com/nspcc-dev/neofs-api-go/v2/object" - "github.com/nspcc-dev/neofs-s3-gw/api" - "github.com/nspcc-dev/neofs-s3-gw/creds/accessbox" - "github.com/nspcc-dev/neofs-sdk-go/bearer" - "github.com/nspcc-dev/neofs-sdk-go/checksum" - "github.com/nspcc-dev/neofs-sdk-go/container" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - "github.com/nspcc-dev/neofs-sdk-go/eacl" - "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" - "github.com/nspcc-dev/neofs-sdk-go/session" - "github.com/nspcc-dev/neofs-sdk-go/user" + objectv2 "github.com/TrueCloudLab/frostfs-api-go/v2/object" + "github.com/TrueCloudLab/frostfs-s3-gw/api" + "github.com/TrueCloudLab/frostfs-s3-gw/creds/accessbox" + "github.com/TrueCloudLab/frostfs-sdk-go/bearer" + "github.com/TrueCloudLab/frostfs-sdk-go/checksum" + "github.com/TrueCloudLab/frostfs-sdk-go/container" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + "github.com/TrueCloudLab/frostfs-sdk-go/eacl" + "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "github.com/TrueCloudLab/frostfs-sdk-go/session" + "github.com/TrueCloudLab/frostfs-sdk-go/user" ) type TestNeoFS struct { diff --git a/api/layer/notifications.go b/api/layer/notifications.go index f1335f55..b695b0a2 100644 --- a/api/layer/notifications.go +++ b/api/layer/notifications.go @@ -7,8 +7,8 @@ import ( errorsStd "errors" "fmt" - "github.com/nspcc-dev/neofs-s3-gw/api" - "github.com/nspcc-dev/neofs-s3-gw/api/data" + "github.com/TrueCloudLab/frostfs-s3-gw/api" + "github.com/TrueCloudLab/frostfs-s3-gw/api/data" "go.uber.org/zap" ) diff --git a/api/layer/object.go b/api/layer/object.go index b9f19502..b7d31e88 100644 --- a/api/layer/object.go +++ b/api/layer/object.go @@ -14,15 +14,15 @@ import ( "strings" "sync" + "github.com/TrueCloudLab/frostfs-s3-gw/api" + "github.com/TrueCloudLab/frostfs-s3-gw/api/cache" + "github.com/TrueCloudLab/frostfs-s3-gw/api/data" + apiErrors "github.com/TrueCloudLab/frostfs-s3-gw/api/errors" + "github.com/TrueCloudLab/frostfs-sdk-go/client" + 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/minio/sio" - "github.com/nspcc-dev/neofs-s3-gw/api" - "github.com/nspcc-dev/neofs-s3-gw/api/cache" - "github.com/nspcc-dev/neofs-s3-gw/api/data" - apiErrors "github.com/nspcc-dev/neofs-s3-gw/api/errors" - "github.com/nspcc-dev/neofs-sdk-go/client" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" "github.com/panjf2000/ants/v2" "go.uber.org/zap" ) diff --git a/api/layer/system_object.go b/api/layer/system_object.go index 91f47c5c..91f2eacb 100644 --- a/api/layer/system_object.go +++ b/api/layer/system_object.go @@ -9,9 +9,9 @@ import ( "strconv" "time" - "github.com/nspcc-dev/neofs-s3-gw/api/data" - "github.com/nspcc-dev/neofs-s3-gw/api/errors" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + "github.com/TrueCloudLab/frostfs-s3-gw/api/data" + "github.com/TrueCloudLab/frostfs-s3-gw/api/errors" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" ) const ( diff --git a/api/layer/tagging.go b/api/layer/tagging.go index 52bb4fb9..37074a35 100644 --- a/api/layer/tagging.go +++ b/api/layer/tagging.go @@ -4,11 +4,11 @@ import ( "context" errorsStd "errors" - "github.com/nspcc-dev/neofs-s3-gw/api/data" - "github.com/nspcc-dev/neofs-s3-gw/api/errors" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" - "github.com/nspcc-dev/neofs-sdk-go/user" + "github.com/TrueCloudLab/frostfs-s3-gw/api/data" + "github.com/TrueCloudLab/frostfs-s3-gw/api/errors" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "github.com/TrueCloudLab/frostfs-sdk-go/user" ) type GetObjectTaggingParams struct { diff --git a/api/layer/tree_mock.go b/api/layer/tree_mock.go index 058b5edf..de4c60b7 100644 --- a/api/layer/tree_mock.go +++ b/api/layer/tree_mock.go @@ -6,8 +6,8 @@ import ( "sort" "strings" - "github.com/nspcc-dev/neofs-s3-gw/api/data" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + "github.com/TrueCloudLab/frostfs-s3-gw/api/data" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" ) type TreeServiceMock struct { diff --git a/api/layer/tree_service.go b/api/layer/tree_service.go index 4a30910d..2c01b85a 100644 --- a/api/layer/tree_service.go +++ b/api/layer/tree_service.go @@ -4,8 +4,8 @@ import ( "context" "errors" - "github.com/nspcc-dev/neofs-s3-gw/api/data" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" + "github.com/TrueCloudLab/frostfs-s3-gw/api/data" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" ) // TreeService provide interface to interact with tree service using s3 data models. diff --git a/api/layer/util.go b/api/layer/util.go index 040dcd00..f6aa12e0 100644 --- a/api/layer/util.go +++ b/api/layer/util.go @@ -9,11 +9,11 @@ import ( "strings" "time" - "github.com/nspcc-dev/neofs-s3-gw/api" - "github.com/nspcc-dev/neofs-s3-gw/api/data" - "github.com/nspcc-dev/neofs-s3-gw/api/layer/encryption" - "github.com/nspcc-dev/neofs-s3-gw/creds/accessbox" - "github.com/nspcc-dev/neofs-sdk-go/object" + "github.com/TrueCloudLab/frostfs-s3-gw/api" + "github.com/TrueCloudLab/frostfs-s3-gw/api/data" + "github.com/TrueCloudLab/frostfs-s3-gw/api/layer/encryption" + "github.com/TrueCloudLab/frostfs-s3-gw/creds/accessbox" + "github.com/TrueCloudLab/frostfs-sdk-go/object" ) type ( diff --git a/api/layer/util_test.go b/api/layer/util_test.go index 92ffef61..4e8b6c15 100644 --- a/api/layer/util_test.go +++ b/api/layer/util_test.go @@ -6,11 +6,11 @@ import ( "testing" "time" - "github.com/nspcc-dev/neofs-s3-gw/api/data" - "github.com/nspcc-dev/neofs-sdk-go/checksum" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" - "github.com/nspcc-dev/neofs-sdk-go/user" + "github.com/TrueCloudLab/frostfs-s3-gw/api/data" + "github.com/TrueCloudLab/frostfs-sdk-go/checksum" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "github.com/TrueCloudLab/frostfs-sdk-go/user" "github.com/stretchr/testify/require" ) diff --git a/api/layer/versioning.go b/api/layer/versioning.go index 46df8a6d..13478029 100644 --- a/api/layer/versioning.go +++ b/api/layer/versioning.go @@ -4,7 +4,7 @@ import ( "context" "sort" - "github.com/nspcc-dev/neofs-s3-gw/api/data" + "github.com/TrueCloudLab/frostfs-s3-gw/api/data" ) func (n *layer) ListObjectVersions(ctx context.Context, p *ListObjectVersionsParams) (*ListObjectVersionsInfo, error) { diff --git a/api/layer/versioning_test.go b/api/layer/versioning_test.go index d15d0118..6fd56e8e 100644 --- a/api/layer/versioning_test.go +++ b/api/layer/versioning_test.go @@ -5,14 +5,14 @@ import ( "context" "testing" + "github.com/TrueCloudLab/frostfs-s3-gw/api" + "github.com/TrueCloudLab/frostfs-s3-gw/api/data" + "github.com/TrueCloudLab/frostfs-s3-gw/creds/accessbox" + bearertest "github.com/TrueCloudLab/frostfs-sdk-go/bearer/test" + "github.com/TrueCloudLab/frostfs-sdk-go/object" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "github.com/TrueCloudLab/frostfs-sdk-go/user" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" - "github.com/nspcc-dev/neofs-s3-gw/api" - "github.com/nspcc-dev/neofs-s3-gw/api/data" - "github.com/nspcc-dev/neofs-s3-gw/creds/accessbox" - bearertest "github.com/nspcc-dev/neofs-sdk-go/bearer/test" - "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" - "github.com/nspcc-dev/neofs-sdk-go/user" "github.com/stretchr/testify/require" "go.uber.org/zap" ) diff --git a/api/max_clients.go b/api/max_clients.go index c7a1242b..cd34b535 100644 --- a/api/max_clients.go +++ b/api/max_clients.go @@ -4,7 +4,7 @@ import ( "net/http" "time" - "github.com/nspcc-dev/neofs-s3-gw/api/errors" + "github.com/TrueCloudLab/frostfs-s3-gw/api/errors" ) type ( diff --git a/api/metrics/collector.go b/api/metrics/collector.go index f2988412..88b1cb5d 100644 --- a/api/metrics/collector.go +++ b/api/metrics/collector.go @@ -1,7 +1,7 @@ package metrics import ( - "github.com/nspcc-dev/neofs-s3-gw/internal/version" + "github.com/TrueCloudLab/frostfs-s3-gw/internal/version" "github.com/prometheus/client_golang/prometheus" ) diff --git a/api/notifications/controller.go b/api/notifications/controller.go index d5134474..bcd50b35 100644 --- a/api/notifications/controller.go +++ b/api/notifications/controller.go @@ -7,9 +7,9 @@ import ( "sync" "time" + "github.com/TrueCloudLab/frostfs-s3-gw/api/handler" + "github.com/TrueCloudLab/frostfs-s3-gw/api/layer" "github.com/nats-io/nats.go" - "github.com/nspcc-dev/neofs-s3-gw/api/handler" - "github.com/nspcc-dev/neofs-s3-gw/api/layer" "go.uber.org/zap" ) diff --git a/api/resolver/resolver.go b/api/resolver/resolver.go index ea7c09db..7223f97e 100644 --- a/api/resolver/resolver.go +++ b/api/resolver/resolver.go @@ -6,9 +6,9 @@ import ( "fmt" "sync" - "github.com/nspcc-dev/neofs-sdk-go/container" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - "github.com/nspcc-dev/neofs-sdk-go/ns" + "github.com/TrueCloudLab/frostfs-sdk-go/container" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + "github.com/TrueCloudLab/frostfs-sdk-go/ns" ) const ( diff --git a/api/response.go b/api/response.go index 6c3415e1..c221bea8 100644 --- a/api/response.go +++ b/api/response.go @@ -7,9 +7,9 @@ import ( "net/http" "strconv" + "github.com/TrueCloudLab/frostfs-s3-gw/api/errors" + "github.com/TrueCloudLab/frostfs-s3-gw/internal/version" "github.com/google/uuid" - "github.com/nspcc-dev/neofs-s3-gw/api/errors" - "github.com/nspcc-dev/neofs-s3-gw/internal/version" ) type ( diff --git a/api/router.go b/api/router.go index 9101299b..7e49d670 100644 --- a/api/router.go +++ b/api/router.go @@ -5,10 +5,10 @@ import ( "net/http" "sync" + "github.com/TrueCloudLab/frostfs-s3-gw/api/auth" + "github.com/TrueCloudLab/frostfs-s3-gw/api/metrics" "github.com/google/uuid" "github.com/gorilla/mux" - "github.com/nspcc-dev/neofs-s3-gw/api/auth" - "github.com/nspcc-dev/neofs-s3-gw/api/metrics" "go.uber.org/zap" "google.golang.org/grpc/metadata" ) diff --git a/api/user_auth.go b/api/user_auth.go index 1cf0d5f6..911621e4 100644 --- a/api/user_auth.go +++ b/api/user_auth.go @@ -4,9 +4,9 @@ import ( "context" "net/http" + "github.com/TrueCloudLab/frostfs-s3-gw/api/auth" + "github.com/TrueCloudLab/frostfs-s3-gw/api/errors" "github.com/gorilla/mux" - "github.com/nspcc-dev/neofs-s3-gw/api/auth" - "github.com/nspcc-dev/neofs-s3-gw/api/errors" "go.uber.org/zap" ) diff --git a/authmate/authmate.go b/authmate/authmate.go index c160de4b..9abff99b 100644 --- a/authmate/authmate.go +++ b/authmate/authmate.go @@ -11,19 +11,19 @@ import ( "os" "time" + "github.com/TrueCloudLab/frostfs-s3-gw/api/cache" + "github.com/TrueCloudLab/frostfs-s3-gw/creds/accessbox" + "github.com/TrueCloudLab/frostfs-s3-gw/creds/tokens" + "github.com/TrueCloudLab/frostfs-sdk-go/bearer" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + neofsecdsa "github.com/TrueCloudLab/frostfs-sdk-go/crypto/ecdsa" + "github.com/TrueCloudLab/frostfs-sdk-go/eacl" + "github.com/TrueCloudLab/frostfs-sdk-go/netmap" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "github.com/TrueCloudLab/frostfs-sdk-go/session" + "github.com/TrueCloudLab/frostfs-sdk-go/user" "github.com/google/uuid" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" - "github.com/nspcc-dev/neofs-s3-gw/api/cache" - "github.com/nspcc-dev/neofs-s3-gw/creds/accessbox" - "github.com/nspcc-dev/neofs-s3-gw/creds/tokens" - "github.com/nspcc-dev/neofs-sdk-go/bearer" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - neofsecdsa "github.com/nspcc-dev/neofs-sdk-go/crypto/ecdsa" - "github.com/nspcc-dev/neofs-sdk-go/eacl" - "github.com/nspcc-dev/neofs-sdk-go/netmap" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" - "github.com/nspcc-dev/neofs-sdk-go/session" - "github.com/nspcc-dev/neofs-sdk-go/user" "go.uber.org/zap" ) diff --git a/authmate/session_tokens.go b/authmate/session_tokens.go index 0b4ec13a..08441665 100644 --- a/authmate/session_tokens.go +++ b/authmate/session_tokens.go @@ -4,9 +4,9 @@ import ( "encoding/json" "fmt" - apisession "github.com/nspcc-dev/neofs-api-go/v2/session" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - "github.com/nspcc-dev/neofs-sdk-go/session" + apisession "github.com/TrueCloudLab/frostfs-api-go/v2/session" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + "github.com/TrueCloudLab/frostfs-sdk-go/session" ) type ( diff --git a/authmate/session_tokens_test.go b/authmate/session_tokens_test.go index add97ea1..c4ddc709 100644 --- a/authmate/session_tokens_test.go +++ b/authmate/session_tokens_test.go @@ -3,7 +3,7 @@ package authmate import ( "testing" - "github.com/nspcc-dev/neofs-sdk-go/session" + "github.com/TrueCloudLab/frostfs-sdk-go/session" "github.com/stretchr/testify/require" ) diff --git a/cmd/s3-authmate/main.go b/cmd/s3-authmate/main.go index 56e999e9..86f1bc52 100644 --- a/cmd/s3-authmate/main.go +++ b/cmd/s3-authmate/main.go @@ -13,18 +13,18 @@ import ( "syscall" "time" + "github.com/TrueCloudLab/frostfs-s3-gw/api" + "github.com/TrueCloudLab/frostfs-s3-gw/authmate" + "github.com/TrueCloudLab/frostfs-s3-gw/internal/neofs" + "github.com/TrueCloudLab/frostfs-s3-gw/internal/version" + "github.com/TrueCloudLab/frostfs-s3-gw/internal/wallet" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + "github.com/TrueCloudLab/frostfs-sdk-go/pool" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/credentials" "github.com/aws/aws-sdk-go/aws/session" v4 "github.com/aws/aws-sdk-go/aws/signer/v4" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" - "github.com/nspcc-dev/neofs-s3-gw/api" - "github.com/nspcc-dev/neofs-s3-gw/authmate" - "github.com/nspcc-dev/neofs-s3-gw/internal/neofs" - "github.com/nspcc-dev/neofs-s3-gw/internal/version" - "github.com/nspcc-dev/neofs-s3-gw/internal/wallet" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - "github.com/nspcc-dev/neofs-sdk-go/pool" "github.com/spf13/viper" "github.com/urfave/cli/v2" "go.uber.org/zap" diff --git a/cmd/s3-gw/app.go b/cmd/s3-gw/app.go index edeeab8a..02f696ab 100644 --- a/cmd/s3-gw/app.go +++ b/cmd/s3-gw/app.go @@ -13,20 +13,20 @@ import ( "syscall" "time" + "github.com/TrueCloudLab/frostfs-s3-gw/api" + "github.com/TrueCloudLab/frostfs-s3-gw/api/auth" + "github.com/TrueCloudLab/frostfs-s3-gw/api/cache" + "github.com/TrueCloudLab/frostfs-s3-gw/api/handler" + "github.com/TrueCloudLab/frostfs-s3-gw/api/layer" + "github.com/TrueCloudLab/frostfs-s3-gw/api/notifications" + "github.com/TrueCloudLab/frostfs-s3-gw/api/resolver" + "github.com/TrueCloudLab/frostfs-s3-gw/internal/neofs" + "github.com/TrueCloudLab/frostfs-s3-gw/internal/version" + "github.com/TrueCloudLab/frostfs-s3-gw/internal/wallet" + "github.com/TrueCloudLab/frostfs-sdk-go/netmap" + "github.com/TrueCloudLab/frostfs-sdk-go/pool" "github.com/gorilla/mux" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" - "github.com/nspcc-dev/neofs-s3-gw/api" - "github.com/nspcc-dev/neofs-s3-gw/api/auth" - "github.com/nspcc-dev/neofs-s3-gw/api/cache" - "github.com/nspcc-dev/neofs-s3-gw/api/handler" - "github.com/nspcc-dev/neofs-s3-gw/api/layer" - "github.com/nspcc-dev/neofs-s3-gw/api/notifications" - "github.com/nspcc-dev/neofs-s3-gw/api/resolver" - "github.com/nspcc-dev/neofs-s3-gw/internal/neofs" - "github.com/nspcc-dev/neofs-s3-gw/internal/version" - "github.com/nspcc-dev/neofs-s3-gw/internal/wallet" - "github.com/nspcc-dev/neofs-sdk-go/netmap" - "github.com/nspcc-dev/neofs-sdk-go/pool" "github.com/spf13/viper" "go.uber.org/zap" ) diff --git a/cmd/s3-gw/app_metrics.go b/cmd/s3-gw/app_metrics.go index 9523990e..427818b6 100644 --- a/cmd/s3-gw/app_metrics.go +++ b/cmd/s3-gw/app_metrics.go @@ -3,7 +3,7 @@ package main import ( "net/http" - "github.com/nspcc-dev/neofs-sdk-go/pool" + "github.com/TrueCloudLab/frostfs-sdk-go/pool" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" "github.com/spf13/viper" diff --git a/cmd/s3-gw/app_settings.go b/cmd/s3-gw/app_settings.go index 00f07dfb..51773fb8 100644 --- a/cmd/s3-gw/app_settings.go +++ b/cmd/s3-gw/app_settings.go @@ -9,9 +9,9 @@ import ( "strings" "time" - "github.com/nspcc-dev/neofs-s3-gw/api/resolver" - "github.com/nspcc-dev/neofs-s3-gw/internal/version" - "github.com/nspcc-dev/neofs-sdk-go/pool" + "github.com/TrueCloudLab/frostfs-s3-gw/api/resolver" + "github.com/TrueCloudLab/frostfs-s3-gw/internal/version" + "github.com/TrueCloudLab/frostfs-sdk-go/pool" "github.com/spf13/pflag" "github.com/spf13/viper" "go.uber.org/zap" diff --git a/creds/accessbox/accessbox.go b/creds/accessbox/accessbox.go index e5584890..2c7eda84 100644 --- a/creds/accessbox/accessbox.go +++ b/creds/accessbox/accessbox.go @@ -10,10 +10,10 @@ import ( "fmt" "io" + "github.com/TrueCloudLab/frostfs-sdk-go/bearer" + "github.com/TrueCloudLab/frostfs-sdk-go/netmap" + "github.com/TrueCloudLab/frostfs-sdk-go/session" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" - "github.com/nspcc-dev/neofs-sdk-go/bearer" - "github.com/nspcc-dev/neofs-sdk-go/netmap" - "github.com/nspcc-dev/neofs-sdk-go/session" "golang.org/x/crypto/chacha20poly1305" "golang.org/x/crypto/hkdf" "google.golang.org/protobuf/proto" diff --git a/creds/accessbox/accessbox.pb.go b/creds/accessbox/accessbox.pb.go index 86df43ad..47e6c6ac 100644 --- a/creds/accessbox/accessbox.pb.go +++ b/creds/accessbox/accessbox.pb.go @@ -1,17 +1,16 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.26.0 -// protoc v3.6.1 +// protoc-gen-go v1.28.1 +// protoc v3.15.8 // source: creds/accessbox/accessbox.proto package accessbox import ( - reflect "reflect" - sync "sync" - protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -291,11 +290,11 @@ var file_creds_accessbox_accessbox_proto_rawDesc = []byte{ 0x0c, 0x52, 0x0b, 0x62, 0x65, 0x61, 0x72, 0x65, 0x72, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x24, 0x0a, 0x0d, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0c, 0x52, 0x0d, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x54, 0x6f, - 0x6b, 0x65, 0x6e, 0x73, 0x42, 0x3b, 0x5a, 0x39, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, - 0x6f, 0x6d, 0x2f, 0x6e, 0x73, 0x70, 0x63, 0x63, 0x2d, 0x64, 0x65, 0x76, 0x2f, 0x6e, 0x65, 0x6f, - 0x66, 0x73, 0x2d, 0x73, 0x33, 0x2d, 0x67, 0x77, 0x2f, 0x63, 0x72, 0x65, 0x64, 0x73, 0x2f, 0x74, - 0x6f, 0x6b, 0x65, 0x6e, 0x62, 0x6f, 0x78, 0x3b, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x62, 0x6f, - 0x78, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6b, 0x65, 0x6e, 0x73, 0x42, 0x40, 0x5a, 0x3e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, + 0x6f, 0x6d, 0x2f, 0x54, 0x72, 0x75, 0x65, 0x43, 0x6c, 0x6f, 0x75, 0x64, 0x4c, 0x61, 0x62, 0x2f, + 0x66, 0x72, 0x6f, 0x73, 0x74, 0x66, 0x73, 0x2d, 0x73, 0x33, 0x2d, 0x67, 0x77, 0x2f, 0x63, 0x72, + 0x65, 0x64, 0x73, 0x2f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x62, 0x6f, 0x78, 0x3b, 0x61, 0x63, 0x63, + 0x65, 0x73, 0x73, 0x62, 0x6f, 0x78, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/creds/accessbox/accessbox.proto b/creds/accessbox/accessbox.proto index 303fb656..6bc27ef3 100644 --- a/creds/accessbox/accessbox.proto +++ b/creds/accessbox/accessbox.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package accessbox; -option go_package = "github.com/nspcc-dev/neofs-s3-gw/creds/tokenbox;accessbox"; +option go_package = "github.com/TrueCloudLab/frostfs-s3-gw/creds/tokenbox;accessbox"; diff --git a/creds/accessbox/bearer_token_test.go b/creds/accessbox/bearer_token_test.go index ccb095eb..5098bdb3 100644 --- a/creds/accessbox/bearer_token_test.go +++ b/creds/accessbox/bearer_token_test.go @@ -3,12 +3,12 @@ package accessbox import ( "testing" + "github.com/TrueCloudLab/frostfs-sdk-go/bearer" + neofsecdsa "github.com/TrueCloudLab/frostfs-sdk-go/crypto/ecdsa" + "github.com/TrueCloudLab/frostfs-sdk-go/eacl" + "github.com/TrueCloudLab/frostfs-sdk-go/session" "github.com/google/uuid" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" - "github.com/nspcc-dev/neofs-sdk-go/bearer" - neofsecdsa "github.com/nspcc-dev/neofs-sdk-go/crypto/ecdsa" - "github.com/nspcc-dev/neofs-sdk-go/eacl" - "github.com/nspcc-dev/neofs-sdk-go/session" "github.com/stretchr/testify/require" ) diff --git a/creds/tokens/credentials.go b/creds/tokens/credentials.go index f1361a9d..b5f22d3f 100644 --- a/creds/tokens/credentials.go +++ b/creds/tokens/credentials.go @@ -7,12 +7,12 @@ import ( "strconv" "time" + "github.com/TrueCloudLab/frostfs-s3-gw/api/cache" + "github.com/TrueCloudLab/frostfs-s3-gw/creds/accessbox" + cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "github.com/TrueCloudLab/frostfs-sdk-go/user" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" - "github.com/nspcc-dev/neofs-s3-gw/api/cache" - "github.com/nspcc-dev/neofs-s3-gw/creds/accessbox" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" - "github.com/nspcc-dev/neofs-sdk-go/user" ) type ( diff --git a/go.mod b/go.mod index f2b6b340..0f9394d1 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,10 @@ -module github.com/nspcc-dev/neofs-s3-gw +module github.com/TrueCloudLab/frostfs-s3-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 github.com/aws/aws-sdk-go v1.44.6 github.com/bluele/gcache v0.0.2 github.com/google/uuid v1.3.0 @@ -10,8 +12,6 @@ require ( github.com/minio/sio v0.3.0 github.com/nats-io/nats.go v1.13.1-0.20220121202836-972a071d373d github.com/nspcc-dev/neo-go v0.99.4 - github.com/nspcc-dev/neofs-api-go/v2 v2.14.0 - github.com/nspcc-dev/neofs-sdk-go v1.0.0-rc.7.0.20221115140820-b4b07a3c4e11 github.com/panjf2000/ants/v2 v2.5.0 github.com/prometheus/client_golang v1.13.0 github.com/spf13/pflag v1.0.5 @@ -25,13 +25,18 @@ require ( ) require ( + github.com/TrueCloudLab/frostfs-contract v0.0.0-20221213081248-6c805c1b4e42 // 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/aws/aws-sdk-go-v2 v1.16.7 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/btcsuite/btcd v0.22.0-beta // indirect github.com/cespare/xxhash/v2 v2.1.2 // indirect github.com/coreos/go-semver v0.3.0 // indirect - github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect + github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/fsnotify/fsnotify v1.4.9 // indirect github.com/golang/protobuf v1.5.2 // indirect @@ -48,19 +53,14 @@ require ( github.com/nats-io/nkeys v0.3.0 // indirect github.com/nats-io/nuid v1.0.1 // indirect github.com/nspcc-dev/go-ordered-json v0.0.0-20220111165707-25110be27d22 // indirect - github.com/nspcc-dev/hrw v1.0.9 // indirect github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220927123257-24c107e3a262 // indirect - github.com/nspcc-dev/neofs-contract v0.16.0 // indirect - github.com/nspcc-dev/neofs-crypto v0.4.0 github.com/nspcc-dev/rfc6979 v0.2.0 // indirect - github.com/nspcc-dev/tzhash v1.6.1 // indirect github.com/pelletier/go-toml v1.9.3 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_model v0.2.0 // indirect github.com/prometheus/common v0.37.0 // indirect github.com/prometheus/procfs v0.8.0 // indirect - github.com/russross/blackfriday/v2 v2.0.1 // indirect - github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect + github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/spaolacci/murmur3 v1.1.0 // indirect github.com/spf13/afero v1.6.0 // indirect github.com/spf13/cast v1.3.1 // indirect diff --git a/go.sum b/go.sum index 5529c8c3..d1aaa97e 100644 --- a/go.sum +++ b/go.sum @@ -43,6 +43,20 @@ github.com/CityOfZion/neo-go v0.62.1-pre.0.20191114145240-e740fbe708f8/go.mod h1 github.com/CityOfZion/neo-go v0.70.1-pre.0.20191209120015-fccb0085941e/go.mod h1:0enZl0az8xA6PVkwzEOwPWVJGqlt/GO4hA4kmQ5Xzig= github.com/CityOfZion/neo-go v0.70.1-pre.0.20191212173117-32ac01130d4c/go.mod h1:JtlHfeqLywZLswKIKFnAp+yzezY4Dji9qlfQKB2OD/I= github.com/CityOfZion/neo-go v0.71.1-pre.0.20200129171427-f773ec69fb84/go.mod h1:FLI526IrRWHmcsO+mHsCbj64pJZhwQFTLJZu+A4PGOA= +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 h1:P/gisZxTzJ9R3tuYDaQWe0tY6m1Zea3gzdPpNYK+NP4= +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= @@ -108,8 +122,8 @@ github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmf github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= -github.com/cpuguy83/go-md2man/v2 v2.0.0 h1:EoUDS0afbrsXAZ9YQ9jdu/mZ2sXgT1/2yyNng4PGlyM= -github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w= +github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -346,41 +360,28 @@ github.com/nspcc-dev/dbft v0.0.0-20191209120240-0d6b7568d9ae/go.mod h1:3FjXOoHmA github.com/nspcc-dev/dbft v0.0.0-20200117124306-478e5cfbf03a/go.mod h1:/YFK+XOxxg0Bfm6P92lY5eDSLYfp06XOdL8KAVgXjVk= 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-20220629112714-fd49ca59d354/go.mod h1:U8MSnEShH+o5hexfWJdze6uMFJteP0ko7J2frO7Yu1Y= github.com/nspcc-dev/dbft v0.0.0-20220902113116-58a5e763e647/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 h1:17VcAuTtrstmFppBjfRiia4K2wA/ukXZhLFS8Y8rz5Y= 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.2/go.mod h1:9P0yWqhZX7i/ChJ+zjtiStO1uPTolPFUM+L5oNznU8E= 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/pkg/interop v0.0.0-20220809123759-3094d3e0c14b/go.mod h1:23bBw0v6pBYcrWs8CBEEDIEDJNbcFoIh8pGGcf2Vv8s= github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220927123257-24c107e3a262 h1:UTmSLZw5OpD/JPE1B5Vf98GF0zu2/Hsqq1lGLtStTUE= github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220927123257-24c107e3a262/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-api-go/v2 v2.14.0 h1:jhuN8Ldqz7WApvUJRFY0bjRXE1R3iCkboMX5QVZhHVk= -github.com/nspcc-dev/neofs-api-go/v2 v2.14.0/go.mod h1:DRIr0Ic1s+6QgdqmNFNLIqMqd7lNMJfYwkczlm1hDtM= -github.com/nspcc-dev/neofs-contract v0.16.0 h1:/K5IMwZOlUCooxpe//73RW20HTfHvwRL088gppU5DM8= -github.com/nspcc-dev/neofs-contract v0.16.0/go.mod h1:gN5bo2TlMvLbySImmg76DVj3jVmYgti2VVlQ+h/tcr0= github.com/nspcc-dev/neofs-crypto v0.2.0/go.mod h1:F/96fUzPM3wR+UGsPi3faVNmFlA9KAEAUQR7dMxZmNA= github.com/nspcc-dev/neofs-crypto v0.2.3/go.mod h1:8w16GEJbH6791ktVqHN9YRNH3s9BEEKYxGhlFnp0cDw= github.com/nspcc-dev/neofs-crypto v0.3.0/go.mod h1:8w16GEJbH6791ktVqHN9YRNH3s9BEEKYxGhlFnp0cDw= -github.com/nspcc-dev/neofs-crypto v0.4.0 h1:5LlrUAM5O0k1+sH/sktBtrgfWtq1pgpDs09fZo+KYi4= github.com/nspcc-dev/neofs-crypto v0.4.0/go.mod h1:6XJ8kbXgOfevbI2WMruOtI+qUJXNwSGM/E9eClXxPHs= github.com/nspcc-dev/neofs-sdk-go v0.0.0-20211201182451-a5b61c4f6477/go.mod h1:dfMtQWmBHYpl9Dez23TGtIUKiFvCIxUZq/CkSIhEpz4= github.com/nspcc-dev/neofs-sdk-go v0.0.0-20220113123743-7f3162110659/go.mod h1:/jay1lr3w7NQd/VDBkEhkJmDmyPNsu4W+QV2obsUV40= -github.com/nspcc-dev/neofs-sdk-go v1.0.0-rc.7.0.20221115140820-b4b07a3c4e11 h1:dcofGaVR6najaIdh0JOXoxqV1MLJWnJ3pPMhD5gowV4= -github.com/nspcc-dev/neofs-sdk-go v1.0.0-rc.7.0.20221115140820-b4b07a3c4e11/go.mod h1:7bH8zabbewpXstaXKoV0Tk3lV7KFYadi5edLU5yDERY= github.com/nspcc-dev/rfc6979 v0.1.0/go.mod h1:exhIh1PdpDC5vQmyEsGvc4YDM/lyQp/452QxGq/UEso= github.com/nspcc-dev/rfc6979 v0.2.0 h1:3e1WNxrN60/6N0DW7+UYisLeZJyfqZTNOjeV/toYvOE= github.com/nspcc-dev/rfc6979 v0.2.0/go.mod h1:exhIh1PdpDC5vQmyEsGvc4YDM/lyQp/452QxGq/UEso= -github.com/nspcc-dev/tzhash v1.6.1 h1:8dUrWFpjkmoHF+7GxuGUmarj9LLHWFcuyF3CTrqq9JE= -github.com/nspcc-dev/tzhash v1.6.1/go.mod h1:BoflzCVp+DO/f1mvbcsJQWoFzidIFBhWFZMglbUW648= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= @@ -438,11 +439,11 @@ github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6L github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k= github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= -github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= +github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= -github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= @@ -721,7 +722,6 @@ golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/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-20220111092808-5a964db01320/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= diff --git a/internal/neofs/neofs.go b/internal/neofs/neofs.go index 9d3a39b8..3392a153 100644 --- a/internal/neofs/neofs.go +++ b/internal/neofs/neofs.go @@ -10,20 +10,20 @@ import ( "strconv" "time" - objectv2 "github.com/nspcc-dev/neofs-api-go/v2/object" - "github.com/nspcc-dev/neofs-s3-gw/api/layer" - "github.com/nspcc-dev/neofs-s3-gw/authmate" - "github.com/nspcc-dev/neofs-s3-gw/creds/tokens" - apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status" - "github.com/nspcc-dev/neofs-sdk-go/container" - "github.com/nspcc-dev/neofs-sdk-go/container/acl" - cid "github.com/nspcc-dev/neofs-sdk-go/container/id" - "github.com/nspcc-dev/neofs-sdk-go/eacl" - "github.com/nspcc-dev/neofs-sdk-go/object" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" - "github.com/nspcc-dev/neofs-sdk-go/pool" - "github.com/nspcc-dev/neofs-sdk-go/session" - "github.com/nspcc-dev/neofs-sdk-go/user" + objectv2 "github.com/TrueCloudLab/frostfs-api-go/v2/object" + "github.com/TrueCloudLab/frostfs-s3-gw/api/layer" + "github.com/TrueCloudLab/frostfs-s3-gw/authmate" + "github.com/TrueCloudLab/frostfs-s3-gw/creds/tokens" + apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" + "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/eacl" + "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/session" + "github.com/TrueCloudLab/frostfs-sdk-go/user" ) // NeoFS represents virtual connection to the NeoFS network. diff --git a/internal/neofs/neofs_test.go b/internal/neofs/neofs_test.go index f83b1880..9dcafa6a 100644 --- a/internal/neofs/neofs_test.go +++ b/internal/neofs/neofs_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/nspcc-dev/neofs-s3-gw/api/layer" - apistatus "github.com/nspcc-dev/neofs-sdk-go/client/status" + "github.com/TrueCloudLab/frostfs-s3-gw/api/layer" + apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" "github.com/stretchr/testify/require" ) diff --git a/internal/neofs/tree.go b/internal/neofs/tree.go index d99e55b7..a0fcd19e 100644 --- a/internal/neofs/tree.go +++ b/internal/neofs/tree.go @@ -9,15 +9,15 @@ import ( "strings" "time" + "github.com/TrueCloudLab/frostfs-s3-gw/api" + "github.com/TrueCloudLab/frostfs-s3-gw/api/data" + "github.com/TrueCloudLab/frostfs-s3-gw/api/layer" + "github.com/TrueCloudLab/frostfs-s3-gw/creds/accessbox" + "github.com/TrueCloudLab/frostfs-s3-gw/internal/neofs/services/tree" + "github.com/TrueCloudLab/frostfs-sdk-go/bearer" + oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "github.com/TrueCloudLab/frostfs-sdk-go/user" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" - "github.com/nspcc-dev/neofs-s3-gw/api" - "github.com/nspcc-dev/neofs-s3-gw/api/data" - "github.com/nspcc-dev/neofs-s3-gw/api/layer" - "github.com/nspcc-dev/neofs-s3-gw/creds/accessbox" - "github.com/nspcc-dev/neofs-s3-gw/internal/neofs/services/tree" - "github.com/nspcc-dev/neofs-sdk-go/bearer" - oid "github.com/nspcc-dev/neofs-sdk-go/object/id" - "github.com/nspcc-dev/neofs-sdk-go/user" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) diff --git a/internal/neofs/tree_signature.go b/internal/neofs/tree_signature.go index 5351f546..b65d35ae 100644 --- a/internal/neofs/tree_signature.go +++ b/internal/neofs/tree_signature.go @@ -2,7 +2,7 @@ package neofs import ( - crypto "github.com/nspcc-dev/neofs-crypto" + crypto "github.com/TrueCloudLab/frostfs-crypto" "google.golang.org/protobuf/proto" ) diff --git a/internal/neofs/tree_test.go b/internal/neofs/tree_test.go index e4199998..d37bcfc9 100644 --- a/internal/neofs/tree_test.go +++ b/internal/neofs/tree_test.go @@ -4,8 +4,8 @@ import ( "errors" "testing" - "github.com/nspcc-dev/neofs-s3-gw/api/data" - "github.com/nspcc-dev/neofs-s3-gw/api/layer" + "github.com/TrueCloudLab/frostfs-s3-gw/api/data" + "github.com/TrueCloudLab/frostfs-s3-gw/api/layer" "github.com/stretchr/testify/require" )