From e02ee50d7b309911f8b050e0b73d976037bc9b63 Mon Sep 17 00:00:00 2001 From: Alex Vanin Date: Tue, 7 Mar 2023 17:08:53 +0300 Subject: [PATCH] Rename package name Due to source code relocation from GitHub. Signed-off-by: Alex Vanin --- README.md | 16 +++++++--------- app.go | 16 ++++++++-------- debian/control | 4 ++-- debian/copyright | 4 ++-- downloader/download.go | 22 +++++++++++----------- downloader/head.go | 12 ++++++------ go.mod | 17 +++++++++-------- go.sum | 30 ++++++++++++++++-------------- integration_test.go | 16 ++++++++-------- metrics/metrics.go | 2 +- resolver/frostfs.go | 2 +- resolver/resolver.go | 6 +++--- settings.go | 2 +- tokens/bearer-token.go | 2 +- tokens/bearer-token_test.go | 4 ++-- uploader/filter.go | 4 ++-- uploader/filter_test.go | 4 ++-- uploader/multipart.go | 2 +- uploader/upload.go | 18 +++++++++--------- utils/params.go | 6 +++--- utils/util.go | 4 ++-- 21 files changed, 97 insertions(+), 96 deletions(-) diff --git a/README.md b/README.md index 7d2e315..de81301 100644 --- a/README.md +++ b/README.md @@ -6,9 +6,7 @@

--- -[![Report](https://goreportcard.com/badge/github.com/TrueCloudLab/frostfs-http-gw)](https://goreportcard.com/report/github.com/TrueCloudLab/frostfs-http-gw) -![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/TrueCloudLab/frostfs-http-gw?sort=semver) -![License](https://img.shields.io/github/license/TrueCloudLab/frostfs-http-gw.svg?style=popout) +[![Report](https://goreportcard.com/badge/git.frostfs.info/TrueCloudLab/frostfs-http-gw)](https://goreportcard.com/report/git.frostfs.info/TrueCloudLab/frostfs-http-gw) # FrostFS HTTP Gateway @@ -20,7 +18,7 @@ See available routes in [specification](./docs/api.md). ## Installation -```go install github.com/TrueCloudLab/frostfs-http-gw``` +```go install git.frostfs.info/TrueCloudLab/frostfs-http-gw``` Or you can call `make` to build it from the cloned repository (the binary will end up in `bin/frostfs-http-gw`). To build frostfs-http-gw binary in clean docker @@ -50,7 +48,7 @@ can be done either via `-p` parameter or via `HTTP_GW_PEERS__ADDRESS` and `HTTP_GW_PEERS__WEIGHT` environment variables (the gate supports multiple FrostFS nodes with weighted load balancing). -If you launch HTTP gateway in bundle with [frostfs-dev-env](https://github.com/TrueCloudLab/frostfs-dev-env), +If you launch HTTP gateway in bundle with [frostfs-dev-env](https://git.frostfs.info/TrueCloudLab/frostfs-dev-env), you can get the IP address of the node in the output of `make hosts` command (with s0*.frostfs.devenv name). @@ -228,7 +226,7 @@ resolve_order: - nns ``` -2. Make sure your container is registered in NNS contract. If you use [frostfs-dev-env](https://github.com/TrueCloudLab/frostfs-dev-env) +2. Make sure your container is registered in NNS contract. If you use [frostfs-dev-env](https://git.frostfs.info/TrueCloudLab/frostfs-dev-env) you can check if your container (e.g. with `container-name` name) is registered in NNS: ```shell @@ -255,7 +253,7 @@ $ curl http://localhost:8082/get_by_attribute/container-name/FileName/object-nam #### Create a container -You can create a container via [frostfs-cli](https://github.com/TrueCloudLab/frostfs-node/releases): +You can create a container via [frostfs-cli](https://git.frostfs.info/TrueCloudLab/frostfs-node/releases): ``` $ frostfs-cli -r $FROSTFS_NODE -w $WALLET container create --policy $POLICY --basic-acl $ACL ``` @@ -268,13 +266,13 @@ For example: $ frostfs-cli -r 192.168.130.72:8080 -w ./wallet.json container create --policy "REP 3" --basic-acl public --await ``` -If you have launched nodes via [frostfs-dev-env](https://github.com/TrueCloudLab/frostfs-dev-env), +If you have launched nodes via [frostfs-dev-env](https://git.frostfs.info/TrueCloudLab/frostfs-dev-env), you can get the key value from `wallets/wallet.json` or write the path to the file `wallets/wallet.key`. #### Prepare a file in a container -To create a file via [frostfs-cli](https://github.com/TrueCloudLab/frostfs-node/releases), run a command below: +To create a file via [frostfs-cli](https://git.frostfs.info/TrueCloudLab/frostfs-node/releases), run a command below: ``` $ frostfs-cli -r $FROSTFS_NODE -k $KEY object put --file $FILENAME --cid $CID ``` diff --git a/app.go b/app.go index e17aca9..825da8e 100644 --- a/app.go +++ b/app.go @@ -11,14 +11,14 @@ import ( "sync" "syscall" - "github.com/TrueCloudLab/frostfs-http-gw/downloader" - "github.com/TrueCloudLab/frostfs-http-gw/metrics" - "github.com/TrueCloudLab/frostfs-http-gw/resolver" - "github.com/TrueCloudLab/frostfs-http-gw/response" - "github.com/TrueCloudLab/frostfs-http-gw/uploader" - "github.com/TrueCloudLab/frostfs-http-gw/utils" - "github.com/TrueCloudLab/frostfs-sdk-go/pool" - "github.com/TrueCloudLab/frostfs-sdk-go/user" + "git.frostfs.info/TrueCloudLab/frostfs-http-gw/downloader" + "git.frostfs.info/TrueCloudLab/frostfs-http-gw/metrics" + "git.frostfs.info/TrueCloudLab/frostfs-http-gw/resolver" + "git.frostfs.info/TrueCloudLab/frostfs-http-gw/response" + "git.frostfs.info/TrueCloudLab/frostfs-http-gw/uploader" + "git.frostfs.info/TrueCloudLab/frostfs-http-gw/utils" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/pool" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" "github.com/fasthttp/router" "github.com/nspcc-dev/neo-go/cli/flags" "github.com/nspcc-dev/neo-go/cli/input" diff --git a/debian/control b/debian/control index cd18ad5..612be94 100644 --- a/debian/control +++ b/debian/control @@ -5,8 +5,8 @@ Maintainer: TrueCloudLab Build-Depends: debhelper-compat (= 13), dh-sysuser, git, devscripts Standards-Version: 4.5.1 Homepage: https://frostfs.info/ -Vcs-Git: https://github.com/TrueCloudLab/frostfs-http-gw.git -Vcs-Browser: https://github.com/TrueCloudLab/frostfs-http-gw +Vcs-Git: https://git.frostfs.info/TrueCloudLab/frostfs-http-gw.git +Vcs-Browser: https://git.frostfs.info/TrueCloudLab/frostfs-http-gw Package: frostfs-http-gw Architecture: any diff --git a/debian/copyright b/debian/copyright index be82996..c278a3a 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-http-gw Upstream-Contact: tech@frostfs.info -Source: https://github.com/TrueCloudLab/frostfs-http-gw +Source: https://git.frostfs.info/TrueCloudLab/frostfs-http-gw Files: * Copyright: 2018-2022 NeoSPCC (@nspcc-dev), contributors of neofs-http-gw project (https://github.com/nspcc-dev/neofs-http-gw/blob/master/CREDITS.md) 2022 True Cloud Lab (@TrueCloudLab), contributors of frostfs-http-gw project - (https://github.com/TrueCloudLab/frostfs-http-gw/blob/master/CREDITS.md) + (https://git.frostfs.info/TrueCloudLab/frostfs-http-gw/src/branch/master/CREDITS.md) License: GPL-3 diff --git a/downloader/download.go b/downloader/download.go index b3881a6..f357550 100644 --- a/downloader/download.go +++ b/downloader/download.go @@ -17,17 +17,17 @@ import ( "unicode" "unicode/utf8" - "github.com/TrueCloudLab/frostfs-http-gw/resolver" - "github.com/TrueCloudLab/frostfs-http-gw/response" - "github.com/TrueCloudLab/frostfs-http-gw/tokens" - "github.com/TrueCloudLab/frostfs-http-gw/utils" - "github.com/TrueCloudLab/frostfs-sdk-go/bearer" - "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/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" - "github.com/TrueCloudLab/frostfs-sdk-go/pool" + "git.frostfs.info/TrueCloudLab/frostfs-http-gw/resolver" + "git.frostfs.info/TrueCloudLab/frostfs-http-gw/response" + "git.frostfs.info/TrueCloudLab/frostfs-http-gw/tokens" + "git.frostfs.info/TrueCloudLab/frostfs-http-gw/utils" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/bearer" + "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/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/pool" "github.com/valyala/fasthttp" "go.uber.org/atomic" "go.uber.org/zap" diff --git a/downloader/head.go b/downloader/head.go index 3fd243e..36f8b60 100644 --- a/downloader/head.go +++ b/downloader/head.go @@ -7,12 +7,12 @@ import ( "strings" "time" - "github.com/TrueCloudLab/frostfs-http-gw/response" - "github.com/TrueCloudLab/frostfs-http-gw/tokens" - "github.com/TrueCloudLab/frostfs-http-gw/utils" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" - "github.com/TrueCloudLab/frostfs-sdk-go/pool" + "git.frostfs.info/TrueCloudLab/frostfs-http-gw/response" + "git.frostfs.info/TrueCloudLab/frostfs-http-gw/tokens" + "git.frostfs.info/TrueCloudLab/frostfs-http-gw/utils" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/pool" "github.com/valyala/fasthttp" "go.uber.org/zap" ) diff --git a/go.mod b/go.mod index b7f3215..4b7319e 100644 --- a/go.mod +++ b/go.mod @@ -1,10 +1,10 @@ -module github.com/TrueCloudLab/frostfs-http-gw +module git.frostfs.info/TrueCloudLab/frostfs-http-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-sdk-go v0.0.0-20230307124721-94476f905599 github.com/fasthttp/router v1.4.1 github.com/nspcc-dev/neo-go v0.101.0 github.com/prometheus/client_golang v1.13.0 @@ -18,14 +18,14 @@ require ( ) require ( + git.frostfs.info/TrueCloudLab/frostfs-contract v0.0.0-20230307110621-19a8ef2d02fb // indirect + git.frostfs.info/TrueCloudLab/frostfs-crypto v0.6.0 // 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/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect github.com/Microsoft/go-winio v0.5.2 // indirect github.com/Microsoft/hcsshim v0.9.2 // indirect - github.com/TrueCloudLab/frostfs-contract v0.0.0-20221213081248-6c805c1b4e42 // indirect - github.com/TrueCloudLab/frostfs-crypto v0.5.0 // indirect - 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/andybalholm/brotli v1.0.4 // indirect github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20221202181307-76fa05c21b12 // indirect github.com/beorn7/perks v1.0.1 // indirect @@ -48,6 +48,7 @@ require ( github.com/gorilla/mux v1.8.0 // indirect github.com/gorilla/websocket v1.4.2 // indirect github.com/hashicorp/golang-lru v0.6.0 // indirect + github.com/hashicorp/golang-lru/v2 v2.0.1 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/klauspost/compress v1.15.0 // indirect github.com/magiconair/properties v1.8.7 // indirect diff --git a/go.sum b/go.sum index 2cd5eb9..585439e 100644 --- a/go.sum +++ b/go.sum @@ -37,6 +37,20 @@ 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/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= @@ -87,20 +101,6 @@ github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbt github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ= -github.com/TrueCloudLab/frostfs-api-go/v2 v2.0.0-20221212144048-1351b6656d68 h1:mwZr15qCuIcWojIOmH6LILPohbWIkknZe9vhBRapmfQ= -github.com/TrueCloudLab/frostfs-api-go/v2 v2.0.0-20221212144048-1351b6656d68/go.mod h1:u3P6aL/NpAIY5IFRsJhmV+61Q3pJ3BkLENqySkf5zZQ= -github.com/TrueCloudLab/frostfs-contract v0.0.0-20221213081248-6c805c1b4e42 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= @@ -530,6 +530,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/integration_test.go b/integration_test.go index 7363e2d..0587273 100644 --- a/integration_test.go +++ b/integration_test.go @@ -13,14 +13,14 @@ import ( "testing" "time" - "github.com/TrueCloudLab/frostfs-sdk-go/container" - "github.com/TrueCloudLab/frostfs-sdk-go/container/acl" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" - "github.com/TrueCloudLab/frostfs-sdk-go/netmap" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" - "github.com/TrueCloudLab/frostfs-sdk-go/pool" - "github.com/TrueCloudLab/frostfs-sdk-go/user" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/acl" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/netmap" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/pool" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/spf13/viper" "github.com/stretchr/testify/require" diff --git a/metrics/metrics.go b/metrics/metrics.go index da57d64..a184588 100644 --- a/metrics/metrics.go +++ b/metrics/metrics.go @@ -3,7 +3,7 @@ package metrics import ( "net/http" - "github.com/TrueCloudLab/frostfs-sdk-go/pool" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/pool" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" "go.uber.org/zap" diff --git a/resolver/frostfs.go b/resolver/frostfs.go index 0a1f255..aa7a751 100644 --- a/resolver/frostfs.go +++ b/resolver/frostfs.go @@ -5,7 +5,7 @@ import ( "errors" "fmt" - "github.com/TrueCloudLab/frostfs-sdk-go/pool" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/pool" ) // FrostFSResolver represents virtual connection to the FrostFS network. diff --git a/resolver/resolver.go b/resolver/resolver.go index 24f8835..e6707e2 100644 --- a/resolver/resolver.go +++ b/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/settings.go b/settings.go index cd71e4a..8d569c0 100644 --- a/settings.go +++ b/settings.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "github.com/TrueCloudLab/frostfs-http-gw/resolver" + "git.frostfs.info/TrueCloudLab/frostfs-http-gw/resolver" "github.com/spf13/pflag" "github.com/spf13/viper" "github.com/valyala/fasthttp" diff --git a/tokens/bearer-token.go b/tokens/bearer-token.go index e1d46a9..6cd98ca 100644 --- a/tokens/bearer-token.go +++ b/tokens/bearer-token.go @@ -7,7 +7,7 @@ import ( "errors" "fmt" - "github.com/TrueCloudLab/frostfs-sdk-go/bearer" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/bearer" "github.com/valyala/fasthttp" ) diff --git a/tokens/bearer-token_test.go b/tokens/bearer-token_test.go index 07df0f9..b03147c 100644 --- a/tokens/bearer-token_test.go +++ b/tokens/bearer-token_test.go @@ -4,8 +4,8 @@ import ( "encoding/base64" "testing" - "github.com/TrueCloudLab/frostfs-sdk-go/bearer" - "github.com/TrueCloudLab/frostfs-sdk-go/user" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/bearer" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" "github.com/nspcc-dev/neo-go/pkg/crypto/keys" "github.com/stretchr/testify/require" "github.com/valyala/fasthttp" diff --git a/uploader/filter.go b/uploader/filter.go index 2942f6d..acab646 100644 --- a/uploader/filter.go +++ b/uploader/filter.go @@ -7,8 +7,8 @@ import ( "strconv" "time" - "github.com/TrueCloudLab/frostfs-api-go/v2/object" - "github.com/TrueCloudLab/frostfs-http-gw/utils" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object" + "git.frostfs.info/TrueCloudLab/frostfs-http-gw/utils" "github.com/valyala/fasthttp" "go.uber.org/zap" ) diff --git a/uploader/filter_test.go b/uploader/filter_test.go index dc6f462..9cb58c1 100644 --- a/uploader/filter_test.go +++ b/uploader/filter_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "github.com/TrueCloudLab/frostfs-api-go/v2/object" - "github.com/TrueCloudLab/frostfs-http-gw/utils" + "git.frostfs.info/TrueCloudLab/frostfs-api-go/v2/object" + "git.frostfs.info/TrueCloudLab/frostfs-http-gw/utils" "github.com/stretchr/testify/require" "github.com/valyala/fasthttp" "go.uber.org/zap" diff --git a/uploader/multipart.go b/uploader/multipart.go index ae03cc0..fb6be22 100644 --- a/uploader/multipart.go +++ b/uploader/multipart.go @@ -3,7 +3,7 @@ package uploader import ( "io" - "github.com/TrueCloudLab/frostfs-http-gw/uploader/multipart" + "git.frostfs.info/TrueCloudLab/frostfs-http-gw/uploader/multipart" "go.uber.org/zap" ) diff --git a/uploader/upload.go b/uploader/upload.go index 9c881de..fc904db 100644 --- a/uploader/upload.go +++ b/uploader/upload.go @@ -9,15 +9,15 @@ import ( "strconv" "time" - "github.com/TrueCloudLab/frostfs-http-gw/resolver" - "github.com/TrueCloudLab/frostfs-http-gw/response" - "github.com/TrueCloudLab/frostfs-http-gw/tokens" - "github.com/TrueCloudLab/frostfs-http-gw/utils" - "github.com/TrueCloudLab/frostfs-sdk-go/bearer" - "github.com/TrueCloudLab/frostfs-sdk-go/object" - oid "github.com/TrueCloudLab/frostfs-sdk-go/object/id" - "github.com/TrueCloudLab/frostfs-sdk-go/pool" - "github.com/TrueCloudLab/frostfs-sdk-go/user" + "git.frostfs.info/TrueCloudLab/frostfs-http-gw/resolver" + "git.frostfs.info/TrueCloudLab/frostfs-http-gw/response" + "git.frostfs.info/TrueCloudLab/frostfs-http-gw/tokens" + "git.frostfs.info/TrueCloudLab/frostfs-http-gw/utils" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/bearer" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object" + oid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object/id" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/pool" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" "github.com/valyala/fasthttp" "go.uber.org/atomic" "go.uber.org/zap" diff --git a/utils/params.go b/utils/params.go index 68d2921..a6fe59b 100644 --- a/utils/params.go +++ b/utils/params.go @@ -1,9 +1,9 @@ package utils import ( - "github.com/TrueCloudLab/frostfs-http-gw/resolver" - "github.com/TrueCloudLab/frostfs-sdk-go/pool" - "github.com/TrueCloudLab/frostfs-sdk-go/user" + "git.frostfs.info/TrueCloudLab/frostfs-http-gw/resolver" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/pool" + "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/user" "go.uber.org/zap" ) diff --git a/utils/util.go b/utils/util.go index ac6edb4..a83064c 100644 --- a/utils/util.go +++ b/utils/util.go @@ -3,8 +3,8 @@ package utils import ( "context" - "github.com/TrueCloudLab/frostfs-http-gw/resolver" - cid "github.com/TrueCloudLab/frostfs-sdk-go/container/id" + "git.frostfs.info/TrueCloudLab/frostfs-http-gw/resolver" + cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id" ) // GetContainerID decode container id, if it's not a valid container id