From 813aa2f1734cb642a75fc5d2043e7ef7b4cb1d27 Mon Sep 17 00:00:00 2001 From: Alex Vanin Date: Tue, 7 Mar 2023 17:38:08 +0300 Subject: [PATCH] Rename package name Due to source code relocation from GitHub. Signed-off-by: Alex Vanin --- .docker/Dockerfile | 2 +- README.md | 6 ++---- 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/cors_test.go | 2 +- 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 | 18 ++++++++--------- api/layer/cors.go | 4 ++-- api/layer/frostfs.go | 20 +++++++++---------- api/layer/layer.go | 24 +++++++++++----------- api/layer/locking_test.go | 2 +- api/layer/multipart_upload.go | 12 +++++------ api/layer/neofs_mock.go | 24 +++++++++++----------- api/layer/notifications.go | 4 ++-- api/layer/object.go | 16 +++++++-------- api/layer/system_object.go | 8 ++++---- api/layer/tagging.go | 12 +++++------ 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.go | 4 ++-- 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 | 26 ++++++++++++------------ cmd/s3-gw/app_settings.go | 6 +++--- creds/accessbox/accessbox.go | 6 +++--- creds/accessbox/accessbox.pb.go | 13 ++++++------ creds/accessbox/accessbox.proto | 2 +- creds/accessbox/bearer_token_test.go | 8 ++++---- creds/tokens/credentials.go | 10 +++++----- debian/control | 4 ++-- debian/copyright | 4 ++-- docs/authmate.md | 2 +- go.mod | 20 +++++++++++-------- go.sum | 30 +++++++++++++++------------- internal/frostfs/frostfs.go | 28 +++++++++++++------------- internal/frostfs/frostfs_test.go | 4 ++-- internal/frostfs/tree.go | 16 +++++++-------- internal/frostfs/tree_signature.go | 2 +- internal/frostfs/tree_test.go | 4 ++-- metrics/app.go | 4 ++-- metrics/billing.go | 2 +- metrics/gate.go | 2 +- metrics/pool.go | 2 +- 101 files changed, 402 insertions(+), 397 deletions(-) diff --git a/.docker/Dockerfile b/.docker/Dockerfile index 8342aba..1fcde85 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -1,7 +1,7 @@ FROM golang:1.19 as builder ARG BUILD=now -ARG REPO=github.com/TrueCloudLab/frostfs-s3-gw +ARG REPO=git.frostfs.info/TrueCloudLab/frostfs-s3-gw ARG VERSION=dev WORKDIR /src diff --git a/README.md b/README.md index 5a40559..c76226c 100644 --- a/README.md +++ b/README.md @@ -6,9 +6,7 @@

--- -[![Report](https://goreportcard.com/badge/github.com/TrueCloudLab/frostfs-s3-gw)](https://goreportcard.com/report/github.com/TrueCloudLab/frostfs-s3-gw) -![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/TrueCloudLab/frostfs-s3-gw?sort=semver) -![License](https://img.shields.io/github/license/TrueCloudLab/frostfs-s3-gw.svg?style=popout) +[![Report](https://goreportcard.com/badge/git.frostfs.info/TrueCloudLab/frostfs-s3-gw)](https://goreportcard.com/report/git.frostfs.info/TrueCloudLab/frostfs-s3-gw) # FrostFS S3 Gateway @@ -16,7 +14,7 @@ FrostFS S3 gateway provides API compatible with Amazon S3 cloud storage service. ## Installation -```go get -u github.com/TrueCloudLab/frostfs-s3-gw``` +```go get -u git.frostfs.info/TrueCloudLab/frostfs-s3-gw``` Or you can call `make` to build it from the cloned repository (the binary will end up in `bin/frostfs-s3-gw` with authmate helper in `bin/frostfs-s3-authmate`). diff --git a/api/auth/center.go b/api/auth/center.go index 27f4224..fb610da 100644 --- a/api/auth/center.go +++ b/api/auth/center.go @@ -14,12 +14,12 @@ 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" + v4 "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/auth/signer/v4" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/cache" + apiErrors "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/errors" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/creds/accessbox" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/creds/tokens" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/aws/aws-sdk-go/aws/credentials" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" ) diff --git a/api/auth/center_test.go b/api/auth/center_test.go index cfe721e..6de1a07 100644 --- a/api/auth/center_test.go +++ b/api/auth/center_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/TrueCloudLab/frostfs-s3-gw/api/errors" + "git.frostfs.info/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 725b4d0..28708b9 100644 --- a/api/cache/access_control.go +++ b/api/cache/access_control.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/TrueCloudLab/frostfs-sdk-go/user" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" "github.com/bluele/gcache" "go.uber.org/zap" ) diff --git a/api/cache/accessbox.go b/api/cache/accessbox.go index 22770d3..b70cd32 100644 --- a/api/cache/accessbox.go +++ b/api/cache/accessbox.go @@ -4,8 +4,8 @@ import ( "fmt" "time" - "github.com/TrueCloudLab/frostfs-s3-gw/creds/accessbox" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/creds/accessbox" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/bluele/gcache" "go.uber.org/zap" ) diff --git a/api/cache/buckets.go b/api/cache/buckets.go index 8b02005..9e121f0 100644 --- a/api/cache/buckets.go +++ b/api/cache/buckets.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/TrueCloudLab/frostfs-s3-gw/api/data" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/data" "github.com/bluele/gcache" "go.uber.org/zap" ) diff --git a/api/cache/cache_test.go b/api/cache/cache_test.go index ff6a1b7..974590e 100644 --- a/api/cache/cache_test.go +++ b/api/cache/cache_test.go @@ -3,10 +3,10 @@ package cache import ( "testing" - "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" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/data" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/creds/accessbox" + cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" + oidtest "git.frostfs.info/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 ba45946..20ebe46 100644 --- a/api/cache/names.go +++ b/api/cache/names.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/bluele/gcache" "go.uber.org/zap" ) diff --git a/api/cache/objects.go b/api/cache/objects.go index 38baa1d..dac327b 100644 --- a/api/cache/objects.go +++ b/api/cache/objects.go @@ -4,8 +4,8 @@ import ( "fmt" "time" - "github.com/TrueCloudLab/frostfs-s3-gw/api/data" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/data" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" "github.com/bluele/gcache" "go.uber.org/zap" ) diff --git a/api/cache/objects_test.go b/api/cache/objects_test.go index afe1479..7c4a004 100644 --- a/api/cache/objects_test.go +++ b/api/cache/objects_test.go @@ -4,9 +4,9 @@ import ( "testing" "time" - "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" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/data" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + objecttest "git.frostfs.info/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 0fd3dc4..37ca0ea 100644 --- a/api/cache/objectslist.go +++ b/api/cache/objectslist.go @@ -6,8 +6,8 @@ import ( "strings" "time" - "github.com/TrueCloudLab/frostfs-s3-gw/api/data" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/data" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" "github.com/bluele/gcache" "go.uber.org/zap" ) diff --git a/api/cache/objectslist_test.go b/api/cache/objectslist_test.go index 6d9b691..d4e426c 100644 --- a/api/cache/objectslist_test.go +++ b/api/cache/objectslist_test.go @@ -4,9 +4,9 @@ import ( "testing" "time" - "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" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/data" + cidtest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id/test" + oidtest "git.frostfs.info/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 094fb18..38a27fe 100644 --- a/api/cache/system.go +++ b/api/cache/system.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/TrueCloudLab/frostfs-s3-gw/api/data" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/data" "github.com/bluele/gcache" "go.uber.org/zap" ) diff --git a/api/data/info.go b/api/data/info.go index d0580a8..f3e69f5 100644 --- a/api/data/info.go +++ b/api/data/info.go @@ -4,9 +4,9 @@ import ( "encoding/xml" "time" - 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" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" ) const ( diff --git a/api/data/tree.go b/api/data/tree.go index 35e442f..dbcb245 100644 --- a/api/data/tree.go +++ b/api/data/tree.go @@ -4,9 +4,9 @@ import ( "strconv" "time" - 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" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" ) const ( diff --git a/api/handler/acl.go b/api/handler/acl.go index 0554568..60c49e2 100644 --- a/api/handler/acl.go +++ b/api/handler/acl.go @@ -14,15 +14,15 @@ 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" + v2acl "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/acl" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/data" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/errors" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/layer" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/eacl" + "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/session" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "go.uber.org/zap" ) diff --git a/api/handler/acl_test.go b/api/handler/acl_test.go index a47b169..d2cd2e7 100644 --- a/api/handler/acl_test.go +++ b/api/handler/acl_test.go @@ -13,14 +13,14 @@ 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" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/data" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/creds/accessbox" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/bearer" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/eacl" + "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/session" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/stretchr/testify/require" ) diff --git a/api/handler/api.go b/api/handler/api.go index 0b64b65..3981aa7 100644 --- a/api/handler/api.go +++ b/api/handler/api.go @@ -4,9 +4,9 @@ import ( "errors" "time" - "github.com/TrueCloudLab/frostfs-s3-gw/api" - "github.com/TrueCloudLab/frostfs-s3-gw/api/layer" - "github.com/TrueCloudLab/frostfs-sdk-go/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/layer" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" "go.uber.org/zap" ) diff --git a/api/handler/attributes.go b/api/handler/attributes.go index 4d1b440..758b43d 100644 --- a/api/handler/attributes.go +++ b/api/handler/attributes.go @@ -6,10 +6,10 @@ import ( "strconv" "strings" - "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" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/data" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/errors" + "git.frostfs.info/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 7fc4241..23ca8ac 100644 --- a/api/handler/attributes_test.go +++ b/api/handler/attributes_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "github.com/TrueCloudLab/frostfs-s3-gw/api" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api" "github.com/stretchr/testify/require" ) diff --git a/api/handler/copy.go b/api/handler/copy.go index 02d4857..1238843 100644 --- a/api/handler/copy.go +++ b/api/handler/copy.go @@ -6,12 +6,12 @@ import ( "regexp" "time" - "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" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/auth" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/data" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/errors" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/layer" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/session" "go.uber.org/zap" ) diff --git a/api/handler/copy_test.go b/api/handler/copy_test.go index 1e4a694..5db629d 100644 --- a/api/handler/copy_test.go +++ b/api/handler/copy_test.go @@ -6,7 +6,7 @@ import ( "net/url" "testing" - "github.com/TrueCloudLab/frostfs-s3-gw/api" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api" "github.com/stretchr/testify/require" ) diff --git a/api/handler/cors.go b/api/handler/cors.go index 556ce8e..841a2e3 100644 --- a/api/handler/cors.go +++ b/api/handler/cors.go @@ -5,9 +5,9 @@ import ( "strconv" "strings" - "github.com/TrueCloudLab/frostfs-s3-gw/api" - "github.com/TrueCloudLab/frostfs-s3-gw/api/errors" - "github.com/TrueCloudLab/frostfs-s3-gw/api/layer" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/errors" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/layer" "go.uber.org/zap" ) diff --git a/api/handler/cors_test.go b/api/handler/cors_test.go index bbd0edf..437793d 100644 --- a/api/handler/cors_test.go +++ b/api/handler/cors_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/TrueCloudLab/frostfs-s3-gw/api" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api" ) func TestCORSOriginWildcard(t *testing.T) { diff --git a/api/handler/delete.go b/api/handler/delete.go index 49f3485..aee8168 100644 --- a/api/handler/delete.go +++ b/api/handler/delete.go @@ -6,13 +6,13 @@ import ( "strconv" "strings" - "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" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/data" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/errors" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/layer" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/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 80ed803..7ee1318 100644 --- a/api/handler/delete_test.go +++ b/api/handler/delete_test.go @@ -6,8 +6,8 @@ import ( "net/url" "testing" - "github.com/TrueCloudLab/frostfs-s3-gw/api" - "github.com/TrueCloudLab/frostfs-s3-gw/api/data" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api" + "git.frostfs.info/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 b8d9bba..3394b32 100644 --- a/api/handler/encryption_test.go +++ b/api/handler/encryption_test.go @@ -12,8 +12,8 @@ import ( "strings" "testing" - "github.com/TrueCloudLab/frostfs-s3-gw/api" - "github.com/TrueCloudLab/frostfs-s3-gw/api/layer" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/layer" "github.com/stretchr/testify/require" ) diff --git a/api/handler/get.go b/api/handler/get.go index 735ba13..58e3a93 100644 --- a/api/handler/get.go +++ b/api/handler/get.go @@ -8,10 +8,10 @@ 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" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/data" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/errors" + "git.frostfs.info/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 99a986f..244a9f5 100644 --- a/api/handler/get_test.go +++ b/api/handler/get_test.go @@ -8,9 +8,9 @@ import ( "testing" "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" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/data" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/errors" + "git.frostfs.info/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 4d2ed3e..ff64b24 100644 --- a/api/handler/handlers_test.go +++ b/api/handler/handlers_test.go @@ -13,15 +13,15 @@ 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" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/data" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/layer" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/resolver" + 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/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/stretchr/testify/require" "go.uber.org/zap" diff --git a/api/handler/head.go b/api/handler/head.go index 58d2d85..8c7ef69 100644 --- a/api/handler/head.go +++ b/api/handler/head.go @@ -4,10 +4,10 @@ import ( "bytes" "net/http" - "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" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/data" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/errors" + "git.frostfs.info/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 40078f8..2c1ea1e 100644 --- a/api/handler/head_test.go +++ b/api/handler/head_test.go @@ -6,10 +6,10 @@ 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" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/creds/accessbox" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/bearer" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/eacl" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/stretchr/testify/require" ) diff --git a/api/handler/info.go b/api/handler/info.go index d5550b5..591e747 100644 --- a/api/handler/info.go +++ b/api/handler/info.go @@ -3,7 +3,7 @@ package handler import ( "net/http" - "github.com/TrueCloudLab/frostfs-s3-gw/api" + "git.frostfs.info/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 1fa3379..d85b6ad 100644 --- a/api/handler/list.go +++ b/api/handler/list.go @@ -4,8 +4,8 @@ import ( "net/http" "time" - "github.com/TrueCloudLab/frostfs-s3-gw/api" - "github.com/TrueCloudLab/frostfs-sdk-go/user" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api" + "git.frostfs.info/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 1130e4f..e659712 100644 --- a/api/handler/locking.go +++ b/api/handler/locking.go @@ -8,10 +8,10 @@ import ( "strconv" "time" - "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" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/data" + apiErrors "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/errors" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/layer" ) const ( diff --git a/api/handler/locking_test.go b/api/handler/locking_test.go index 1c0f28f..422d40f 100644 --- a/api/handler/locking_test.go +++ b/api/handler/locking_test.go @@ -10,9 +10,9 @@ import ( "testing" "time" - "github.com/TrueCloudLab/frostfs-s3-gw/api" - "github.com/TrueCloudLab/frostfs-s3-gw/api/data" - apiErrors "github.com/TrueCloudLab/frostfs-s3-gw/api/errors" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/data" + apiErrors "git.frostfs.info/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 5e5706c..6b2fd55 100644 --- a/api/handler/multipart_upload.go +++ b/api/handler/multipart_upload.go @@ -7,11 +7,11 @@ 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" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/data" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/errors" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/layer" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/session" "github.com/google/uuid" "go.uber.org/zap" ) diff --git a/api/handler/not_support.go b/api/handler/not_support.go index 2d4d3e2..5ee06ab 100644 --- a/api/handler/not_support.go +++ b/api/handler/not_support.go @@ -3,8 +3,8 @@ package handler import ( "net/http" - "github.com/TrueCloudLab/frostfs-s3-gw/api" - "github.com/TrueCloudLab/frostfs-s3-gw/api/errors" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api" + "git.frostfs.info/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 a48f475..1cdf0e9 100644 --- a/api/handler/notifications.go +++ b/api/handler/notifications.go @@ -8,11 +8,11 @@ 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" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/data" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/errors" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/layer" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/bearer" "github.com/google/uuid" ) diff --git a/api/handler/notifications_test.go b/api/handler/notifications_test.go index 22de9c6..82aa5bf 100644 --- a/api/handler/notifications_test.go +++ b/api/handler/notifications_test.go @@ -3,8 +3,8 @@ package handler import ( "testing" - "github.com/TrueCloudLab/frostfs-s3-gw/api/data" - "github.com/TrueCloudLab/frostfs-s3-gw/api/errors" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/data" + "git.frostfs.info/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 8fe35e5..d2c1b2f 100644 --- a/api/handler/object_list.go +++ b/api/handler/object_list.go @@ -6,11 +6,11 @@ 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" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/data" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/errors" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/layer" + oid "git.frostfs.info/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 0a1bdee..d4a9634 100644 --- a/api/handler/object_list_test.go +++ b/api/handler/object_list_test.go @@ -6,7 +6,7 @@ import ( "strconv" "testing" - "github.com/TrueCloudLab/frostfs-s3-gw/api/data" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/data" "github.com/stretchr/testify/require" ) diff --git a/api/handler/put.go b/api/handler/put.go index c7ae3d9..3acd183 100644 --- a/api/handler/put.go +++ b/api/handler/put.go @@ -16,15 +16,15 @@ import ( "strings" "time" - "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" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/auth" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/data" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/errors" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/layer" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/layer/encryption" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/creds/accessbox" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/eacl" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/session" "go.uber.org/zap" ) diff --git a/api/handler/put_test.go b/api/handler/put_test.go index 8fc7c66..aac8c3b 100644 --- a/api/handler/put_test.go +++ b/api/handler/put_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "github.com/TrueCloudLab/frostfs-s3-gw/api" - "github.com/TrueCloudLab/frostfs-s3-gw/api/layer" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/layer" "github.com/stretchr/testify/require" ) diff --git a/api/handler/tagging.go b/api/handler/tagging.go index 6298ef1..6ae568f 100644 --- a/api/handler/tagging.go +++ b/api/handler/tagging.go @@ -8,10 +8,10 @@ import ( "strings" "unicode" - "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" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/data" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/errors" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/layer" "go.uber.org/zap" ) diff --git a/api/handler/unimplemented.go b/api/handler/unimplemented.go index 05f2970..1f7e1ca 100644 --- a/api/handler/unimplemented.go +++ b/api/handler/unimplemented.go @@ -3,8 +3,8 @@ package handler import ( "net/http" - "github.com/TrueCloudLab/frostfs-s3-gw/api" - "github.com/TrueCloudLab/frostfs-s3-gw/api/errors" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api" + "git.frostfs.info/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 61af738..c040cfc 100644 --- a/api/handler/util.go +++ b/api/handler/util.go @@ -7,11 +7,11 @@ import ( "strconv" "strings" - "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" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/data" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/errors" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/layer" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/session" "go.uber.org/zap" ) diff --git a/api/handler/versioning.go b/api/handler/versioning.go index b262a25..20a87b3 100644 --- a/api/handler/versioning.go +++ b/api/handler/versioning.go @@ -4,10 +4,10 @@ import ( "encoding/xml" "net/http" - "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" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/data" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/errors" + "git.frostfs.info/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 a68ed5d..961c009 100644 --- a/api/layer/cache.go +++ b/api/layer/cache.go @@ -1,11 +1,11 @@ package layer import ( - "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" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/cache" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/data" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" "go.uber.org/zap" ) diff --git a/api/layer/compound.go b/api/layer/compound.go index 1c77e1f..4ac4a6f 100644 --- a/api/layer/compound.go +++ b/api/layer/compound.go @@ -4,8 +4,8 @@ import ( "context" errorsStd "errors" - "github.com/TrueCloudLab/frostfs-s3-gw/api/data" - "github.com/TrueCloudLab/frostfs-s3-gw/api/errors" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/data" + "git.frostfs.info/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 7dc3e1f..474597f 100644 --- a/api/layer/container.go +++ b/api/layer/container.go @@ -5,15 +5,15 @@ import ( "fmt" "strconv" - v2container "github.com/TrueCloudLab/frostfs-api-go/v2/container" - "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" + v2container "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/container" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/data" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/errors" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container" + 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/session" "go.uber.org/zap" ) diff --git a/api/layer/cors.go b/api/layer/cors.go index bef3393..8a76833 100644 --- a/api/layer/cors.go +++ b/api/layer/cors.go @@ -8,8 +8,8 @@ import ( "fmt" "io" - "github.com/TrueCloudLab/frostfs-s3-gw/api/data" - "github.com/TrueCloudLab/frostfs-s3-gw/api/errors" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/data" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/errors" "go.uber.org/zap" ) diff --git a/api/layer/frostfs.go b/api/layer/frostfs.go index b8c8aab..d24bc2c 100644 --- a/api/layer/frostfs.go +++ b/api/layer/frostfs.go @@ -7,16 +7,16 @@ import ( "io" "time" - "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" + "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" + "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/session" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" ) // PrmContainerCreate groups parameters of FrostFS.CreateContainer operation. diff --git a/api/layer/layer.go b/api/layer/layer.go index 4d7aee6..0ea7aaf 100644 --- a/api/layer/layer.go +++ b/api/layer/layer.go @@ -11,18 +11,18 @@ 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" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/data" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/errors" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/layer/encryption" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/creds/accessbox" + "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/eacl" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/session" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" "github.com/nats-io/nats.go" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "go.uber.org/zap" diff --git a/api/layer/locking_test.go b/api/layer/locking_test.go index bf1cb45..6cbcd55 100644 --- a/api/layer/locking_test.go +++ b/api/layer/locking_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/TrueCloudLab/frostfs-s3-gw/api/data" + "git.frostfs.info/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 aaef977..7fec347 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" - "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" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/data" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/errors" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/layer/encryption" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" "github.com/minio/sio" "go.uber.org/zap" ) diff --git a/api/layer/neofs_mock.go b/api/layer/neofs_mock.go index 112caf8..dc27104 100644 --- a/api/layer/neofs_mock.go +++ b/api/layer/neofs_mock.go @@ -10,18 +10,18 @@ import ( "io" "time" - 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" + objectv2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/creds/accessbox" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/bearer" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/checksum" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container" + 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" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/session" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" ) type TestFrostFS struct { diff --git a/api/layer/notifications.go b/api/layer/notifications.go index b695b0a..b47cdb6 100644 --- a/api/layer/notifications.go +++ b/api/layer/notifications.go @@ -7,8 +7,8 @@ import ( errorsStd "errors" "fmt" - "github.com/TrueCloudLab/frostfs-s3-gw/api" - "github.com/TrueCloudLab/frostfs-s3-gw/api/data" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/data" "go.uber.org/zap" ) diff --git a/api/layer/object.go b/api/layer/object.go index 5e5e705..e2c6f35 100644 --- a/api/layer/object.go +++ b/api/layer/object.go @@ -14,14 +14,14 @@ 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" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/cache" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/data" + apiErrors "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/errors" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client" + 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" "github.com/minio/sio" "github.com/panjf2000/ants/v2" "go.uber.org/zap" diff --git a/api/layer/system_object.go b/api/layer/system_object.go index 154ed82..f8bdec7 100644 --- a/api/layer/system_object.go +++ b/api/layer/system_object.go @@ -9,9 +9,9 @@ import ( "strconv" "time" - "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" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/data" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/errors" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" ) const ( @@ -238,7 +238,7 @@ func (n *layer) attributesFromLock(ctx context.Context, lock *data.ObjectLock) ( } if lock.LegalHold != nil && lock.LegalHold.Enabled { - // todo: (@KirillovDenis) reconsider this when FrostFS will support Legal Hold https://github.com/TrueCloudLab/frostfs-contract/issues/2 + // todo: (@KirillovDenis) reconsider this when FrostFS will support Legal Hold https://git.frostfs.info/TrueCloudLab/frostfs-contract/issues/2 // Currently lock object must have an expiration epoch. // Besides we need to override retention expiration epoch since legal hold cannot be deleted yet. expEpoch = math.MaxUint64 diff --git a/api/layer/tagging.go b/api/layer/tagging.go index 7007fd8..4eee309 100644 --- a/api/layer/tagging.go +++ b/api/layer/tagging.go @@ -4,12 +4,12 @@ import ( "context" errorsStd "errors" - "github.com/TrueCloudLab/frostfs-s3-gw/api" - "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" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/data" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/errors" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" "go.uber.org/zap" ) diff --git a/api/layer/tree_mock.go b/api/layer/tree_mock.go index 790735f..aa42833 100644 --- a/api/layer/tree_mock.go +++ b/api/layer/tree_mock.go @@ -6,8 +6,8 @@ import ( "sort" "strings" - "github.com/TrueCloudLab/frostfs-s3-gw/api/data" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/data" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" ) type TreeServiceMock struct { diff --git a/api/layer/tree_service.go b/api/layer/tree_service.go index 622d3d5..040969f 100644 --- a/api/layer/tree_service.go +++ b/api/layer/tree_service.go @@ -4,8 +4,8 @@ import ( "context" "errors" - "github.com/TrueCloudLab/frostfs-s3-gw/api/data" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/data" + oid "git.frostfs.info/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 f6aa12e..4b37c3a 100644 --- a/api/layer/util.go +++ b/api/layer/util.go @@ -9,11 +9,11 @@ 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/encryption" - "github.com/TrueCloudLab/frostfs-s3-gw/creds/accessbox" - "github.com/TrueCloudLab/frostfs-sdk-go/object" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/data" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/layer/encryption" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/creds/accessbox" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" ) type ( diff --git a/api/layer/util_test.go b/api/layer/util_test.go index 4e8b6c1..574f83e 100644 --- a/api/layer/util_test.go +++ b/api/layer/util_test.go @@ -6,11 +6,11 @@ import ( "testing" "time" - "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" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/data" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/checksum" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" "github.com/stretchr/testify/require" ) diff --git a/api/layer/versioning.go b/api/layer/versioning.go index 1347802..9a4d0da 100644 --- a/api/layer/versioning.go +++ b/api/layer/versioning.go @@ -4,7 +4,7 @@ import ( "context" "sort" - "github.com/TrueCloudLab/frostfs-s3-gw/api/data" + "git.frostfs.info/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 89e8225..e1132f5 100644 --- a/api/layer/versioning_test.go +++ b/api/layer/versioning_test.go @@ -5,13 +5,13 @@ 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" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/data" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/creds/accessbox" + bearertest "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/bearer/test" + "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/user" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/stretchr/testify/require" "go.uber.org/zap" diff --git a/api/max_clients.go b/api/max_clients.go index cd34b53..4827839 100644 --- a/api/max_clients.go +++ b/api/max_clients.go @@ -4,7 +4,7 @@ import ( "net/http" "time" - "github.com/TrueCloudLab/frostfs-s3-gw/api/errors" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/errors" ) type ( diff --git a/api/metrics.go b/api/metrics.go index 24cf124..eaa0c15 100644 --- a/api/metrics.go +++ b/api/metrics.go @@ -9,8 +9,8 @@ import ( "sync/atomic" "time" - "github.com/TrueCloudLab/frostfs-s3-gw/creds/accessbox" - "github.com/TrueCloudLab/frostfs-sdk-go/bearer" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/creds/accessbox" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/bearer" "github.com/prometheus/client_golang/prometheus" ) diff --git a/api/metrics_collector.go b/api/metrics_collector.go index 2b9d31a..96d582c 100644 --- a/api/metrics_collector.go +++ b/api/metrics_collector.go @@ -1,7 +1,7 @@ package api import ( - "github.com/TrueCloudLab/frostfs-s3-gw/internal/version" + "git.frostfs.info/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 2a378ad..68b913c 100644 --- a/api/notifications/controller.go +++ b/api/notifications/controller.go @@ -7,8 +7,8 @@ import ( "sync" "time" - "github.com/TrueCloudLab/frostfs-s3-gw/api/handler" - "github.com/TrueCloudLab/frostfs-s3-gw/api/layer" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/handler" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/layer" "github.com/nats-io/nats.go" "go.uber.org/zap" ) diff --git a/api/resolver/resolver.go b/api/resolver/resolver.go index 07a8f18..9a51d50 100644 --- a/api/resolver/resolver.go +++ b/api/resolver/resolver.go @@ -6,9 +6,9 @@ import ( "fmt" "sync" - "github.com/TrueCloudLab/frostfs-sdk-go/container" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - "github.com/TrueCloudLab/frostfs-sdk-go/ns" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/ns" ) const ( diff --git a/api/response.go b/api/response.go index 02f4a15..44acd95 100644 --- a/api/response.go +++ b/api/response.go @@ -7,8 +7,8 @@ import ( "net/http" "strconv" - "github.com/TrueCloudLab/frostfs-s3-gw/api/errors" - "github.com/TrueCloudLab/frostfs-s3-gw/internal/version" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/errors" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/internal/version" "github.com/google/uuid" ) diff --git a/api/router.go b/api/router.go index bf493fc..a7fd2a4 100644 --- a/api/router.go +++ b/api/router.go @@ -5,8 +5,8 @@ import ( "net/http" "sync" - "github.com/TrueCloudLab/frostfs-s3-gw/api/auth" - "github.com/TrueCloudLab/frostfs-s3-gw/api/data" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/auth" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/data" "github.com/google/uuid" "github.com/gorilla/mux" "go.uber.org/zap" diff --git a/api/user_auth.go b/api/user_auth.go index 938b469..3d97636 100644 --- a/api/user_auth.go +++ b/api/user_auth.go @@ -4,8 +4,8 @@ import ( "context" "net/http" - "github.com/TrueCloudLab/frostfs-s3-gw/api/auth" - "github.com/TrueCloudLab/frostfs-s3-gw/api/errors" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/auth" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/errors" "github.com/gorilla/mux" "go.uber.org/zap" ) diff --git a/authmate/authmate.go b/authmate/authmate.go index 943c782..2d20cb1 100644 --- a/authmate/authmate.go +++ b/authmate/authmate.go @@ -11,17 +11,17 @@ 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" - frostfsecdsa "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" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/cache" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/creds/accessbox" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/creds/tokens" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/bearer" + 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" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/session" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" "github.com/google/uuid" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "go.uber.org/zap" diff --git a/authmate/session_tokens.go b/authmate/session_tokens.go index 0844166..d0066b8 100644 --- a/authmate/session_tokens.go +++ b/authmate/session_tokens.go @@ -4,9 +4,9 @@ import ( "encoding/json" "fmt" - 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" + apisession "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/session" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/session" ) type ( diff --git a/authmate/session_tokens_test.go b/authmate/session_tokens_test.go index c4ddc70..7adcc01 100644 --- a/authmate/session_tokens_test.go +++ b/authmate/session_tokens_test.go @@ -3,7 +3,7 @@ package authmate import ( "testing" - "github.com/TrueCloudLab/frostfs-sdk-go/session" + "git.frostfs.info/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 da45e2b..bfdf881 100644 --- a/cmd/s3-authmate/main.go +++ b/cmd/s3-authmate/main.go @@ -13,13 +13,13 @@ import ( "syscall" "time" - "github.com/TrueCloudLab/frostfs-s3-gw/api" - "github.com/TrueCloudLab/frostfs-s3-gw/authmate" - "github.com/TrueCloudLab/frostfs-s3-gw/internal/frostfs" - "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" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/authmate" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/internal/frostfs" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/internal/version" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/internal/wallet" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/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" diff --git a/cmd/s3-gw/app.go b/cmd/s3-gw/app.go index 5a0b950..85a2796 100644 --- a/cmd/s3-gw/app.go +++ b/cmd/s3-gw/app.go @@ -13,19 +13,19 @@ 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/frostfs" - "github.com/TrueCloudLab/frostfs-s3-gw/internal/version" - "github.com/TrueCloudLab/frostfs-s3-gw/internal/wallet" - "github.com/TrueCloudLab/frostfs-s3-gw/metrics" - "github.com/TrueCloudLab/frostfs-sdk-go/netmap" - "github.com/TrueCloudLab/frostfs-sdk-go/pool" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/auth" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/cache" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/handler" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/layer" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/notifications" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/resolver" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/internal/frostfs" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/internal/version" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/internal/wallet" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/metrics" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/pool" "github.com/gorilla/mux" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/spf13/viper" diff --git a/cmd/s3-gw/app_settings.go b/cmd/s3-gw/app_settings.go index cd8a3af..a8fd912 100644 --- a/cmd/s3-gw/app_settings.go +++ b/cmd/s3-gw/app_settings.go @@ -10,9 +10,9 @@ import ( "strings" "time" - "github.com/TrueCloudLab/frostfs-s3-gw/api/resolver" - "github.com/TrueCloudLab/frostfs-s3-gw/internal/version" - "github.com/TrueCloudLab/frostfs-sdk-go/pool" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/resolver" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/internal/version" + "git.frostfs.info/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 2c7eda8..19bf69f 100644 --- a/creds/accessbox/accessbox.go +++ b/creds/accessbox/accessbox.go @@ -10,9 +10,9 @@ import ( "fmt" "io" - "github.com/TrueCloudLab/frostfs-sdk-go/bearer" - "github.com/TrueCloudLab/frostfs-sdk-go/netmap" - "github.com/TrueCloudLab/frostfs-sdk-go/session" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/bearer" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/session" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "golang.org/x/crypto/chacha20poly1305" "golang.org/x/crypto/hkdf" diff --git a/creds/accessbox/accessbox.pb.go b/creds/accessbox/accessbox.pb.go index 47e6c6a..2ad4c51 100644 --- a/creds/accessbox/accessbox.pb.go +++ b/creds/accessbox/accessbox.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.1 -// protoc v3.15.8 +// protoc v3.21.12 // source: creds/accessbox/accessbox.proto package accessbox @@ -290,11 +290,12 @@ 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, 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, + 0x6b, 0x65, 0x6e, 0x73, 0x42, 0x46, 0x5a, 0x44, 0x67, 0x69, 0x74, 0x2e, 0x66, 0x72, 0x6f, 0x73, + 0x74, 0x66, 0x73, 0x2e, 0x69, 0x6e, 0x66, 0x6f, 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 6bc27ef..3d0a13c 100644 --- a/creds/accessbox/accessbox.proto +++ b/creds/accessbox/accessbox.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package accessbox; -option go_package = "github.com/TrueCloudLab/frostfs-s3-gw/creds/tokenbox;accessbox"; +option go_package = "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/creds/tokenbox;accessbox"; diff --git a/creds/accessbox/bearer_token_test.go b/creds/accessbox/bearer_token_test.go index 758af77..bf95fd5 100644 --- a/creds/accessbox/bearer_token_test.go +++ b/creds/accessbox/bearer_token_test.go @@ -3,10 +3,10 @@ package accessbox import ( "testing" - "github.com/TrueCloudLab/frostfs-sdk-go/bearer" - frostfsecdsa "github.com/TrueCloudLab/frostfs-sdk-go/crypto/ecdsa" - "github.com/TrueCloudLab/frostfs-sdk-go/eacl" - "github.com/TrueCloudLab/frostfs-sdk-go/session" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/bearer" + 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/session" "github.com/google/uuid" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/stretchr/testify/require" diff --git a/creds/tokens/credentials.go b/creds/tokens/credentials.go index 6bfaf9b..a9e0bef 100644 --- a/creds/tokens/credentials.go +++ b/creds/tokens/credentials.go @@ -7,11 +7,11 @@ 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" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/cache" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/creds/accessbox" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" ) diff --git a/debian/control b/debian/control index 0c5bab7..9d2dc4e 100644 --- a/debian/control +++ b/debian/control @@ -5,8 +5,8 @@ Maintainer: TrueCloudLab Build-Depends: debhelper-compat (= 13), git, devscripts Standards-Version: 4.5.1 Homepage: http://frostfs.info/ -Vcs-Git: https://github.com/TrueCloudLab/frostfs-s3-gw.git -Vcs-Browser: https://github.com/TrueCloudLab/frostfs-s3-gw +Vcs-Git: https://git.frostfs.info/TrueCloudLab/frostfs-s3-gw.git +Vcs-Browser: https://git.frostfs.info/TrueCloudLab/frostfs-s3-gw Package: frostfs-s3-gw Architecture: any diff --git a/debian/copyright b/debian/copyright index 13871fe..9f0180b 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,13 +1,13 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: frostfs-s3-gw Upstream-Contact: tech@frostfs.info -Source: https://github.com/TrueCloudLab/frostfs-s3-gw +Source: https://git.frostfs.info/TrueCloudLab/frostfs-s3-gw Files: * Copyright: 2018-2022 NeoSPCC (@nspcc-dev), contributors of neofs-s3-gw project (https://github.com/nspcc-dev/neofs-s3-gw/blob/master/CREDITS.md) 2022 True Cloud Lab (@TrueCloudLab), contributors of frostfs-s3-gw project - (https://github.com/TrueCloudLab/frostfs-s3-gw/blob/master/CREDITS.md) + (https://git.frostfs.info/TrueCloudLab/frostfs-s3-gw/src/branch/master/CREDITS.md) License: AGPL-3.0-only diff --git a/docs/authmate.md b/docs/authmate.md index 730c7ba..e753b41 100644 --- a/docs/authmate.md +++ b/docs/authmate.md @@ -235,7 +235,7 @@ in example above) ### Containers policy Rules for mapping of `LocationConstraint` ([aws spec](https://docs.aws.amazon.com/AmazonS3/latest/API/API_CreateBucket.html#API_CreateBucket_RequestBody)) -to `PlacementPolicy` ([frostfs spec](https://github.com/TrueCloudLab/frostfs-spec/blob/master/01-arch/02-policy.md)) +to `PlacementPolicy` can be set via parameter `--container-policy` (json-string and file path allowed): ```json { diff --git a/go.mod b/go.mod index afb603b..97fc75f 100644 --- a/go.mod +++ b/go.mod @@ -1,10 +1,11 @@ -module github.com/TrueCloudLab/frostfs-s3-gw +module git.frostfs.info/TrueCloudLab/frostfs-s3-gw go 1.18 require ( - github.com/TrueCloudLab/frostfs-api-go/v2 v2.0.0-20221212144048-1351b6656d68 - github.com/TrueCloudLab/frostfs-sdk-go v0.0.0-20230130120602-cf64ddfb143c + 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/aws/aws-sdk-go v1.44.6 github.com/bluele/gcache v0.0.2 github.com/google/uuid v1.3.0 @@ -25,11 +26,14 @@ 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 + git.frostfs.info/TrueCloudLab/frostfs-contract v0.0.0-20230307110621-19a8ef2d02fb // indirect + 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/hashicorp/golang-lru/v2 v2.0.1 // indirect +) + +require ( github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20221202181307-76fa05c21b12 // indirect //github.com/aws/aws-sdk-go-v2 v1.16.7 // indirect github.com/beorn7/perks v1.0.1 // indirect diff --git a/go.sum b/go.sum index 4a97af3..0dca0db 100644 --- a/go.sum +++ b/go.sum @@ -36,26 +36,26 @@ cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RX cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= 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 h1:S/TrbOOu9qEXZRZ9/Ddw7crnxbBUQLo68PSzQWYrc9M= +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/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/CityOfZion/neo-go v0.62.1-pre.0.20191114145240-e740fbe708f8/go.mod h1:MJCkWUBhi9pn/CrYO1Q3P687y2KeahrOPS9BD9LDGb0= 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-20230130120602-cf64ddfb143c h1:7TTjeRSWHOSmFEsblebGBN4aLeZEVVN9JixQvu2tD7Q= -github.com/TrueCloudLab/frostfs-sdk-go v0.0.0-20230130120602-cf64ddfb143c/go.mod h1:J5Gv7HtN9wJ5vKMy+vOT9/D6ixPMNl2ureKNNq8dask= -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= @@ -234,6 +234,8 @@ github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ 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/holiman/uint256 v1.2.0/go.mod h1:y4ga/t+u+Xwd7CpDgZESaRcWy0I7XMlTMA25ApIH5Jw= diff --git a/internal/frostfs/frostfs.go b/internal/frostfs/frostfs.go index 6fb0d2a..77db3ab 100644 --- a/internal/frostfs/frostfs.go +++ b/internal/frostfs/frostfs.go @@ -10,20 +10,20 @@ import ( "strconv" "time" - 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" + objectv2 "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/layer" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/authmate" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/creds/tokens" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" + "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/eacl" + "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/session" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" ) // FrostFS represents virtual connection to the FrostFS network. diff --git a/internal/frostfs/frostfs_test.go b/internal/frostfs/frostfs_test.go index acb18cc..e14dddc 100644 --- a/internal/frostfs/frostfs_test.go +++ b/internal/frostfs/frostfs_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/TrueCloudLab/frostfs-s3-gw/api/layer" - apistatus "github.com/TrueCloudLab/frostfs-sdk-go/client/status" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/layer" + apistatus "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client/status" "github.com/stretchr/testify/require" ) diff --git a/internal/frostfs/tree.go b/internal/frostfs/tree.go index 3c77118..cca1959 100644 --- a/internal/frostfs/tree.go +++ b/internal/frostfs/tree.go @@ -9,14 +9,14 @@ 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/frostfs/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" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/data" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/layer" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/creds/accessbox" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/internal/frostfs/services/tree" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/bearer" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" diff --git a/internal/frostfs/tree_signature.go b/internal/frostfs/tree_signature.go index da8a8c7..410a592 100644 --- a/internal/frostfs/tree_signature.go +++ b/internal/frostfs/tree_signature.go @@ -2,7 +2,7 @@ package frostfs import ( - crypto "github.com/TrueCloudLab/frostfs-crypto" + crypto "git.frostfs.info/TrueCloudLab/frostfs-crypto" "google.golang.org/protobuf/proto" ) diff --git a/internal/frostfs/tree_test.go b/internal/frostfs/tree_test.go index 22fee5d..58aa9bf 100644 --- a/internal/frostfs/tree_test.go +++ b/internal/frostfs/tree_test.go @@ -4,8 +4,8 @@ import ( "errors" "testing" - "github.com/TrueCloudLab/frostfs-s3-gw/api/data" - "github.com/TrueCloudLab/frostfs-s3-gw/api/layer" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/data" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/layer" "github.com/stretchr/testify/require" ) diff --git a/metrics/app.go b/metrics/app.go index 3a3decc..4de4317 100644 --- a/metrics/app.go +++ b/metrics/app.go @@ -4,8 +4,8 @@ import ( "net/http" "sync" - "github.com/TrueCloudLab/frostfs-s3-gw/api" - "github.com/TrueCloudLab/frostfs-s3-gw/internal/frostfs" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/internal/frostfs" "go.uber.org/zap" ) diff --git a/metrics/billing.go b/metrics/billing.go index 57ce95b..4b03d28 100644 --- a/metrics/billing.go +++ b/metrics/billing.go @@ -3,7 +3,7 @@ package metrics import ( "sync" - "github.com/TrueCloudLab/frostfs-s3-gw/api" + "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api" "github.com/prometheus/client_golang/prometheus" ) diff --git a/metrics/gate.go b/metrics/gate.go index 15b1cf7..5a82e69 100644 --- a/metrics/gate.go +++ b/metrics/gate.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" ) diff --git a/metrics/pool.go b/metrics/pool.go index bada57c..8f90a2d 100644 --- a/metrics/pool.go +++ b/metrics/pool.go @@ -1,7 +1,7 @@ package metrics import ( - "github.com/TrueCloudLab/frostfs-sdk-go/pool" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/pool" "github.com/prometheus/client_golang/prometheus" )