diff --git a/Makefile b/Makefile index db8225bbc274e53df99acf892c17f61e35e36e78..de47dd82229b7d03164adfa6afbea02173431d94 100644 --- a/Makefile +++ b/Makefile @@ -47,7 +47,7 @@ GOCOVER_COBERTURA := ${BUILD_DIR}/bin/gocover-cobertura # Build information BUNDLE_FLAGS ?= $(shell test -f ${SOURCE_DIR}/../.gdk-install-root && echo --no-deployment || echo --deployment) -GITALY_PACKAGE := gitlab.com/gitlab-org/gitaly +GITALY_PACKAGE := gitlab.com/gitlab-org/gitaly/v13 BUILD_TIME := $(shell date +"%Y%m%d.%H%M%S") GITALY_VERSION := $(shell git describe --match v* 2>/dev/null | sed 's/^v//' || cat ${SOURCE_DIR}/VERSION 2>/dev/null || echo unknown) GO_LDFLAGS := -ldflags '-X ${GITALY_PACKAGE}/internal/version.version=${GITALY_VERSION} -X ${GITALY_PACKAGE}/internal/version.buildtime=${BUILD_TIME}' diff --git a/NOTICE b/NOTICE index 81db0288b40643973df9979d32fbab0aecd2c64e..1a04aa1059c5f2871b48b44148544a0110bea670 100644 --- a/NOTICE +++ b/NOTICE @@ -3153,7 +3153,7 @@ LICENSE - github.com/uber/jaeger-lib/metrics limitations under the License. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -LICENSE - gitlab.com/gitlab-org/gitaly/internal/middleware/panichandler +LICENSE - gitlab.com/gitlab-org/gitaly/v13/internal/middleware/panichandler Copyright (c) 2016 Masahiro Sano MIT License @@ -3178,7 +3178,7 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -LICENSE.txt - gitlab.com/gitlab-org/gitaly/internal/praefect/grpc-proxy/proxy +LICENSE.txt - gitlab.com/gitlab-org/gitaly/v13/internal/praefect/grpc-proxy/proxy Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ diff --git a/_support/noticegen/noticegen.go b/_support/noticegen/noticegen.go index c54d1df7d10270eef7ac843c54c40de16c9b1b2f..373f6fe922ac27883e605f782df6394356c0cf90 100644 --- a/_support/noticegen/noticegen.go +++ b/_support/noticegen/noticegen.go @@ -47,7 +47,7 @@ func main() { log.Fatal(err) } - if p == "gitlab.com/gitlab-org/gitaly" { + if p == "gitlab.com/gitlab-org/gitaly/v13" { return nil } diff --git a/client/dial.go b/client/dial.go index d6013826817ce1991451fd44d393595358574d90..8592dbe43c4fca4d0ae26ac9ff5f8a7d897fb0ab 100644 --- a/client/dial.go +++ b/client/dial.go @@ -7,7 +7,7 @@ import ( "net/url" "time" - gitaly_x509 "gitlab.com/gitlab-org/gitaly/internal/x509" + gitaly_x509 "gitlab.com/gitlab-org/gitaly/v13/internal/x509" grpccorrelation "gitlab.com/gitlab-org/labkit/correlation/grpc" grpctracing "gitlab.com/gitlab-org/labkit/tracing/grpc" "google.golang.org/grpc" diff --git a/client/dial_test.go b/client/dial_test.go index 29091fc3b5de4c375319b70efc7fdcee8b786d2d..1c1395227e40aee1cccfc8f8dcf973bd7ee68a37 100644 --- a/client/dial_test.go +++ b/client/dial_test.go @@ -13,9 +13,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/uber/jaeger-client-go" - proxytestdata "gitlab.com/gitlab-org/gitaly/internal/praefect/grpc-proxy/testdata" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - gitaly_x509 "gitlab.com/gitlab-org/gitaly/internal/x509" + proxytestdata "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/grpc-proxy/testdata" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + gitaly_x509 "gitlab.com/gitlab-org/gitaly/v13/internal/x509" "gitlab.com/gitlab-org/labkit/correlation" grpccorrelation "gitlab.com/gitlab-org/labkit/correlation/grpc" grpctracing "gitlab.com/gitlab-org/labkit/tracing/grpc" diff --git a/client/pool.go b/client/pool.go index 00e6ed05f06c0b25adc2ff5a2fdcd1aa2dc513ba..630f094bd887a1f5bf925690b0fa46550c48f0ae 100644 --- a/client/pool.go +++ b/client/pool.go @@ -6,7 +6,7 @@ import ( "fmt" "sync" - gitalyauth "gitlab.com/gitlab-org/gitaly/auth" + gitalyauth "gitlab.com/gitlab-org/gitaly/v13/auth" "google.golang.org/grpc" ) diff --git a/client/pool_test.go b/client/pool_test.go index 5a58e2793d3e09653f67c7afd03c243a6ec918f8..21a7264318aee7ec34b32bfa95ef92719a6b4dc5 100644 --- a/client/pool_test.go +++ b/client/pool_test.go @@ -9,9 +9,9 @@ import ( grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware" "github.com/stretchr/testify/require" - gitaly_auth "gitlab.com/gitlab-org/gitaly/internal/gitaly/config/auth" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/server/auth" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + gitaly_auth "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config/auth" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/server/auth" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/health" diff --git a/client/receive_pack.go b/client/receive_pack.go index b3ca8d8d56b73695ee8aecbbe694cf2d41ed2a36..34f18a156e74f429ab71fd43f3c7a9fe9f9ca39f 100644 --- a/client/receive_pack.go +++ b/client/receive_pack.go @@ -4,9 +4,9 @@ import ( "context" "io" - "gitlab.com/gitlab-org/gitaly/internal/stream" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/stream" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc" ) diff --git a/client/upload_archive.go b/client/upload_archive.go index 118ef478704f41c3f0a16f6e70f89d11a21ad56c..52435b61b24db119f730b7dfa985302e5d0a8778 100644 --- a/client/upload_archive.go +++ b/client/upload_archive.go @@ -4,9 +4,9 @@ import ( "context" "io" - "gitlab.com/gitlab-org/gitaly/internal/stream" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/stream" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc" ) diff --git a/client/upload_pack.go b/client/upload_pack.go index b7c004576fb867138dc3abecff486669ae342b61..c8d9de937c2db74d948dcd6948643c0d86c967bf 100644 --- a/client/upload_pack.go +++ b/client/upload_pack.go @@ -4,9 +4,9 @@ import ( "context" "io" - "gitlab.com/gitlab-org/gitaly/internal/stream" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/stream" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc" ) diff --git a/cmd/gitaly-blackbox/main.go b/cmd/gitaly-blackbox/main.go index 7210d5d5f7f486b7b4b12e4ad2b64e2d4762ec5e..7fda9bd598bea2d2936d89b8824b430cc705a0ad 100644 --- a/cmd/gitaly-blackbox/main.go +++ b/cmd/gitaly-blackbox/main.go @@ -7,9 +7,9 @@ import ( "os" "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/blackbox" - "gitlab.com/gitlab-org/gitaly/internal/log" - "gitlab.com/gitlab-org/gitaly/internal/version" + "gitlab.com/gitlab-org/gitaly/v13/internal/blackbox" + "gitlab.com/gitlab-org/gitaly/v13/internal/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/version" ) var ( diff --git a/cmd/gitaly-debug/analyzehttp.go b/cmd/gitaly-debug/analyzehttp.go index 2088acdc5ab63d273ab1fc9e966e32880df60623..3930959a85c413f2d807851281743086fb5ab47b 100644 --- a/cmd/gitaly-debug/analyzehttp.go +++ b/cmd/gitaly-debug/analyzehttp.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "gitlab.com/gitlab-org/gitaly/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/stats" ) func analyzeHTTPClone(cloneURL string) { diff --git a/cmd/gitaly-debug/bitmap.go b/cmd/gitaly-debug/bitmap.go index a8d768df1ed5890cffe807b4c9a616c257dc763e..b372dbd9379e11a5744d079dbec1ed38bca18e96 100644 --- a/cmd/gitaly-debug/bitmap.go +++ b/cmd/gitaly-debug/bitmap.go @@ -5,7 +5,7 @@ import ( "fmt" "os" - "gitlab.com/gitlab-org/gitaly/internal/git/packfile" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/packfile" ) func listBitmapPack(idxFile string) { diff --git a/cmd/gitaly-debug/simulatehttp.go b/cmd/gitaly-debug/simulatehttp.go index ac9a63fe31af1f424a6096070aa5df10ebca47e7..aa1daa878a01636b56da421b82019a9a347863e6 100644 --- a/cmd/gitaly-debug/simulatehttp.go +++ b/cmd/gitaly-debug/simulatehttp.go @@ -9,8 +9,8 @@ import ( "regexp" "time" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/pktline" ) func simulateHTTPClone(gitDir string) { diff --git a/cmd/gitaly-git2go/main_test.go b/cmd/gitaly-git2go/main_test.go index e9552633b0ba71c02e0489a91fac2b1d632cf977..5248a648cab27786255aeb3710df2463b653bb54 100644 --- a/cmd/gitaly-git2go/main_test.go +++ b/cmd/gitaly-git2go/main_test.go @@ -6,7 +6,7 @@ import ( "os" "testing" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/cmd/gitaly-git2go/merge.go b/cmd/gitaly-git2go/merge.go index 3f07a51ab95ec15b1740d05db174a5dcc2ff8120..c79dadd26f7071f1048a45d5a2d03f79326b41a0 100644 --- a/cmd/gitaly-git2go/merge.go +++ b/cmd/gitaly-git2go/merge.go @@ -10,7 +10,7 @@ import ( "time" git "github.com/libgit2/git2go/v30" - "gitlab.com/gitlab-org/gitaly/internal/git2go" + "gitlab.com/gitlab-org/gitaly/v13/internal/git2go" ) type mergeSubcommand struct { diff --git a/cmd/gitaly-git2go/merge_test.go b/cmd/gitaly-git2go/merge_test.go index c5ae2a5d9c1d10a1b6c0c4a79f6895a91f077ac5..5d5ab9d7bbf42c17f3177cb75dc41fa93eac8181 100644 --- a/cmd/gitaly-git2go/merge_test.go +++ b/cmd/gitaly-git2go/merge_test.go @@ -9,9 +9,9 @@ import ( git "github.com/libgit2/git2go/v30" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git2go" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/git2go" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestMergeFailsWithMissingArguments(t *testing.T) { diff --git a/cmd/gitaly-hooks/hooks.go b/cmd/gitaly-hooks/hooks.go index dda50710c1497c144746a2069b689a5c4d58f6e8..10bd8038eaf4bfbb833bff5b3c2a7da9d4cb4b32 100644 --- a/cmd/gitaly-hooks/hooks.go +++ b/cmd/gitaly-hooks/hooks.go @@ -14,17 +14,17 @@ import ( "github.com/BurntSushi/toml" "github.com/golang/protobuf/jsonpb" - gitalyauth "gitlab.com/gitlab-org/gitaly/auth" - "gitlab.com/gitlab-org/gitaly/client" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/gitlabshell" - gitalylog "gitlab.com/gitlab-org/gitaly/internal/log" - "gitlab.com/gitlab-org/gitaly/internal/metadata/featureflag" - "gitlab.com/gitlab-org/gitaly/internal/praefect/metadata" - "gitlab.com/gitlab-org/gitaly/internal/stream" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + gitalyauth "gitlab.com/gitlab-org/gitaly/v13/auth" + "gitlab.com/gitlab-org/gitaly/v13/client" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitlabshell" + gitalylog "gitlab.com/gitlab-org/gitaly/v13/internal/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/metadata/featureflag" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/metadata" + "gitlab.com/gitlab-org/gitaly/v13/internal/stream" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "gitlab.com/gitlab-org/labkit/tracing" "google.golang.org/grpc" ) diff --git a/cmd/gitaly-hooks/hooks_test.go b/cmd/gitaly-hooks/hooks_test.go index 5e219e9838ec0837d2688373bc0039896c0c1e3c..f3ab6bd68f43cfba645a0e1a337b62ea86e7b9bc 100644 --- a/cmd/gitaly-hooks/hooks_test.go +++ b/cmd/gitaly-hooks/hooks_test.go @@ -14,13 +14,13 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - gitalyhook "gitlab.com/gitlab-org/gitaly/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/hook" - "gitlab.com/gitlab-org/gitaly/internal/praefect/metadata" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + gitalyhook "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/hook" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/metadata" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/reflection" ) diff --git a/cmd/gitaly-ssh/auth_test.go b/cmd/gitaly-ssh/auth_test.go index 30d7e41a7ff076cbb55e00df9c4440e056836931..c8d434ecdf1b3b5a6d0084f6c503d785d4f1cd03 100644 --- a/cmd/gitaly-ssh/auth_test.go +++ b/cmd/gitaly-ssh/auth_test.go @@ -12,13 +12,13 @@ import ( "github.com/golang/protobuf/jsonpb" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/server" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/server" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" ) diff --git a/cmd/gitaly-ssh/main.go b/cmd/gitaly-ssh/main.go index 1a99ae8490c5fbd490cd1ea1d4939ee45761ec3c..e52c5811291a69c2305146444c864f0b6eecd5c6 100644 --- a/cmd/gitaly-ssh/main.go +++ b/cmd/gitaly-ssh/main.go @@ -7,9 +7,9 @@ import ( "os" "strings" - gitalyauth "gitlab.com/gitlab-org/gitaly/auth" - "gitlab.com/gitlab-org/gitaly/client" - "gitlab.com/gitlab-org/gitaly/internal/metadata/featureflag" + gitalyauth "gitlab.com/gitlab-org/gitaly/v13/auth" + "gitlab.com/gitlab-org/gitaly/v13/client" + "gitlab.com/gitlab-org/gitaly/v13/internal/metadata/featureflag" "gitlab.com/gitlab-org/labkit/tracing" "google.golang.org/grpc" ) diff --git a/cmd/gitaly-ssh/main_test.go b/cmd/gitaly-ssh/main_test.go index 7256a7e02399b12bd1edaea997790d9f309164c8..db4c75ecee116f5b0c3b0b9728fef87f4f90bdd7 100644 --- a/cmd/gitaly-ssh/main_test.go +++ b/cmd/gitaly-ssh/main_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" "google.golang.org/grpc" ) diff --git a/cmd/gitaly-ssh/receive_pack.go b/cmd/gitaly-ssh/receive_pack.go index 70b2cb1b941494a8ec17f8c8a98abc034c7e013d..0de7ff34a9b399f2b876d98a65008a8e57a50ecb 100644 --- a/cmd/gitaly-ssh/receive_pack.go +++ b/cmd/gitaly-ssh/receive_pack.go @@ -6,8 +6,8 @@ import ( "os" "github.com/golang/protobuf/jsonpb" - "gitlab.com/gitlab-org/gitaly/client" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/client" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" ) diff --git a/cmd/gitaly-ssh/testhelper_test.go b/cmd/gitaly-ssh/testhelper_test.go index 729ff1f59b288dc9bc1e860d365a9a32d33318eb..5a1b7b93c33039bd1bc735197e13b56394c23689 100644 --- a/cmd/gitaly-ssh/testhelper_test.go +++ b/cmd/gitaly-ssh/testhelper_test.go @@ -5,8 +5,8 @@ import ( "path/filepath" "testing" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) var gitalySSHPath string diff --git a/cmd/gitaly-ssh/upload_archive.go b/cmd/gitaly-ssh/upload_archive.go index dcb9eb2cf53b69e27f35a64bfeb752bac62f0519..80dc851e24ce7afc63d54bf4815cd63563735542 100644 --- a/cmd/gitaly-ssh/upload_archive.go +++ b/cmd/gitaly-ssh/upload_archive.go @@ -6,8 +6,8 @@ import ( "os" "github.com/golang/protobuf/jsonpb" - "gitlab.com/gitlab-org/gitaly/client" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/client" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" ) diff --git a/cmd/gitaly-ssh/upload_pack.go b/cmd/gitaly-ssh/upload_pack.go index 25c8563250261765aa618ca6fb273c10cd0ac7f8..dc11b56f44959bf045f10ff4e0a90bd8bf5234b0 100644 --- a/cmd/gitaly-ssh/upload_pack.go +++ b/cmd/gitaly-ssh/upload_pack.go @@ -6,8 +6,8 @@ import ( "os" "github.com/golang/protobuf/jsonpb" - "gitlab.com/gitlab-org/gitaly/client" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/client" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" ) diff --git a/cmd/gitaly-ssh/upload_pack_test.go b/cmd/gitaly-ssh/upload_pack_test.go index 8872b9a0661fcafa5fa655f4382d3badde42226a..4d0408c93f36f53efa7e7b440856098986762458 100644 --- a/cmd/gitaly-ssh/upload_pack_test.go +++ b/cmd/gitaly-ssh/upload_pack_test.go @@ -8,12 +8,12 @@ import ( "github.com/golang/protobuf/jsonpb" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/updateref" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/server" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/updateref" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/server" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) const keepAroundNamespace = "refs/keep-around" diff --git a/cmd/gitaly-wrapper/main.go b/cmd/gitaly-wrapper/main.go index e31c9e2e085aa25626233512a5579944daceca34..afb10d197505e3e840c9b857a0eb58fac1c7efb2 100644 --- a/cmd/gitaly-wrapper/main.go +++ b/cmd/gitaly-wrapper/main.go @@ -12,8 +12,8 @@ import ( "time" "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/bootstrap" - "gitlab.com/gitlab-org/gitaly/internal/ps" + "gitlab.com/gitlab-org/gitaly/v13/internal/bootstrap" + "gitlab.com/gitlab-org/gitaly/v13/internal/ps" ) const ( diff --git a/cmd/gitaly-wrapper/main_test.go b/cmd/gitaly-wrapper/main_test.go index 59963da525c148abe91863469fe4fc1139540a01..d5ce3a83d26f299463b9144ceac7f82290b5ba36 100644 --- a/cmd/gitaly-wrapper/main_test.go +++ b/cmd/gitaly-wrapper/main_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/bootstrap" + "gitlab.com/gitlab-org/gitaly/v13/internal/bootstrap" ) // TestStolenPid tests for regressions in https://gitlab.com/gitlab-org/gitaly/issues/1661 diff --git a/cmd/gitaly/main.go b/cmd/gitaly/main.go index 3df15744a083732adbd7fd4bbe6ef0368bce2f27..d3d52b7271d540adaa77d20d94137c7e564f6912 100644 --- a/cmd/gitaly/main.go +++ b/cmd/gitaly/main.go @@ -9,17 +9,17 @@ import ( "github.com/prometheus/client_golang/prometheus" log "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/bootstrap" - "gitlab.com/gitlab-org/gitaly/internal/bootstrap/starter" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config/sentry" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/server" - glog "gitlab.com/gitlab-org/gitaly/internal/log" - "gitlab.com/gitlab-org/gitaly/internal/storage" - "gitlab.com/gitlab-org/gitaly/internal/tempdir" - "gitlab.com/gitlab-org/gitaly/internal/version" + "gitlab.com/gitlab-org/gitaly/v13/internal/bootstrap" + "gitlab.com/gitlab-org/gitaly/v13/internal/bootstrap/starter" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config/sentry" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/server" + glog "gitlab.com/gitlab-org/gitaly/v13/internal/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/storage" + "gitlab.com/gitlab-org/gitaly/v13/internal/tempdir" + "gitlab.com/gitlab-org/gitaly/v13/internal/version" "gitlab.com/gitlab-org/labkit/monitoring" "gitlab.com/gitlab-org/labkit/tracing" ) diff --git a/cmd/praefect/main.go b/cmd/praefect/main.go index f5a62f389e9800b3dd9750823eccb93bb354ae91..b6906594a47352a7576f65ba5a8f1903e1b99f42 100644 --- a/cmd/praefect/main.go +++ b/cmd/praefect/main.go @@ -92,22 +92,22 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/bootstrap" - "gitlab.com/gitlab-org/gitaly/internal/bootstrap/starter" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config/sentry" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/log" - "gitlab.com/gitlab-org/gitaly/internal/praefect" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore/glsql" - "gitlab.com/gitlab-org/gitaly/internal/praefect/metrics" - "gitlab.com/gitlab-org/gitaly/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/internal/praefect/nodes/tracker" - "gitlab.com/gitlab-org/gitaly/internal/praefect/protoregistry" - "gitlab.com/gitlab-org/gitaly/internal/praefect/reconciler" - "gitlab.com/gitlab-org/gitaly/internal/praefect/transactions" - "gitlab.com/gitlab-org/gitaly/internal/version" + "gitlab.com/gitlab-org/gitaly/v13/internal/bootstrap" + "gitlab.com/gitlab-org/gitaly/v13/internal/bootstrap/starter" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config/sentry" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/metrics" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/nodes/tracker" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/protoregistry" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/reconciler" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/transactions" + "gitlab.com/gitlab-org/gitaly/v13/internal/version" "gitlab.com/gitlab-org/labkit/monitoring" "gitlab.com/gitlab-org/labkit/tracing" ) diff --git a/cmd/praefect/main_test.go b/cmd/praefect/main_test.go index 7604d33dd67790422efd25005e78a5cbeb59a6a6..05ddb65ba29efe7ea4475130d82c2f63c292b9ad 100644 --- a/cmd/praefect/main_test.go +++ b/cmd/praefect/main_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/bootstrap/starter" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/bootstrap/starter" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" ) func TestNoConfigFlag(t *testing.T) { diff --git a/cmd/praefect/subcmd.go b/cmd/praefect/subcmd.go index 7b867dc5489087ff1d1a1be8fc57206c37671c91..ae86e6aa06711f2a8cb865bb4e0b7c01b32163bc 100644 --- a/cmd/praefect/subcmd.go +++ b/cmd/praefect/subcmd.go @@ -9,11 +9,11 @@ import ( "os/signal" "time" - gitalyauth "gitlab.com/gitlab-org/gitaly/auth" - "gitlab.com/gitlab-org/gitaly/client" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore/glsql" + gitalyauth "gitlab.com/gitlab-org/gitaly/v13/auth" + "gitlab.com/gitlab-org/gitaly/v13/client" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore/glsql" "google.golang.org/grpc" ) diff --git a/cmd/praefect/subcmd_accept_dataloss.go b/cmd/praefect/subcmd_accept_dataloss.go index cb81e1b90026403510378aa8cc0f4381cd106aef..399728c08335f2e08dc529ab3ce0f36b726fe358 100644 --- a/cmd/praefect/subcmd_accept_dataloss.go +++ b/cmd/praefect/subcmd_accept_dataloss.go @@ -5,8 +5,8 @@ import ( "flag" "fmt" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) type requiredParameterError string diff --git a/cmd/praefect/subcmd_accept_dataloss_test.go b/cmd/praefect/subcmd_accept_dataloss_test.go index c687337f57124236ed3c00c994dfe6ac87165cfb..d4cb502760430920768a395a2972fda9a7ada3da 100644 --- a/cmd/praefect/subcmd_accept_dataloss_test.go +++ b/cmd/praefect/subcmd_accept_dataloss_test.go @@ -6,11 +6,11 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/internal/praefect/service/info" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/service/info" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func TestAcceptDatalossSubcommand(t *testing.T) { diff --git a/cmd/praefect/subcmd_dataloss.go b/cmd/praefect/subcmd_dataloss.go index 460e374ba299eb8fd0177cc0cd77d68b06ed5e56..ebf64625a504ec26f0a3eff0443fc2028e61dcca 100644 --- a/cmd/praefect/subcmd_dataloss.go +++ b/cmd/praefect/subcmd_dataloss.go @@ -10,8 +10,8 @@ import ( "sort" "strings" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) type unexpectedPositionalArgsError struct{ Command string } diff --git a/cmd/praefect/subcmd_dataloss_test.go b/cmd/praefect/subcmd_dataloss_test.go index a7094dfe7284de92c6978d8d3c8df47c43edf99f..6c2d50031aee3c4002e89239b4a6bc70c468ea57 100644 --- a/cmd/praefect/subcmd_dataloss_test.go +++ b/cmd/praefect/subcmd_dataloss_test.go @@ -5,11 +5,11 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/internal/praefect/service/info" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/service/info" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestDatalossSubcommand(t *testing.T) { diff --git a/cmd/praefect/subcmd_pingnodes.go b/cmd/praefect/subcmd_pingnodes.go index cc2f87ff63669044cde7b59dc36f0ac79902dd9c..4685881ac199d5c4f07ce24b60a7d91c2abb878a 100644 --- a/cmd/praefect/subcmd_pingnodes.go +++ b/cmd/praefect/subcmd_pingnodes.go @@ -9,8 +9,8 @@ import ( "sync" "time" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/health/grpc_health_v1" ) diff --git a/cmd/praefect/subcmd_pingnodes_test.go b/cmd/praefect/subcmd_pingnodes_test.go index 22bc90a9779496dd10a914a24af39d1bd1f18e66..beea6a4573af7063ca13e6d0a2079e5e28b1ab73 100644 --- a/cmd/praefect/subcmd_pingnodes_test.go +++ b/cmd/praefect/subcmd_pingnodes_test.go @@ -10,8 +10,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) type mockServerService struct { diff --git a/cmd/praefect/subcmd_reconcile.go b/cmd/praefect/subcmd_reconcile.go index d9431fe417d96c1655140aa472fcda37009bc107..af67d46818cb1a7c8a35fa0fd3f2122059500b44 100644 --- a/cmd/praefect/subcmd_reconcile.go +++ b/cmd/praefect/subcmd_reconcile.go @@ -8,8 +8,8 @@ import ( "io" "log" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) type nodeReconciler struct { diff --git a/cmd/praefect/subcmd_sqldown.go b/cmd/praefect/subcmd_sqldown.go index 2748de0d026c8bad51d00c3dc8cf534a2d8721e3..277e9ca9b6efa877fc7b4b91f6928cff1e471ae7 100644 --- a/cmd/praefect/subcmd_sqldown.go +++ b/cmd/praefect/subcmd_sqldown.go @@ -6,8 +6,8 @@ import ( "fmt" "strconv" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore" ) type sqlMigrateDownSubcommand struct { diff --git a/cmd/praefect/subcmd_sqlstatus.go b/cmd/praefect/subcmd_sqlstatus.go index f71d9d20060edcd160c98303b787b66280f678ab..078f071bca339f6467bfc314290258c280d6ba59 100644 --- a/cmd/praefect/subcmd_sqlstatus.go +++ b/cmd/praefect/subcmd_sqlstatus.go @@ -6,8 +6,8 @@ import ( "sort" "github.com/olekukonko/tablewriter" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore" ) type sqlMigrateStatusSubcommand struct{} diff --git a/cmd/praefect/subcmd_test.go b/cmd/praefect/subcmd_test.go index adb940851e39434e7ca888989a4b61fd69ff2a88..ab9765e7a980bd46128297eff80366a8599d00e3 100644 --- a/cmd/praefect/subcmd_test.go +++ b/cmd/praefect/subcmd_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/health" "google.golang.org/grpc/health/grpc_health_v1" diff --git a/go.mod b/go.mod index 87e5732dbf8d7441d72aaf66dd35f13c17dee974..593df89df9cb1b4a2f04ca05e1ff859220ec9eae 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module gitlab.com/gitlab-org/gitaly +module gitlab.com/gitlab-org/gitaly/v13 require ( github.com/BurntSushi/toml v0.3.1 diff --git a/go.sum b/go.sum index 5b8b468a2c7255d2e617ced2101a33b390661018..179efb12d2a4703af38b366f1e3f35e52c710cab 100644 --- a/go.sum +++ b/go.sum @@ -77,6 +77,7 @@ github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/gavv/httpexpect v2.0.0+incompatible/go.mod h1:x+9tiU1YnrOvnB725RkpoLv1M62hOWzwo5OXotisrKc= github.com/getsentry/raven-go v0.1.0/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ= +github.com/getsentry/raven-go v0.1.2 h1:4V0z512S5mZXiBvmW2RbuZBSIY1sEdMNsPjpx2zwtSE= github.com/getsentry/raven-go v0.1.2/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ= github.com/getsentry/sentry-go v0.5.1 h1:MIPe7ScHADsrK2vznqmhksIUFxq7m0JfTh+ZIMkI+VQ= github.com/getsentry/sentry-go v0.5.1/go.mod h1:B8H7x8TYDPkeWPRzGpIiFO97LZP6rL8A3hEt8lUItMw= @@ -356,7 +357,9 @@ github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDf github.com/yudai/pp v2.0.1+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZkTdatxwunjIkc= github.com/ziutek/mymysql v1.5.4 h1:GB0qdRGsTwQSBVYuVShFBKaXSnSnYYC2d9knnE1LHFs= github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0= +gitlab.com/gitlab-org/gitaly v1.68.0 h1:VlcJs1+PrhW7lqJUU7Fh1q8FMJujmbbivdfde/cwB98= gitlab.com/gitlab-org/gitaly v1.68.0/go.mod h1:/pCsB918Zu5wFchZ9hLYin9WkJ2yQqdVNz0zlv5HbXg= +gitlab.com/gitlab-org/gitaly v1.87.0 h1:iTR1CslbK6F3vKe8yPqb5OQ+Pnrj/bl8ded5dPMU79s= gitlab.com/gitlab-org/gitlab-shell v0.0.0-20200921044701-1a2bfecd2f0e h1:kqUd95SLY+StJ14/rJdFwurKword02z9oGxEcDJH7gg= gitlab.com/gitlab-org/gitlab-shell v0.0.0-20200921044701-1a2bfecd2f0e/go.mod h1:RABblvnnhHpFU/lexlwGqpKgZsLV3RGA2D/Elp5/KEA= gitlab.com/gitlab-org/labkit v0.0.0-20190221122536-0c3fc7cdd57c/go.mod h1:rYhLgfrbEcyfinG+R3EvKu6bZSsmwQqcXzLfHWSfUKM= diff --git a/internal/blackbox/blackbox.go b/internal/blackbox/blackbox.go index d9f39dd591caf173ae8875684bb1e003b5893e73..79bde3ec646d18c3e52edc24c569f30ad0380d80 100644 --- a/internal/blackbox/blackbox.go +++ b/internal/blackbox/blackbox.go @@ -7,8 +7,8 @@ import ( "github.com/prometheus/client_golang/prometheus" log "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/internal/version" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v13/internal/version" "gitlab.com/gitlab-org/labkit/monitoring" ) diff --git a/internal/blackbox/config.go b/internal/blackbox/config.go index 7d4bb9c241b3e5cce7eadd1b936417dff0b4e028..d830975de1aaf521b46253e7d53210e53153f784 100644 --- a/internal/blackbox/config.go +++ b/internal/blackbox/config.go @@ -6,7 +6,7 @@ import ( "time" "github.com/BurntSushi/toml" - logconfig "gitlab.com/gitlab-org/gitaly/internal/gitaly/config/log" + logconfig "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config/log" ) type Config struct { diff --git a/internal/bootstrap/starter/starter.go b/internal/bootstrap/starter/starter.go index a8b7c018c3ce86874d20199c663def094d7c2f96..23cc2e832c2c1f7bb3bf8c3c8dc3ade79f37cbe7 100644 --- a/internal/bootstrap/starter/starter.go +++ b/internal/bootstrap/starter/starter.go @@ -7,8 +7,8 @@ import ( "strings" "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/bootstrap" - "gitlab.com/gitlab-org/gitaly/internal/connectioncounter" + "gitlab.com/gitlab-org/gitaly/v13/internal/bootstrap" + "gitlab.com/gitlab-org/gitaly/v13/internal/connectioncounter" ) const ( diff --git a/internal/cache/cachedb.go b/internal/cache/cachedb.go index a70724596c69b326a75491c502cb489d7a751251..a8746a35f0586ebb87d595f1614c2b44c7ca4133 100644 --- a/internal/cache/cachedb.go +++ b/internal/cache/cachedb.go @@ -10,8 +10,8 @@ import ( "github.com/golang/protobuf/proto" "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" - "gitlab.com/gitlab-org/gitaly/internal/safe" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/safe" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) // maps a cache path to the number of active writers diff --git a/internal/cache/cachedb_test.go b/internal/cache/cachedb_test.go index 7031f62614d9e328d1dc5220cbc282a355c19829..3a1b6bf841c13ef3dbce3bedc93225ba4890c8f8 100644 --- a/internal/cache/cachedb_test.go +++ b/internal/cache/cachedb_test.go @@ -12,11 +12,11 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/cache" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/metadata/featureflag" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/cache" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/metadata/featureflag" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func TestMain(m *testing.M) { diff --git a/internal/cache/keyer.go b/internal/cache/keyer.go index 41528aade22e865fd04b83022a4b4115d3154b5d..87c0b98d89e96cd58d5a77864434512fb03d3af1 100644 --- a/internal/cache/keyer.go +++ b/internal/cache/keyer.go @@ -16,13 +16,13 @@ import ( "github.com/golang/protobuf/proto" "github.com/google/uuid" "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/metadata/featureflag" - "gitlab.com/gitlab-org/gitaly/internal/safe" - "gitlab.com/gitlab-org/gitaly/internal/storage" - "gitlab.com/gitlab-org/gitaly/internal/tempdir" - "gitlab.com/gitlab-org/gitaly/internal/version" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/metadata/featureflag" + "gitlab.com/gitlab-org/gitaly/v13/internal/safe" + "gitlab.com/gitlab-org/gitaly/v13/internal/storage" + "gitlab.com/gitlab-org/gitaly/v13/internal/tempdir" + "gitlab.com/gitlab-org/gitaly/v13/internal/version" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" ) diff --git a/internal/cache/walker.go b/internal/cache/walker.go index 775f048967be4b939e2809615832909059bff8b9..30626b78db7240598169c695fe077c23912a5e41 100644 --- a/internal/cache/walker.go +++ b/internal/cache/walker.go @@ -12,10 +12,10 @@ import ( "time" "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/dontpanic" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/log" - "gitlab.com/gitlab-org/gitaly/internal/tempdir" + "gitlab.com/gitlab-org/gitaly/v13/internal/dontpanic" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/tempdir" ) func logWalkErr(err error, path, msg string) { diff --git a/internal/cache/walker_test.go b/internal/cache/walker_test.go index a469ffbd1172e4ef2bf0ad760de9da4745e0f731..62347d382f3d75beee97e1d4081cda7e49e66354 100644 --- a/internal/cache/walker_test.go +++ b/internal/cache/walker_test.go @@ -9,10 +9,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/cache" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/tempdir" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/cache" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/tempdir" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestDiskCacheObjectWalker(t *testing.T) { diff --git a/internal/command/command.go b/internal/command/command.go index 5ea8ab752180c74327f8facdf655a284aef7a487..6ad473b84aed4d6d9084e05eec283b1efcd11fbc 100644 --- a/internal/command/command.go +++ b/internal/command/command.go @@ -16,8 +16,8 @@ import ( "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/metadata/featureflag" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/metadata/featureflag" "gitlab.com/gitlab-org/labkit/tracing" ) diff --git a/internal/dontpanic/retry.go b/internal/dontpanic/retry.go index 2f95761974ad8f1d80f6f63edf808b132181fc37..bbcbd89c5b7936ccdeacb319833278b13ba9c4b2 100644 --- a/internal/dontpanic/retry.go +++ b/internal/dontpanic/retry.go @@ -11,7 +11,7 @@ import ( "time" sentry "github.com/getsentry/sentry-go" - "gitlab.com/gitlab-org/gitaly/internal/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/log" ) // Try will wrap the provided function with a panic recovery. If a panic occurs, diff --git a/internal/dontpanic/retry_test.go b/internal/dontpanic/retry_test.go index fe5c88092191441cf135bc371aba8c5a303a64ff..9ee4ee9979bb54d579dae97e85abbe908ddd5e8f 100644 --- a/internal/dontpanic/retry_test.go +++ b/internal/dontpanic/retry_test.go @@ -5,7 +5,7 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/dontpanic" + "gitlab.com/gitlab-org/gitaly/v13/internal/dontpanic" ) func TestTry(t *testing.T) { diff --git a/internal/git/alternates/alternates.go b/internal/git/alternates/alternates.go index b17fdaff394aceffdbe40c9447950b599dab8693..98b073a99f331fa46e9683447c5c84adbe2fc440 100644 --- a/internal/git/alternates/alternates.go +++ b/internal/git/alternates/alternates.go @@ -5,8 +5,8 @@ import ( "path/filepath" "strings" - "gitlab.com/gitlab-org/gitaly/internal/git/repository" - "gitlab.com/gitlab-org/gitaly/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/repository" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" ) // PathAndEnv finds the disk path to a repository, and returns the diff --git a/internal/git/bitmap.go b/internal/git/bitmap.go index f557557f746ad3b974421eaa5f95df09c26c0aa8..f64d66139ad6a4b08bc8bc6665f1bec05a17ec86 100644 --- a/internal/git/bitmap.go +++ b/internal/git/bitmap.go @@ -9,9 +9,9 @@ import ( "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" grpc_ctxtags "github.com/grpc-ecosystem/go-grpc-middleware/tags" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/internal/git/packfile" - "gitlab.com/gitlab-org/gitaly/internal/git/repository" - "gitlab.com/gitlab-org/gitaly/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/packfile" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/repository" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" ) var badBitmapRequestCount = prometheus.NewCounterVec( diff --git a/internal/git/catfile/batch.go b/internal/git/catfile/batch.go index 759899091f91fb037f7d28350d0f80c0f322a48e..fe01901f7993d0a146f0666d3627c9ae8ee88e33 100644 --- a/internal/git/catfile/batch.go +++ b/internal/git/catfile/batch.go @@ -8,9 +8,9 @@ import ( "io/ioutil" "sync" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/alternates" - "gitlab.com/gitlab-org/gitaly/internal/git/repository" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/alternates" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/repository" ) // batch encapsulates a 'git cat-file --batch' process diff --git a/internal/git/catfile/batch_cache.go b/internal/git/catfile/batch_cache.go index d20568d361fb13b61b476276633bd6b2560163bf..2bba3e9af82aa5e479e23991a591f3f627a810cf 100644 --- a/internal/git/catfile/batch_cache.go +++ b/internal/git/catfile/batch_cache.go @@ -6,8 +6,8 @@ import ( "time" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/internal/git/repository" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/repository" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" ) const ( diff --git a/internal/git/catfile/batchcheck.go b/internal/git/catfile/batchcheck.go index 00714b7a814685a5ae50bf8a97efca1386ea67a9..093578176a18f5fb52fe7e354dbc48d57e7a73c2 100644 --- a/internal/git/catfile/batchcheck.go +++ b/internal/git/catfile/batchcheck.go @@ -7,9 +7,9 @@ import ( "io" "sync" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/alternates" - "gitlab.com/gitlab-org/gitaly/internal/git/repository" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/alternates" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/repository" ) // batchCheck encapsulates a 'git cat-file --batch-check' process diff --git a/internal/git/catfile/catfile.go b/internal/git/catfile/catfile.go index be662f45b27f3613e17bc0c6b0eca3f41e998e6e..08b17cca5ef9cabc5105233ce552c11bc5d257b7 100644 --- a/internal/git/catfile/catfile.go +++ b/internal/git/catfile/catfile.go @@ -5,8 +5,8 @@ import ( "sync" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/internal/git/repository" - "gitlab.com/gitlab-org/gitaly/internal/metadata" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/repository" + "gitlab.com/gitlab-org/gitaly/v13/internal/metadata" ) var catfileCacheCounter = prometheus.NewCounterVec( diff --git a/internal/git/catfile/catfile_test.go b/internal/git/catfile/catfile_test.go index da1ab8059213e061d332e706dfa98560eb19b6e8..46febea8a87a14542305da891024d360b09511c1 100644 --- a/internal/git/catfile/catfile_test.go +++ b/internal/git/catfile/catfile_test.go @@ -12,9 +12,9 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" "google.golang.org/grpc/metadata" ) diff --git a/internal/git/catfile/testhelper_test.go b/internal/git/catfile/testhelper_test.go index 8cbef4ef548537825e44f44bc3afa31b08b79498..048718d3799ab39de2543cdac6c87311b5c69d12 100644 --- a/internal/git/catfile/testhelper_test.go +++ b/internal/git/catfile/testhelper_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/git/command.go b/internal/git/command.go index 6fb682913e828570a9331e1aa4f972fe7ecadf93..bf8c640426d7225d852ea1855d31693b47e939cc 100644 --- a/internal/git/command.go +++ b/internal/git/command.go @@ -4,9 +4,9 @@ import ( "context" "os/exec" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/git/alternates" - "gitlab.com/gitlab-org/gitaly/internal/git/repository" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/alternates" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/repository" ) // unsafeCmdWithEnv creates a git.unsafeCmd with the given args, environment, and Repository diff --git a/internal/git/command_test.go b/internal/git/command_test.go index 746baf8560f5bb8ad87c7155bf5b30671f471a91..524b3502923f0372b80dfe841ca04771b3234d01 100644 --- a/internal/git/command_test.go +++ b/internal/git/command_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestGitCommandProxy(t *testing.T) { diff --git a/internal/git/dirs_test.go b/internal/git/dirs_test.go index e0bb87e0cc82659e3727c8f140056934d06bd845..b0ecc9d1b57395e94b03572a4a26095d5d7aff78 100644 --- a/internal/git/dirs_test.go +++ b/internal/git/dirs_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestObjectDirs(t *testing.T) { diff --git a/internal/git/gittest/delta_islands.go b/internal/git/gittest/delta_islands.go index 7640be6d3f3847e4b4cc5858b96b22e27271e96b..42417976a602f295fa1ec51f2f5bf3228cafffe8 100644 --- a/internal/git/gittest/delta_islands.go +++ b/internal/git/gittest/delta_islands.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) // TestDeltaIslands is based on the tests in diff --git a/internal/git/gittest/http_server.go b/internal/git/gittest/http_server.go index 25ff78f08914c1bfc8c9dfc7c0f5b561f8b8b25a..bd442f599f81cd8cbd5a39c0a859569a3c31fabf 100644 --- a/internal/git/gittest/http_server.go +++ b/internal/git/gittest/http_server.go @@ -10,7 +10,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" ) // RemoteUploadPackServer implements two HTTP routes for git-upload-pack by copying stdin and stdout into and out of the git upload-pack command diff --git a/internal/git/helper_test.go b/internal/git/helper_test.go index f3cd415b17ca3266e80e6601c014db00bcc4d62a..f6bed1a69980cdca2acbf779d03deebaf0645d9e 100644 --- a/internal/git/helper_test.go +++ b/internal/git/helper_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/git/hooks/hooks.go b/internal/git/hooks/hooks.go index aabb2f5fa57b9da586199bdc00fdebc9877824ef..57c46a696254a234dda15ea842d23c1fe0ee8d4a 100644 --- a/internal/git/hooks/hooks.go +++ b/internal/git/hooks/hooks.go @@ -4,7 +4,7 @@ import ( "fmt" "path/filepath" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" ) // Override allows tests to control where the hooks directory is. diff --git a/internal/git/hooks/hooks_test.go b/internal/git/hooks/hooks_test.go index 1ea9266bf27c68c963f04c29b067f03d36c605ac..2c7e87b021d6fa78c77b92c7d2e6a7c0f88e058c 100644 --- a/internal/git/hooks/hooks_test.go +++ b/internal/git/hooks/hooks_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" ) func TestPath(t *testing.T) { diff --git a/internal/git/log/commit.go b/internal/git/log/commit.go index 81a768be37ac19f72a14f5b2ba1908482430a417..597f04c8a8ca5604cc7283c3ffa9d8d75f46b87a 100644 --- a/internal/git/log/commit.go +++ b/internal/git/log/commit.go @@ -10,10 +10,10 @@ import ( "strings" "github.com/golang/protobuf/ptypes/timestamp" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) // GetCommit tries to resolve revision to a Git commit. Returns nil if diff --git a/internal/git/log/commit_test.go b/internal/git/log/commit_test.go index 891443bb14cf6b5093e4d31c5e89ffd60bad40c6..39813278eb448f426c599afc71b05c1f0a018509 100644 --- a/internal/git/log/commit_test.go +++ b/internal/git/log/commit_test.go @@ -7,9 +7,9 @@ import ( "github.com/golang/protobuf/ptypes/timestamp" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/metadata" ) diff --git a/internal/git/log/last_commit.go b/internal/git/log/last_commit.go index 6c29a64e60227b827e58fdec7c2ba6dcf3927963..448ebeab2abd9758bd59b4e14c0bf93652792fa5 100644 --- a/internal/git/log/last_commit.go +++ b/internal/git/log/last_commit.go @@ -4,11 +4,11 @@ import ( "context" "io/ioutil" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) // LastCommitForPath returns the last commit which modified path. diff --git a/internal/git/log/log.go b/internal/git/log/log.go index c591f36bf97c8f8d77bee76ce2c4625aadbb39ea..29529a2517b5f6a9f943a54ad4e9564b72f0f1f8 100644 --- a/internal/git/log/log.go +++ b/internal/git/log/log.go @@ -6,8 +6,8 @@ import ( "fmt" "io" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) // IsNotFound tests if an error is a "not found" error. diff --git a/internal/git/log/tag.go b/internal/git/log/tag.go index f309f9b780f4b9214af615c4ffb90ad94cc54a46..fd7898e3448fef799e81c67e30ec64657dda6a33 100644 --- a/internal/git/log/tag.go +++ b/internal/git/log/tag.go @@ -8,9 +8,9 @@ import ( "io/ioutil" "strings" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) const ( diff --git a/internal/git/log/tag_test.go b/internal/git/log/tag_test.go index 2aadb8511bb453304c8e47ef03da81e719429139..0331d96612f85a323eb79fca2f333907e26fd86b 100644 --- a/internal/git/log/tag_test.go +++ b/internal/git/log/tag_test.go @@ -8,9 +8,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestGetTag(t *testing.T) { diff --git a/internal/git/objectpool/clone.go b/internal/git/objectpool/clone.go index e21587de852a107835db7b041377b5e0ad3c0994..b8f0b1e3b1ae967eb3a77534e2d3d0972ad262d2 100644 --- a/internal/git/objectpool/clone.go +++ b/internal/git/objectpool/clone.go @@ -5,9 +5,9 @@ import ( "os" "path/filepath" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) // Clone a repository to a pool, without setting the alternates, is not the diff --git a/internal/git/objectpool/clone_test.go b/internal/git/objectpool/clone_test.go index cb10fd01d0a7b09e7aa0f2e64dc734e1019ee49d..fb2f1e59434dd7479a7e625f095b444010de381f 100644 --- a/internal/git/objectpool/clone_test.go +++ b/internal/git/objectpool/clone_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestClone(t *testing.T) { diff --git a/internal/git/objectpool/fetch.go b/internal/git/objectpool/fetch.go index 2bcd3a59918f9ee3342931e465fd295b4b4fbc4b..490705c2193e7560d14702a3efb473d2a17521f9 100644 --- a/internal/git/objectpool/fetch.go +++ b/internal/git/objectpool/fetch.go @@ -13,11 +13,11 @@ import ( "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/repository" - "gitlab.com/gitlab-org/gitaly/internal/git/updateref" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/repository" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/updateref" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) const ( diff --git a/internal/git/objectpool/fetch_test.go b/internal/git/objectpool/fetch_test.go index 4998d2b3a38d117095f383fe054462dace4daa16..d7f63f0b6795f6b89692edb720a1522678998d42 100644 --- a/internal/git/objectpool/fetch_test.go +++ b/internal/git/objectpool/fetch_test.go @@ -8,10 +8,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestFetchFromOriginDangling(t *testing.T) { diff --git a/internal/git/objectpool/link.go b/internal/git/objectpool/link.go index ac7b526f4f7401771ced576b3fc22dcd805ecab1..8a125d81ab05d00383fa03d82682987755c8c6bb 100644 --- a/internal/git/objectpool/link.go +++ b/internal/git/objectpool/link.go @@ -10,11 +10,11 @@ import ( "path/filepath" "strings" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/remote" - "gitlab.com/gitlab-org/gitaly/internal/git/repository" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/remote" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/repository" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) // Link will write the relative path to the object pool from the repository that diff --git a/internal/git/objectpool/link_test.go b/internal/git/objectpool/link_test.go index c3a7318af7f97c5974a42e822898e7d9868bef20..3eb10b67e1ac633b24c1f2572cfe21827f7077a4 100644 --- a/internal/git/objectpool/link_test.go +++ b/internal/git/objectpool/link_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestLink(t *testing.T) { diff --git a/internal/git/objectpool/pool.go b/internal/git/objectpool/pool.go index 96ead698781cd7e9a37a4e19ad93e46086ace5d4..bf337bbc15a7c866ef21711ecb1f92a0d779b7a1 100644 --- a/internal/git/objectpool/pool.go +++ b/internal/git/objectpool/pool.go @@ -12,10 +12,10 @@ import ( "regexp" "strings" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/storage" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/storage" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) // poolDirRegexp is used to validate object pool directory structure and name. diff --git a/internal/git/objectpool/pool_test.go b/internal/git/objectpool/pool_test.go index 2a2dd2c5400340c37ee382ad8fe741a2b9a79fff..f9809b64d3b7c6b69ec7f67a392ee49bbbb53d73 100644 --- a/internal/git/objectpool/pool_test.go +++ b/internal/git/objectpool/pool_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestNewObjectPool(t *testing.T) { diff --git a/internal/git/objectpool/proto.go b/internal/git/objectpool/proto.go index 1e69f5a50cb198ed876b2193bf0ba6435b4c4b02..95d4732a0be6428bd73c735ae898da9c6c26de4d 100644 --- a/internal/git/objectpool/proto.go +++ b/internal/git/objectpool/proto.go @@ -1,8 +1,8 @@ package objectpool import ( - "gitlab.com/gitlab-org/gitaly/internal/storage" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/storage" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) // FromProto returns an object pool object from a git repository object diff --git a/internal/git/objectpool/testhelper_test.go b/internal/git/objectpool/testhelper_test.go index 21eef190a0dffc5644bad201dd326d3014c709be..8bcffa71a57b2f25fa0ba78e6bfdbc58ba1481ff 100644 --- a/internal/git/objectpool/testhelper_test.go +++ b/internal/git/objectpool/testhelper_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/git/packfile/bitmap.go b/internal/git/packfile/bitmap.go index fa35ec4b64a7365c76f313079d17b61a50fc8091..25195a94f9e5171836d7107141ec69f928be68c5 100644 --- a/internal/git/packfile/bitmap.go +++ b/internal/git/packfile/bitmap.go @@ -11,7 +11,7 @@ import ( "math/big" "os" - "gitlab.com/gitlab-org/gitaly/internal/git/gitio" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/gitio" ) // IndexBitmap is the in-memory representation of a .bitmap file. diff --git a/internal/git/packfile/index.go b/internal/git/packfile/index.go index 29640bcb12edd9d5a11618377f782e170d5d20a6..74f15e18c70b29eb520c77cc1eb33d9eb95645f0 100644 --- a/internal/git/packfile/index.go +++ b/internal/git/packfile/index.go @@ -16,7 +16,7 @@ import ( "strconv" "strings" - "gitlab.com/gitlab-org/gitaly/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" ) const sumSize = sha1.Size diff --git a/internal/git/packfile/packfile_test.go b/internal/git/packfile/packfile_test.go index d571a668b4046324ff264f2caeaac1654f9253ee..9d8668d11bcc8fafbb90e2e36f44b38c051a8646 100644 --- a/internal/git/packfile/packfile_test.go +++ b/internal/git/packfile/packfile_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/git/pktline/read_monitor_test.go b/internal/git/pktline/read_monitor_test.go index 63f26f1db005eb2026030a3aa16829286d4a3926..2aec058191e5df870ab2e820c138097056a6bebd 100644 --- a/internal/git/pktline/read_monitor_test.go +++ b/internal/git/pktline/read_monitor_test.go @@ -11,7 +11,7 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestReadMonitorTimeout(t *testing.T) { diff --git a/internal/git/proto.go b/internal/git/proto.go index 69a41482018d6bb0c266f243ef4c3333fe135953..7299e91c9e900e37a5034574a96d62557c4fa60d 100644 --- a/internal/git/proto.go +++ b/internal/git/proto.go @@ -9,8 +9,8 @@ import ( "strings" "time" - "gitlab.com/gitlab-org/gitaly/internal/git/repository" - "gitlab.com/gitlab-org/gitaly/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/repository" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" ) // FallbackTimeValue is the value returned by `SafeTimeParse` in case it diff --git a/internal/git/proto_test.go b/internal/git/proto_test.go index 3386c41d4b6ccd470049056879c5307af1064fc5..20c2fd2ee114bf2f9c7b6ffe31295c7fecb04866 100644 --- a/internal/git/proto_test.go +++ b/internal/git/proto_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" ) func TestVersionComparator(t *testing.T) { diff --git a/internal/git/protocol.go b/internal/git/protocol.go index 6b0541027e4698fc14516ac420678f20a8684ef1..2cbb51f9bfd9d92478844b0f463a7e05d712b25b 100644 --- a/internal/git/protocol.go +++ b/internal/git/protocol.go @@ -7,7 +7,7 @@ import ( grpc_ctxtags "github.com/grpc-ecosystem/go-grpc-middleware/tags" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/internal/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/log" ) const ( diff --git a/internal/git/protocol_test.go b/internal/git/protocol_test.go index f5ec602db0bc4e3a5f7b706334a8800ebba058f9..6dd05594c0608ac252c8e0fc4cfa2b4d083e174e 100644 --- a/internal/git/protocol_test.go +++ b/internal/git/protocol_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) type fakeProtocolMessage struct { diff --git a/internal/git/receivepack.go b/internal/git/receivepack.go index f75afd55abc1ed2f8d281e5568ce1c79e8d5ed20..3a04ebaa17bb91cc10c21f94daae15c1dbe761c6 100644 --- a/internal/git/receivepack.go +++ b/internal/git/receivepack.go @@ -7,12 +7,12 @@ import ( "strconv" "github.com/golang/protobuf/jsonpb" - "gitlab.com/gitlab-org/gitaly/internal/git/hooks" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/gitlabshell" - "gitlab.com/gitlab-org/gitaly/internal/metadata/featureflag" - "gitlab.com/gitlab-org/gitaly/internal/praefect/metadata" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/hooks" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitlabshell" + "gitlab.com/gitlab-org/gitaly/v13/internal/metadata/featureflag" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/metadata" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) // ReceivePackRequest abstracts away the different requests that end up diff --git a/internal/git/remote/remote.go b/internal/git/remote/remote.go index 41e83b1877996b3c08c0762ae3f59a310a752273..125db9d1a0a24fe198ba58de97aa939ba393a9ac 100644 --- a/internal/git/remote/remote.go +++ b/internal/git/remote/remote.go @@ -4,8 +4,8 @@ import ( "bufio" "context" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/repository" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/repository" ) //Remove removes the remote from repository diff --git a/internal/git/remote/remote_test.go b/internal/git/remote/remote_test.go index 91549043a1357dee8aeb8b14479b5402e3b6be9c..ac54d8eb45621b3ea086cffd93346a0d7d6a771d 100644 --- a/internal/git/remote/remote_test.go +++ b/internal/git/remote/remote_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/git/repository.go b/internal/git/repository.go index 1f995f3d525c201c11e8685b9ceafdacb02b6e19..108d803e878ddf0a9d91f11295791a3f919c81d7 100644 --- a/internal/git/repository.go +++ b/internal/git/repository.go @@ -10,8 +10,8 @@ import ( "os/exec" "strings" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/git/repository" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/repository" ) var ( diff --git a/internal/git/repository_test.go b/internal/git/repository_test.go index b18509bd7b2beb98d4fda6257483ec52270142b8..79593357189dbca508876af81e3b62eaadb5a7e0 100644 --- a/internal/git/repository_test.go +++ b/internal/git/repository_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) const ( diff --git a/internal/git/safecmd.go b/internal/git/safecmd.go index c45aa3a8f1cafb6f5af924030bf32611d5d5f9a9..af05f39623d9ab38756059712124348c0ddbc13f 100644 --- a/internal/git/safecmd.go +++ b/internal/git/safecmd.go @@ -9,9 +9,9 @@ import ( "strings" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/git/repository" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/repository" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) var ( diff --git a/internal/git/safecmd_test.go b/internal/git/safecmd_test.go index 6ab1993909a4bc269f0afbccd5ef8ee02382d917..f24feb1edf7bcc55b1df9a17f8837f05d3031571 100644 --- a/internal/git/safecmd_test.go +++ b/internal/git/safecmd_test.go @@ -5,10 +5,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func TestFlagValidation(t *testing.T) { diff --git a/internal/git/stats/analyzehttp.go b/internal/git/stats/analyzehttp.go index 7b7303c4b8a18ef6f48f90f2b8d1ee65ac00f9fc..2999cd827234b8f646682cbf9c798ea1b86ca670 100644 --- a/internal/git/stats/analyzehttp.go +++ b/internal/git/stats/analyzehttp.go @@ -13,7 +13,7 @@ import ( "strings" "time" - "gitlab.com/gitlab-org/gitaly/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/pktline" ) type Clone struct { diff --git a/internal/git/stats/analyzehttp_test.go b/internal/git/stats/analyzehttp_test.go index c041db9b1cbd20f5a9e5948c368c8e2443933146..0b56351a7a4c7a54268e66c258b51db7a4e63ed3 100644 --- a/internal/git/stats/analyzehttp_test.go +++ b/internal/git/stats/analyzehttp_test.go @@ -8,7 +8,7 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestClone(t *testing.T) { diff --git a/internal/git/stats/git.go b/internal/git/stats/git.go index cc8abe59bf1053f515a77e6bcaed4f684e9357ba..d71fe94f6b58ff86e64775f96f781d196e9474c3 100644 --- a/internal/git/stats/git.go +++ b/internal/git/stats/git.go @@ -8,8 +8,8 @@ import ( "strings" "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/repository" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/repository" ) // LogObjectsInfo read statistics of the git repo objects diff --git a/internal/git/stats/git_test.go b/internal/git/stats/git_test.go index 0909b8400932a3f112fca54eac8e55d0c5df2617..14e513b7e7b0e026d7e0235e927d5999c7b5cf9f 100644 --- a/internal/git/stats/git_test.go +++ b/internal/git/stats/git_test.go @@ -12,9 +12,9 @@ import ( "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" "github.com/sirupsen/logrus" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func TestLogObjectInfo(t *testing.T) { diff --git a/internal/git/stats/packfile_negotiation.go b/internal/git/stats/packfile_negotiation.go index 266d2d545dc85bf6eb2ae82c6c39f90c17f8e649..3b964fe25ce96feb65c3f4af61acf755ca6b9e2d 100644 --- a/internal/git/stats/packfile_negotiation.go +++ b/internal/git/stats/packfile_negotiation.go @@ -8,8 +8,8 @@ import ( "strings" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/internal/git/pktline" - "gitlab.com/gitlab-org/gitaly/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/text" ) type PackfileNegotiation struct { diff --git a/internal/git/stats/packfile_negotiation_test.go b/internal/git/stats/packfile_negotiation_test.go index d9f67ef94d93c71bafaf00d39a6d9324a4f614b9..db756f293bfb795c36386e61884ce7d016de2225 100644 --- a/internal/git/stats/packfile_negotiation_test.go +++ b/internal/git/stats/packfile_negotiation_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/pktline" ) const ( diff --git a/internal/git/stats/profile.go b/internal/git/stats/profile.go index ea32446e59bb9bec4dc9a1a7f6461d9e8ac132ad..e3b7117062bb0effe07a0a6c41389377d2f9f91a 100644 --- a/internal/git/stats/profile.go +++ b/internal/git/stats/profile.go @@ -9,9 +9,9 @@ import ( "strconv" "time" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/repository" - "gitlab.com/gitlab-org/gitaly/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/repository" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" ) // HasBitmap returns whether or not the repository contains an object bitmap. diff --git a/internal/git/stats/profile_test.go b/internal/git/stats/profile_test.go index b2592102286f384a1fd9854cbba40c51f0e98189..a121e03f715c26ce90e86612762c76b27987e21d 100644 --- a/internal/git/stats/profile_test.go +++ b/internal/git/stats/profile_test.go @@ -7,7 +7,7 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestRepositoryProfile(t *testing.T) { diff --git a/internal/git/stats/reference_discovery.go b/internal/git/stats/reference_discovery.go index 0bd83628d8567e61fe12390b3389838adcf61680..429c27314218f8269a6f59de73ca1915826288f0 100644 --- a/internal/git/stats/reference_discovery.go +++ b/internal/git/stats/reference_discovery.go @@ -7,8 +7,8 @@ import ( "strings" "time" - "gitlab.com/gitlab-org/gitaly/internal/git/pktline" - "gitlab.com/gitlab-org/gitaly/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/text" ) // Reference as used by the reference discovery protocol diff --git a/internal/git/stats/reference_discovery_test.go b/internal/git/stats/reference_discovery_test.go index 00bc947e3da57f9c98d7167e02f28b6871b3e2ae..53fbc053f5fd91827f58ccdf31dad63c421351fc 100644 --- a/internal/git/stats/reference_discovery_test.go +++ b/internal/git/stats/reference_discovery_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/pktline" ) func TestSingleRefParses(t *testing.T) { diff --git a/internal/git/stats/testhelper_test.go b/internal/git/stats/testhelper_test.go index 19eea94580ccb422f3750ca4b3aad46ae9935ac4..007169636604d931612198dff688a4c26b820275 100644 --- a/internal/git/stats/testhelper_test.go +++ b/internal/git/stats/testhelper_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/git/updateref/updateref.go b/internal/git/updateref/updateref.go index 10d9901caab20642171dbaff2e00fc051b92402b..609f9949df23a731e222e68526d3fff78101a49d 100644 --- a/internal/git/updateref/updateref.go +++ b/internal/git/updateref/updateref.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/repository" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/repository" ) // Updater wraps a `git update-ref --stdin` process, presenting an interface diff --git a/internal/git/updateref/updateref_test.go b/internal/git/updateref/updateref_test.go index f8590ec2c5fcb475f50fc92b7f14568358b84e3b..8389315172be9a5ef33fb05df4faff910e86e421 100644 --- a/internal/git/updateref/updateref_test.go +++ b/internal/git/updateref/updateref_test.go @@ -8,9 +8,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func TestMain(m *testing.M) { diff --git a/internal/git2go/merge.go b/internal/git2go/merge.go index b901353af378abc4c5571ce61a62255b76c00fdf..d80aa557a6ed54edf2311031d8e50d89366fc0f7 100644 --- a/internal/git2go/merge.go +++ b/internal/git2go/merge.go @@ -12,8 +12,8 @@ import ( "strings" "time" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" ) var ( diff --git a/internal/gitaly/config/concurrency.go b/internal/gitaly/config/concurrency.go index 75a58852fc2d97c74559ad63aec9233130bdcc18..3f0bd3294c377da2e0aafc11261825973d259e34 100644 --- a/internal/gitaly/config/concurrency.go +++ b/internal/gitaly/config/concurrency.go @@ -1,7 +1,7 @@ package config import ( - "gitlab.com/gitlab-org/gitaly/internal/middleware/limithandler" + "gitlab.com/gitlab-org/gitaly/v13/internal/middleware/limithandler" ) // ConfigureConcurrencyLimits configures the per-repo, per RPC rate limits diff --git a/internal/gitaly/config/config.go b/internal/gitaly/config/config.go index 993e095dd239fa8ce7ef33bc74713eb4727863be..ea2ef7f097c0da02cf6e30d01f838c5ed792e7bf 100644 --- a/internal/gitaly/config/config.go +++ b/internal/gitaly/config/config.go @@ -15,11 +15,11 @@ import ( "github.com/BurntSushi/toml" "github.com/kelseyhightower/envconfig" log "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config/auth" - internallog "gitlab.com/gitlab-org/gitaly/internal/gitaly/config/log" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config/prometheus" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config/sentry" - "gitlab.com/gitlab-org/gitaly/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config/auth" + internallog "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config/prometheus" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config/sentry" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/text" ) var ( diff --git a/internal/gitaly/config/config_test.go b/internal/gitaly/config/config_test.go index 926b6812fb91a352f615d515b4814e591b94513d..d4e2c6e3b3030413a3349ef32a90cca63a83d0d4 100644 --- a/internal/gitaly/config/config_test.go +++ b/internal/gitaly/config/config_test.go @@ -15,7 +15,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config/sentry" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config/sentry" ) func configFileReader(content string) io.Reader { diff --git a/internal/gitaly/config/locator.go b/internal/gitaly/config/locator.go index b280a6cfb66b146e3b964028a0a90178726079eb..c23997f1aea7c3518a4a2d7d44ed25d2043191ec 100644 --- a/internal/gitaly/config/locator.go +++ b/internal/gitaly/config/locator.go @@ -4,8 +4,8 @@ import ( "os" "path/filepath" - "gitlab.com/gitlab-org/gitaly/internal/git/repository" - "gitlab.com/gitlab-org/gitaly/internal/storage" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/repository" + "gitlab.com/gitlab-org/gitaly/v13/internal/storage" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/config/logger.go b/internal/gitaly/config/logger.go index 66e9f47480e15007a4ca41d8f5f05e6300b80893..02d52b30f065215349718d8e70f72ecad510541d 100644 --- a/internal/gitaly/config/logger.go +++ b/internal/gitaly/config/logger.go @@ -1,7 +1,7 @@ package config import ( - gitalylog "gitlab.com/gitlab-org/gitaly/internal/log" + gitalylog "gitlab.com/gitlab-org/gitaly/v13/internal/log" ) // ConfigureLogging uses the global conf and environmental vars to configure log levels and format diff --git a/internal/gitaly/config/prometheus/config.go b/internal/gitaly/config/prometheus/config.go index 08c4d87037e40b0d604dd30ccde0fcaf73eb0737..0f71528af8c900bd60fd0c260d373d4adf175e31 100644 --- a/internal/gitaly/config/prometheus/config.go +++ b/internal/gitaly/config/prometheus/config.go @@ -4,7 +4,7 @@ import ( grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" "github.com/prometheus/client_golang/prometheus" log "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/middleware/limithandler" + "gitlab.com/gitlab-org/gitaly/v13/internal/middleware/limithandler" ) // Config contains additional configuration data for prometheus diff --git a/internal/gitaly/config/sentry/sentry.go b/internal/gitaly/config/sentry/sentry.go index 8f408d9a9d01de0122b3c398e9f9a2666fcc0130..3ea6fa7acd77be411c8678d7a34172564f57e4a1 100644 --- a/internal/gitaly/config/sentry/sentry.go +++ b/internal/gitaly/config/sentry/sentry.go @@ -5,7 +5,7 @@ import ( sentry "github.com/getsentry/sentry-go" log "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/middleware/panichandler" + "gitlab.com/gitlab-org/gitaly/v13/internal/middleware/panichandler" ) // Config contains configuration for sentry diff --git a/internal/gitaly/diff/diff.go b/internal/gitaly/diff/diff.go index a1d53b0d02110e3005bd169e3cf2466a4efe81f7..bc8a8ee83ba82530bfef741a3b516943b782de18 100644 --- a/internal/gitaly/diff/diff.go +++ b/internal/gitaly/diff/diff.go @@ -9,7 +9,7 @@ import ( "regexp" "strconv" - "gitlab.com/gitlab-org/gitaly/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" ) const blankID = "0000000000000000000000000000000000000000" diff --git a/internal/gitaly/hook/access.go b/internal/gitaly/hook/access.go index 07699147c49a19bac8a627f1d100101c6a929aca..32b71e2f4f2aade0850c3e1da767530f7a20bc2c 100644 --- a/internal/gitaly/hook/access.go +++ b/internal/gitaly/hook/access.go @@ -12,9 +12,9 @@ import ( "regexp" "strings" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "gitlab.com/gitlab-org/gitlab-shell/client" ) diff --git a/internal/gitaly/hook/access_test.go b/internal/gitaly/hook/access_test.go index deb17bfcb8b03e5cc7403b56d62c0685e04fd4ab..639876481f578262bcc5717494f62db53b61d4a2 100644 --- a/internal/gitaly/hook/access_test.go +++ b/internal/gitaly/hook/access_test.go @@ -10,10 +10,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) type postReceiveRequest struct { diff --git a/internal/gitaly/hook/custom.go b/internal/gitaly/hook/custom.go index 1e295159a92ab3f4d42103cfd99258ed5e3d4a1e..2f541ccbbe59b6e68b3e172e29edeb76aa46739b 100644 --- a/internal/gitaly/hook/custom.go +++ b/internal/gitaly/hook/custom.go @@ -11,9 +11,9 @@ import ( "path/filepath" "strings" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) // customHooksExecutor executes all custom hooks for a given repository and hook name diff --git a/internal/gitaly/hook/custom_test.go b/internal/gitaly/hook/custom_test.go index c20675d78f3a0b67472f180815dab6eb7fa97e66..396de983bbc1d1b20e19dc54a6ab5b4a055c83ad 100644 --- a/internal/gitaly/hook/custom_test.go +++ b/internal/gitaly/hook/custom_test.go @@ -12,10 +12,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) // printAllScript is a bash script that prints out stdin, the arguments, diff --git a/internal/gitaly/hook/manager.go b/internal/gitaly/hook/manager.go index 09cb82df16cf560fd4ccb90094975690d5beb033..302f811e5cc246a8cce72cdc15b513b8aea73455 100644 --- a/internal/gitaly/hook/manager.go +++ b/internal/gitaly/hook/manager.go @@ -5,9 +5,9 @@ import ( "io" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/client" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/client" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) // Manager is an interface providing the ability to execute Git hooks. diff --git a/internal/gitaly/hook/postreceive.go b/internal/gitaly/hook/postreceive.go index 2c77f612ce777defa727c7a000ddba8f4a10b9cd..a4cbe68b251d726cb687e20dbcd1d9fac83b9a31 100644 --- a/internal/gitaly/hook/postreceive.go +++ b/internal/gitaly/hook/postreceive.go @@ -10,9 +10,9 @@ import ( "math" "strings" - "gitlab.com/gitlab-org/gitaly/internal/git/hooks" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/hooks" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) const ( diff --git a/internal/gitaly/hook/prereceive.go b/internal/gitaly/hook/prereceive.go index 8f8fa79cf2803f469f225db7c4f87deb23874e5b..150a7ba73283a19c54f4947ad3b51ebb1784b882 100644 --- a/internal/gitaly/hook/prereceive.go +++ b/internal/gitaly/hook/prereceive.go @@ -10,8 +10,8 @@ import ( "path/filepath" "strings" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func getRelativeObjectDirs(repoPath, gitObjectDir, gitAlternateObjectDirs string) (string, []string, error) { diff --git a/internal/gitaly/hook/referencetransaction.go b/internal/gitaly/hook/referencetransaction.go index d16cce80acf712e0b8575998aeb4a7309c92baa0..966aece5d1ea80ec8873932d227e2ac878bcb583 100644 --- a/internal/gitaly/hook/referencetransaction.go +++ b/internal/gitaly/hook/referencetransaction.go @@ -6,7 +6,7 @@ import ( "io" "io/ioutil" - "gitlab.com/gitlab-org/gitaly/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" ) func (m *GitLabHookManager) ReferenceTransactionHook(ctx context.Context, env []string, stdin io.Reader) error { diff --git a/internal/gitaly/hook/testhelper_test.go b/internal/gitaly/hook/testhelper_test.go index 9e4156e50e701a194d5cb867c68fbd3299c33e16..3748904996022124717c9be9b13e3a50d7a535f9 100644 --- a/internal/gitaly/hook/testhelper_test.go +++ b/internal/gitaly/hook/testhelper_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/hook/transactions.go b/internal/gitaly/hook/transactions.go index 0b1a78f1d279caa45ade44f580a63ae212132843..348e896f02d77b808e0c8d379209ce129b95206a 100644 --- a/internal/gitaly/hook/transactions.go +++ b/internal/gitaly/hook/transactions.go @@ -7,8 +7,8 @@ import ( "time" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/internal/praefect/metadata" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/metadata" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" ) diff --git a/internal/gitaly/hook/update.go b/internal/gitaly/hook/update.go index 2290ff427be9c80ff6c307286658874dcebf55d1..0e2c3298dec5f8a49954b27c0a3ec22af8a35159 100644 --- a/internal/gitaly/hook/update.go +++ b/internal/gitaly/hook/update.go @@ -4,8 +4,8 @@ import ( "context" "io" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func (m *GitLabHookManager) UpdateHook(ctx context.Context, repo *gitalypb.Repository, ref, oldValue, newValue string, env []string, stdout, stderr io.Writer) error { diff --git a/internal/gitaly/linguist/linguist.go b/internal/gitaly/linguist/linguist.go index 29916e9341f6260edf829224ff526c33a44b56b3..5be72dc71d58ad5322666a13d26f15d3313f0211 100644 --- a/internal/gitaly/linguist/linguist.go +++ b/internal/gitaly/linguist/linguist.go @@ -11,8 +11,8 @@ import ( "os/exec" "path/filepath" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" ) func init() { diff --git a/internal/gitaly/linguist/linguist_test.go b/internal/gitaly/linguist/linguist_test.go index e428aefd2c191f2cbbb66c1486270650786aab87..12fba758350892570efd92e163c497334c30d002 100644 --- a/internal/gitaly/linguist/linguist_test.go +++ b/internal/gitaly/linguist/linguist_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/maintenance/daily.go b/internal/gitaly/maintenance/daily.go index dc45c19067fb4d5b579d0848b4e977cd7b879734..023c9fcd7236a2fe58e59a6651bda5cdda536914 100644 --- a/internal/gitaly/maintenance/daily.go +++ b/internal/gitaly/maintenance/daily.go @@ -5,8 +5,8 @@ import ( "time" "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/dontpanic" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/dontpanic" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" ) // StoragesJob runs a job on storages. The string slice param indicates which diff --git a/internal/gitaly/maintenance/daily_test.go b/internal/gitaly/maintenance/daily_test.go index 7f00b05537daf04f96a7b6c7b8c482734c1c2c21..a68aab15be696780dfd86ed31ebf5247e09fe7fa 100644 --- a/internal/gitaly/maintenance/daily_test.go +++ b/internal/gitaly/maintenance/daily_test.go @@ -7,8 +7,8 @@ import ( "github.com/sirupsen/logrus" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestStartDaily(t *testing.T) { diff --git a/internal/gitaly/maintenance/optimize.go b/internal/gitaly/maintenance/optimize.go index 3cbb4692ea968f2ef7047a039b838fe637026dff..815a99e4973b878f70452abc1a376274414d3a54 100644 --- a/internal/gitaly/maintenance/optimize.go +++ b/internal/gitaly/maintenance/optimize.go @@ -10,9 +10,9 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/storage" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/storage" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" ) diff --git a/internal/gitaly/maintenance/optimize_test.go b/internal/gitaly/maintenance/optimize_test.go index 281c5efcdac3a96933e2cd57af816c071347e7e7..25dddc66ce8750684c8b1b22ba9e8b4650963ec4 100644 --- a/internal/gitaly/maintenance/optimize_test.go +++ b/internal/gitaly/maintenance/optimize_test.go @@ -8,10 +8,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/repository" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/repository" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" ) diff --git a/internal/gitaly/rubyserver/concurrency_test.go b/internal/gitaly/rubyserver/concurrency_test.go index 1472ec38958bb514acca89e7d4b16b54de5a7c08..262783b1f9cc4c08cd14d56ed2ca3be102030661 100644 --- a/internal/gitaly/rubyserver/concurrency_test.go +++ b/internal/gitaly/rubyserver/concurrency_test.go @@ -7,8 +7,8 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" "google.golang.org/grpc/codes" healthpb "google.golang.org/grpc/health/grpc_health_v1" "google.golang.org/grpc/status" diff --git a/internal/gitaly/rubyserver/proxy.go b/internal/gitaly/rubyserver/proxy.go index 153e699ed36ee0d9e7de5781159603eb6be0667b..ee031c4e543cbd92b20d5ff8693c30b5d80a346a 100644 --- a/internal/gitaly/rubyserver/proxy.go +++ b/internal/gitaly/rubyserver/proxy.go @@ -6,9 +6,9 @@ import ( "os" "strings" - "gitlab.com/gitlab-org/gitaly/internal/helper" - praefect_metadata "gitlab.com/gitlab-org/gitaly/internal/praefect/metadata" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + praefect_metadata "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/metadata" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/metadata" ) diff --git a/internal/gitaly/rubyserver/proxy_test.go b/internal/gitaly/rubyserver/proxy_test.go index 142ff38ba6e6681a007b796f3a032e31df45cda1..cb7ee1d85b3baf1245477a2f2b25d380d761a03e 100644 --- a/internal/gitaly/rubyserver/proxy_test.go +++ b/internal/gitaly/rubyserver/proxy_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" "google.golang.org/grpc/metadata" ) diff --git a/internal/gitaly/rubyserver/rubyserver.go b/internal/gitaly/rubyserver/rubyserver.go index 3d5db50acc4ded8e92543fea8ae808ccf9259388..de1865d0be0b635464775a33119059cac02b09dd 100644 --- a/internal/gitaly/rubyserver/rubyserver.go +++ b/internal/gitaly/rubyserver/rubyserver.go @@ -12,16 +12,16 @@ import ( grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware" grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/git/hooks" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver/balancer" - "gitlab.com/gitlab-org/gitaly/internal/gitlabshell" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/supervisor" - "gitlab.com/gitlab-org/gitaly/internal/version" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/hooks" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver/balancer" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitlabshell" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/supervisor" + "gitlab.com/gitlab-org/gitaly/v13/internal/version" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" grpccorrelation "gitlab.com/gitlab-org/labkit/correlation/grpc" grpctracing "gitlab.com/gitlab-org/labkit/tracing/grpc" "google.golang.org/grpc" diff --git a/internal/gitaly/rubyserver/rubyserver_test.go b/internal/gitaly/rubyserver/rubyserver_test.go index be3cbd477dc9cfe4d387a926a709dbc272ce1106..ac205d937129ec50a943a2f31795046d8b93ed2a 100644 --- a/internal/gitaly/rubyserver/rubyserver_test.go +++ b/internal/gitaly/rubyserver/rubyserver_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/rubyserver/testhelper_test.go b/internal/gitaly/rubyserver/testhelper_test.go index 66575e48e8bdcbc1a9f706efb7d31e601921746c..997788472cb35cc4592c229d2b3b75d55563b342 100644 --- a/internal/gitaly/rubyserver/testhelper_test.go +++ b/internal/gitaly/rubyserver/testhelper_test.go @@ -4,8 +4,8 @@ import ( "os" "testing" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) var ( diff --git a/internal/gitaly/rubyserver/worker.go b/internal/gitaly/rubyserver/worker.go index 9fc13f2cd4fa772e53da68817757b801d0b0b4f7..dda3d225e212c7860d0c45d7ba58bc7465494a2b 100644 --- a/internal/gitaly/rubyserver/worker.go +++ b/internal/gitaly/rubyserver/worker.go @@ -7,9 +7,9 @@ import ( "github.com/prometheus/client_golang/prometheus" log "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver/balancer" - "gitlab.com/gitlab-org/gitaly/internal/supervisor" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver/balancer" + "gitlab.com/gitlab-org/gitaly/v13/internal/supervisor" ) var ( diff --git a/internal/gitaly/rubyserver/worker_test.go b/internal/gitaly/rubyserver/worker_test.go index c043b7709365296e1d3d11a0140d3494d732c9d2..e174fd3bd70ece7a791eca97736a25071298b636 100644 --- a/internal/gitaly/rubyserver/worker_test.go +++ b/internal/gitaly/rubyserver/worker_test.go @@ -6,8 +6,8 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/supervisor" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/supervisor" ) func TestWorker(t *testing.T) { diff --git a/internal/gitaly/server/auth/auth.go b/internal/gitaly/server/auth/auth.go index 3e0e995141228e2d70992887c1362d821484639e..52624e723b9752fbe61b7da6b2e430b71ec3a970 100644 --- a/internal/gitaly/server/auth/auth.go +++ b/internal/gitaly/server/auth/auth.go @@ -6,8 +6,8 @@ import ( grpc_auth "github.com/grpc-ecosystem/go-grpc-middleware/auth" "github.com/prometheus/client_golang/prometheus" - gitalyauth "gitlab.com/gitlab-org/gitaly/auth" - internalauth "gitlab.com/gitlab-org/gitaly/internal/gitaly/config/auth" + gitalyauth "gitlab.com/gitlab-org/gitaly/v13/auth" + internalauth "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config/auth" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/internal/gitaly/server/auth_test.go b/internal/gitaly/server/auth_test.go index 491d21d68ba4fbedc73c03141d32e5addac62167..d17bb83b2a88afe0deddfed579a158138b1eb31f 100644 --- a/internal/gitaly/server/auth_test.go +++ b/internal/gitaly/server/auth_test.go @@ -13,13 +13,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - gitalyauth "gitlab.com/gitlab-org/gitaly/auth" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config/auth" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + gitalyauth "gitlab.com/gitlab-org/gitaly/v13/auth" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config/auth" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/credentials" diff --git a/internal/gitaly/server/server.go b/internal/gitaly/server/server.go index 71e6dc96f5c842dec957dfc8c357ca263c50676e..bb10acc408d5263a47072025632ec44b3c2858a7 100644 --- a/internal/gitaly/server/server.go +++ b/internal/gitaly/server/server.go @@ -11,23 +11,23 @@ import ( grpc_ctxtags "github.com/grpc-ecosystem/go-grpc-middleware/tags" grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" log "github.com/sirupsen/logrus" - diskcache "gitlab.com/gitlab-org/gitaly/internal/cache" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/server/auth" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/internal/helper/fieldextractors" - gitalylog "gitlab.com/gitlab-org/gitaly/internal/log" - "gitlab.com/gitlab-org/gitaly/internal/logsanitizer" - "gitlab.com/gitlab-org/gitaly/internal/middleware/cache" - "gitlab.com/gitlab-org/gitaly/internal/middleware/cancelhandler" - "gitlab.com/gitlab-org/gitaly/internal/middleware/commandstatshandler" - "gitlab.com/gitlab-org/gitaly/internal/middleware/limithandler" - "gitlab.com/gitlab-org/gitaly/internal/middleware/metadatahandler" - "gitlab.com/gitlab-org/gitaly/internal/middleware/panichandler" - "gitlab.com/gitlab-org/gitaly/internal/middleware/sentryhandler" - "gitlab.com/gitlab-org/gitaly/internal/praefect/protoregistry" + diskcache "gitlab.com/gitlab-org/gitaly/v13/internal/cache" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/server/auth" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/fieldextractors" + gitalylog "gitlab.com/gitlab-org/gitaly/v13/internal/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/logsanitizer" + "gitlab.com/gitlab-org/gitaly/v13/internal/middleware/cache" + "gitlab.com/gitlab-org/gitaly/v13/internal/middleware/cancelhandler" + "gitlab.com/gitlab-org/gitaly/v13/internal/middleware/commandstatshandler" + "gitlab.com/gitlab-org/gitaly/v13/internal/middleware/limithandler" + "gitlab.com/gitlab-org/gitaly/v13/internal/middleware/metadatahandler" + "gitlab.com/gitlab-org/gitaly/v13/internal/middleware/panichandler" + "gitlab.com/gitlab-org/gitaly/v13/internal/middleware/sentryhandler" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/protoregistry" grpccorrelation "gitlab.com/gitlab-org/labkit/correlation/grpc" grpctracing "gitlab.com/gitlab-org/labkit/tracing/grpc" "google.golang.org/grpc" diff --git a/internal/gitaly/server/server_factory.go b/internal/gitaly/server/server_factory.go index 92a2d4516cd7eacdb6ffa33b3b8502db3f6c31ef..104766e2de7c2f8a63a42e092ddddaec381fd2aa 100644 --- a/internal/gitaly/server/server_factory.go +++ b/internal/gitaly/server/server_factory.go @@ -8,13 +8,13 @@ import ( "time" "github.com/sirupsen/logrus" - gitalyauth "gitlab.com/gitlab-org/gitaly/auth" - "gitlab.com/gitlab-org/gitaly/client" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/maintenance" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + gitalyauth "gitlab.com/gitlab-org/gitaly/v13/auth" + "gitlab.com/gitlab-org/gitaly/v13/client" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/maintenance" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" ) diff --git a/internal/gitaly/server/server_factory_test.go b/internal/gitaly/server/server_factory_test.go index a5ab67853bda86c8c815d184a98a9403817899cb..ff34f8d01e29e63c75f77e24416227bcefc6e041 100644 --- a/internal/gitaly/server/server_factory_test.go +++ b/internal/gitaly/server/server_factory_test.go @@ -8,10 +8,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/client" - "gitlab.com/gitlab-org/gitaly/internal/bootstrap/starter" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/client" + "gitlab.com/gitlab-org/gitaly/v13/internal/bootstrap/starter" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/credentials" diff --git a/internal/gitaly/service/blob/get_blob.go b/internal/gitaly/service/blob/get_blob.go index 53f5c38959d485081fbef5eeab00999bcf5aa120..5136f8d626a8bedb0602ebc7e20e5859d93da24e 100644 --- a/internal/gitaly/service/blob/get_blob.go +++ b/internal/gitaly/service/blob/get_blob.go @@ -4,10 +4,10 @@ import ( "fmt" "io" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/blob/get_blob_test.go b/internal/gitaly/service/blob/get_blob_test.go index ca24b07ad2ea4e83f9bd7c6edf04b5e6d713ceab..b8f8b04cb1ed9e605abd94d7ffe1d2a6ead1a3d4 100644 --- a/internal/gitaly/service/blob/get_blob_test.go +++ b/internal/gitaly/service/blob/get_blob_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" ) func TestSuccessfulGetBlob(t *testing.T) { diff --git a/internal/gitaly/service/blob/get_blobs.go b/internal/gitaly/service/blob/get_blobs.go index 18bfbbab61454d0ce611746bccfc5a6ee4d3c855..1ade0dc0a68b680e65121bb466db57b61f95c3fa 100644 --- a/internal/gitaly/service/blob/get_blobs.go +++ b/internal/gitaly/service/blob/get_blobs.go @@ -5,11 +5,11 @@ import ( "io" "io/ioutil" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/commit" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/commit" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/blob/get_blobs_test.go b/internal/gitaly/service/blob/get_blobs_test.go index 308be38799ac5911c18c9006dd6da2202546178c..f8a01e09e4356ac23f7227bc740ec0bcf24becc8 100644 --- a/internal/gitaly/service/blob/get_blobs_test.go +++ b/internal/gitaly/service/blob/get_blobs_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/blob/lfs_pointers.go b/internal/gitaly/service/blob/lfs_pointers.go index ca9627985916a40c00340c1267a733df0a81d891..5e5542a7c979e7858ee63f8c6978da48b737f99f 100644 --- a/internal/gitaly/service/blob/lfs_pointers.go +++ b/internal/gitaly/service/blob/lfs_pointers.go @@ -3,11 +3,11 @@ package blob import ( "fmt" - "gitlab.com/gitlab-org/gitaly/internal/errors" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/errors" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/blob/lfs_pointers_test.go b/internal/gitaly/service/blob/lfs_pointers_test.go index 9f2c8de4f10e63e01f0f3ff7cb9cc7e729fd5b9a..e07d81aa93f518fbba24c8daf4619c352e5ea47d 100644 --- a/internal/gitaly/service/blob/lfs_pointers_test.go +++ b/internal/gitaly/service/blob/lfs_pointers_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/blob/server.go b/internal/gitaly/service/blob/server.go index 283fb79cef2cd5fba1060c3f21f605b74e7e7268..21e9ab447837d3442f88bf134c75b8de96a6cfa6 100644 --- a/internal/gitaly/service/blob/server.go +++ b/internal/gitaly/service/blob/server.go @@ -1,8 +1,8 @@ package blob import ( - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) type server struct { diff --git a/internal/gitaly/service/blob/testhelper_test.go b/internal/gitaly/service/blob/testhelper_test.go index 4a8d086e81071bab1d2af6591044480578b17929..91aa3e93119b4f79b9b2952914efdb3a9fa97757 100644 --- a/internal/gitaly/service/blob/testhelper_test.go +++ b/internal/gitaly/service/blob/testhelper_test.go @@ -6,9 +6,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/reflection" ) diff --git a/internal/gitaly/service/cleanup/apply_bfg_object_map_stream.go b/internal/gitaly/service/cleanup/apply_bfg_object_map_stream.go index 0b49f0134b1be78dbeba7d9fbc208673a808191e..2dfce35877a212aae2c005f2f6cf5c17de2a12c4 100644 --- a/internal/gitaly/service/cleanup/apply_bfg_object_map_stream.go +++ b/internal/gitaly/service/cleanup/apply_bfg_object_map_stream.go @@ -5,12 +5,12 @@ import ( "io" "github.com/golang/protobuf/proto" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/cleanup/internalrefs" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/cleanup/notifier" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/cleanup/internalrefs" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/cleanup/notifier" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" ) type bfgStreamReader struct { diff --git a/internal/gitaly/service/cleanup/apply_bfg_object_map_stream_test.go b/internal/gitaly/service/cleanup/apply_bfg_object_map_stream_test.go index b109575b7c8130570602b4bace4612a3d4f92b07..ee6ceb87c2f81d56c7177b67839d60b17c040bc9 100644 --- a/internal/gitaly/service/cleanup/apply_bfg_object_map_stream_test.go +++ b/internal/gitaly/service/cleanup/apply_bfg_object_map_stream_test.go @@ -9,10 +9,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/cleanup/internalrefs/cleaner.go b/internal/gitaly/service/cleanup/internalrefs/cleaner.go index dc1c3be0d9aa7fa7e78dffcd3bc59e26f5495ee8..5cd902a73b876f7849eb105f9f4441279d20e63c 100644 --- a/internal/gitaly/service/cleanup/internalrefs/cleaner.go +++ b/internal/gitaly/service/cleanup/internalrefs/cleaner.go @@ -9,9 +9,9 @@ import ( "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" log "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/updateref" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/updateref" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) // Only references in these namespaces are cleaned up diff --git a/internal/gitaly/service/cleanup/notifier/notifier.go b/internal/gitaly/service/cleanup/notifier/notifier.go index a0d66ccbae2764f55c9f62f053721f1cd5679c7b..fc104e9e3700d1a8a933ac56e9adbc1329a12fdc 100644 --- a/internal/gitaly/service/cleanup/notifier/notifier.go +++ b/internal/gitaly/service/cleanup/notifier/notifier.go @@ -3,9 +3,9 @@ package notifier import ( "context" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) // Notifier sends messages stating that an OID has been rewritten, looking diff --git a/internal/gitaly/service/cleanup/server.go b/internal/gitaly/service/cleanup/server.go index e482b6069e9fdc25377678e74c3ecb006ff1d7bc..d220d468ee69fb9e4167f05c481e47d446a9253e 100644 --- a/internal/gitaly/service/cleanup/server.go +++ b/internal/gitaly/service/cleanup/server.go @@ -1,7 +1,7 @@ package cleanup import ( - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) type server struct { diff --git a/internal/gitaly/service/cleanup/testhelper_test.go b/internal/gitaly/service/cleanup/testhelper_test.go index 7b41fd12343b1bcec2388aedcb534d2a23381447..e0033a64b78f30736baab86d3361ba4f87e41f85 100644 --- a/internal/gitaly/service/cleanup/testhelper_test.go +++ b/internal/gitaly/service/cleanup/testhelper_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/reflection" ) diff --git a/internal/gitaly/service/commit/between.go b/internal/gitaly/service/commit/between.go index 2a424ab4851d6db29a739f725f6655bb9088150e..75227403fc0ebf510c6084f5ce33ba3d72299453 100644 --- a/internal/gitaly/service/commit/between.go +++ b/internal/gitaly/service/commit/between.go @@ -4,9 +4,9 @@ import ( "fmt" "github.com/golang/protobuf/proto" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) type commitsBetweenSender struct { diff --git a/internal/gitaly/service/commit/between_test.go b/internal/gitaly/service/commit/between_test.go index 14cdbd4c0596aa961eb22a0f8badf3a87b02ec5e..bd9fd60af5b75f125234aee48b16b2824743cf35 100644 --- a/internal/gitaly/service/commit/between_test.go +++ b/internal/gitaly/service/commit/between_test.go @@ -6,8 +6,8 @@ import ( "github.com/golang/protobuf/ptypes/timestamp" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/commit/commit_messages.go b/internal/gitaly/service/commit/commit_messages.go index 27962668723be41fb860bf24ab9a9b230aeafae5..e0719f1954703cfcbc9ac6a63d728ccef50fdd91 100644 --- a/internal/gitaly/service/commit/commit_messages.go +++ b/internal/gitaly/service/commit/commit_messages.go @@ -5,11 +5,11 @@ import ( "fmt" "io" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" ) func (s *server) GetCommitMessages(request *gitalypb.GetCommitMessagesRequest, stream gitalypb.CommitService_GetCommitMessagesServer) error { diff --git a/internal/gitaly/service/commit/commit_messages_test.go b/internal/gitaly/service/commit/commit_messages_test.go index e576028670d51215587bf5abda13a64be1ca3ded..975cdb74550bf359e606ed5cf04d12531d1638f4 100644 --- a/internal/gitaly/service/commit/commit_messages_test.go +++ b/internal/gitaly/service/commit/commit_messages_test.go @@ -6,9 +6,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/commit/commit_signatures.go b/internal/gitaly/service/commit/commit_signatures.go index 6b9d3ee4b4ec5f331825ba59afeb6063a4d674cc..a1af84908cc0058f3624f58287e99bb92986d23c 100644 --- a/internal/gitaly/service/commit/commit_signatures.go +++ b/internal/gitaly/service/commit/commit_signatures.go @@ -7,11 +7,11 @@ import ( "fmt" "io" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/commit/commit_signatures_test.go b/internal/gitaly/service/commit/commit_signatures_test.go index 086b2a88594265025698405a0ab2178f27effeb7..a627a64fbc5962cf09eadb2c5fe70f9759e7ec19 100644 --- a/internal/gitaly/service/commit/commit_signatures_test.go +++ b/internal/gitaly/service/commit/commit_signatures_test.go @@ -6,9 +6,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/commit/commits_by_message.go b/internal/gitaly/service/commit/commits_by_message.go index 9a2388202f7a997438b7823c8e9a5a786f63cfec..c8ad3a6d22d114184613edeef974de9521a72126 100644 --- a/internal/gitaly/service/commit/commits_by_message.go +++ b/internal/gitaly/service/commit/commits_by_message.go @@ -4,9 +4,9 @@ import ( "fmt" "github.com/golang/protobuf/proto" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) type commitsByMessageSender struct { diff --git a/internal/gitaly/service/commit/commits_by_message_test.go b/internal/gitaly/service/commit/commits_by_message_test.go index 1077d536dc0178e6208db1146364bb60b9ef1329..686b654b1f32ac1dcdadaa7878bb011aae9e52c4 100644 --- a/internal/gitaly/service/commit/commits_by_message_test.go +++ b/internal/gitaly/service/commit/commits_by_message_test.go @@ -6,8 +6,8 @@ import ( "github.com/golang/protobuf/ptypes/timestamp" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/commit/commits_helper.go b/internal/gitaly/service/commit/commits_helper.go index fb9c4627bec6ec017aec84b594931bbb393bb1bb..2abe9a78bd0152508151a0800932f1b7192107b7 100644 --- a/internal/gitaly/service/commit/commits_helper.go +++ b/internal/gitaly/service/commit/commits_helper.go @@ -4,10 +4,10 @@ import ( "context" "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func sendCommits(ctx context.Context, sender chunk.Sender, repo *gitalypb.Repository, revisionRange []string, paths []string, options *gitalypb.GlobalOptions, extraArgs ...git.Option) error { diff --git a/internal/gitaly/service/commit/count_commits.go b/internal/gitaly/service/commit/count_commits.go index 76f9fb7ed8724bb0e3e864ffe64812128d4057da..702ea280aaa0b08bd50db67c74460f1b504a6f6a 100644 --- a/internal/gitaly/service/commit/count_commits.go +++ b/internal/gitaly/service/commit/count_commits.go @@ -9,8 +9,8 @@ import ( "time" "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/commit/count_commits_test.go b/internal/gitaly/service/commit/count_commits_test.go index 3d840dc074d0d3f965838fc26363dbf1e0cc0093..185eb2ff3cda4dcf964f8ff9776bba8b73056694 100644 --- a/internal/gitaly/service/commit/count_commits_test.go +++ b/internal/gitaly/service/commit/count_commits_test.go @@ -7,8 +7,8 @@ import ( "github.com/golang/protobuf/ptypes/timestamp" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/commit/count_diverging_commits.go b/internal/gitaly/service/commit/count_diverging_commits.go index 89fb4cd0775240d55ff2d64166975f90b663cbfe..d7908371ebe83b9b9cbb91179aad15f19b6ab64b 100644 --- a/internal/gitaly/service/commit/count_diverging_commits.go +++ b/internal/gitaly/service/commit/count_diverging_commits.go @@ -8,9 +8,9 @@ import ( "strconv" "strings" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) // CountDivergingCommits counts the diverging commits between from and to. Important to note that when --max-count is applied, the counts are not guaranteed to be diff --git a/internal/gitaly/service/commit/count_diverging_commits_test.go b/internal/gitaly/service/commit/count_diverging_commits_test.go index c22b26ce433530ce75799d932739ca1ecbae83c8..f88dd348b731a5104eaef96a4690753c88f6da2b 100644 --- a/internal/gitaly/service/commit/count_diverging_commits_test.go +++ b/internal/gitaly/service/commit/count_diverging_commits_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/commit/filter_shas_with_signatures.go b/internal/gitaly/service/commit/filter_shas_with_signatures.go index 8cd2f24fca796fa783d0459b683f02762aa3d2bb..1dacecda92facb5fa1cc8ae5de26d4523b787d3a 100644 --- a/internal/gitaly/service/commit/filter_shas_with_signatures.go +++ b/internal/gitaly/service/commit/filter_shas_with_signatures.go @@ -4,10 +4,10 @@ import ( "errors" "io" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func (s *server) FilterShasWithSignatures(bidi gitalypb.CommitService_FilterShasWithSignaturesServer) error { diff --git a/internal/gitaly/service/commit/filter_shas_with_signatures_test.go b/internal/gitaly/service/commit/filter_shas_with_signatures_test.go index 877a58f5b55c1c41e7f879b7393a76638ac3b33d..e35870b7f6b2b69735b32f05fafd941124492ab1 100644 --- a/internal/gitaly/service/commit/filter_shas_with_signatures_test.go +++ b/internal/gitaly/service/commit/filter_shas_with_signatures_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func TestFilterShasWithSignaturesSuccessful(t *testing.T) { diff --git a/internal/gitaly/service/commit/find_all_commits.go b/internal/gitaly/service/commit/find_all_commits.go index 5e02cad77330e5c08136c56b3b463eb89a294c57..a34906432bef4ad1f44d9d623e87ec33776cf8ed 100644 --- a/internal/gitaly/service/commit/find_all_commits.go +++ b/internal/gitaly/service/commit/find_all_commits.go @@ -4,10 +4,10 @@ import ( "fmt" "github.com/golang/protobuf/proto" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/ref" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/ref" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) // We declare this function in variables so that we can override them in our tests diff --git a/internal/gitaly/service/commit/find_all_commits_test.go b/internal/gitaly/service/commit/find_all_commits_test.go index 3071e6b133abe850f6af0e8480cf04ed49ed9895..c29e43b4ab838daf5c62d163f4814b614023a953 100644 --- a/internal/gitaly/service/commit/find_all_commits_test.go +++ b/internal/gitaly/service/commit/find_all_commits_test.go @@ -7,9 +7,9 @@ import ( "github.com/golang/protobuf/ptypes/timestamp" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/ref" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/ref" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/commit/find_commit.go b/internal/gitaly/service/commit/find_commit.go index ca2cf7ca137fbd08d5985c151e7d7015bb087c0e..0be8f4c141f9c53f4c934a4694340039b260e1fd 100644 --- a/internal/gitaly/service/commit/find_commit.go +++ b/internal/gitaly/service/commit/find_commit.go @@ -3,10 +3,10 @@ package commit import ( "context" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func (s *server) FindCommit(ctx context.Context, in *gitalypb.FindCommitRequest) (*gitalypb.FindCommitResponse, error) { diff --git a/internal/gitaly/service/commit/find_commit_test.go b/internal/gitaly/service/commit/find_commit_test.go index 9ada6c2b3202f9f181b53dc46ecefbd853ad4d2e..6b00d2353acf9abaf011291ac06568ca01472fcf 100644 --- a/internal/gitaly/service/commit/find_commit_test.go +++ b/internal/gitaly/service/commit/find_commit_test.go @@ -8,12 +8,12 @@ import ( "github.com/golang/protobuf/ptypes/timestamp" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" diff --git a/internal/gitaly/service/commit/find_commits.go b/internal/gitaly/service/commit/find_commits.go index 35fdde103bbc2ce7168cdc8153f79b09ae5df2cf..0a0a875b9d29d2266cb18b1d85a016a3b1ff9468 100644 --- a/internal/gitaly/service/commit/find_commits.go +++ b/internal/gitaly/service/commit/find_commits.go @@ -8,13 +8,13 @@ import ( "strings" "github.com/golang/protobuf/proto" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func (s *server) FindCommits(req *gitalypb.FindCommitsRequest, stream gitalypb.CommitService_FindCommitsServer) error { diff --git a/internal/gitaly/service/commit/find_commits_test.go b/internal/gitaly/service/commit/find_commits_test.go index c94b8017358f65843f8a4b6d234ab7545ce53ef7..b00b8248332d9937cd597d5e4846f3eb3a74969c 100644 --- a/internal/gitaly/service/commit/find_commits_test.go +++ b/internal/gitaly/service/commit/find_commits_test.go @@ -11,9 +11,9 @@ import ( "github.com/golang/protobuf/ptypes/timestamp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/commit/isancestor.go b/internal/gitaly/service/commit/isancestor.go index 6bff2ac62389a5e1dac8134cc0d142d337fa2877..ed911ffd19d654cdafe9442dae61830bebc47349 100644 --- a/internal/gitaly/service/commit/isancestor.go +++ b/internal/gitaly/service/commit/isancestor.go @@ -5,8 +5,8 @@ import ( "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" log "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/commit/isancestor_test.go b/internal/gitaly/service/commit/isancestor_test.go index f63b422a84be63b4fc5abef70314e7c69cd8d9aa..cf0d1acbf30c9aca1ba37c6a3384e996f7876ac5 100644 --- a/internal/gitaly/service/commit/isancestor_test.go +++ b/internal/gitaly/service/commit/isancestor_test.go @@ -6,10 +6,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/commit/languages.go b/internal/gitaly/service/commit/languages.go index ce08b05343270b26879ae6752484f70dc3dc3777..e99a3a0283ecccf054ae28a90e85fdfe26c6ee5a 100644 --- a/internal/gitaly/service/commit/languages.go +++ b/internal/gitaly/service/commit/languages.go @@ -9,13 +9,13 @@ import ( "sort" "strings" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/alternates" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/linguist" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/ref" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/alternates" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/linguist" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/ref" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/commit/languages_test.go b/internal/gitaly/service/commit/languages_test.go index ce96393f7db0c7c41d0cd5f8f8fc6fa6c30629d1..a348f4a0676b13662b7a7240aa10296bb30c7cbf 100644 --- a/internal/gitaly/service/commit/languages_test.go +++ b/internal/gitaly/service/commit/languages_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/commit/last_commit_for_path.go b/internal/gitaly/service/commit/last_commit_for_path.go index ff54582d73a53cefa688ae11dbbf4a2dc72f2f5b..8bb447e8df6c1436b417fa9f8e62b38cdb8bffe1 100644 --- a/internal/gitaly/service/commit/last_commit_for_path.go +++ b/internal/gitaly/service/commit/last_commit_for_path.go @@ -3,11 +3,11 @@ package commit import ( "context" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func (s *server) LastCommitForPath(ctx context.Context, in *gitalypb.LastCommitForPathRequest) (*gitalypb.LastCommitForPathResponse, error) { diff --git a/internal/gitaly/service/commit/last_commit_for_path_test.go b/internal/gitaly/service/commit/last_commit_for_path_test.go index 859129e5b60ea49942203cd3c208afe4c0da7ac9..a9feeb3fc33b75effd037759d3c774707c714cc0 100644 --- a/internal/gitaly/service/commit/last_commit_for_path_test.go +++ b/internal/gitaly/service/commit/last_commit_for_path_test.go @@ -5,8 +5,8 @@ import ( "github.com/golang/protobuf/ptypes/timestamp" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/commit/list_commits_by_oid.go b/internal/gitaly/service/commit/list_commits_by_oid.go index 2dc4674960b06cc035891cf7e67d80aa1f428a26..b2a2da3799a98cb8949fea1540c64b3f829d44a3 100644 --- a/internal/gitaly/service/commit/list_commits_by_oid.go +++ b/internal/gitaly/service/commit/list_commits_by_oid.go @@ -3,10 +3,10 @@ package commit import ( "github.com/golang/protobuf/proto" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - gitlog "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + gitlog "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) var ( diff --git a/internal/gitaly/service/commit/list_commits_by_oid_test.go b/internal/gitaly/service/commit/list_commits_by_oid_test.go index 3dd2cbb46b7cd3140f82bc2c07dbd877be74e668..2ed6a9470828733fa1f0a210615445022aef6f33 100644 --- a/internal/gitaly/service/commit/list_commits_by_oid_test.go +++ b/internal/gitaly/service/commit/list_commits_by_oid_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func TestSuccessfulListCommitsByOidRequest(t *testing.T) { diff --git a/internal/gitaly/service/commit/list_commits_by_ref_name.go b/internal/gitaly/service/commit/list_commits_by_ref_name.go index deb2d04aeab79582afe5b284d13467f69de03d9f..0b47ce5479c399725f8fa27ececfee4f595f3966 100644 --- a/internal/gitaly/service/commit/list_commits_by_ref_name.go +++ b/internal/gitaly/service/commit/list_commits_by_ref_name.go @@ -2,11 +2,11 @@ package commit import ( "github.com/golang/protobuf/proto" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - gitlog "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + gitlog "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func (s *server) ListCommitsByRefName(in *gitalypb.ListCommitsByRefNameRequest, stream gitalypb.CommitService_ListCommitsByRefNameServer) error { diff --git a/internal/gitaly/service/commit/list_commits_by_ref_name_test.go b/internal/gitaly/service/commit/list_commits_by_ref_name_test.go index d876444fe3ec1d99e35567f5cacff5b05a82e09d..4a5227a85ceb907207a0ea6d49d272995be1cbae 100644 --- a/internal/gitaly/service/commit/list_commits_by_ref_name_test.go +++ b/internal/gitaly/service/commit/list_commits_by_ref_name_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func TestSuccessfulListCommitsByRefNameRequest(t *testing.T) { diff --git a/internal/gitaly/service/commit/list_files.go b/internal/gitaly/service/commit/list_files.go index 505a9bc9267a5b05ea8c2fe599e59cfd245f6254..4541b0520508faf0a6e7bb0d8fd0d94b072bdb88 100644 --- a/internal/gitaly/service/commit/list_files.go +++ b/internal/gitaly/service/commit/list_files.go @@ -7,11 +7,11 @@ import ( "github.com/golang/protobuf/proto" "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" log "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/lstree" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/lstree" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/commit/list_files_test.go b/internal/gitaly/service/commit/list_files_test.go index f07fbdce81e58144159ef3bda695655c6504f977..0b5fc012142833486f8b0d6c408f59a35ad6a146 100644 --- a/internal/gitaly/service/commit/list_files_test.go +++ b/internal/gitaly/service/commit/list_files_test.go @@ -8,9 +8,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/ref" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/ref" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/commit/list_last_commits_for_tree.go b/internal/gitaly/service/commit/list_last_commits_for_tree.go index 8ca02c3d3a5e9c01651c3390bc7b249e0da7b09d..1d4f8056a2cba26474f4506597a3bf7f802f9eba 100644 --- a/internal/gitaly/service/commit/list_last_commits_for_tree.go +++ b/internal/gitaly/service/commit/list_last_commits_for_tree.go @@ -5,13 +5,13 @@ import ( "io" "sort" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/git/lstree" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/lstree" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) const ( diff --git a/internal/gitaly/service/commit/list_last_commits_for_tree_test.go b/internal/gitaly/service/commit/list_last_commits_for_tree_test.go index 86eba6cacb3f24e7f7fd9d6df862276e60299b96..ecbfd2f260d35e80aaaf8a5bc118d9fe903ae41e 100644 --- a/internal/gitaly/service/commit/list_last_commits_for_tree_test.go +++ b/internal/gitaly/service/commit/list_last_commits_for_tree_test.go @@ -10,9 +10,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/commit/raw_blame.go b/internal/gitaly/service/commit/raw_blame.go index 9c8100c813dc51ffa9e9c108d569ba379d7efc3a..03af6b6b527bdc34461faed59145df33f7cf3a24 100644 --- a/internal/gitaly/service/commit/raw_blame.go +++ b/internal/gitaly/service/commit/raw_blame.go @@ -5,9 +5,9 @@ import ( "io" "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/commit/raw_blame_test.go b/internal/gitaly/service/commit/raw_blame_test.go index 2c373cf5a10ead0e0f71ee1c760b8fd6e4ee9802..1108e824ad91a0a4d90b412a153e7c357a5747d0 100644 --- a/internal/gitaly/service/commit/raw_blame_test.go +++ b/internal/gitaly/service/commit/raw_blame_test.go @@ -6,9 +6,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/commit/server.go b/internal/gitaly/service/commit/server.go index d36c6c3e6efd51bad1d95084bc6a13618dcec7a8..df0439e64691b83c9b291ecd6a39a2a7d7cb3134 100644 --- a/internal/gitaly/service/commit/server.go +++ b/internal/gitaly/service/commit/server.go @@ -1,9 +1,9 @@ package commit import ( - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/ref" - "gitlab.com/gitlab-org/gitaly/internal/storage" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/ref" + "gitlab.com/gitlab-org/gitaly/v13/internal/storage" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) type server struct { diff --git a/internal/gitaly/service/commit/stats.go b/internal/gitaly/service/commit/stats.go index 1eb7efd0a139c5a9c61536f70cabfabe40b51612..820747ff657ac1b33622d81f063809ea2ce0478e 100644 --- a/internal/gitaly/service/commit/stats.go +++ b/internal/gitaly/service/commit/stats.go @@ -7,10 +7,10 @@ import ( "strconv" "strings" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func (s *server) CommitStats(ctx context.Context, in *gitalypb.CommitStatsRequest) (*gitalypb.CommitStatsResponse, error) { diff --git a/internal/gitaly/service/commit/stats_test.go b/internal/gitaly/service/commit/stats_test.go index b69046a1294f79bf94fe18c6d3b213b223cc7f67..39d0652effcf37bb6b00053061a03553d0e98e7d 100644 --- a/internal/gitaly/service/commit/stats_test.go +++ b/internal/gitaly/service/commit/stats_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/commit/testhelper_test.go b/internal/gitaly/service/commit/testhelper_test.go index 290c4fca9ef20605f3f95ee279f3e97d69977cb2..40b294c9d50c4682640ff879dd50108e74ec6221 100644 --- a/internal/gitaly/service/commit/testhelper_test.go +++ b/internal/gitaly/service/commit/testhelper_test.go @@ -6,9 +6,9 @@ import ( "testing" "github.com/golang/protobuf/ptypes/timestamp" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/reflection" ) diff --git a/internal/gitaly/service/commit/tree_entries.go b/internal/gitaly/service/commit/tree_entries.go index e1238c9e3025b42fd7ba2bbb690d20068ef34f80..516333ef5c157f317df670affdc7ff1a6c8c01e4 100644 --- a/internal/gitaly/service/commit/tree_entries.go +++ b/internal/gitaly/service/commit/tree_entries.go @@ -6,10 +6,10 @@ import ( "github.com/golang/protobuf/proto" "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" log "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/commit/tree_entries_helper.go b/internal/gitaly/service/commit/tree_entries_helper.go index 7d837604b2846df13e41465afb15263a7e615739..1a0794fd2770f5676c9150c4b1e784b97e342cb0 100644 --- a/internal/gitaly/service/commit/tree_entries_helper.go +++ b/internal/gitaly/service/commit/tree_entries_helper.go @@ -10,8 +10,8 @@ import ( "path/filepath" "strings" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) type revisionPath struct{ revision, path string } diff --git a/internal/gitaly/service/commit/tree_entries_test.go b/internal/gitaly/service/commit/tree_entries_test.go index b3491d832490e2fbbcc842e6154dab29158e261d..74fe6bea95f7925f810a192b696d38243ade5ea8 100644 --- a/internal/gitaly/service/commit/tree_entries_test.go +++ b/internal/gitaly/service/commit/tree_entries_test.go @@ -9,9 +9,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/commit/tree_entry.go b/internal/gitaly/service/commit/tree_entry.go index 10f5b0c4a43921237753f36d1c8143112e853727..5c5c6f4ebd98e94f4f2719abfc280de78bc10b5f 100644 --- a/internal/gitaly/service/commit/tree_entry.go +++ b/internal/gitaly/service/commit/tree_entry.go @@ -5,11 +5,11 @@ import ( "io" "strings" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/commit/tree_entry_test.go b/internal/gitaly/service/commit/tree_entry_test.go index 8c0af7566b4c69d102d4a189332741aa09ba758c..3b132d30a241119b799650c74050f1936ccda84a 100644 --- a/internal/gitaly/service/commit/tree_entry_test.go +++ b/internal/gitaly/service/commit/tree_entry_test.go @@ -6,8 +6,8 @@ import ( "io" "testing" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/commit/util.go b/internal/gitaly/service/commit/util.go index ce99e3e58f54146ab798ea1c56b10944c0c31df8..43f3b97519eb22924e83183ccb668524361e5121 100644 --- a/internal/gitaly/service/commit/util.go +++ b/internal/gitaly/service/commit/util.go @@ -5,7 +5,7 @@ import ( "path/filepath" "strconv" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func newTreeEntry(commitOid, rootOid, rootPath string, filename, oidBytes, modeBytes []byte) (*gitalypb.TreeEntry, error) { diff --git a/internal/gitaly/service/conflicts/list_conflict_files.go b/internal/gitaly/service/conflicts/list_conflict_files.go index 7499c9ab153eb7d437719e436d9ab99f9a1a74a4..5253b01fef90b34ba5d6e7b0b6ad019e72364124 100644 --- a/internal/gitaly/service/conflicts/list_conflict_files.go +++ b/internal/gitaly/service/conflicts/list_conflict_files.go @@ -3,8 +3,8 @@ package conflicts import ( "fmt" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/conflicts/list_conflict_files_test.go b/internal/gitaly/service/conflicts/list_conflict_files_test.go index b384f8b8cad743ad567c95219d3a42f904f88ddf..149361dd1f875349aa8831aaae6140c8d2a50bb8 100644 --- a/internal/gitaly/service/conflicts/list_conflict_files_test.go +++ b/internal/gitaly/service/conflicts/list_conflict_files_test.go @@ -6,8 +6,8 @@ import ( "github.com/golang/protobuf/proto" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/conflicts/resolve_conflicts.go b/internal/gitaly/service/conflicts/resolve_conflicts.go index d8734ef8d525e6a557a1dac7e283f237bf43f2f6..8085e9c0a8a6bdcc1e75a8eab5a1998930e8c76b 100644 --- a/internal/gitaly/service/conflicts/resolve_conflicts.go +++ b/internal/gitaly/service/conflicts/resolve_conflicts.go @@ -3,8 +3,8 @@ package conflicts import ( "fmt" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/conflicts/resolve_conflicts_test.go b/internal/gitaly/service/conflicts/resolve_conflicts_test.go index 0580f1607fe4d1b10a237a61e0339e04dd5110f6..818aaff5151cfd3d5180f0cd0ff5c2a37bc34159 100644 --- a/internal/gitaly/service/conflicts/resolve_conflicts_test.go +++ b/internal/gitaly/service/conflicts/resolve_conflicts_test.go @@ -6,12 +6,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - serverPkg "gitlab.com/gitlab-org/gitaly/internal/gitaly/server" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/conflicts" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + serverPkg "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/server" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/conflicts" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" diff --git a/internal/gitaly/service/conflicts/server.go b/internal/gitaly/service/conflicts/server.go index d339dcca4ba0a061d69bce66f525824538f93a9b..ca24abd40d2c28fdabea9c3edb9a75bfbec70224 100644 --- a/internal/gitaly/service/conflicts/server.go +++ b/internal/gitaly/service/conflicts/server.go @@ -1,8 +1,8 @@ package conflicts import ( - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) type server struct { diff --git a/internal/gitaly/service/conflicts/testhelper_test.go b/internal/gitaly/service/conflicts/testhelper_test.go index e952327a17366867e850a8caa286dbc4bfc99b9b..93c4491b2bcaafb99696cb10848a6b07a6d505bf 100644 --- a/internal/gitaly/service/conflicts/testhelper_test.go +++ b/internal/gitaly/service/conflicts/testhelper_test.go @@ -7,11 +7,11 @@ import ( log "github.com/sirupsen/logrus" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git/hooks" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/hooks" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/reflection" ) diff --git a/internal/gitaly/service/diff/commit.go b/internal/gitaly/service/diff/commit.go index 590177d890fc8e6ea397427253fa9a26c75a7481..93c891eada0b6bc58bd000b1a1dbeea2d14dd7d9 100644 --- a/internal/gitaly/service/diff/commit.go +++ b/internal/gitaly/service/diff/commit.go @@ -6,9 +6,9 @@ import ( "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" log "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/diff" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/diff" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/diff/commit_test.go b/internal/gitaly/service/diff/commit_test.go index 1c814cea79413fd109660ad6c332b8f52e808980..659bbbe86ae7e495e77c77f08bddeda151f89380 100644 --- a/internal/gitaly/service/diff/commit_test.go +++ b/internal/gitaly/service/diff/commit_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/diff" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/diff" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/diff/numstat.go b/internal/gitaly/service/diff/numstat.go index ec892a68167452b873d4dea2744bfb3ba2de44cc..f8728027069de5e6e9025547b2dae000486b7674 100644 --- a/internal/gitaly/service/diff/numstat.go +++ b/internal/gitaly/service/diff/numstat.go @@ -3,9 +3,9 @@ package diff import ( "io" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/diff" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/diff" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/diff/numstat_test.go b/internal/gitaly/service/diff/numstat_test.go index 13f84321080a1160334426c1be0e12158c410a11..4caa2dcf0d452426e7f76f1bdac1b0433070a3df 100644 --- a/internal/gitaly/service/diff/numstat_test.go +++ b/internal/gitaly/service/diff/numstat_test.go @@ -5,9 +5,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/diff" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/diff" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/diff/raw.go b/internal/gitaly/service/diff/raw.go index 5e47936f036752b7bd1a41b76de24f5c4dc714d4..b74d5148adea1bebfa7f0a7ba11b4c9c338f2295 100644 --- a/internal/gitaly/service/diff/raw.go +++ b/internal/gitaly/service/diff/raw.go @@ -4,9 +4,9 @@ import ( "context" "io" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/diff/raw_test.go b/internal/gitaly/service/diff/raw_test.go index 02dbfc976cbd4711e6302498e5ff4856794d0788..b3fdc7fee98d21485790f35a35c2fcf46e76e295 100644 --- a/internal/gitaly/service/diff/raw_test.go +++ b/internal/gitaly/service/diff/raw_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/diff/server.go b/internal/gitaly/service/diff/server.go index 1966b25a019d5ad229ffcd6c3bf99696201c9cf6..7e0b982f784cf3827be68913a0aafb3bdc97e7e0 100644 --- a/internal/gitaly/service/diff/server.go +++ b/internal/gitaly/service/diff/server.go @@ -1,8 +1,8 @@ package diff import ( - "gitlab.com/gitlab-org/gitaly/internal/storage" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/storage" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) const msgSizeThreshold = 5 * 1024 diff --git a/internal/gitaly/service/diff/testhelper_test.go b/internal/gitaly/service/diff/testhelper_test.go index a701953f621ba078c647a0af43e9185d7e4a1555..d4f0ee78937b6fd3c35738fcc99ddba2c2631a43 100644 --- a/internal/gitaly/service/diff/testhelper_test.go +++ b/internal/gitaly/service/diff/testhelper_test.go @@ -5,9 +5,9 @@ import ( "os" "testing" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/reflection" ) diff --git a/internal/gitaly/service/hook/post_receive.go b/internal/gitaly/service/hook/post_receive.go index 2fd3ecad4d36425935638f9004249188129cf967..989163c2f1453e8de989f2ccb18c7e244c7b01b4 100644 --- a/internal/gitaly/service/hook/post_receive.go +++ b/internal/gitaly/service/hook/post_receive.go @@ -5,9 +5,9 @@ import ( "fmt" "os/exec" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" ) func postReceiveHookResponse(stream gitalypb.HookService_PostReceiveHookServer, code int32, stderr string) error { diff --git a/internal/gitaly/service/hook/post_receive_test.go b/internal/gitaly/service/hook/post_receive_test.go index bd09c2d006795e84c7668a90a5bfb74e297a1043..0cb02e605739b158a2eed826bd1bdf3c26c480a2 100644 --- a/internal/gitaly/service/hook/post_receive_test.go +++ b/internal/gitaly/service/hook/post_receive_test.go @@ -8,13 +8,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - gitalyhook "gitlab.com/gitlab-org/gitaly/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/internal/praefect/metadata" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + gitalyhook "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/metadata" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/hook/pre_receive.go b/internal/gitaly/service/hook/pre_receive.go index 112ea7d53a9441a95da1a54666be815c678a6406..133b48ec0c4d59f5b8b74bbcee3362c9e2d9935f 100644 --- a/internal/gitaly/service/hook/pre_receive.go +++ b/internal/gitaly/service/hook/pre_receive.go @@ -5,11 +5,11 @@ import ( "fmt" "os/exec" - "gitlab.com/gitlab-org/gitaly/internal/git/hooks" - "gitlab.com/gitlab-org/gitaly/internal/gitlabshell" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/hooks" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitlabshell" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" ) type hookRequest interface { diff --git a/internal/gitaly/service/hook/pre_receive_test.go b/internal/gitaly/service/hook/pre_receive_test.go index 2e706a55aa34fea177e926b4c84995f20a510d5e..87c0f05f41d6a0c41f503874b20cd5990311983e 100644 --- a/internal/gitaly/service/hook/pre_receive_test.go +++ b/internal/gitaly/service/hook/pre_receive_test.go @@ -12,13 +12,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - gitalyhook "gitlab.com/gitlab-org/gitaly/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/internal/praefect/metadata" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + gitalyhook "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/metadata" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/hook/reference_transaction.go b/internal/gitaly/service/hook/reference_transaction.go index 2118ceb02fbc8014d87e31903bf6e1380b897211..d757588e70dd86a88280d2ae7433ab037911478e 100644 --- a/internal/gitaly/service/hook/reference_transaction.go +++ b/internal/gitaly/service/hook/reference_transaction.go @@ -3,9 +3,9 @@ package hook import ( "errors" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" ) func validateReferenceTransactionHookRequest(in *gitalypb.ReferenceTransactionHookRequest) error { diff --git a/internal/gitaly/service/hook/reference_transaction_test.go b/internal/gitaly/service/hook/reference_transaction_test.go index 4afef978334877c0d055da8e0ea7360901317a81..d8111a2f09f4c81b22fcf9d753c0d68de0fe8115 100644 --- a/internal/gitaly/service/hook/reference_transaction_test.go +++ b/internal/gitaly/service/hook/reference_transaction_test.go @@ -7,11 +7,11 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/praefect/metadata" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/metadata" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/hook/server.go b/internal/gitaly/service/hook/server.go index fd708665501716a8770221ecb135de9f61a95296..ed6e41a4d6a3838bce17ba6a952c70f37d61e8dd 100644 --- a/internal/gitaly/service/hook/server.go +++ b/internal/gitaly/service/hook/server.go @@ -1,8 +1,8 @@ package hook import ( - gitalyhook "gitlab.com/gitlab-org/gitaly/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + gitalyhook "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) type server struct { diff --git a/internal/gitaly/service/hook/testhelper_test.go b/internal/gitaly/service/hook/testhelper_test.go index d0934d5ee14ebf4dcfe5b14395833e065b49ee34..0aeab5196bf1ba3a7233c55900ca08da439cb553 100644 --- a/internal/gitaly/service/hook/testhelper_test.go +++ b/internal/gitaly/service/hook/testhelper_test.go @@ -5,11 +5,11 @@ import ( "testing" "github.com/stretchr/testify/require" - gitalyauth "gitlab.com/gitlab-org/gitaly/auth" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - gitalyhook "gitlab.com/gitlab-org/gitaly/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + gitalyauth "gitlab.com/gitlab-org/gitaly/v13/auth" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + gitalyhook "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/reflection" ) diff --git a/internal/gitaly/service/hook/update.go b/internal/gitaly/service/hook/update.go index 0ee4b29e009a815532c657e2ef8bb9e729811e57..f98ed68c5aaf79166323c68e2cef2b3f9440ac84 100644 --- a/internal/gitaly/service/hook/update.go +++ b/internal/gitaly/service/hook/update.go @@ -4,9 +4,9 @@ import ( "errors" "os/exec" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" ) func validateUpdateHookRequest(in *gitalypb.UpdateHookRequest) error { diff --git a/internal/gitaly/service/hook/update_test.go b/internal/gitaly/service/hook/update_test.go index 0773bb1d4bd6aa07f6ae49c5b79258f7adc77015..df59f9ea6cd846ae5cf8101529a6801050e57c3e 100644 --- a/internal/gitaly/service/hook/update_test.go +++ b/internal/gitaly/service/hook/update_test.go @@ -8,10 +8,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/inspect/inspector.go b/internal/gitaly/service/inspect/inspector.go index fcd8a1aa719910deedce09f49fee765bb7cb87a5..eb7ba48f3022758e0b390b05a64c1535bc65107d 100644 --- a/internal/gitaly/service/inspect/inspector.go +++ b/internal/gitaly/service/inspect/inspector.go @@ -7,8 +7,8 @@ import ( "io/ioutil" "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" - "gitlab.com/gitlab-org/gitaly/internal/git/pktline" - "gitlab.com/gitlab-org/gitaly/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/text" ) // NewWriter returns Writer that will feed 'action' with data on each write to it. diff --git a/internal/gitaly/service/inspect/inspector_test.go b/internal/gitaly/service/inspect/inspector_test.go index 4f119f0e6ff4cbe52fb25a2b565df1e7d5367d06..876d7cee650ee61b32ab8cda65fec04ef5d8b95f 100644 --- a/internal/gitaly/service/inspect/inspector_test.go +++ b/internal/gitaly/service/inspect/inspector_test.go @@ -12,7 +12,7 @@ import ( "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" "github.com/sirupsen/logrus" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestWrite(t *testing.T) { diff --git a/internal/gitaly/service/internalgitaly/server.go b/internal/gitaly/service/internalgitaly/server.go index 743aa79a6394bacd3213a2d635047e77e663145c..d87c77154d67b7daa6f27a19b26bf0598a6a7e8c 100644 --- a/internal/gitaly/service/internalgitaly/server.go +++ b/internal/gitaly/service/internalgitaly/server.go @@ -1,8 +1,8 @@ package internalgitaly import ( - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) type server struct { diff --git a/internal/gitaly/service/internalgitaly/testhelper_test.go b/internal/gitaly/service/internalgitaly/testhelper_test.go index bccec58af93b2a9005b2c06b22d1fea30c891688..38a562363b468080347e103c2dd0e429554c8c14 100644 --- a/internal/gitaly/service/internalgitaly/testhelper_test.go +++ b/internal/gitaly/service/internalgitaly/testhelper_test.go @@ -4,8 +4,8 @@ import ( "net" "testing" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/reflection" ) diff --git a/internal/gitaly/service/internalgitaly/walkrepos.go b/internal/gitaly/service/internalgitaly/walkrepos.go index 1fc565b2a12e8ffe3df9c2cce6b6fb397e980ba9..e6982fffb87432237b2947680626abb954562a83 100644 --- a/internal/gitaly/service/internalgitaly/walkrepos.go +++ b/internal/gitaly/service/internalgitaly/walkrepos.go @@ -5,8 +5,8 @@ import ( "os" "path/filepath" - "gitlab.com/gitlab-org/gitaly/internal/storage" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/storage" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/internalgitaly/walkrepos_test.go b/internal/gitaly/service/internalgitaly/walkrepos_test.go index 1a2919e9148090645fdf314bcacc92eedb075257..35aee5572e9a28ee24be23a70422c0a626d8696a 100644 --- a/internal/gitaly/service/internalgitaly/walkrepos_test.go +++ b/internal/gitaly/service/internalgitaly/walkrepos_test.go @@ -8,9 +8,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/namespace/namespace.go b/internal/gitaly/service/namespace/namespace.go index a06a63e0457a39e0aa64d05c8973c0d4e7aec057..b186c6ccd8326a9c1f925148e284621ffe26231d 100644 --- a/internal/gitaly/service/namespace/namespace.go +++ b/internal/gitaly/service/namespace/namespace.go @@ -7,8 +7,8 @@ import ( "os" "path/filepath" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/namespace/namespace_test.go b/internal/gitaly/service/namespace/namespace_test.go index baf42af035887d5ea8b6b234fe525cdcd49bebe6..cb1fb1e2afff92c58c96ba5b6fef91e8c278bfbf 100644 --- a/internal/gitaly/service/namespace/namespace_test.go +++ b/internal/gitaly/service/namespace/namespace_test.go @@ -7,10 +7,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/namespace/server.go b/internal/gitaly/service/namespace/server.go index 4b324b3a1939412b740d3fa2f87bd971547e55ae..07e1c92a44a14e44f2bae93009acd792b47f1093 100644 --- a/internal/gitaly/service/namespace/server.go +++ b/internal/gitaly/service/namespace/server.go @@ -1,6 +1,6 @@ package namespace -import "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" +import "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" type server struct { } diff --git a/internal/gitaly/service/namespace/testhelper_test.go b/internal/gitaly/service/namespace/testhelper_test.go index 31a6cd00a62a2e44300bd3b59cc724ef07e17772..d2540dfef18b70f61ee7a9fcf04ef83d8d3838bd 100644 --- a/internal/gitaly/service/namespace/testhelper_test.go +++ b/internal/gitaly/service/namespace/testhelper_test.go @@ -4,8 +4,8 @@ import ( "net" "testing" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/reflection" ) diff --git a/internal/gitaly/service/objectpool/alternates.go b/internal/gitaly/service/objectpool/alternates.go index 523f83e317e9cd08e3b39c20881c48f16deb5127..b5dbf46c18c00d26e63f22f7e08d9ad054f53a79 100644 --- a/internal/gitaly/service/objectpool/alternates.go +++ b/internal/gitaly/service/objectpool/alternates.go @@ -12,10 +12,10 @@ import ( "time" "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) // DisconnectGitAlternates is a slightly dangerous RPC. It optimistically diff --git a/internal/gitaly/service/objectpool/alternates_test.go b/internal/gitaly/service/objectpool/alternates_test.go index 7aee5ef8c8a4b3347bfd07a2cc653b44879b653e..77cba15faa8a088eaa621ef6aaac660187df7c6b 100644 --- a/internal/gitaly/service/objectpool/alternates_test.go +++ b/internal/gitaly/service/objectpool/alternates_test.go @@ -7,11 +7,11 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/objectpool" - gconfig "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/objectpool" + gconfig "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func TestDisconnectGitAlternates(t *testing.T) { diff --git a/internal/gitaly/service/objectpool/create.go b/internal/gitaly/service/objectpool/create.go index 407e56287cfb3c4e0ab58702b63583cfeb0d7f97..6c840b1858b01734d23ee0713b9f6c92cb774ccd 100644 --- a/internal/gitaly/service/objectpool/create.go +++ b/internal/gitaly/service/objectpool/create.go @@ -3,9 +3,9 @@ package objectpool import ( "context" - "gitlab.com/gitlab-org/gitaly/internal/git/objectpool" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/objectpool" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/objectpool/create_test.go b/internal/gitaly/service/objectpool/create_test.go index 9962d548661dedbb10da78fe62d39cee6fc071b6..47eaaef3dfb1e948d4de4b5e24e2f1ee2e106cc2 100644 --- a/internal/gitaly/service/objectpool/create_test.go +++ b/internal/gitaly/service/objectpool/create_test.go @@ -8,10 +8,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git/objectpool" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/objectpool" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/objectpool/fetch_into_object_pool.go b/internal/gitaly/service/objectpool/fetch_into_object_pool.go index e289dccd828305e7dde32355b1ed1a0f8e3741d1..808261014d46c59f207cadb9cda0ef6316ca2fc0 100644 --- a/internal/gitaly/service/objectpool/fetch_into_object_pool.go +++ b/internal/gitaly/service/objectpool/fetch_into_object_pool.go @@ -5,10 +5,10 @@ import ( "errors" "fmt" - "gitlab.com/gitlab-org/gitaly/internal/git/objectpool" - "gitlab.com/gitlab-org/gitaly/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/objectpool" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func (s *server) FetchIntoObjectPool(ctx context.Context, req *gitalypb.FetchIntoObjectPoolRequest) (*gitalypb.FetchIntoObjectPoolResponse, error) { diff --git a/internal/gitaly/service/objectpool/fetch_into_object_pool_test.go b/internal/gitaly/service/objectpool/fetch_into_object_pool_test.go index 064645f5e778960d730b3bcd211059bb9f155472..05a3aeb699b40a941bd50c0821a3f925ef71e08e 100644 --- a/internal/gitaly/service/objectpool/fetch_into_object_pool_test.go +++ b/internal/gitaly/service/objectpool/fetch_into_object_pool_test.go @@ -11,10 +11,10 @@ import ( "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git/objectpool" - gconfig "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/objectpool" + gconfig "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "gitlab.com/gitlab-org/labkit/log" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/objectpool/get.go b/internal/gitaly/service/objectpool/get.go index c409ee8693cd4c5f2d73b53c9c6cb42c468760c8..c3f8f81dd48b4373bf449a9a2f6a7f7ac1805efc 100644 --- a/internal/gitaly/service/objectpool/get.go +++ b/internal/gitaly/service/objectpool/get.go @@ -5,9 +5,9 @@ import ( "errors" "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" - "gitlab.com/gitlab-org/gitaly/internal/git/objectpool" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/objectpool" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func (s *server) GetObjectPool(ctx context.Context, in *gitalypb.GetObjectPoolRequest) (*gitalypb.GetObjectPoolResponse, error) { diff --git a/internal/gitaly/service/objectpool/get_test.go b/internal/gitaly/service/objectpool/get_test.go index ef5526226f6a059d26d3f364fc8dac135ae17dd3..3cb151b8d468b17686356340333327d79920bd4e 100644 --- a/internal/gitaly/service/objectpool/get_test.go +++ b/internal/gitaly/service/objectpool/get_test.go @@ -7,10 +7,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git/objectpool" - gconfig "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/objectpool" + gconfig "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func TestGetObjectPoolSuccess(t *testing.T) { diff --git a/internal/gitaly/service/objectpool/link.go b/internal/gitaly/service/objectpool/link.go index a62b7ec97cdbde230eaf7633b40053564ab43449..86ba258f8089ce4afee268e43841f124141ee143 100644 --- a/internal/gitaly/service/objectpool/link.go +++ b/internal/gitaly/service/objectpool/link.go @@ -5,8 +5,8 @@ import ( "errors" "fmt" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/objectpool/link_test.go b/internal/gitaly/service/objectpool/link_test.go index c98c878d58f1135389e443e11fa44dce59a378fd..4807c966693ff2d8c0cbfb238011505229947a05 100644 --- a/internal/gitaly/service/objectpool/link_test.go +++ b/internal/gitaly/service/objectpool/link_test.go @@ -7,12 +7,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/git/objectpool" - gconfig "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/storage" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/objectpool" + gconfig "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/storage" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/objectpool/reduplicate.go b/internal/gitaly/service/objectpool/reduplicate.go index 9778535cd01adfe4300afec8c094ce7284580c29..7d45b81978a9539ddd899798b083ef6e16917d48 100644 --- a/internal/gitaly/service/objectpool/reduplicate.go +++ b/internal/gitaly/service/objectpool/reduplicate.go @@ -3,8 +3,8 @@ package objectpool import ( "context" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/objectpool/reduplicate_test.go b/internal/gitaly/service/objectpool/reduplicate_test.go index f901ad4066f53dbb90b6aa1d1363b2fb6f73eb2b..ef1cdfda93a658791fab687d29e2dc9af3e04c3e 100644 --- a/internal/gitaly/service/objectpool/reduplicate_test.go +++ b/internal/gitaly/service/objectpool/reduplicate_test.go @@ -5,11 +5,11 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/objectpool" - gconfig "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/objectpool" + gconfig "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func TestReduplicate(t *testing.T) { diff --git a/internal/gitaly/service/objectpool/server.go b/internal/gitaly/service/objectpool/server.go index bc90a7a589af388a5184d793c4cedb6c4e6dfb95..cab715923c154e9e9cb9efcc193431d6503ec20d 100644 --- a/internal/gitaly/service/objectpool/server.go +++ b/internal/gitaly/service/objectpool/server.go @@ -1,8 +1,8 @@ package objectpool import ( - "gitlab.com/gitlab-org/gitaly/internal/storage" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/storage" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) type server struct { diff --git a/internal/gitaly/service/objectpool/testhelper_test.go b/internal/gitaly/service/objectpool/testhelper_test.go index 507388ebf411f9442470690d6e90faa31d76b56d..9d3740490e7b532b5d8ed7862b639f179ba93cf0 100644 --- a/internal/gitaly/service/objectpool/testhelper_test.go +++ b/internal/gitaly/service/objectpool/testhelper_test.go @@ -6,9 +6,9 @@ import ( "os" "testing" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/reflection" ) diff --git a/internal/gitaly/service/operations/apply_patch.go b/internal/gitaly/service/operations/apply_patch.go index 464c79cd07cdd244193c36684736f42ea1d1e719..a1b10cdd80a0ae8caabbeae59a17991010bd62a8 100644 --- a/internal/gitaly/service/operations/apply_patch.go +++ b/internal/gitaly/service/operations/apply_patch.go @@ -3,8 +3,8 @@ package operations import ( "fmt" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/operations/apply_patch_test.go b/internal/gitaly/service/operations/apply_patch_test.go index 1b24b23915133606ced3741f9f4e8a62ab839527..8e7323fc2029b491acd0831479a07df5db03bddd 100644 --- a/internal/gitaly/service/operations/apply_patch_test.go +++ b/internal/gitaly/service/operations/apply_patch_test.go @@ -11,10 +11,10 @@ import ( "testing/iotest" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/operations/branches.go b/internal/gitaly/service/operations/branches.go index f3bed19bb67beca4980ac3bdf2135c18cd6f5a20..62f57d98ab54037f3fe7a8d66e3cab57fe82036d 100644 --- a/internal/gitaly/service/operations/branches.go +++ b/internal/gitaly/service/operations/branches.go @@ -5,11 +5,11 @@ import ( "errors" "fmt" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/metadata/featureflag" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/metadata/featureflag" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/operations/branches_test.go b/internal/gitaly/service/operations/branches_test.go index bc5e57eedf896bcd56b816ef2ce3d1c0ee69e62a..7c7aba596efaee1ea6dd615fb0fcb24f791fe4c7 100644 --- a/internal/gitaly/service/operations/branches_test.go +++ b/internal/gitaly/service/operations/branches_test.go @@ -9,16 +9,16 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - gitalyhook "gitlab.com/gitlab-org/gitaly/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/hook" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/metadata/featureflag" - "gitlab.com/gitlab-org/gitaly/internal/praefect/metadata" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + gitalyhook "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/hook" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/metadata/featureflag" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/metadata" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/operations/cherry_pick.go b/internal/gitaly/service/operations/cherry_pick.go index 7713f7f8633f20337b99ed0a61d1c6d19ca9cdca..5ecf6521365ccc974f0cfd7cf91cb916f13fb9dd 100644 --- a/internal/gitaly/service/operations/cherry_pick.go +++ b/internal/gitaly/service/operations/cherry_pick.go @@ -3,8 +3,8 @@ package operations import ( "context" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/operations/cherry_pick_test.go b/internal/gitaly/service/operations/cherry_pick_test.go index 1af9c597480af116f8f35190c9377caa24c5d2d2..b88338c78319dd770213d49da8a0b789e4e2ef0f 100644 --- a/internal/gitaly/service/operations/cherry_pick_test.go +++ b/internal/gitaly/service/operations/cherry_pick_test.go @@ -5,9 +5,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" ) diff --git a/internal/gitaly/service/operations/commit_files.go b/internal/gitaly/service/operations/commit_files.go index b67bf30aae27ac706905d0f9c9add2cd984b3825..ee9070acbed8c37e8c75c56ab1b948c784eb0b1a 100644 --- a/internal/gitaly/service/operations/commit_files.go +++ b/internal/gitaly/service/operations/commit_files.go @@ -3,9 +3,9 @@ package operations import ( "fmt" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/operations/commit_files_test.go b/internal/gitaly/service/operations/commit_files_test.go index 391ba9c24e60564a0d326b81ef5f372b11e3d70c..b7aa4331503cc1d80b6bcbe0f0832c345a572e1c 100644 --- a/internal/gitaly/service/operations/commit_files_test.go +++ b/internal/gitaly/service/operations/commit_files_test.go @@ -7,10 +7,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" ) diff --git a/internal/gitaly/service/operations/merge.go b/internal/gitaly/service/operations/merge.go index 466cbf5e05a09dcdc7634053d8e02eb1bbd1e677..6b8774fe3c8d0af809a95bad421437779d0cd85a 100644 --- a/internal/gitaly/service/operations/merge.go +++ b/internal/gitaly/service/operations/merge.go @@ -8,17 +8,17 @@ import ( "io" "strings" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/updateref" - "gitlab.com/gitlab-org/gitaly/internal/git2go" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/internal/gitlabshell" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/internal/metadata/featureflag" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/updateref" + "gitlab.com/gitlab-org/gitaly/v13/internal/git2go" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitlabshell" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v13/internal/metadata/featureflag" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) type preReceiveError struct { diff --git a/internal/gitaly/service/operations/merge_test.go b/internal/gitaly/service/operations/merge_test.go index feeb9a4085a76273a0339f4834472fbebb8f7763..47bccdb0af84a82c2250ba789d3ad1c3802f2105 100644 --- a/internal/gitaly/service/operations/merge_test.go +++ b/internal/gitaly/service/operations/merge_test.go @@ -10,12 +10,12 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/command" - gitlog "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/internal/metadata/featureflag" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + gitlog "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v13/internal/metadata/featureflag" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/operations/rebase.go b/internal/gitaly/service/operations/rebase.go index 0b20e341e75cbb940214f9801ffb9159b96eea08..ce5a5bfa4805b4af008990acab08e6a918fb6435 100644 --- a/internal/gitaly/service/operations/rebase.go +++ b/internal/gitaly/service/operations/rebase.go @@ -5,10 +5,10 @@ package operations import ( "errors" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func (s *server) UserRebaseConfirmable(stream gitalypb.OperationService_UserRebaseConfirmableServer) error { diff --git a/internal/gitaly/service/operations/rebase_test.go b/internal/gitaly/service/operations/rebase_test.go index 1741968e60f7a040a63eab19ad8ee6f217530aa2..a82fb1ed6768b948cf96c3899223a7a85faa3aeb 100644 --- a/internal/gitaly/service/operations/rebase_test.go +++ b/internal/gitaly/service/operations/rebase_test.go @@ -9,11 +9,11 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - gitlog "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + gitlog "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" ) diff --git a/internal/gitaly/service/operations/revert.go b/internal/gitaly/service/operations/revert.go index 1ac3cdd9b6fa17f6a24f32ddeaf3efc9d9365b74..e54fd621abe262fb998ceaa4c9be440dc33e2929 100644 --- a/internal/gitaly/service/operations/revert.go +++ b/internal/gitaly/service/operations/revert.go @@ -3,8 +3,8 @@ package operations import ( "context" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/operations/revert_test.go b/internal/gitaly/service/operations/revert_test.go index 0a2af6296640881bb672e57d8f51099fb11a74f8..94ec6f2ea31ae5cae5991ade3bc081a8ce882e85 100644 --- a/internal/gitaly/service/operations/revert_test.go +++ b/internal/gitaly/service/operations/revert_test.go @@ -5,9 +5,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" ) diff --git a/internal/gitaly/service/operations/server.go b/internal/gitaly/service/operations/server.go index 6c2892f19a39e1ad51319ce17a18c398ce8dcdb1..7d89bc3cc6a2f6d06ee491f22e562d4122f13867 100644 --- a/internal/gitaly/service/operations/server.go +++ b/internal/gitaly/service/operations/server.go @@ -1,11 +1,11 @@ package operations import ( - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/internal/storage" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/internal/storage" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) type server struct { diff --git a/internal/gitaly/service/operations/squash.go b/internal/gitaly/service/operations/squash.go index e354bea8cfc65a2c956113c4f83d4c409b21d965..e319f1cbdf2630704b048bfee5d9bd347a359933 100644 --- a/internal/gitaly/service/operations/squash.go +++ b/internal/gitaly/service/operations/squash.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/operations/squash_test.go b/internal/gitaly/service/operations/squash_test.go index 7164f8dc5c46bb82f7507021fe36007a8c8b79df..9e3e7dc716e23017c59f0e11076008138c2b1bd0 100644 --- a/internal/gitaly/service/operations/squash_test.go +++ b/internal/gitaly/service/operations/squash_test.go @@ -9,10 +9,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/operations/submodules.go b/internal/gitaly/service/operations/submodules.go index 3408c648d9550b909704e790f1d6116a3b1cb1a6..fc61749c04c5fcf8700486b6229e622850f6108d 100644 --- a/internal/gitaly/service/operations/submodules.go +++ b/internal/gitaly/service/operations/submodules.go @@ -5,8 +5,8 @@ import ( "fmt" "regexp" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/operations/submodules_test.go b/internal/gitaly/service/operations/submodules_test.go index e3de793b07dace7afbc51bac32ab27b68672ff29..a026899b8fd060e1a3c091653eab4b8e18c5d985 100644 --- a/internal/gitaly/service/operations/submodules_test.go +++ b/internal/gitaly/service/operations/submodules_test.go @@ -7,10 +7,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/git/lstree" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/lstree" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/operations/tags.go b/internal/gitaly/service/operations/tags.go index 158d21b8c75fcab8b81a43214332bea6ca26a9c3..b358d2c1fd7d720c5a43c22042e5a890cb984a62 100644 --- a/internal/gitaly/service/operations/tags.go +++ b/internal/gitaly/service/operations/tags.go @@ -3,8 +3,8 @@ package operations import ( "context" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func (s *server) UserDeleteTag(ctx context.Context, req *gitalypb.UserDeleteTagRequest) (*gitalypb.UserDeleteTagResponse, error) { diff --git a/internal/gitaly/service/operations/tags_test.go b/internal/gitaly/service/operations/tags_test.go index 51810513409cb740462831117ff9aa4ffcfd64ef..b1a8b4644571db27d4f9cd11453ea848b88ae5c1 100644 --- a/internal/gitaly/service/operations/tags_test.go +++ b/internal/gitaly/service/operations/tags_test.go @@ -10,12 +10,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/internal/metadata/featureflag" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v13/internal/metadata/featureflag" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/operations/testhelper_test.go b/internal/gitaly/service/operations/testhelper_test.go index 036205964e18df8a8e75e768f92a999bb94021f6..70b2b5622a8467ce9133a4c8c7d0d11532f3d768 100644 --- a/internal/gitaly/service/operations/testhelper_test.go +++ b/internal/gitaly/service/operations/testhelper_test.go @@ -8,18 +8,18 @@ import ( log "github.com/sirupsen/logrus" "github.com/stretchr/testify/require" - gitalyauth "gitlab.com/gitlab-org/gitaly/auth" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - gitalyhook "gitlab.com/gitlab-org/gitaly/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/commit" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/hook" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/ref" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/repository" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/ssh" - gitalylog "gitlab.com/gitlab-org/gitaly/internal/log" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + gitalyauth "gitlab.com/gitlab-org/gitaly/v13/auth" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + gitalyhook "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/commit" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/hook" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/ref" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/repository" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/ssh" + gitalylog "gitlab.com/gitlab-org/gitaly/v13/internal/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/reflection" ) diff --git a/internal/gitaly/service/operations/update_branches_test.go b/internal/gitaly/service/operations/update_branches_test.go index 9b002c19df089a1712826b94c3bc3e1f35509b35..6adbf310902936c7659d7289d94889a68f869af4 100644 --- a/internal/gitaly/service/operations/update_branches_test.go +++ b/internal/gitaly/service/operations/update_branches_test.go @@ -7,10 +7,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/metadata/featureflag" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/metadata/featureflag" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/operations/utils.go b/internal/gitaly/service/operations/utils.go index 899a86450530605c1d39ffb4230b48bb6a15795c..c6c68b1bfac8df1ab02a4618915bc1012f539dcc 100644 --- a/internal/gitaly/service/operations/utils.go +++ b/internal/gitaly/service/operations/utils.go @@ -3,7 +3,7 @@ package operations import ( "fmt" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) type cherryPickOrRevertRequest interface { diff --git a/internal/gitaly/service/ref/branches.go b/internal/gitaly/service/ref/branches.go index 67dcaa6a59fa36db45b15d43783d2887ca1f2b16..a67575c9076bf26f6689633b529e267b53d03d83 100644 --- a/internal/gitaly/service/ref/branches.go +++ b/internal/gitaly/service/ref/branches.go @@ -5,9 +5,9 @@ import ( "errors" "strings" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/ref/branches_test.go b/internal/gitaly/service/ref/branches_test.go index 0dbde77a8945885c564ddf9803e39c06bc589153..7c86a8aa8f31fc357b7ed74406fa5fb704d63a83 100644 --- a/internal/gitaly/service/ref/branches_test.go +++ b/internal/gitaly/service/ref/branches_test.go @@ -4,9 +4,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/ref/delete_refs.go b/internal/gitaly/service/ref/delete_refs.go index 4b0baa11e5478b219829a17774adf0f14d480149..d338a6c36dd0fc4a81d38111e216ec704619015e 100644 --- a/internal/gitaly/service/ref/delete_refs.go +++ b/internal/gitaly/service/ref/delete_refs.go @@ -6,10 +6,10 @@ import ( "fmt" "strings" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/updateref" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/updateref" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/ref/delete_refs_test.go b/internal/gitaly/service/ref/delete_refs_test.go index 73a88f7fc3634ba9e10f0b3ac610a97482735568..42fe198f9edf30d4d5a146ec57ef0c5d0a1ece0c 100644 --- a/internal/gitaly/service/ref/delete_refs_test.go +++ b/internal/gitaly/service/ref/delete_refs_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/ref/list_new_blobs.go b/internal/gitaly/service/ref/list_new_blobs.go index fdd03949e5e25975c9c5d03aff4ba5c8d046116c..d4e6b158bb2483eb5fb019b3def312c7d6c03ba0 100644 --- a/internal/gitaly/service/ref/list_new_blobs.go +++ b/internal/gitaly/service/ref/list_new_blobs.go @@ -5,10 +5,10 @@ import ( "fmt" "strings" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func (s *server) ListNewBlobs(in *gitalypb.ListNewBlobsRequest, stream gitalypb.RefService_ListNewBlobsServer) error { diff --git a/internal/gitaly/service/ref/list_new_blobs_test.go b/internal/gitaly/service/ref/list_new_blobs_test.go index 6e16e8c5dac694408880a114a3c0da8811b00bd5..f385b7b10c0a7401c54c7917a8059325777dd647 100644 --- a/internal/gitaly/service/ref/list_new_blobs_test.go +++ b/internal/gitaly/service/ref/list_new_blobs_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/ref/list_new_commits.go b/internal/gitaly/service/ref/list_new_commits.go index d465dca05d45194cb05e3823ef09db51bb396a56..1fe2197700be9778cdf1a2c001a080a92a3f3e22 100644 --- a/internal/gitaly/service/ref/list_new_commits.go +++ b/internal/gitaly/service/ref/list_new_commits.go @@ -3,11 +3,11 @@ package ref import ( "bufio" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func (s *server) ListNewCommits(in *gitalypb.ListNewCommitsRequest, stream gitalypb.RefService_ListNewCommitsServer) error { diff --git a/internal/gitaly/service/ref/list_new_commits_test.go b/internal/gitaly/service/ref/list_new_commits_test.go index a75ed8c689ad32fca9fef571dc1cce850c60a020..48c34c86624b4498b205e2fdae4a44728d07c949 100644 --- a/internal/gitaly/service/ref/list_new_commits_test.go +++ b/internal/gitaly/service/ref/list_new_commits_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/ref/pack_refs.go b/internal/gitaly/service/ref/pack_refs.go index 51e457750c4b39167cec7156d8f4cc548b4f9a48..86e41afdfec52046c77aa128b9ab521c7819648b 100644 --- a/internal/gitaly/service/ref/pack_refs.go +++ b/internal/gitaly/service/ref/pack_refs.go @@ -5,10 +5,10 @@ import ( "errors" "fmt" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/repository" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/repository" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func (server) PackRefs(ctx context.Context, in *gitalypb.PackRefsRequest) (*gitalypb.PackRefsResponse, error) { diff --git a/internal/gitaly/service/ref/pack_refs_test.go b/internal/gitaly/service/ref/pack_refs_test.go index 6eff598fe52950ad4c8fe831889b497ebc9e66a9..a4aafd43b599a48dfe82d979ffbc4127a7cc64ad 100644 --- a/internal/gitaly/service/ref/pack_refs_test.go +++ b/internal/gitaly/service/ref/pack_refs_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func TestPackRefsSuccessfulRequest(t *testing.T) { diff --git a/internal/gitaly/service/ref/refexists.go b/internal/gitaly/service/ref/refexists.go index b463d1b2c1c9189f752ab1c71e5b53e2bb9027f3..aa3d7b9b20e4e0cb03f7b80e6da4f1693df136d3 100644 --- a/internal/gitaly/service/ref/refexists.go +++ b/internal/gitaly/service/ref/refexists.go @@ -5,10 +5,10 @@ import ( "fmt" "strings" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) // RefExists returns true if the given reference exists. The ref must start with the string `ref/` diff --git a/internal/gitaly/service/ref/refexists_test.go b/internal/gitaly/service/ref/refexists_test.go index 557699fda802bd49727dd9aebb7002ba712962f2..0e534ffa4558d6c4b627b311d184e0b9a5c729b5 100644 --- a/internal/gitaly/service/ref/refexists_test.go +++ b/internal/gitaly/service/ref/refexists_test.go @@ -3,9 +3,9 @@ package ref import ( "testing" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/ref/refname.go b/internal/gitaly/service/ref/refname.go index fdd8a4c2cceaa0dd3eb6271095926caed3c2d817..7fc3437e3202a5f8cfa546b3aaf1e3373d4c4b83 100644 --- a/internal/gitaly/service/ref/refname.go +++ b/internal/gitaly/service/ref/refname.go @@ -7,9 +7,9 @@ import ( "fmt" "strings" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) // FindRefName returns a ref that starts with the given prefix, if one exists. diff --git a/internal/gitaly/service/ref/refname_test.go b/internal/gitaly/service/ref/refname_test.go index 0b67a0b9bf76a92c127f522911ac3e1507df39ab..be81a376fb9aa7f6d991770192cbaf2c57b40d2f 100644 --- a/internal/gitaly/service/ref/refname_test.go +++ b/internal/gitaly/service/ref/refname_test.go @@ -4,10 +4,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/ref/refnames.go b/internal/gitaly/service/ref/refnames.go index e4f12fb5dc1d59041f1526fadcfb8030430c78fa..63d0a7dda055d4cfbca7f84b6db4e1aae7d1239d 100644 --- a/internal/gitaly/service/ref/refnames.go +++ b/internal/gitaly/service/ref/refnames.go @@ -6,9 +6,9 @@ import ( "github.com/golang/protobuf/proto" "github.com/golang/protobuf/ptypes/wrappers" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) // FindAllBranchNames creates a stream of ref names for all branches in the given repository diff --git a/internal/gitaly/service/ref/refnames_containing.go b/internal/gitaly/service/ref/refnames_containing.go index 43b91f1e5e39c186748223052a106298f7f50780..2e51dae01138cf1f7b854b006361f4a0b3d432c1 100644 --- a/internal/gitaly/service/ref/refnames_containing.go +++ b/internal/gitaly/service/ref/refnames_containing.go @@ -6,10 +6,10 @@ import ( "github.com/golang/protobuf/proto" "github.com/golang/protobuf/ptypes/wrappers" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) // ListBranchNamesContainingCommit returns a maximum of in.GetLimit() Branch names diff --git a/internal/gitaly/service/ref/refs.go b/internal/gitaly/service/ref/refs.go index 97ddd5796447b7489357a3af739f772551f695a8..c41b632d4a1ad385e4013e03e054a088416ded00 100644 --- a/internal/gitaly/service/ref/refs.go +++ b/internal/gitaly/service/ref/refs.go @@ -10,13 +10,13 @@ import ( "strings" "github.com/golang/protobuf/proto" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - gitlog "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/internal/helper/lines" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + gitlog "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/lines" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) const ( diff --git a/internal/gitaly/service/ref/refs_test.go b/internal/gitaly/service/ref/refs_test.go index 72c5070b294c9f55cec31d3dee4b35ef944ec270..68060610ed7b43fd074b1e2c076a558336d3dc19 100644 --- a/internal/gitaly/service/ref/refs_test.go +++ b/internal/gitaly/service/ref/refs_test.go @@ -13,13 +13,13 @@ import ( "github.com/golang/protobuf/ptypes/timestamp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/git/updateref" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/updateref" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/ref/remote_branches.go b/internal/gitaly/service/ref/remote_branches.go index f72b4d2969b36b95656ac7169e5510b79d6cdab9..0ea9c77b0160fbd48bd4818bd33c0451bdd531fb 100644 --- a/internal/gitaly/service/ref/remote_branches.go +++ b/internal/gitaly/service/ref/remote_branches.go @@ -4,10 +4,10 @@ import ( "fmt" "strings" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func (s *server) FindAllRemoteBranches(req *gitalypb.FindAllRemoteBranchesRequest, stream gitalypb.RefService_FindAllRemoteBranchesServer) error { diff --git a/internal/gitaly/service/ref/remote_branches_test.go b/internal/gitaly/service/ref/remote_branches_test.go index a88ca9f6130ddc277d89929100f6da7d34d11e7e..d1e3149a893e816a0c1efec3e50733b6a4bcde4b 100644 --- a/internal/gitaly/service/ref/remote_branches_test.go +++ b/internal/gitaly/service/ref/remote_branches_test.go @@ -5,9 +5,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/ref/server.go b/internal/gitaly/service/ref/server.go index 69370613b68e2c19b6e313b6a3ece71eaa8e1406..6745d2f6f43b2756ed0502a01bf0f2e4442c5e9a 100644 --- a/internal/gitaly/service/ref/server.go +++ b/internal/gitaly/service/ref/server.go @@ -1,8 +1,8 @@ package ref import ( - "gitlab.com/gitlab-org/gitaly/internal/storage" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/storage" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) type server struct { diff --git a/internal/gitaly/service/ref/tag_messages.go b/internal/gitaly/service/ref/tag_messages.go index e632dd7f8805c5d2de3b3336ba2845ab0274123a..3f2500101338693e1bc5c2897faf2266d1acef29 100644 --- a/internal/gitaly/service/ref/tag_messages.go +++ b/internal/gitaly/service/ref/tag_messages.go @@ -5,11 +5,11 @@ import ( "fmt" "io" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/ref/tag_messages_test.go b/internal/gitaly/service/ref/tag_messages_test.go index 16dac869bc5e78118b463ecd877cece415c8c931..3c1b0105f454ddabdbee23303a17600f4f5995cd 100644 --- a/internal/gitaly/service/ref/tag_messages_test.go +++ b/internal/gitaly/service/ref/tag_messages_test.go @@ -6,9 +6,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/ref/testhelper_test.go b/internal/gitaly/service/ref/testhelper_test.go index 26a82661a739a8784698c3eac0a57e04a4dd7317..cb9e30f0a5700b3d0a6627e8a0a1342ec9cf88c0 100644 --- a/internal/gitaly/service/ref/testhelper_test.go +++ b/internal/gitaly/service/ref/testhelper_test.go @@ -7,10 +7,10 @@ import ( "github.com/golang/protobuf/ptypes/timestamp" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/helper/lines" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/lines" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/reflection" ) diff --git a/internal/gitaly/service/ref/util.go b/internal/gitaly/service/ref/util.go index 883f21ceddc48aec23be06929f3dbcef4fa40b40..986c6e97d2b89feb5a6e2548d325491d41ce37ac 100644 --- a/internal/gitaly/service/ref/util.go +++ b/internal/gitaly/service/ref/util.go @@ -4,10 +4,10 @@ import ( "bytes" "fmt" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/helper/lines" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/lines" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) var localBranchFormatFields = []string{"%(refname)", "%(objectname)"} diff --git a/internal/gitaly/service/ref/util_test.go b/internal/gitaly/service/ref/util_test.go index 134747f81571f625d648b759777ee340cc3e215f..292624ec3f2285dca15e5da1bc634c6a47173757 100644 --- a/internal/gitaly/service/ref/util_test.go +++ b/internal/gitaly/service/ref/util_test.go @@ -5,7 +5,7 @@ import ( "github.com/golang/protobuf/ptypes/timestamp" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func TestBuildLocalBranch(t *testing.T) { diff --git a/internal/gitaly/service/register.go b/internal/gitaly/service/register.go index 736067c868a313c6aecd2378b5704a7f8ab0f2c3..62190cc8b8cc3303f2b1c866d3991849035e57fd 100644 --- a/internal/gitaly/service/register.go +++ b/internal/gitaly/service/register.go @@ -5,28 +5,28 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - gitalyhook "gitlab.com/gitlab-org/gitaly/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/blob" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/cleanup" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/commit" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/conflicts" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/diff" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/hook" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/internalgitaly" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/namespace" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/objectpool" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/operations" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/ref" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/remote" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/repository" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/server" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/smarthttp" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/ssh" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/wiki" - "gitlab.com/gitlab-org/gitaly/internal/storage" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + gitalyhook "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/blob" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/cleanup" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/commit" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/conflicts" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/diff" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/hook" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/internalgitaly" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/namespace" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/objectpool" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/operations" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/ref" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/remote" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/repository" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/server" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/smarthttp" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/ssh" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/wiki" + "gitlab.com/gitlab-org/gitaly/v13/internal/storage" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/health" healthpb "google.golang.org/grpc/health/grpc_health_v1" diff --git a/internal/gitaly/service/remote/fetch_internal_remote.go b/internal/gitaly/service/remote/fetch_internal_remote.go index 311fb1da547639b304fc8b6680fb42af01ca4261..a70e594b3c37b3ec71a7837a318fcb4e420450e6 100644 --- a/internal/gitaly/service/remote/fetch_internal_remote.go +++ b/internal/gitaly/service/remote/fetch_internal_remote.go @@ -7,11 +7,11 @@ import ( "fmt" "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/ref" - "gitlab.com/gitlab-org/gitaly/internal/gitalyssh" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/ref" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitalyssh" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/remote/fetch_internal_remote_test.go b/internal/gitaly/service/remote/fetch_internal_remote_test.go index 9121fd549a95fc85b23476722b2254afb104614d..8e41afb0c991025b76a77ca509079d39ad8910d7 100644 --- a/internal/gitaly/service/remote/fetch_internal_remote_test.go +++ b/internal/gitaly/service/remote/fetch_internal_remote_test.go @@ -6,14 +6,14 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - serverPkg "gitlab.com/gitlab-org/gitaly/internal/gitaly/server" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/ref" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/remote" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/ssh" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + serverPkg "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/server" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/ref" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/remote" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/ssh" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" diff --git a/internal/gitaly/service/remote/find_remote_root_ref.go b/internal/gitaly/service/remote/find_remote_root_ref.go index 23dd0c03c5ad23756cb61b3ed29de0edd7d9c8c8..cf5adca77daa4ff33a9395e543bbd4b0956f1d16 100644 --- a/internal/gitaly/service/remote/find_remote_root_ref.go +++ b/internal/gitaly/service/remote/find_remote_root_ref.go @@ -5,8 +5,8 @@ import ( "context" "strings" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/remote/find_remote_root_ref_test.go b/internal/gitaly/service/remote/find_remote_root_ref_test.go index 2fc2351a607f8bdbc27e367375252165ad620d09..b297776767e28e91efab4339caea2a4c38a98816 100644 --- a/internal/gitaly/service/remote/find_remote_root_ref_test.go +++ b/internal/gitaly/service/remote/find_remote_root_ref_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/remote/remotes.go b/internal/gitaly/service/remote/remotes.go index afe4c0aea1c038b2d82864fcca53b3266356e6f0..c5c29553604cc8b2b21df398e28bbf3ffca26053 100644 --- a/internal/gitaly/service/remote/remotes.go +++ b/internal/gitaly/service/remote/remotes.go @@ -9,11 +9,11 @@ import ( "strings" "github.com/golang/protobuf/proto" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/remote" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/remote" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/remote/remotes_test.go b/internal/gitaly/service/remote/remotes_test.go index 350b890cb462f3473735e449d4f2ca6d963e79a1..5135811057d18e8fe8d7d1da6f40173397e57c39 100644 --- a/internal/gitaly/service/remote/remotes_test.go +++ b/internal/gitaly/service/remote/remotes_test.go @@ -9,8 +9,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/remote/server.go b/internal/gitaly/service/remote/server.go index ec090412d297cbdd81d4fad47c9098289d8c2ff2..b577a9ff09a2cd79d3287bb956bb488fb5a47d3d 100644 --- a/internal/gitaly/service/remote/server.go +++ b/internal/gitaly/service/remote/server.go @@ -1,10 +1,10 @@ package remote import ( - "gitlab.com/gitlab-org/gitaly/client" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/internal/storage" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/client" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/internal/storage" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) type server struct { diff --git a/internal/gitaly/service/remote/testhelper_test.go b/internal/gitaly/service/remote/testhelper_test.go index aec62d020ce8c666ad29a1a614e18cbd8419e13b..117853804ddc256ee1e72036b2684d3c698bc748 100644 --- a/internal/gitaly/service/remote/testhelper_test.go +++ b/internal/gitaly/service/remote/testhelper_test.go @@ -6,10 +6,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/reflection" ) diff --git a/internal/gitaly/service/remote/update_remote_mirror.go b/internal/gitaly/service/remote/update_remote_mirror.go index 97a61af0b4a649b38710cc80c59ea05edb85ad92..81f247ea418159a4f7595f3fc9646b996d5b7b76 100644 --- a/internal/gitaly/service/remote/update_remote_mirror.go +++ b/internal/gitaly/service/remote/update_remote_mirror.go @@ -3,9 +3,9 @@ package remote import ( "fmt" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func (s *server) UpdateRemoteMirror(stream gitalypb.RemoteService_UpdateRemoteMirrorServer) error { diff --git a/internal/gitaly/service/remote/update_remote_mirror_test.go b/internal/gitaly/service/remote/update_remote_mirror_test.go index 80b0d443e85be3ca726e4f3a16318a029cdf48d9..77bf4715eaa177c60f0d968c3240652241a6505d 100644 --- a/internal/gitaly/service/remote/update_remote_mirror_test.go +++ b/internal/gitaly/service/remote/update_remote_mirror_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/repository/apply_gitattributes.go b/internal/gitaly/service/repository/apply_gitattributes.go index 9a89aef9d8b7ad6e648bcb6e3126a4fe6ba7dfea..b042e65a67600e6a3ed7efc96242fb37f1e7adb6 100644 --- a/internal/gitaly/service/repository/apply_gitattributes.go +++ b/internal/gitaly/service/repository/apply_gitattributes.go @@ -8,9 +8,9 @@ import ( "os" "path/filepath" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/repository/apply_gitattributes_test.go b/internal/gitaly/service/repository/apply_gitattributes_test.go index cbb3a877746deb6de1d1dd029f0ebbe575ce74b2..79be79c48bd0f14fef04878f588ee44a108186b2 100644 --- a/internal/gitaly/service/repository/apply_gitattributes_test.go +++ b/internal/gitaly/service/repository/apply_gitattributes_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/repository/archive.go b/internal/gitaly/service/repository/archive.go index 807f97ebd7317ff310fc0cda0d0034f39deddb73..fa239c1276988ac812cc8091b1eceb6d54bac1be 100644 --- a/internal/gitaly/service/repository/archive.go +++ b/internal/gitaly/service/repository/archive.go @@ -8,14 +8,14 @@ import ( "os/exec" "strings" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/commit" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/storage" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/commit" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/storage" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" ) func (s *server) GetArchive(in *gitalypb.GetArchiveRequest, stream gitalypb.RepositoryService_GetArchiveServer) error { diff --git a/internal/gitaly/service/repository/archive_test.go b/internal/gitaly/service/repository/archive_test.go index 4f600d836f8c619bfdba77f0ad0217ce23736eb7..3341e7b98d4b907419eb09b3241616dd39c08428 100644 --- a/internal/gitaly/service/repository/archive_test.go +++ b/internal/gitaly/service/repository/archive_test.go @@ -9,10 +9,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/repository/backup_custom_hooks.go b/internal/gitaly/service/repository/backup_custom_hooks.go index b5dd32f936e67076fd2e64e1c149734b3a340360..76897fac4fb7ac62da2302df7a4dd57f2f57171f 100644 --- a/internal/gitaly/service/repository/backup_custom_hooks.go +++ b/internal/gitaly/service/repository/backup_custom_hooks.go @@ -5,9 +5,9 @@ import ( "os/exec" "path/filepath" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/repository/backup_custom_hooks_test.go b/internal/gitaly/service/repository/backup_custom_hooks_test.go index 8efcec4d522b113ec9b1117eb2e963fa3471c98c..98b17f265a3191783edf884dff3303456dffab42 100644 --- a/internal/gitaly/service/repository/backup_custom_hooks_test.go +++ b/internal/gitaly/service/repository/backup_custom_hooks_test.go @@ -11,10 +11,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" ) func TestSuccessfullBackupCustomHooksRequest(t *testing.T) { diff --git a/internal/gitaly/service/repository/calculate_checksum.go b/internal/gitaly/service/repository/calculate_checksum.go index 330aa1a210643d678b6f73de8e639309f65ab3a4..284414d4f0ee13af0dc11b756eb4597e9b0ff145 100644 --- a/internal/gitaly/service/repository/calculate_checksum.go +++ b/internal/gitaly/service/repository/calculate_checksum.go @@ -10,9 +10,9 @@ import ( "regexp" "strings" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/alternates" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/alternates" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/repository/calculate_checksum_test.go b/internal/gitaly/service/repository/calculate_checksum_test.go index 41835c7208448b4baea957e04a56b6bfbe6c1d44..8c17cfc5ae4b61e059bbf551d773335c83c92923 100644 --- a/internal/gitaly/service/repository/calculate_checksum_test.go +++ b/internal/gitaly/service/repository/calculate_checksum_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/repository/cleanup.go b/internal/gitaly/service/repository/cleanup.go index 00b7d49c8258476b3f4e071e6a021230ec82ca37..48a09d404aa7475fb5c3c26bde0b9cd6f5c03970 100644 --- a/internal/gitaly/service/repository/cleanup.go +++ b/internal/gitaly/service/repository/cleanup.go @@ -8,8 +8,8 @@ import ( "strings" "time" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/repository/cleanup_test.go b/internal/gitaly/service/repository/cleanup_test.go index d29aeb73afe4aa59ff1678c6fc12c35e4b21be2c..5e82980a56ea5c5ad3e3dfd1d76e7614e1d8ad36 100644 --- a/internal/gitaly/service/repository/cleanup_test.go +++ b/internal/gitaly/service/repository/cleanup_test.go @@ -9,10 +9,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func TestCleanupDeletesRefsLocks(t *testing.T) { diff --git a/internal/gitaly/service/repository/clone_from_pool.go b/internal/gitaly/service/repository/clone_from_pool.go index 6f07fb0f25801e977bb35793aaf515e9dbd3216a..7990f7ee32887c8bda7c344e3c484a0243234a65 100644 --- a/internal/gitaly/service/repository/clone_from_pool.go +++ b/internal/gitaly/service/repository/clone_from_pool.go @@ -6,9 +6,9 @@ import ( "fmt" "os" - "gitlab.com/gitlab-org/gitaly/internal/git/objectpool" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/objectpool" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func (s *server) CloneFromPool(ctx context.Context, req *gitalypb.CloneFromPoolRequest) (*gitalypb.CloneFromPoolResponse, error) { diff --git a/internal/gitaly/service/repository/clone_from_pool_internal.go b/internal/gitaly/service/repository/clone_from_pool_internal.go index 6e3447cdfca3d3ee5fce4c479cde973f1a0cd8a4..40694d36ba21c010b730b3b914077a5c55aa0609 100644 --- a/internal/gitaly/service/repository/clone_from_pool_internal.go +++ b/internal/gitaly/service/repository/clone_from_pool_internal.go @@ -6,11 +6,11 @@ import ( "fmt" "os" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/objectpool" - "gitlab.com/gitlab-org/gitaly/internal/git/repository" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/objectpool" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/repository" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func (s *server) CloneFromPoolInternal(ctx context.Context, req *gitalypb.CloneFromPoolInternalRequest) (*gitalypb.CloneFromPoolInternalResponse, error) { diff --git a/internal/gitaly/service/repository/clone_from_pool_internal_test.go b/internal/gitaly/service/repository/clone_from_pool_internal_test.go index 3ea868d9d886e3e5f329d6c5a74cfd895f8a6c18..cbb2458597157ede508955e3299ef4158b946443 100644 --- a/internal/gitaly/service/repository/clone_from_pool_internal_test.go +++ b/internal/gitaly/service/repository/clone_from_pool_internal_test.go @@ -8,12 +8,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git/objectpool" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/repository" - "gitlab.com/gitlab-org/gitaly/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/objectpool" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/repository" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/metadata" ) diff --git a/internal/gitaly/service/repository/clone_from_pool_test.go b/internal/gitaly/service/repository/clone_from_pool_test.go index 4c30c0d145f68c7a20158ccd225f6ff586f7b8bb..e9f923701961abf0b345cd26262483e0b9ec0d80 100644 --- a/internal/gitaly/service/repository/clone_from_pool_test.go +++ b/internal/gitaly/service/repository/clone_from_pool_test.go @@ -6,10 +6,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/repository" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/repository" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/metadata" ) diff --git a/internal/gitaly/service/repository/commit_graph.go b/internal/gitaly/service/repository/commit_graph.go index 845bf3785b084f3389437785d9be57259fc02f6c..1b39876d7ba655365b79bc72e262deab5c333d7d 100644 --- a/internal/gitaly/service/repository/commit_graph.go +++ b/internal/gitaly/service/repository/commit_graph.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) const ( diff --git a/internal/gitaly/service/repository/commit_graph_test.go b/internal/gitaly/service/repository/commit_graph_test.go index 11efa8a18068f1f9c8e83bc5618a55b92d3ff698..c2fb97a4b51a62cbf3b23acfe47704522c19ea60 100644 --- a/internal/gitaly/service/repository/commit_graph_test.go +++ b/internal/gitaly/service/repository/commit_graph_test.go @@ -7,8 +7,8 @@ import ( "time" "github.com/stretchr/testify/assert" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func TestWriteCommitGraph(t *testing.T) { diff --git a/internal/gitaly/service/repository/config.go b/internal/gitaly/service/repository/config.go index 91aecab9d4573a43009d9bcd85d4cb597f09ca9b..9a5fbfe68ff0b85ed0427a2162cd876eb91e6c31 100644 --- a/internal/gitaly/service/repository/config.go +++ b/internal/gitaly/service/repository/config.go @@ -3,10 +3,10 @@ package repository import ( "context" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/repository/config_test.go b/internal/gitaly/service/repository/config_test.go index 9cc0fcea142d0ea7194c10b09e851b52a3d503d1..830b4d8af4923badd2fff9fba5aabe4641ae3025 100644 --- a/internal/gitaly/service/repository/config_test.go +++ b/internal/gitaly/service/repository/config_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/repository/create.go b/internal/gitaly/service/repository/create.go index 7f56fca8e6216aa041e8797b28ff29e978ce7865..75dbbfb19b537386d2df8abb3c54486f3f530270 100644 --- a/internal/gitaly/service/repository/create.go +++ b/internal/gitaly/service/repository/create.go @@ -4,9 +4,9 @@ import ( "context" "os" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func (s *server) CreateRepository(ctx context.Context, req *gitalypb.CreateRepositoryRequest) (*gitalypb.CreateRepositoryResponse, error) { diff --git a/internal/gitaly/service/repository/create_bundle.go b/internal/gitaly/service/repository/create_bundle.go index 4f2d631c5e8d9e31c3ddabe76c4b3a62358ad7ec..bb91524bec2bbdafa6448550d7eda94bc2ac8250 100644 --- a/internal/gitaly/service/repository/create_bundle.go +++ b/internal/gitaly/service/repository/create_bundle.go @@ -3,10 +3,10 @@ package repository import ( "io" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/repository/create_bundle_test.go b/internal/gitaly/service/repository/create_bundle_test.go index 2ad93a0f94c5f11a452abe4e8cb9e23e407053ac..5049e9b17001c16575855de78e0bc6df3d2fc082 100644 --- a/internal/gitaly/service/repository/create_bundle_test.go +++ b/internal/gitaly/service/repository/create_bundle_test.go @@ -9,10 +9,10 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/tempdir" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/tempdir" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/repository/create_from_bundle.go b/internal/gitaly/service/repository/create_from_bundle.go index 67031d8eedfb6acf40608343e9dc6d8a8e4597ce..8ca1f7d6c7fd983828321f91c91d183162dc6569 100644 --- a/internal/gitaly/service/repository/create_from_bundle.go +++ b/internal/gitaly/service/repository/create_from_bundle.go @@ -9,11 +9,11 @@ import ( "path/filepath" "strings" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/tempdir" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/tempdir" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/repository/create_from_bundle_test.go b/internal/gitaly/service/repository/create_from_bundle_test.go index 46262b34b5733aa56de02e1ab6026d08315eb891..87a3fa028a6f930f65014f03d839ae9693a58667 100644 --- a/internal/gitaly/service/repository/create_from_bundle_test.go +++ b/internal/gitaly/service/repository/create_from_bundle_test.go @@ -9,12 +9,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/tempdir" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/tempdir" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/repository/create_from_snapshot.go b/internal/gitaly/service/repository/create_from_snapshot.go index cdea178767f69039860edbad17cfa3a36de2aad4..06ee689f506992dbdc64e6720f26f4c6db33457c 100644 --- a/internal/gitaly/service/repository/create_from_snapshot.go +++ b/internal/gitaly/service/repository/create_from_snapshot.go @@ -8,9 +8,9 @@ import ( "os/exec" "time" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/tempdir" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/tempdir" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "gitlab.com/gitlab-org/labkit/correlation" "gitlab.com/gitlab-org/labkit/tracing" "google.golang.org/grpc/codes" diff --git a/internal/gitaly/service/repository/create_from_snapshot_test.go b/internal/gitaly/service/repository/create_from_snapshot_test.go index 0cfb79f54bdfb13acd2eb3bfd82b571e316af9dc..952ac89629b4867ce11ae8bd3301d5aa3a9d8732 100644 --- a/internal/gitaly/service/repository/create_from_snapshot_test.go +++ b/internal/gitaly/service/repository/create_from_snapshot_test.go @@ -11,9 +11,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/archive" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/archive" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/repository/create_from_url.go b/internal/gitaly/service/repository/create_from_url.go index a40488d10b9a2fd99bf05bd1d6d82ec4734d06ff..850f9a74df60cbb3855cb244c60f5c2a38cb8afa 100644 --- a/internal/gitaly/service/repository/create_from_url.go +++ b/internal/gitaly/service/repository/create_from_url.go @@ -9,10 +9,10 @@ import ( "net/url" "os" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/repository/create_from_url_test.go b/internal/gitaly/service/repository/create_from_url_test.go index 41a1146435008585eb936d58ad4da55cb9a03d7b..36527ea0acc1c028ec2d9b2d9c6533a7caa70cde 100644 --- a/internal/gitaly/service/repository/create_from_url_test.go +++ b/internal/gitaly/service/repository/create_from_url_test.go @@ -10,9 +10,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/repository/create_test.go b/internal/gitaly/service/repository/create_test.go index 76e18470f232ccf26a14757196e134c9f0d3fb1b..d5d5b94dd080c8265e86efc3bc1b2dae5ee6eab5 100644 --- a/internal/gitaly/service/repository/create_test.go +++ b/internal/gitaly/service/repository/create_test.go @@ -9,9 +9,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/repository/fetch.go b/internal/gitaly/service/repository/fetch.go index cb27a9bc79d43a1fdf9080b8c70e6c93ba4806fd..f143002c70b59fe82a82822ad7410baa60080bdd 100644 --- a/internal/gitaly/service/repository/fetch.go +++ b/internal/gitaly/service/repository/fetch.go @@ -5,12 +5,12 @@ import ( "fmt" "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/internal/gitalyssh" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/metadata/featureflag" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitalyssh" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/metadata/featureflag" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func (s *server) FetchSourceBranch(ctx context.Context, req *gitalypb.FetchSourceBranchRequest) (*gitalypb.FetchSourceBranchResponse, error) { diff --git a/internal/gitaly/service/repository/fetch_remote.go b/internal/gitaly/service/repository/fetch_remote.go index 3c4b7a907c11542486339070d1f481b49632fd83..4aa653db9198bca0d85860dd96fb70034df6c399 100644 --- a/internal/gitaly/service/repository/fetch_remote.go +++ b/internal/gitaly/service/repository/fetch_remote.go @@ -3,8 +3,8 @@ package repository import ( "context" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func (s *server) FetchRemote(ctx context.Context, in *gitalypb.FetchRemoteRequest) (*gitalypb.FetchRemoteResponse, error) { diff --git a/internal/gitaly/service/repository/fetch_remote_test.go b/internal/gitaly/service/repository/fetch_remote_test.go index 7e0f0ad3c4e5de1c0f6f69c3b9dfdd4fe749303f..409ce49bf671c9f4f89eaa2a3e011854427f223e 100644 --- a/internal/gitaly/service/repository/fetch_remote_test.go +++ b/internal/gitaly/service/repository/fetch_remote_test.go @@ -13,10 +13,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/repository/fetch_test.go b/internal/gitaly/service/repository/fetch_test.go index d38f61f63082b20b98a954927b4029bcecc00294..4b2ffeaaa5629199dd35d33d0e44e2cfc6788f40 100644 --- a/internal/gitaly/service/repository/fetch_test.go +++ b/internal/gitaly/service/repository/fetch_test.go @@ -6,14 +6,14 @@ import ( "testing" "github.com/stretchr/testify/require" - gitLog "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - serverPkg "gitlab.com/gitlab-org/gitaly/internal/gitaly/server" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/repository" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/metadata/featureflag" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + gitLog "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + serverPkg "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/server" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/repository" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/metadata/featureflag" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/codes" healthpb "google.golang.org/grpc/health/grpc_health_v1" diff --git a/internal/gitaly/service/repository/fork.go b/internal/gitaly/service/repository/fork.go index 2ec3abd98c23cf1122ce1b6403a0ee490962266e..1f57c7b14a14238ead3ea60d5f823cf2b46de9ae 100644 --- a/internal/gitaly/service/repository/fork.go +++ b/internal/gitaly/service/repository/fork.go @@ -5,9 +5,9 @@ import ( "fmt" "os" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/gitalyssh" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitalyssh" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/repository/fork_test.go b/internal/gitaly/service/repository/fork_test.go index 8f2b557cfc7dfc999848c1eb23d22a4a211596b5..9774b6452dbe52ae07d23b2d5f0f7e961dd05bdf 100644 --- a/internal/gitaly/service/repository/fork_test.go +++ b/internal/gitaly/service/repository/fork_test.go @@ -8,12 +8,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/repository" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - gitaly_x509 "gitlab.com/gitlab-org/gitaly/internal/x509" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/repository" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + gitaly_x509 "gitlab.com/gitlab-org/gitaly/v13/internal/x509" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" diff --git a/internal/gitaly/service/repository/fsck.go b/internal/gitaly/service/repository/fsck.go index 4c2d5c3cc7cf33a64997ca18638049ee13f747cc..e09b9a69914f5dea0e37cb6a479b3f54fa3e8003 100644 --- a/internal/gitaly/service/repository/fsck.go +++ b/internal/gitaly/service/repository/fsck.go @@ -4,9 +4,9 @@ import ( "bytes" "context" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/alternates" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/alternates" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func (s *server) Fsck(ctx context.Context, req *gitalypb.FsckRequest) (*gitalypb.FsckResponse, error) { diff --git a/internal/gitaly/service/repository/fsck_test.go b/internal/gitaly/service/repository/fsck_test.go index 103d244041001c535c2f9586105a3158bfe04164..c676c4998eac7307d184fd82cdc2fe112028c1f4 100644 --- a/internal/gitaly/service/repository/fsck_test.go +++ b/internal/gitaly/service/repository/fsck_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func TestFsckSuccess(t *testing.T) { diff --git a/internal/gitaly/service/repository/gc.go b/internal/gitaly/service/repository/gc.go index b333b87668a2a87299e58132d1c489dbc749a73c..239d737f9c5aba398dab28be511c66ea907035e1 100644 --- a/internal/gitaly/service/repository/gc.go +++ b/internal/gitaly/service/repository/gc.go @@ -10,12 +10,12 @@ import ( "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" log "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/helper/housekeeping" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/housekeeping" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/repository/gc_test.go b/internal/gitaly/service/repository/gc_test.go index 2aa44778c1e58e821dbace8ebf2fcb424b82a631..5ff3709cb76e7ad4b3feb4fce2a17b4fb8138d1b 100644 --- a/internal/gitaly/service/repository/gc_test.go +++ b/internal/gitaly/service/repository/gc_test.go @@ -13,10 +13,10 @@ import ( "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "gitlab.com/gitlab-org/labkit/log" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/repository/info_attributes.go b/internal/gitaly/service/repository/info_attributes.go index e1765cfba83468d85ca6163b492a13f081250bcc..79ef3700e53039d0fe1c2d3b7ec6aa2279ebb7b6 100644 --- a/internal/gitaly/service/repository/info_attributes.go +++ b/internal/gitaly/service/repository/info_attributes.go @@ -5,8 +5,8 @@ import ( "os" "path/filepath" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/repository/info_attributes_test.go b/internal/gitaly/service/repository/info_attributes_test.go index d599b2107fdfd248a65353c3131c7e3138024ff4..bf597fc2516acdb8ac9dd103aeb1cdf416061e47 100644 --- a/internal/gitaly/service/repository/info_attributes_test.go +++ b/internal/gitaly/service/repository/info_attributes_test.go @@ -8,9 +8,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" ) func TestGetInfoAttributesExisting(t *testing.T) { diff --git a/internal/gitaly/service/repository/license.go b/internal/gitaly/service/repository/license.go index 40d217a0adc1f3025ff53e0f868c00f93d54bd68..76c69308ec6c9e262ba15aa3b673c13428d22d8a 100644 --- a/internal/gitaly/service/repository/license.go +++ b/internal/gitaly/service/repository/license.go @@ -3,8 +3,8 @@ package repository import ( "context" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func (s *server) FindLicense(ctx context.Context, in *gitalypb.FindLicenseRequest) (*gitalypb.FindLicenseResponse, error) { diff --git a/internal/gitaly/service/repository/license_test.go b/internal/gitaly/service/repository/license_test.go index 63886c5f6c19ac1f4264d2e65c4c114dba4dfd08..70ac581a920416bd56b6650426741d823539d9ac 100644 --- a/internal/gitaly/service/repository/license_test.go +++ b/internal/gitaly/service/repository/license_test.go @@ -5,9 +5,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func TestSuccessfulFindLicenseRequest(t *testing.T) { diff --git a/internal/gitaly/service/repository/merge_base.go b/internal/gitaly/service/repository/merge_base.go index e663085a0c0c7ca90272ac1713aef8368a6ae1c8..705d8c149ed4727e9f2311546456afcbaaa05734 100644 --- a/internal/gitaly/service/repository/merge_base.go +++ b/internal/gitaly/service/repository/merge_base.go @@ -4,9 +4,9 @@ import ( "context" "io/ioutil" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/repository/merge_base_test.go b/internal/gitaly/service/repository/merge_base_test.go index 35b394f8cdaaa0608e7abd7f47a1624508aa1e97..adc55eae7375a80ebdf56d7eb405dfba323ea08e 100644 --- a/internal/gitaly/service/repository/merge_base_test.go +++ b/internal/gitaly/service/repository/merge_base_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/repository/midx.go b/internal/gitaly/service/repository/midx.go index c151af2de89986a0b6fbb07bdf1f792b02caf3b2..56dac988de9f7b95a8e3420914e1491557dd4bea 100644 --- a/internal/gitaly/service/repository/midx.go +++ b/internal/gitaly/service/repository/midx.go @@ -9,11 +9,11 @@ import ( "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" log "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/repository" - "gitlab.com/gitlab-org/gitaly/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/repository" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) const ( diff --git a/internal/gitaly/service/repository/midx_test.go b/internal/gitaly/service/repository/midx_test.go index df22fec9a09719d792eff8d68ba34ee8601b80e4..399eedd8b3af145680f9d4b33517004fc25565f1 100644 --- a/internal/gitaly/service/repository/midx_test.go +++ b/internal/gitaly/service/repository/midx_test.go @@ -11,9 +11,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func TestMidxWrite(t *testing.T) { diff --git a/internal/gitaly/service/repository/optimize.go b/internal/gitaly/service/repository/optimize.go index 9d0d580566345335702302b3d5c05eb314cdbb0f..df4a9ebc62f10fe6e1a5e7c8e31c479a9ebba17b 100644 --- a/internal/gitaly/service/repository/optimize.go +++ b/internal/gitaly/service/repository/optimize.go @@ -8,10 +8,10 @@ import ( "path/filepath" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) var ( diff --git a/internal/gitaly/service/repository/optimize_test.go b/internal/gitaly/service/repository/optimize_test.go index cba2caa29eb95c65a7308eb6c41d132f11870ff0..38da60750885dbef9307a6743c62bc42dbf500c1 100644 --- a/internal/gitaly/service/repository/optimize_test.go +++ b/internal/gitaly/service/repository/optimize_test.go @@ -7,10 +7,10 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/internal/git/updateref" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/updateref" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/repository/raw_changes.go b/internal/gitaly/service/repository/raw_changes.go index dab1d1fb1d24fbd5bb0c1e5685d1b044ce7c0b79..456110cff34e5aaed98b5da84c12f77e5a358aa6 100644 --- a/internal/gitaly/service/repository/raw_changes.go +++ b/internal/gitaly/service/repository/raw_changes.go @@ -8,12 +8,12 @@ import ( "unicode/utf8" "github.com/golang/protobuf/proto" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/internal/git/rawdiff" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/rawdiff" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func (s *server) GetRawChanges(req *gitalypb.GetRawChangesRequest, stream gitalypb.RepositoryService_GetRawChangesServer) error { diff --git a/internal/gitaly/service/repository/raw_changes_test.go b/internal/gitaly/service/repository/raw_changes_test.go index 07cc8f9758f5925bc7742770078947172a2f188d..ea6bde1b3c972529c5cd4978910a8f38eecf9dea 100644 --- a/internal/gitaly/service/repository/raw_changes_test.go +++ b/internal/gitaly/service/repository/raw_changes_test.go @@ -7,8 +7,8 @@ import ( "unicode/utf8" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/repository/rebase_in_progress.go b/internal/gitaly/service/repository/rebase_in_progress.go index b72ead5745371388ff6cc57a24b195c3f9f0f386..b5a1ebecb800c54a6e5f5eb4e962c0f987f9b385 100644 --- a/internal/gitaly/service/repository/rebase_in_progress.go +++ b/internal/gitaly/service/repository/rebase_in_progress.go @@ -8,8 +8,8 @@ import ( "strings" "time" - "gitlab.com/gitlab-org/gitaly/internal/helper/housekeeping" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/housekeeping" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/repository/rebase_in_progress_test.go b/internal/gitaly/service/repository/rebase_in_progress_test.go index efc44b7abc0c662d83d362a01771cbacf9c3f5dd..273a1c02aab4100c3ba27f9f2979d0f8a21508a9 100644 --- a/internal/gitaly/service/repository/rebase_in_progress_test.go +++ b/internal/gitaly/service/repository/rebase_in_progress_test.go @@ -8,8 +8,8 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/repository/redirecting_test_server_test.go b/internal/gitaly/service/repository/redirecting_test_server_test.go index 3ae1e37d4b75c944b11ff85a2a6b0289c759fe1e..6f27e800063a7ee5a48dc0a4d725221133e7958f 100644 --- a/internal/gitaly/service/repository/redirecting_test_server_test.go +++ b/internal/gitaly/service/repository/redirecting_test_server_test.go @@ -8,8 +8,8 @@ import ( "net/http/httptest" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) const redirectURL = "/redirect_url" diff --git a/internal/gitaly/service/repository/remove.go b/internal/gitaly/service/repository/remove.go index 3a89a1e521c6c971a866afd72f82eb3b4aeb2abf..8a97a63b36a15053b944aee7763a5d9747060b07 100644 --- a/internal/gitaly/service/repository/remove.go +++ b/internal/gitaly/service/repository/remove.go @@ -5,10 +5,10 @@ import ( "os" "path/filepath" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/tempdir" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/tempdir" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func (s *server) RemoveRepository(ctx context.Context, in *gitalypb.RemoveRepositoryRequest) (*gitalypb.RemoveRepositoryResponse, error) { diff --git a/internal/gitaly/service/repository/remove_test.go b/internal/gitaly/service/repository/remove_test.go index 24b31f1cd6c25e5038f0f1ac92d19a60d4ec601c..55ded13f28f3dc2612e9d8cb56c2b53fcf2a613b 100644 --- a/internal/gitaly/service/repository/remove_test.go +++ b/internal/gitaly/service/repository/remove_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func TestRemoveRepository(t *testing.T) { diff --git a/internal/gitaly/service/repository/rename.go b/internal/gitaly/service/repository/rename.go index a6477a76eb074a39900cae0284fbc83d5e222d10..3cfa5cf722a3d52636e1d39c40800aa77a2c5b4c 100644 --- a/internal/gitaly/service/repository/rename.go +++ b/internal/gitaly/service/repository/rename.go @@ -6,8 +6,8 @@ import ( "os" "path/filepath" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func (s *server) RenameRepository(ctx context.Context, in *gitalypb.RenameRepositoryRequest) (*gitalypb.RenameRepositoryResponse, error) { diff --git a/internal/gitaly/service/repository/rename_test.go b/internal/gitaly/service/repository/rename_test.go index e04d9a6ca1af59a6d0bb16372e02cf048d030b4c..a47e9bf77fbed7e8f6ef41fceeadc17fc601a554 100644 --- a/internal/gitaly/service/repository/rename_test.go +++ b/internal/gitaly/service/repository/rename_test.go @@ -5,10 +5,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/storage" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/storage" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/repository/repack.go b/internal/gitaly/service/repository/repack.go index c4aa38b3a1dc9dec82d68c6c6de36c84a9c7692a..b2e594638a047b8505b17f49fc4452d5566d4a22 100644 --- a/internal/gitaly/service/repository/repack.go +++ b/internal/gitaly/service/repository/repack.go @@ -5,10 +5,10 @@ import ( "fmt" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/repository" - "gitlab.com/gitlab-org/gitaly/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/repository" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/repository/repack_test.go b/internal/gitaly/service/repository/repack_test.go index f84f99e974dbd9b6cb7df79cd5a17aa088eced55..95eb416c01317c48c628adcb171600c5fadce8bb 100644 --- a/internal/gitaly/service/repository/repack_test.go +++ b/internal/gitaly/service/repository/repack_test.go @@ -13,10 +13,10 @@ import ( "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "gitlab.com/gitlab-org/labkit/log" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/repository/replicate.go b/internal/gitaly/service/repository/replicate.go index 75a7508fc4a37ecdad91ae2102e70809a977b05c..ec9a5c74d110e3862d716471998f3937aee2c90d 100644 --- a/internal/gitaly/service/repository/replicate.go +++ b/internal/gitaly/service/repository/replicate.go @@ -10,13 +10,13 @@ import ( "path/filepath" "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/safe" - "gitlab.com/gitlab-org/gitaly/internal/storage" - "gitlab.com/gitlab-org/gitaly/internal/tempdir" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/safe" + "gitlab.com/gitlab-org/gitaly/v13/internal/storage" + "gitlab.com/gitlab-org/gitaly/v13/internal/tempdir" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "golang.org/x/sync/errgroup" ) diff --git a/internal/gitaly/service/repository/replicate_test.go b/internal/gitaly/service/repository/replicate_test.go index 8e79664e59d039230b5ff780bbcf42809fc23c20..f1f66ba8abce5674c86aeff8b0115862689be88f 100644 --- a/internal/gitaly/service/repository/replicate_test.go +++ b/internal/gitaly/service/repository/replicate_test.go @@ -11,12 +11,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/repository" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/repository" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" diff --git a/internal/gitaly/service/repository/repository.go b/internal/gitaly/service/repository/repository.go index 2f57a72a4d7a7769b6d3f90c627cb45eb98a06d8..98aae5af8ac9822f89ee22e95027dd76e0a93405 100644 --- a/internal/gitaly/service/repository/repository.go +++ b/internal/gitaly/service/repository/repository.go @@ -4,10 +4,10 @@ import ( "context" "io/ioutil" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/storage" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/storage" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/repository/repository_test.go b/internal/gitaly/service/repository/repository_test.go index 7f914d88685a4af65d21acbc3807289ffb8e8c77..488e3a5abf8d9b7559a008527b5863c88e435d1c 100644 --- a/internal/gitaly/service/repository/repository_test.go +++ b/internal/gitaly/service/repository/repository_test.go @@ -7,10 +7,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/repository/restore_custom_hooks.go b/internal/gitaly/service/repository/restore_custom_hooks.go index 670b261e18db97d1f0c43d5a28ad61bd70ce7f5c..667f68a291fdb0d1a81aa90d0489ff4371618606 100644 --- a/internal/gitaly/service/repository/restore_custom_hooks.go +++ b/internal/gitaly/service/repository/restore_custom_hooks.go @@ -3,9 +3,9 @@ package repository import ( "os/exec" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/repository/restore_custom_hooks_test.go b/internal/gitaly/service/repository/restore_custom_hooks_test.go index d4eb5ca06a7a6a1c2464781acc9b64dc13e4f72b..9ce74e2921fcb6676d5b1ef20f7eca0f371752d7 100644 --- a/internal/gitaly/service/repository/restore_custom_hooks_test.go +++ b/internal/gitaly/service/repository/restore_custom_hooks_test.go @@ -7,10 +7,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/repository/search_files.go b/internal/gitaly/service/repository/search_files.go index 958880097234d5dbc1d75da52843edfbd84450e7..843593fba5ce7516cf47e5826b6364268bc8ef93 100644 --- a/internal/gitaly/service/repository/search_files.go +++ b/internal/gitaly/service/repository/search_files.go @@ -8,12 +8,12 @@ import ( "math" "regexp" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/helper/lines" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/lines" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/repository/search_files_test.go b/internal/gitaly/service/repository/search_files_test.go index aa625a272faab0378df5eec85fbfae0d2b50e885..33904d390a9ea777c210c8f1462ea4fc22893909 100644 --- a/internal/gitaly/service/repository/search_files_test.go +++ b/internal/gitaly/service/repository/search_files_test.go @@ -10,9 +10,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/repository/server.go b/internal/gitaly/service/repository/server.go index 5a52d1eaa98bf8d0d77c6ed36fb7ad18ac492b18..3ecee040d3d75a0fc442c2ce4b8f2dca977b7c67 100644 --- a/internal/gitaly/service/repository/server.go +++ b/internal/gitaly/service/repository/server.go @@ -3,11 +3,11 @@ package repository import ( "context" - "gitlab.com/gitlab-org/gitaly/client" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/storage" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/client" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/storage" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) type server struct { diff --git a/internal/gitaly/service/repository/server_test.go b/internal/gitaly/service/repository/server_test.go index f249c31059e08db97ba36545535410a12ed3097b..1cfad8606982380d103af9f2b0da4c6a8426ef55 100644 --- a/internal/gitaly/service/repository/server_test.go +++ b/internal/gitaly/service/repository/server_test.go @@ -4,9 +4,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/client" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/client" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" "google.golang.org/grpc/metadata" ) diff --git a/internal/gitaly/service/repository/size.go b/internal/gitaly/service/repository/size.go index 8359604ebdc2fd82f0aacca2391ab91cf7ef6e18..cc1f9ebe100a5c8228ab18848b04599c8cd92478 100644 --- a/internal/gitaly/service/repository/size.go +++ b/internal/gitaly/service/repository/size.go @@ -9,8 +9,8 @@ import ( "strconv" "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func (s *server) RepositorySize(ctx context.Context, in *gitalypb.RepositorySizeRequest) (*gitalypb.RepositorySizeResponse, error) { diff --git a/internal/gitaly/service/repository/size_test.go b/internal/gitaly/service/repository/size_test.go index ff28183ffa8da398bfba0bd2deb19cb5a145eb1b..a27921c985dc5c58fd40b7517acb57072bac5f2b 100644 --- a/internal/gitaly/service/repository/size_test.go +++ b/internal/gitaly/service/repository/size_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/repository/snapshot.go b/internal/gitaly/service/repository/snapshot.go index 55e77be85492dbfa1b3ab660a1132639b801a9dd..91bf5df124e7f7c146969d0e2033b37bece01b2a 100644 --- a/internal/gitaly/service/repository/snapshot.go +++ b/internal/gitaly/service/repository/snapshot.go @@ -8,11 +8,11 @@ import ( "regexp" "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/archive" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/archive" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" ) var objectFiles = []*regexp.Regexp{ diff --git a/internal/gitaly/service/repository/snapshot_test.go b/internal/gitaly/service/repository/snapshot_test.go index 87794021b42e90b8f7e7eae49595f90654cae5ae..bf87c3ab89362660d4e3bfced9b797ca915d0719 100644 --- a/internal/gitaly/service/repository/snapshot_test.go +++ b/internal/gitaly/service/repository/snapshot_test.go @@ -14,14 +14,14 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/archive" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/archive" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/repository/squash_in_progress.go b/internal/gitaly/service/repository/squash_in_progress.go index a9f1c006372c69e1118f04e68e6166cfa955b705..bcf8400d32c8f5ef756aab3450f80d7c66a2282d 100644 --- a/internal/gitaly/service/repository/squash_in_progress.go +++ b/internal/gitaly/service/repository/squash_in_progress.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/repository/squash_in_progress_test.go b/internal/gitaly/service/repository/squash_in_progress_test.go index 72f0beda73f46a9554909312cb8a3c0468e30b70..39ec6ae1c1de1834e9bd1287c0150afa294b74aa 100644 --- a/internal/gitaly/service/repository/squash_in_progress_test.go +++ b/internal/gitaly/service/repository/squash_in_progress_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/repository/testhelper_test.go b/internal/gitaly/service/repository/testhelper_test.go index 43dbe466e24ff17e59ebb5a8d2510000d1b67060..c48983201145c7416e9318ca69cbb9bbf4218e43 100644 --- a/internal/gitaly/service/repository/testhelper_test.go +++ b/internal/gitaly/service/repository/testhelper_test.go @@ -10,15 +10,15 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - gitalyauth "gitlab.com/gitlab-org/gitaly/auth" - "gitlab.com/gitlab-org/gitaly/client" - dcache "gitlab.com/gitlab-org/gitaly/internal/cache" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - mcache "gitlab.com/gitlab-org/gitaly/internal/middleware/cache" - "gitlab.com/gitlab-org/gitaly/internal/praefect/protoregistry" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + gitalyauth "gitlab.com/gitlab-org/gitaly/v13/auth" + "gitlab.com/gitlab-org/gitaly/v13/client" + dcache "gitlab.com/gitlab-org/gitaly/v13/internal/cache" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + mcache "gitlab.com/gitlab-org/gitaly/v13/internal/middleware/cache" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/protoregistry" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/credentials" diff --git a/internal/gitaly/service/repository/util.go b/internal/gitaly/service/repository/util.go index 16839fa44b94b9db8170bcf09065dae331bba718..b86494273a825a83e4d0b74a0614496e7a102c9a 100644 --- a/internal/gitaly/service/repository/util.go +++ b/internal/gitaly/service/repository/util.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func removeOriginInRepo(ctx context.Context, repository *gitalypb.Repository) error { diff --git a/internal/gitaly/service/repository/write_ref.go b/internal/gitaly/service/repository/write_ref.go index bbaf239cbabe24747382f4dfe83d987a6c9e31e0..eaf701c035f28658a329123f8ed29092a63dd8b8 100644 --- a/internal/gitaly/service/repository/write_ref.go +++ b/internal/gitaly/service/repository/write_ref.go @@ -5,10 +5,10 @@ import ( "context" "fmt" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/updateref" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/updateref" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func (s *server) WriteRef(ctx context.Context, req *gitalypb.WriteRefRequest) (*gitalypb.WriteRefResponse, error) { diff --git a/internal/gitaly/service/repository/write_ref_test.go b/internal/gitaly/service/repository/write_ref_test.go index d84f8ec50f09f67d723a1bf7d8031275e1cc93ea..2a3aff9d1dcf2badf526f7e8d72949967514586b 100644 --- a/internal/gitaly/service/repository/write_ref_test.go +++ b/internal/gitaly/service/repository/write_ref_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/server/disk_stats.go b/internal/gitaly/service/server/disk_stats.go index 921591c710c9bcd5998c14e423c0231a3c5d094c..018f76ca64cb28e9226ea2c54327d4327e8cdd71 100644 --- a/internal/gitaly/service/server/disk_stats.go +++ b/internal/gitaly/service/server/disk_stats.go @@ -4,8 +4,8 @@ import ( "context" "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func (s *server) DiskStatistics(ctx context.Context, _ *gitalypb.DiskStatisticsRequest) (*gitalypb.DiskStatisticsResponse, error) { diff --git a/internal/gitaly/service/server/disk_stats_test.go b/internal/gitaly/service/server/disk_stats_test.go index 61e59d22ec659ecf5bf6aee497a306f5e4968ff6..fb85356a65a57fd890c686f595ce00a96dc74ab2 100644 --- a/internal/gitaly/service/server/disk_stats_test.go +++ b/internal/gitaly/service/server/disk_stats_test.go @@ -5,9 +5,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "golang.org/x/sys/unix" ) diff --git a/internal/gitaly/service/server/info.go b/internal/gitaly/service/server/info.go index 0766aa374d41c50ecddd9fa0976bf60a3507f249..9b6ba609a013e40b8f2e0e9057d87221de997cf6 100644 --- a/internal/gitaly/service/server/info.go +++ b/internal/gitaly/service/server/info.go @@ -7,12 +7,12 @@ import ( "path/filepath" "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/helper/fstype" - "gitlab.com/gitlab-org/gitaly/internal/storage" - "gitlab.com/gitlab-org/gitaly/internal/version" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/fstype" + "gitlab.com/gitlab-org/gitaly/v13/internal/storage" + "gitlab.com/gitlab-org/gitaly/v13/internal/version" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func (s *server) ServerInfo(ctx context.Context, in *gitalypb.ServerInfoRequest) (*gitalypb.ServerInfoResponse, error) { diff --git a/internal/gitaly/service/server/info_test.go b/internal/gitaly/service/server/info_test.go index 5aa0475d1081b412aa45368f7a577eea282d11f7..9838e3e82c14a860d30bea6d4c380f52966d4a44 100644 --- a/internal/gitaly/service/server/info_test.go +++ b/internal/gitaly/service/server/info_test.go @@ -6,15 +6,15 @@ import ( "testing" "github.com/stretchr/testify/require" - gitalyauth "gitlab.com/gitlab-org/gitaly/auth" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - internalauth "gitlab.com/gitlab-org/gitaly/internal/gitaly/config/auth" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/server/auth" - "gitlab.com/gitlab-org/gitaly/internal/storage" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/internal/version" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + gitalyauth "gitlab.com/gitlab-org/gitaly/v13/auth" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + internalauth "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config/auth" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/server/auth" + "gitlab.com/gitlab-org/gitaly/v13/internal/storage" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/version" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/reflection" diff --git a/internal/gitaly/service/server/server.go b/internal/gitaly/service/server/server.go index 993b10dd4e874501ef656c49c73e3a7498218050..aa3a97d25ce5675142983752bb0a2f44f1603f58 100644 --- a/internal/gitaly/service/server/server.go +++ b/internal/gitaly/service/server/server.go @@ -1,8 +1,8 @@ package server import ( - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) type server struct { diff --git a/internal/gitaly/service/server/storage_status_openbsd.go b/internal/gitaly/service/server/storage_status_openbsd.go index 6fdee1eaba5addc7853a4253694ef613f4374fe2..9982c9df1ce8012907abbda5df1ed78f4674a065 100644 --- a/internal/gitaly/service/server/storage_status_openbsd.go +++ b/internal/gitaly/service/server/storage_status_openbsd.go @@ -1,8 +1,8 @@ package server import ( - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "golang.org/x/sys/unix" ) diff --git a/internal/gitaly/service/server/storage_status_unix.go b/internal/gitaly/service/server/storage_status_unix.go index ccce15e6e96f663f4f5ab6d6a8acaa357277aba4..c52d1a7299df296f17b97d2904aa393629190501 100644 --- a/internal/gitaly/service/server/storage_status_unix.go +++ b/internal/gitaly/service/server/storage_status_unix.go @@ -3,8 +3,8 @@ package server import ( - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "golang.org/x/sys/unix" ) diff --git a/internal/gitaly/service/smarthttp/cache.go b/internal/gitaly/service/smarthttp/cache.go index bb953f78c743fc611fe505a9bf9ee5e05738b8e9..2f35ebbefc0fbdd52316e0b652114373d4949fde 100644 --- a/internal/gitaly/service/smarthttp/cache.go +++ b/internal/gitaly/service/smarthttp/cache.go @@ -10,8 +10,8 @@ import ( "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" "github.com/prometheus/client_golang/prometheus" log "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/cache" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/cache" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/smarthttp/inforefs.go b/internal/gitaly/service/smarthttp/inforefs.go index 6e12f4aaa0466f6ae7d2e4d94989bf3ff56e25ba..0ddfbf8f73317b54da7bbb1d3f7dc5373aaebe58 100644 --- a/internal/gitaly/service/smarthttp/inforefs.go +++ b/internal/gitaly/service/smarthttp/inforefs.go @@ -7,11 +7,11 @@ import ( "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" log "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/pktline" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/smarthttp/inforefs_test.go b/internal/gitaly/service/smarthttp/inforefs_test.go index a7c390dff0a856ef5528b2fcbe89000774e0f716..25cef583e225b258ef23353f9856926eb63922a8 100644 --- a/internal/gitaly/service/smarthttp/inforefs_test.go +++ b/internal/gitaly/service/smarthttp/inforefs_test.go @@ -15,16 +15,16 @@ import ( "github.com/golang/protobuf/proto" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/cache" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/objectpool" - "gitlab.com/gitlab-org/gitaly/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/tempdir" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/cache" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/objectpool" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/tempdir" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/smarthttp/receive_pack.go b/internal/gitaly/service/smarthttp/receive_pack.go index 2a5f389181b105dc16704d7e24a514b8bca50325..9c2d94d26384fb53e810bbae187bb90b38b34a05 100644 --- a/internal/gitaly/service/smarthttp/receive_pack.go +++ b/internal/gitaly/service/smarthttp/receive_pack.go @@ -3,11 +3,11 @@ package smarthttp import ( "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" log "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/smarthttp/receive_pack_test.go b/internal/gitaly/service/smarthttp/receive_pack_test.go index 40bbc6b8c816ed85ed211650bea1288ae8962305..bf6cf8f5c1d03b71c6ad1acb4f968095b3791705 100644 --- a/internal/gitaly/service/smarthttp/receive_pack_test.go +++ b/internal/gitaly/service/smarthttp/receive_pack_test.go @@ -14,19 +14,19 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/hooks" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - gitalyhook "gitlab.com/gitlab-org/gitaly/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/hook" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/internal/metadata/featureflag" - pconfig "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/internal/praefect/metadata" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/hooks" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + gitalyhook "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/hook" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v13/internal/metadata/featureflag" + pconfig "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/metadata" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/reflection" diff --git a/internal/gitaly/service/smarthttp/server.go b/internal/gitaly/service/smarthttp/server.go index 15a6bb9698c86b3b5381181dc1a2b8f1ae4b937b..ba390962bfd2ad5b01dfdc96850e0840e3aeea99 100644 --- a/internal/gitaly/service/smarthttp/server.go +++ b/internal/gitaly/service/smarthttp/server.go @@ -2,7 +2,7 @@ package smarthttp import ( "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) type server struct { diff --git a/internal/gitaly/service/smarthttp/testhelper_test.go b/internal/gitaly/service/smarthttp/testhelper_test.go index 919926a4f9b1b25b457f14729858ac41ee59315c..783df95b6ded353e0543636f68e1c65fd618ffbf 100644 --- a/internal/gitaly/service/smarthttp/testhelper_test.go +++ b/internal/gitaly/service/smarthttp/testhelper_test.go @@ -7,14 +7,14 @@ import ( "testing" "github.com/stretchr/testify/require" - gitalyauth "gitlab.com/gitlab-org/gitaly/auth" - diskcache "gitlab.com/gitlab-org/gitaly/internal/cache" - "gitlab.com/gitlab-org/gitaly/internal/git/hooks" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/middleware/cache" - "gitlab.com/gitlab-org/gitaly/internal/praefect/protoregistry" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + gitalyauth "gitlab.com/gitlab-org/gitaly/v13/auth" + diskcache "gitlab.com/gitlab-org/gitaly/v13/internal/cache" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/hooks" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/middleware/cache" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/protoregistry" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/reflection" ) diff --git a/internal/gitaly/service/smarthttp/upload_pack.go b/internal/gitaly/service/smarthttp/upload_pack.go index 6ccec7f16437756f6aba9f2f1307e51823288ac2..d39dd75e5ae1a7411e590c7a85b649f53a24f02c 100644 --- a/internal/gitaly/service/smarthttp/upload_pack.go +++ b/internal/gitaly/service/smarthttp/upload_pack.go @@ -6,13 +6,13 @@ import ( "io" "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/inspect" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/inspect" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/smarthttp/upload_pack_test.go b/internal/gitaly/service/smarthttp/upload_pack_test.go index 235b2588249de98e5e132e47c636d6a9f8280da1..7a7e4a8946adbaf68242e0c73416414a94586164 100644 --- a/internal/gitaly/service/smarthttp/upload_pack_test.go +++ b/internal/gitaly/service/smarthttp/upload_pack_test.go @@ -15,12 +15,12 @@ import ( promtest "github.com/prometheus/client_golang/prometheus/testutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/pktline" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/ssh/monitor_stdin_command.go b/internal/gitaly/service/ssh/monitor_stdin_command.go index c0c2c11fb0bd1fc5462a3062d2e3d7223f01dac1..bc836eec9a00cd72f1d3c5323a59c6644dfcd628 100644 --- a/internal/gitaly/service/ssh/monitor_stdin_command.go +++ b/internal/gitaly/service/ssh/monitor_stdin_command.go @@ -5,9 +5,9 @@ import ( "fmt" "io" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/pktline" ) func monitorStdinCommand(ctx context.Context, stdin io.Reader, stdout, stderr io.Writer, env []string, globals []git.Option, sc git.SubCmd) (*command.Command, *pktline.ReadMonitor, error) { diff --git a/internal/gitaly/service/ssh/receive_pack.go b/internal/gitaly/service/ssh/receive_pack.go index 949e35dbb80b225fed1e97fb1dd244616715f2da..8ce1c7a2194efb4bec8d177f58b08ab04d445b0f 100644 --- a/internal/gitaly/service/ssh/receive_pack.go +++ b/internal/gitaly/service/ssh/receive_pack.go @@ -6,11 +6,11 @@ import ( "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" log "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" ) func (s *server) SSHReceivePack(stream gitalypb.SSHService_SSHReceivePackServer) error { diff --git a/internal/gitaly/service/ssh/receive_pack_test.go b/internal/gitaly/service/ssh/receive_pack_test.go index 3dc2049751f910360cb87ad461348c7f7547df28..a99547ad46fdd6a7a920bb95d74e5cd79d31d43a 100644 --- a/internal/gitaly/service/ssh/receive_pack_test.go +++ b/internal/gitaly/service/ssh/receive_pack_test.go @@ -14,14 +14,14 @@ import ( "github.com/golang/protobuf/jsonpb" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/hooks" - "gitlab.com/gitlab-org/gitaly/internal/git/objectpool" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/hooks" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/objectpool" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/ssh/server.go b/internal/gitaly/service/ssh/server.go index b86df0a348a18c8c96e3e325a9fd7bef3f29adc4..97e1be9dca6d9fdb6d3b1f694fb84010591c4a4e 100644 --- a/internal/gitaly/service/ssh/server.go +++ b/internal/gitaly/service/ssh/server.go @@ -4,7 +4,7 @@ import ( "time" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) var ( diff --git a/internal/gitaly/service/ssh/testhelper_test.go b/internal/gitaly/service/ssh/testhelper_test.go index 6884fa3b92d8e60b63ae81a8218dcb976a2cb7f5..4cd5bea3fc248f31429facd8b4247b10187dd96b 100644 --- a/internal/gitaly/service/ssh/testhelper_test.go +++ b/internal/gitaly/service/ssh/testhelper_test.go @@ -7,9 +7,9 @@ import ( log "github.com/sirupsen/logrus" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/reflection" ) diff --git a/internal/gitaly/service/ssh/upload_archive.go b/internal/gitaly/service/ssh/upload_archive.go index ec61468a17aaf9f2489ca251cd33579d3e1bc4ca..da206a8d0f9a566853025f01979c1ef157bda47c 100644 --- a/internal/gitaly/service/ssh/upload_archive.go +++ b/internal/gitaly/service/ssh/upload_archive.go @@ -4,12 +4,12 @@ import ( "context" "fmt" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/pktline" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" ) func (s *server) SSHUploadArchive(stream gitalypb.SSHService_SSHUploadArchiveServer) error { diff --git a/internal/gitaly/service/ssh/upload_archive_test.go b/internal/gitaly/service/ssh/upload_archive_test.go index d39f636f2f220fe1f9075ed0505e36e1d76f6eaa..b541b9d42e8362562209959a447bb793329846ec 100644 --- a/internal/gitaly/service/ssh/upload_archive_test.go +++ b/internal/gitaly/service/ssh/upload_archive_test.go @@ -9,9 +9,9 @@ import ( "github.com/golang/protobuf/jsonpb" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/ssh/upload_pack.go b/internal/gitaly/service/ssh/upload_pack.go index 91cb456e340e0004c1808b6126420a17179f2890..d43ad32f69afb3988c6242aff1da7efb171cffe6 100644 --- a/internal/gitaly/service/ssh/upload_pack.go +++ b/internal/gitaly/service/ssh/upload_pack.go @@ -8,14 +8,14 @@ import ( "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" log "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/pktline" - "gitlab.com/gitlab-org/gitaly/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/inspect" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/inspect" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" ) func (s *server) SSHUploadPack(stream gitalypb.SSHService_SSHUploadPackServer) error { diff --git a/internal/gitaly/service/ssh/upload_pack_test.go b/internal/gitaly/service/ssh/upload_pack_test.go index 62fb7e0f91841eb48370a0b8f4fc2efd49e85aa6..360e145804a64801c4189bf2df654dcf9a144c3e 100644 --- a/internal/gitaly/service/ssh/upload_pack_test.go +++ b/internal/gitaly/service/ssh/upload_pack_test.go @@ -14,11 +14,11 @@ import ( "github.com/prometheus/client_golang/prometheus" promtest "github.com/prometheus/client_golang/prometheus/testutil" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/wiki/delete_page.go b/internal/gitaly/service/wiki/delete_page.go index 6f1fbef0cd0d3e69f14d936655b5c5a36829a7ca..4355b1ddfe21f3a86d4e62cd0cdfd894ec7e8ef5 100644 --- a/internal/gitaly/service/wiki/delete_page.go +++ b/internal/gitaly/service/wiki/delete_page.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/wiki/delete_page_test.go b/internal/gitaly/service/wiki/delete_page_test.go index 428ba4b7df08a3d500511838567031c4788dc5f4..96c504027d682214faac4f87cb3da90282988f09 100644 --- a/internal/gitaly/service/wiki/delete_page_test.go +++ b/internal/gitaly/service/wiki/delete_page_test.go @@ -4,9 +4,9 @@ import ( "testing" "github.com/stretchr/testify/require" - gitlog "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + gitlog "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/wiki/find_file.go b/internal/gitaly/service/wiki/find_file.go index 388fdd633625263e2ab4b78ff34ed0752a2a2765..8e9f7c8fc7f32bc852f2195ebcda643f07ea5adf 100644 --- a/internal/gitaly/service/wiki/find_file.go +++ b/internal/gitaly/service/wiki/find_file.go @@ -1,9 +1,9 @@ package wiki import ( - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/wiki/find_file_test.go b/internal/gitaly/service/wiki/find_file_test.go index 73e7de7a9987987798bb9924798dec50ec8afa5a..d578779b72796c0210ff913079e7b9e9c9584131 100644 --- a/internal/gitaly/service/wiki/find_file_test.go +++ b/internal/gitaly/service/wiki/find_file_test.go @@ -9,8 +9,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/wiki/find_page.go b/internal/gitaly/service/wiki/find_page.go index 093036d4f6c6b18bf0a591afec7354e2741b29f7..ef2baa03ddc95a6b706b27b865cbfca6630b801e 100644 --- a/internal/gitaly/service/wiki/find_page.go +++ b/internal/gitaly/service/wiki/find_page.go @@ -3,9 +3,9 @@ package wiki import ( "errors" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/wiki/find_page_test.go b/internal/gitaly/service/wiki/find_page_test.go index 1591ffb53ef0590b1db6cca90911147ec824aa57..0130889f2004358a6b42b43a302ae487a73ad13c 100644 --- a/internal/gitaly/service/wiki/find_page_test.go +++ b/internal/gitaly/service/wiki/find_page_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/wiki/get_all_pages.go b/internal/gitaly/service/wiki/get_all_pages.go index b389c8379834a81dfe5dda2ded47d3542f1061ea..8cfdb87ed0b132ef4372d2a69524860ac8b9f7aa 100644 --- a/internal/gitaly/service/wiki/get_all_pages.go +++ b/internal/gitaly/service/wiki/get_all_pages.go @@ -1,8 +1,8 @@ package wiki import ( - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func (s *server) WikiGetAllPages(request *gitalypb.WikiGetAllPagesRequest, stream gitalypb.WikiService_WikiGetAllPagesServer) error { diff --git a/internal/gitaly/service/wiki/get_all_pages_test.go b/internal/gitaly/service/wiki/get_all_pages_test.go index 7952915c2ab1174df535e1a188335a7fdb182cd7..7d7788def94fa056ceafe0049cde950c7f51201d 100644 --- a/internal/gitaly/service/wiki/get_all_pages_test.go +++ b/internal/gitaly/service/wiki/get_all_pages_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/wiki/get_page_versions.go b/internal/gitaly/service/wiki/get_page_versions.go index 7833a7afedadbefdb0ed70ae31c5129c9a311440..375781a1432639b6514fbd9104627a311d41319d 100644 --- a/internal/gitaly/service/wiki/get_page_versions.go +++ b/internal/gitaly/service/wiki/get_page_versions.go @@ -1,8 +1,8 @@ package wiki import ( - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/wiki/get_page_versions_test.go b/internal/gitaly/service/wiki/get_page_versions_test.go index 09a8ad15a5e7b2b3dafcd49dfcdb347334f9eaa0..c779721656e7b1545a197dc23f4df6bb4ad0a2b8 100644 --- a/internal/gitaly/service/wiki/get_page_versions_test.go +++ b/internal/gitaly/service/wiki/get_page_versions_test.go @@ -7,9 +7,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func TestWikiGetPageVersionsRequest(t *testing.T) { diff --git a/internal/gitaly/service/wiki/list_pages.go b/internal/gitaly/service/wiki/list_pages.go index f0329eafa0127e893ccdd4704d499ce4ba87ea66..7f3874321a8e1006ecc6b709c943b439831f7417 100644 --- a/internal/gitaly/service/wiki/list_pages.go +++ b/internal/gitaly/service/wiki/list_pages.go @@ -1,8 +1,8 @@ package wiki import ( - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func (s *server) WikiListPages(request *gitalypb.WikiListPagesRequest, stream gitalypb.WikiService_WikiListPagesServer) error { diff --git a/internal/gitaly/service/wiki/list_pages_test.go b/internal/gitaly/service/wiki/list_pages_test.go index b2e0f164b644b62469921917096aaab70d5e0b8f..3d78ba05a859b562bf3339a46a97f3f92dece6f7 100644 --- a/internal/gitaly/service/wiki/list_pages_test.go +++ b/internal/gitaly/service/wiki/list_pages_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func TestSuccessfulWikiListPagesRequest(t *testing.T) { diff --git a/internal/gitaly/service/wiki/server.go b/internal/gitaly/service/wiki/server.go index 0b695b005a9e335645e6eef0c2e693651ec50dd0..473cf490efb7ffd88a3c9b72fd298b6f3c3014ed 100644 --- a/internal/gitaly/service/wiki/server.go +++ b/internal/gitaly/service/wiki/server.go @@ -1,8 +1,8 @@ package wiki import ( - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) type server struct { diff --git a/internal/gitaly/service/wiki/testhelper_test.go b/internal/gitaly/service/wiki/testhelper_test.go index 0a1ed1e794e37a486f72c155c94284f9d0a12fc2..c54dd0ca95d582914d957a01d6a506223e946686 100644 --- a/internal/gitaly/service/wiki/testhelper_test.go +++ b/internal/gitaly/service/wiki/testhelper_test.go @@ -10,13 +10,13 @@ import ( log "github.com/sirupsen/logrus" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git/hooks" - gitlog "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/hooks" + gitlog "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/reflection" ) diff --git a/internal/gitaly/service/wiki/update_page.go b/internal/gitaly/service/wiki/update_page.go index d9c417b2a59e2b484b75d4b7b6ae7bf9c346b4cf..0d9fa76ab01d8c2ddf2ddc553cccd20a7c3d5b72 100644 --- a/internal/gitaly/service/wiki/update_page.go +++ b/internal/gitaly/service/wiki/update_page.go @@ -3,8 +3,8 @@ package wiki import ( "fmt" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/wiki/update_page_test.go b/internal/gitaly/service/wiki/update_page_test.go index 094628826ee0925a26355f0d8bb3c1139dd5e5ef..479269b5da6c9586de08caa8767d3ffc7225f69e 100644 --- a/internal/gitaly/service/wiki/update_page_test.go +++ b/internal/gitaly/service/wiki/update_page_test.go @@ -5,9 +5,9 @@ import ( "testing" "github.com/stretchr/testify/require" - gitlog "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + gitlog "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/wiki/util.go b/internal/gitaly/service/wiki/util.go index cbbbd7778579f49c253cbe01dcfb975dbd7cd89a..82d83a84c029875ee9cc83ca6c0624cd306a6edd 100644 --- a/internal/gitaly/service/wiki/util.go +++ b/internal/gitaly/service/wiki/util.go @@ -3,7 +3,7 @@ package wiki import ( "fmt" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) type requestWithCommitDetails interface { diff --git a/internal/gitaly/service/wiki/write_page.go b/internal/gitaly/service/wiki/write_page.go index 81fe00bb80942e247e525899c2931fcc5980a020..cf288b5fcf610c428df760d34c9c9e2ec92bfb7d 100644 --- a/internal/gitaly/service/wiki/write_page.go +++ b/internal/gitaly/service/wiki/write_page.go @@ -3,8 +3,8 @@ package wiki import ( "fmt" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/wiki/write_page_test.go b/internal/gitaly/service/wiki/write_page_test.go index f9ef38d87edd83688b0d1a703a9b80f57f60b815..04aed3ed6ee479761d411a20f56c7c689a9d7c99 100644 --- a/internal/gitaly/service/wiki/write_page_test.go +++ b/internal/gitaly/service/wiki/write_page_test.go @@ -5,9 +5,9 @@ import ( "testing" "github.com/stretchr/testify/require" - gitlog "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + gitlog "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitalyssh/gitalyssh.go b/internal/gitalyssh/gitalyssh.go index ff4abba2451830291e53f0370caba9b9978fbd66..5269da752343c7b075a3ea2b71b67d2ae74422d2 100644 --- a/internal/gitalyssh/gitalyssh.go +++ b/internal/gitalyssh/gitalyssh.go @@ -11,11 +11,11 @@ import ( "github.com/golang/protobuf/jsonpb" "github.com/golang/protobuf/proto" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/metadata/featureflag" - gitaly_x509 "gitlab.com/gitlab-org/gitaly/internal/x509" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/metadata/featureflag" + gitaly_x509 "gitlab.com/gitlab-org/gitaly/v13/internal/x509" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "gitlab.com/gitlab-org/labkit/correlation" "gitlab.com/gitlab-org/labkit/tracing" "google.golang.org/grpc/codes" diff --git a/internal/gitalyssh/gitalyssh_test.go b/internal/gitalyssh/gitalyssh_test.go index f6e3bf045eeda293348212953f0c3826a0a4a855..22ec6c59e951a6706e44af84efc0e72431010253 100644 --- a/internal/gitalyssh/gitalyssh_test.go +++ b/internal/gitalyssh/gitalyssh_test.go @@ -9,9 +9,9 @@ import ( "github.com/golang/protobuf/jsonpb" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "gitlab.com/gitlab-org/labkit/correlation" "google.golang.org/grpc/metadata" ) diff --git a/internal/gitalyssh/testhelper_test.go b/internal/gitalyssh/testhelper_test.go index 2337927907322ea5893ae8613c95c4f147769ddd..ccb3d3e8296af563267e8e432d398d0594727826 100644 --- a/internal/gitalyssh/testhelper_test.go +++ b/internal/gitalyssh/testhelper_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitlabshell/env.go b/internal/gitlabshell/env.go index 763001318640447a8b2398a51703e828bcd9d3ba..beb683dcddaeeff5a7300bdc673c75d61c30746f 100644 --- a/internal/gitlabshell/env.go +++ b/internal/gitlabshell/env.go @@ -3,7 +3,7 @@ package gitlabshell import ( "encoding/json" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" ) // Env is a helper that returns a slice with environment variables used by gitlab shell diff --git a/internal/gitlabshell/env_test.go b/internal/gitlabshell/env_test.go index 46c45a81ba608c32957dfe1614b70caee0c2b53d..5d1c8c1b2edd9dd0c18df2a232312da5cf54f3fb 100644 --- a/internal/gitlabshell/env_test.go +++ b/internal/gitlabshell/env_test.go @@ -10,9 +10,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/gitlabshell" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitlabshell" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestGitHooksConfig(t *testing.T) { diff --git a/internal/helper/chunk/chunker_test.go b/internal/helper/chunk/chunker_test.go index 0dd22e1b52b71e2315d1f2d439f3845e67e84ee0..af199b3358009e074482117369ce057d1e56b969 100644 --- a/internal/helper/chunk/chunker_test.go +++ b/internal/helper/chunk/chunker_test.go @@ -8,8 +8,8 @@ import ( "github.com/golang/protobuf/proto" "github.com/golang/protobuf/ptypes/wrappers" "github.com/stretchr/testify/require" - test "gitlab.com/gitlab-org/gitaly/internal/helper/chunk/pb" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + test "gitlab.com/gitlab-org/gitaly/v13/internal/helper/chunk/pb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" "google.golang.org/grpc" ) diff --git a/internal/helper/fieldextractors/fieldextractor.go b/internal/helper/fieldextractors/fieldextractor.go index 4318eef5c0e4be16cc7f9926e95ae544e830a934..be5eca7afddbd6eed5c8c66862a78272a0e8f533 100644 --- a/internal/helper/fieldextractors/fieldextractor.go +++ b/internal/helper/fieldextractors/fieldextractor.go @@ -3,7 +3,7 @@ package fieldextractors import ( "strings" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) type repositoryBasedRequest interface { diff --git a/internal/helper/housekeeping/housekeeping_test.go b/internal/helper/housekeeping/housekeeping_test.go index 4077c9f9c9d68a9ed30ce7b63864983f36076e70..a9160c27da46c705d1e757354a5bbd59f4dc8e00 100644 --- a/internal/helper/housekeeping/housekeeping_test.go +++ b/internal/helper/housekeeping/housekeeping_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) type entryFinalState int diff --git a/internal/helper/repo.go b/internal/helper/repo.go index 7c9d51351e893385719e0588ea479c3a473d5919..ae96e6a0ecf9a3f7a4beb632666603ea120955b1 100644 --- a/internal/helper/repo.go +++ b/internal/helper/repo.go @@ -4,9 +4,9 @@ import ( "os" "path/filepath" - "gitlab.com/gitlab-org/gitaly/internal/git/repository" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/storage" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/repository" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/storage" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/helper/repo_test.go b/internal/helper/repo_test.go index 9a9f3578aa4d888f7c960eff6d17ef0076e55d56..911c49d18b444b3e999c637d7ec8f214ed5612ac 100644 --- a/internal/helper/repo_test.go +++ b/internal/helper/repo_test.go @@ -6,9 +6,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/helper/storage.go b/internal/helper/storage.go index 523ca7ed6176247870478a8001929bfb5351ae7a..993948f9d017de8ca40ec37efd1d730ea55e41fc 100644 --- a/internal/helper/storage.go +++ b/internal/helper/storage.go @@ -7,7 +7,7 @@ import ( "errors" "fmt" - "gitlab.com/gitlab-org/gitaly/internal/storage" + "gitlab.com/gitlab-org/gitaly/v13/internal/storage" "google.golang.org/grpc/metadata" ) diff --git a/internal/helper/storage_test.go b/internal/helper/storage_test.go index d0f229e0e9e2c33f8ac240b60463f2feafe69811..a99885d6d9d7d10283828e55fe2fa617b47c2df4 100644 --- a/internal/helper/storage_test.go +++ b/internal/helper/storage_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/storage" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/storage" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" "google.golang.org/grpc/metadata" ) diff --git a/internal/middleware/cache/cache.go b/internal/middleware/cache/cache.go index d5b67373a13f8cc20e809cb808360aad05df8879..7a8eac187aca6ec2a6f8393920ec481a18b101fd 100644 --- a/internal/middleware/cache/cache.go +++ b/internal/middleware/cache/cache.go @@ -8,9 +8,9 @@ import ( "github.com/golang/protobuf/proto" "github.com/sirupsen/logrus" - diskcache "gitlab.com/gitlab-org/gitaly/internal/cache" - "gitlab.com/gitlab-org/gitaly/internal/praefect/protoregistry" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + diskcache "gitlab.com/gitlab-org/gitaly/v13/internal/cache" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/protoregistry" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" ) diff --git a/internal/middleware/cache/cache_test.go b/internal/middleware/cache/cache_test.go index 2ef7635ced57dde37690f9ab5d722a7286ad2c80..4248d46bf3087d931594fc91490df00e28de3224 100644 --- a/internal/middleware/cache/cache_test.go +++ b/internal/middleware/cache/cache_test.go @@ -12,12 +12,12 @@ import ( "github.com/golang/protobuf/protoc-gen-go/descriptor" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - diskcache "gitlab.com/gitlab-org/gitaly/internal/cache" - "gitlab.com/gitlab-org/gitaly/internal/middleware/cache" - "gitlab.com/gitlab-org/gitaly/internal/middleware/cache/testdata" - "gitlab.com/gitlab-org/gitaly/internal/praefect/protoregistry" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + diskcache "gitlab.com/gitlab-org/gitaly/v13/internal/cache" + "gitlab.com/gitlab-org/gitaly/v13/internal/middleware/cache" + "gitlab.com/gitlab-org/gitaly/v13/internal/middleware/cache/testdata" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/protoregistry" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/health" diff --git a/internal/middleware/cache/prometheus.go b/internal/middleware/cache/prometheus.go index 949945382f2ea779fdecc2aec64fcb40cb4cf72a..9aa998f94bf4d2ccc2be233fb6ee44ec3b65a696 100644 --- a/internal/middleware/cache/prometheus.go +++ b/internal/middleware/cache/prometheus.go @@ -2,7 +2,7 @@ package cache import ( "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/internal/praefect/protoregistry" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/protoregistry" ) var ( diff --git a/internal/middleware/cache/testdata/stream.pb.go b/internal/middleware/cache/testdata/stream.pb.go index f8013cf878757ed4541829fa467bbc5d3f838e3f..623c8eeb0f85f99b3d8a21319b080afddb215f23 100644 --- a/internal/middleware/cache/testdata/stream.pb.go +++ b/internal/middleware/cache/testdata/stream.pb.go @@ -7,7 +7,7 @@ import ( context "context" fmt "fmt" proto "github.com/golang/protobuf/proto" - gitalypb "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + gitalypb "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/internal/middleware/commandstatshandler/commandstatshandler.go b/internal/middleware/commandstatshandler/commandstatshandler.go index 8c3330f38cde477ddd3bfd353aef321d5f7e92a9..4369604618ab148a647aa2fdcf221c9bac1aeaa6 100644 --- a/internal/middleware/commandstatshandler/commandstatshandler.go +++ b/internal/middleware/commandstatshandler/commandstatshandler.go @@ -5,7 +5,7 @@ import ( grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware" "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" - "gitlab.com/gitlab-org/gitaly/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" "google.golang.org/grpc" ) diff --git a/internal/middleware/commandstatshandler/commandstatshandler_test.go b/internal/middleware/commandstatshandler/commandstatshandler_test.go index c021033233346a32feac7491f1d41f6091b503cd..e26a1b15ce74bf79ff30556fea2423d8575275ae 100644 --- a/internal/middleware/commandstatshandler/commandstatshandler_test.go +++ b/internal/middleware/commandstatshandler/commandstatshandler_test.go @@ -11,11 +11,11 @@ import ( grpc_logrus "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" "github.com/sirupsen/logrus" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/ref" - "gitlab.com/gitlab-org/gitaly/internal/metadata/featureflag" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/ref" + "gitlab.com/gitlab-org/gitaly/v13/internal/metadata/featureflag" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/test/bufconn" ) diff --git a/internal/middleware/limithandler/limithandler_test.go b/internal/middleware/limithandler/limithandler_test.go index c98f7f3891fbf7ac719f2ba453d423d460675c36..5a843dac612c1c712285191b237a918a77f585f6 100644 --- a/internal/middleware/limithandler/limithandler_test.go +++ b/internal/middleware/limithandler/limithandler_test.go @@ -8,9 +8,9 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/middleware/limithandler" - pb "gitlab.com/gitlab-org/gitaly/internal/middleware/limithandler/testpb" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/middleware/limithandler" + pb "gitlab.com/gitlab-org/gitaly/v13/internal/middleware/limithandler/testpb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" "google.golang.org/grpc" ) diff --git a/internal/middleware/limithandler/testhelper_test.go b/internal/middleware/limithandler/testhelper_test.go index 4248049284bcc35daf5ec7ee8a1568eeb8652dd2..06114a7e448c5b73b1fcc56315f00d33209f9ab0 100644 --- a/internal/middleware/limithandler/testhelper_test.go +++ b/internal/middleware/limithandler/testhelper_test.go @@ -4,7 +4,7 @@ import ( "context" "sync/atomic" - pb "gitlab.com/gitlab-org/gitaly/internal/middleware/limithandler/testpb" + pb "gitlab.com/gitlab-org/gitaly/v13/internal/middleware/limithandler/testpb" ) type server struct { diff --git a/internal/middleware/metadatahandler/metadatahandler.go b/internal/middleware/metadatahandler/metadatahandler.go index 70e38b7cdf671798732a92e5bf2f50b83caa2fdd..a944a50166f6e09ba70ba66feef65bedf21c3a27 100644 --- a/internal/middleware/metadatahandler/metadatahandler.go +++ b/internal/middleware/metadatahandler/metadatahandler.go @@ -7,8 +7,8 @@ import ( grpc_ctxtags "github.com/grpc-ecosystem/go-grpc-middleware/tags" grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" "github.com/prometheus/client_golang/prometheus" - gitalyauth "gitlab.com/gitlab-org/gitaly/auth" - "gitlab.com/gitlab-org/gitaly/internal/helper" + gitalyauth "gitlab.com/gitlab-org/gitaly/v13/auth" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" "gitlab.com/gitlab-org/labkit/correlation" "google.golang.org/grpc" "google.golang.org/grpc/metadata" diff --git a/internal/middleware/metadatahandler/metadatahandler_test.go b/internal/middleware/metadatahandler/metadatahandler_test.go index 068162da15002ee50b74bfcb8ab7464ebaac5024..3183f8f4dd3f2e92a84c661bfcab6df7a777154b 100644 --- a/internal/middleware/metadatahandler/metadatahandler_test.go +++ b/internal/middleware/metadatahandler/metadatahandler_test.go @@ -8,7 +8,7 @@ import ( grpc_ctxtags "github.com/grpc-ecosystem/go-grpc-middleware/tags" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" "gitlab.com/gitlab-org/labkit/correlation" "google.golang.org/grpc/metadata" ) diff --git a/internal/middleware/sentryhandler/sentryhandler.go b/internal/middleware/sentryhandler/sentryhandler.go index 7766e14c561e02775ccdf8c6b349ea0bb9fde24d..981d0073e731f60be907eb2f9ba60cbfc9875828 100644 --- a/internal/middleware/sentryhandler/sentryhandler.go +++ b/internal/middleware/sentryhandler/sentryhandler.go @@ -10,7 +10,7 @@ import ( sentry "github.com/getsentry/sentry-go" grpc_ctxtags "github.com/grpc-ecosystem/go-grpc-middleware/tags" - "gitlab.com/gitlab-org/gitaly/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" "google.golang.org/grpc" "google.golang.org/grpc/codes" ) diff --git a/internal/middleware/sentryhandler/sentryhandler_test.go b/internal/middleware/sentryhandler/sentryhandler_test.go index 4aaca2c22a90d2bbc694f3f416fa9356a641984d..64eda9c12253230e5af708aaba6ac05b1fe58977 100644 --- a/internal/middleware/sentryhandler/sentryhandler_test.go +++ b/internal/middleware/sentryhandler/sentryhandler_test.go @@ -8,7 +8,7 @@ import ( grpc_ctxtags "github.com/grpc-ecosystem/go-grpc-middleware/tags" "github.com/stretchr/testify/assert" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/praefect/auth_test.go b/internal/praefect/auth_test.go index 27d19de5da23d4238633ebd34fa07fbdffa76316..02eab8e0fccab801a871de001019864a89942c3d 100644 --- a/internal/praefect/auth_test.go +++ b/internal/praefect/auth_test.go @@ -8,17 +8,17 @@ import ( "github.com/golang/protobuf/proto" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - gitalyauth "gitlab.com/gitlab-org/gitaly/auth" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config/auth" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/internal/praefect/mock" - "gitlab.com/gitlab-org/gitaly/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/internal/praefect/protoregistry" - "gitlab.com/gitlab-org/gitaly/internal/praefect/transactions" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper/promtest" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + gitalyauth "gitlab.com/gitlab-org/gitaly/v13/auth" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config/auth" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/mock" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/protoregistry" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/transactions" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper/promtest" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/codes" ) diff --git a/internal/praefect/config/config.go b/internal/praefect/config/config.go index a06acf91488fcbc302a8f3cdd22f49c1e9852e28..dab93919ae82f5dae4854c8533f950e1f76576e1 100644 --- a/internal/praefect/config/config.go +++ b/internal/praefect/config/config.go @@ -8,11 +8,11 @@ import ( "github.com/BurntSushi/toml" promclient "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config/auth" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config/log" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config/prometheus" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config/sentry" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config/auth" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config/prometheus" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config/sentry" ) type Failover struct { diff --git a/internal/praefect/config/config_test.go b/internal/praefect/config/config_test.go index be87c9f89664a7945fbc31f3e85545ffc2c41298..e448e58b336ef8239df40fcffa6df46402935f62 100644 --- a/internal/praefect/config/config_test.go +++ b/internal/praefect/config/config_test.go @@ -7,10 +7,10 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config/log" - gitaly_prometheus "gitlab.com/gitlab-org/gitaly/internal/gitaly/config/prometheus" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config/sentry" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config/log" + gitaly_prometheus "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config/prometheus" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config/sentry" ) func TestConfigValidation(t *testing.T) { diff --git a/internal/praefect/config/log.go b/internal/praefect/config/log.go index 724d81f92e84395be2511d9e5746fff8d9d62754..47646fdcc0a6afa9bba9718885978d2e9eeaba40 100644 --- a/internal/praefect/config/log.go +++ b/internal/praefect/config/log.go @@ -2,7 +2,7 @@ package config import ( "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/log" ) // ConfigureLogger applies the settings from the configuration file to the diff --git a/internal/praefect/consistencycheck_test.go b/internal/praefect/consistencycheck_test.go index 29fbc3e4a6a071b9f8ca17ccf644b96e83fc1dba..087894f9cfd6e64aedc6d3700d9fe2b50a76ab18 100644 --- a/internal/praefect/consistencycheck_test.go +++ b/internal/praefect/consistencycheck_test.go @@ -7,10 +7,10 @@ import ( "time" "github.com/stretchr/testify/require" - gconfig "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + gconfig "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func TestConsistencyCheck(t *testing.T) { diff --git a/internal/praefect/coordinator.go b/internal/praefect/coordinator.go index 3d752512bf5653f995bede6ba03948d594eb02d4..0ecd79c028a921490da729de827dfcba3fbbc036 100644 --- a/internal/praefect/coordinator.go +++ b/internal/praefect/coordinator.go @@ -9,18 +9,18 @@ import ( "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" "github.com/prometheus/client_golang/prometheus" "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/metadata/featureflag" - "gitlab.com/gitlab-org/gitaly/internal/middleware/metadatahandler" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/internal/praefect/grpc-proxy/proxy" - "gitlab.com/gitlab-org/gitaly/internal/praefect/metadata" - "gitlab.com/gitlab-org/gitaly/internal/praefect/metrics" - "gitlab.com/gitlab-org/gitaly/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/internal/praefect/protoregistry" - "gitlab.com/gitlab-org/gitaly/internal/praefect/transactions" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/metadata/featureflag" + "gitlab.com/gitlab-org/gitaly/v13/internal/middleware/metadatahandler" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/grpc-proxy/proxy" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/metadata" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/metrics" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/protoregistry" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/transactions" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "gitlab.com/gitlab-org/labkit/correlation" "golang.org/x/sync/errgroup" ) diff --git a/internal/praefect/coordinator_test.go b/internal/praefect/coordinator_test.go index 01c5603f0659040e7d4d2baee8ae99f50f72c76e..33d5b38152a7eb0fe1bad34373f0fb079fdcc3bd 100644 --- a/internal/praefect/coordinator_test.go +++ b/internal/praefect/coordinator_test.go @@ -15,18 +15,18 @@ import ( "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/metadata/featureflag" - "gitlab.com/gitlab-org/gitaly/internal/middleware/metadatahandler" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore" - praefect_metadata "gitlab.com/gitlab-org/gitaly/internal/praefect/metadata" - "gitlab.com/gitlab-org/gitaly/internal/praefect/mock" - "gitlab.com/gitlab-org/gitaly/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/internal/praefect/protoregistry" - "gitlab.com/gitlab-org/gitaly/internal/praefect/transactions" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper/promtest" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/metadata/featureflag" + "gitlab.com/gitlab-org/gitaly/v13/internal/middleware/metadatahandler" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore" + praefect_metadata "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/metadata" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/mock" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/protoregistry" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/transactions" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper/promtest" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "gitlab.com/gitlab-org/labkit/correlation" "google.golang.org/grpc/codes" "google.golang.org/grpc/health/grpc_health_v1" diff --git a/internal/praefect/correlation.go b/internal/praefect/correlation.go index 29c7d7fb1ea702354b04c426bbc1de127c6433cc..1ef1d6e5dbf323cb9f9f378f93d7f2d4858707f6 100644 --- a/internal/praefect/correlation.go +++ b/internal/praefect/correlation.go @@ -4,7 +4,7 @@ import ( "bytes" "time" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) const base62Chars string = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" diff --git a/internal/praefect/datastore/collector_test.go b/internal/praefect/datastore/collector_test.go index 0c5f022e5bfd37acfa6c3b153908b445dd3141e2..d6a46109d316cbb00f2d4f3db1d583fc91f11139 100644 --- a/internal/praefect/datastore/collector_test.go +++ b/internal/praefect/datastore/collector_test.go @@ -7,7 +7,7 @@ import ( "github.com/prometheus/client_golang/prometheus/testutil" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) type primaryGetterFunc func(context.Context) (map[string]string, error) diff --git a/internal/praefect/datastore/glsql/postgres.go b/internal/praefect/datastore/glsql/postgres.go index 4b474c179de1bb3c8749357af082bd7cec348ad1..c1622a68f5222ccd5d0b5a55b4796d76131bc78d 100644 --- a/internal/praefect/datastore/glsql/postgres.go +++ b/internal/praefect/datastore/glsql/postgres.go @@ -9,8 +9,8 @@ import ( _ "github.com/lib/pq" migrate "github.com/rubenv/sql-migrate" "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore/migrations" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore/migrations" ) // OpenDB returns connection pool to the database. diff --git a/internal/praefect/datastore/glsql/postgres_test.go b/internal/praefect/datastore/glsql/postgres_test.go index 33db541df4d16e6a939d99fd642dd488c7aa9afd..5afd35abddddd6464e0b118476f6b711f891d40b 100644 --- a/internal/praefect/datastore/glsql/postgres_test.go +++ b/internal/praefect/datastore/glsql/postgres_test.go @@ -14,8 +14,8 @@ import ( "github.com/sirupsen/logrus" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestOpenDB(t *testing.T) { diff --git a/internal/praefect/datastore/glsql/testing.go b/internal/praefect/datastore/glsql/testing.go index 44a1e02f9b5b59fc733837ba64c7eabe56d90127..41294b6e88a47c6556c232bffe5938e5be5812bb 100644 --- a/internal/praefect/datastore/glsql/testing.go +++ b/internal/praefect/datastore/glsql/testing.go @@ -12,7 +12,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" ) var ( diff --git a/internal/praefect/datastore/init_test.go b/internal/praefect/datastore/init_test.go index a9601791fae518f93454d779f02feb95d28c90e9..5ec6e04a35b882ff909ec5d4e21c7ef60befc83a 100644 --- a/internal/praefect/datastore/init_test.go +++ b/internal/praefect/datastore/init_test.go @@ -7,8 +7,8 @@ import ( "os" "testing" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore/glsql" ) func TestMain(m *testing.M) { diff --git a/internal/praefect/datastore/memory.go b/internal/praefect/datastore/memory.go index b9994f38ccaa8315d32a9fc015e5b9d5ec7062c9..3bd08eb0151f0d22fdc266eeea277e49f4f80e3b 100644 --- a/internal/praefect/datastore/memory.go +++ b/internal/praefect/datastore/memory.go @@ -9,7 +9,7 @@ import ( "sync" "time" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" ) var ( diff --git a/internal/praefect/datastore/memory_test.go b/internal/praefect/datastore/memory_test.go index e707fed08bc493b8e0f75fdc3d4e0e4720ebedfc..955dbf1dc70eb45b54effcda7d40d8299d4b6d15 100644 --- a/internal/praefect/datastore/memory_test.go +++ b/internal/praefect/datastore/memory_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestMemoryReplicationEventQueue(t *testing.T) { diff --git a/internal/praefect/datastore/postgres.go b/internal/praefect/datastore/postgres.go index 8e6d1744d3bc08c905c473c2ee65dd1168670f7a..ac44529e2b7a5baab915fdc45b2d5cfd5c9eba15 100644 --- a/internal/praefect/datastore/postgres.go +++ b/internal/praefect/datastore/postgres.go @@ -7,9 +7,9 @@ import ( "time" migrate "github.com/rubenv/sql-migrate" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore/glsql" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore/migrations" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore/migrations" ) // MigrationStatusRow represents an entry in the schema migrations table. diff --git a/internal/praefect/datastore/postgres_test.go b/internal/praefect/datastore/postgres_test.go index c23c84af694bbf6df9b33559373eab007ef14cad..b561b70ebd318dfc412427e9ec19d007618afa9a 100644 --- a/internal/praefect/datastore/postgres_test.go +++ b/internal/praefect/datastore/postgres_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" ) func TestMigrateStatus(t *testing.T) { diff --git a/internal/praefect/datastore/queue.go b/internal/praefect/datastore/queue.go index 1899a7bee9c60bd3aadfc622681b956b75257002..829f341ed840e699657318083726ae0ee1f9a23f 100644 --- a/internal/praefect/datastore/queue.go +++ b/internal/praefect/datastore/queue.go @@ -10,7 +10,7 @@ import ( "time" "github.com/lib/pq" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore/glsql" ) // ReplicationEventQueue allows to put new events to the persistent queue and retrieve them back. diff --git a/internal/praefect/datastore/queue_bm_test.go b/internal/praefect/datastore/queue_bm_test.go index f3984bf16a5001fb01efde844c997ac3a6a29d6b..98be178daa50a5cc28c33d08f133eb521b1c298b 100644 --- a/internal/praefect/datastore/queue_bm_test.go +++ b/internal/praefect/datastore/queue_bm_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func BenchmarkPostgresReplicationEventQueue_Acknowledge(b *testing.B) { diff --git a/internal/praefect/datastore/queue_test.go b/internal/praefect/datastore/queue_test.go index de0a53af65ed430f5beda183fbed60760bb59e1f..5c5b6c81c991d7e3c6082c6eb02b5ec5f455c6ec 100644 --- a/internal/praefect/datastore/queue_test.go +++ b/internal/praefect/datastore/queue_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore/glsql" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestPostgresReplicationEventQueue_Enqueue(t *testing.T) { diff --git a/internal/praefect/datastore/repository_memory_test.go b/internal/praefect/datastore/repository_memory_test.go index 161b63d4d0dfdcb723a532eb5f84c0dbb4682934..84aa38954cc2a0e3a0c6f73d57addc5268da43b8 100644 --- a/internal/praefect/datastore/repository_memory_test.go +++ b/internal/praefect/datastore/repository_memory_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) type requireState func(t *testing.T, ctx context.Context, vss virtualStorageState, ss storageState) diff --git a/internal/praefect/datastore/repository_postgres.go b/internal/praefect/datastore/repository_postgres.go index e00974f3b38d9708b6eee1a3c1b748a85d17212a..42d92d645686fefb0c54212ffd07dbede8ab9108 100644 --- a/internal/praefect/datastore/repository_postgres.go +++ b/internal/praefect/datastore/repository_postgres.go @@ -7,7 +7,7 @@ import ( "fmt" "github.com/lib/pq" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore/glsql" ) // GenerationUnknown is used to indicate lack of generation number in diff --git a/internal/praefect/datastore/repository_postgres_bm_test.go b/internal/praefect/datastore/repository_postgres_bm_test.go index 7c8647609e896454334d63ead5507e174017cb36..093a64f311d6b629a4cf8ad0ac6c3115aa6380be 100644 --- a/internal/praefect/datastore/repository_postgres_bm_test.go +++ b/internal/praefect/datastore/repository_postgres_bm_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) // The test setup takes a lot of time, so it is better to run each sub-benchmark separately with limit on number of repeats. diff --git a/internal/praefect/grpc-proxy/proxy/examples_test.go b/internal/praefect/grpc-proxy/proxy/examples_test.go index eb5508de54b798be0e6b26c273497467cb14ad09..ee8ab07152850c6f5b5e5b9094eea4b2dd9e5c19 100644 --- a/internal/praefect/grpc-proxy/proxy/examples_test.go +++ b/internal/praefect/grpc-proxy/proxy/examples_test.go @@ -11,8 +11,8 @@ import ( "context" "strings" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/praefect/grpc-proxy/proxy" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/grpc-proxy/proxy" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" diff --git a/internal/praefect/grpc-proxy/proxy/handler.go b/internal/praefect/grpc-proxy/proxy/handler.go index 73730b2c7a49b5a2c063060d19d4c2f9fd81a72e..eb76136dff20c4ea74a3af45f02fe629b9293d91 100644 --- a/internal/praefect/grpc-proxy/proxy/handler.go +++ b/internal/praefect/grpc-proxy/proxy/handler.go @@ -12,7 +12,7 @@ import ( "errors" "io" - "gitlab.com/gitlab-org/gitaly/internal/middleware/sentryhandler" + "gitlab.com/gitlab-org/gitaly/v13/internal/middleware/sentryhandler" "golang.org/x/sync/errgroup" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/internal/praefect/grpc-proxy/proxy/handler_test.go b/internal/praefect/grpc-proxy/proxy/handler_test.go index f9ef180a17ceed698e328552e800d71ab3ce398d..51a496328dc8dc04480054f3e92e91d712ec733b 100644 --- a/internal/praefect/grpc-proxy/proxy/handler_test.go +++ b/internal/praefect/grpc-proxy/proxy/handler_test.go @@ -24,13 +24,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - "gitlab.com/gitlab-org/gitaly/client" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/helper/fieldextractors" - "gitlab.com/gitlab-org/gitaly/internal/middleware/sentryhandler" - "gitlab.com/gitlab-org/gitaly/internal/praefect/grpc-proxy/proxy" - pb "gitlab.com/gitlab-org/gitaly/internal/praefect/grpc-proxy/testdata" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/client" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/fieldextractors" + "gitlab.com/gitlab-org/gitaly/v13/internal/middleware/sentryhandler" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/grpc-proxy/proxy" + pb "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/grpc-proxy/testdata" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/grpclog" diff --git a/internal/praefect/grpc-proxy/proxy/helper_test.go b/internal/praefect/grpc-proxy/proxy/helper_test.go index c240f8d71b610cd0c61eaac1f8d23c47448196b2..4e75134a15321c37b81720dc2968bc5d4177b924 100644 --- a/internal/praefect/grpc-proxy/proxy/helper_test.go +++ b/internal/praefect/grpc-proxy/proxy/helper_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/praefect/grpc-proxy/proxy" - testservice "gitlab.com/gitlab-org/gitaly/internal/praefect/grpc-proxy/testdata" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/grpc-proxy/proxy" + testservice "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/grpc-proxy/testdata" "google.golang.org/grpc" ) diff --git a/internal/praefect/grpc-proxy/proxy/peeker_test.go b/internal/praefect/grpc-proxy/proxy/peeker_test.go index 38565da00017f059cb955c09917b74f3a15f50d7..16e1e08f59790d2f6d3a3d028f07f1287153490b 100644 --- a/internal/praefect/grpc-proxy/proxy/peeker_test.go +++ b/internal/praefect/grpc-proxy/proxy/peeker_test.go @@ -9,10 +9,10 @@ import ( "github.com/golang/protobuf/proto" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/praefect/grpc-proxy/proxy" - testservice "gitlab.com/gitlab-org/gitaly/internal/praefect/grpc-proxy/testdata" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/grpc-proxy/proxy" + testservice "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/grpc-proxy/testdata" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) // TestStreamPeeking demonstrates that a director function is able to peek diff --git a/internal/praefect/helper_test.go b/internal/praefect/helper_test.go index 499df18d82ea55c89e6a7c2f10729134e70efec9..9bd39737c61c4b3b01f12546761acfcded206609 100644 --- a/internal/praefect/helper_test.go +++ b/internal/praefect/helper_test.go @@ -10,24 +10,24 @@ import ( "github.com/golang/protobuf/protoc-gen-go/descriptor" "github.com/sirupsen/logrus" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/client" - gconfig "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - internalauth "gitlab.com/gitlab-org/gitaly/internal/gitaly/config/auth" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/server/auth" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/internalgitaly" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/repository" - gitalyserver "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/server" - "gitlab.com/gitlab-org/gitaly/internal/log" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/internal/praefect/grpc-proxy/proxy" - "gitlab.com/gitlab-org/gitaly/internal/praefect/mock" - "gitlab.com/gitlab-org/gitaly/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/internal/praefect/protoregistry" - "gitlab.com/gitlab-org/gitaly/internal/praefect/transactions" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper/promtest" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/client" + gconfig "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + internalauth "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config/auth" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/server/auth" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/internalgitaly" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/repository" + gitalyserver "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/server" + "gitlab.com/gitlab-org/gitaly/v13/internal/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/grpc-proxy/proxy" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/mock" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/protoregistry" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/transactions" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper/promtest" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" correlation "gitlab.com/gitlab-org/labkit/correlation/grpc" "google.golang.org/grpc" "google.golang.org/grpc/health" diff --git a/internal/praefect/info_service_test.go b/internal/praefect/info_service_test.go index 8d59575bdbb2da4522657aa75c62b41f479ec6ed..09f2e68a43fe3a53c349eb406298f4ffd2ba161e 100644 --- a/internal/praefect/info_service_test.go +++ b/internal/praefect/info_service_test.go @@ -6,10 +6,10 @@ import ( "testing" "github.com/stretchr/testify/require" - gconfig "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + gconfig "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func TestInfoService_RepositoryReplicas(t *testing.T) { diff --git a/internal/praefect/metadata/server.go b/internal/praefect/metadata/server.go index fa6c36bde32c7986921c771a05c3e68406345603..309f14dd2fd9dd5a80cdae293514418254d5c6f5 100644 --- a/internal/praefect/metadata/server.go +++ b/internal/praefect/metadata/server.go @@ -10,8 +10,8 @@ import ( "net/url" "strings" - "gitlab.com/gitlab-org/gitaly/internal/bootstrap/starter" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/bootstrap/starter" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" "google.golang.org/grpc/credentials" "google.golang.org/grpc/metadata" "google.golang.org/grpc/peer" diff --git a/internal/praefect/metadata/server_test.go b/internal/praefect/metadata/server_test.go index 44ab3af2b4cc34a6bf9b5bd92f8fd9e6265c20fd..5713a0e92e0aa1902953173988674f5bb1899c79 100644 --- a/internal/praefect/metadata/server_test.go +++ b/internal/praefect/metadata/server_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" "google.golang.org/grpc/credentials" "google.golang.org/grpc/peer" ) diff --git a/internal/praefect/metrics/prometheus.go b/internal/praefect/metrics/prometheus.go index 1c366fe93a2ff4f58f25741b8a1af58b297aa609..bd0bae91c1f574f3d083e4f09c0a3e9126482e58 100644 --- a/internal/praefect/metrics/prometheus.go +++ b/internal/praefect/metrics/prometheus.go @@ -2,8 +2,8 @@ package metrics import ( "github.com/prometheus/client_golang/prometheus" - promconfig "gitlab.com/gitlab-org/gitaly/internal/gitaly/config/prometheus" - "gitlab.com/gitlab-org/gitaly/internal/prometheus/metrics" + promconfig "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config/prometheus" + "gitlab.com/gitlab-org/gitaly/v13/internal/prometheus/metrics" ) // RegisterReplicationDelay creates and registers a prometheus histogram diff --git a/internal/praefect/middleware/errorhandler.go b/internal/praefect/middleware/errorhandler.go index 5339419a513af1547683baa7b2f0b5a983208b60..2644dabd72ab5f07869ccbedd459480bef2155fd 100644 --- a/internal/praefect/middleware/errorhandler.go +++ b/internal/praefect/middleware/errorhandler.go @@ -5,8 +5,8 @@ import ( "fmt" "io" - "gitlab.com/gitlab-org/gitaly/internal/praefect/nodes/tracker" - "gitlab.com/gitlab-org/gitaly/internal/praefect/protoregistry" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/nodes/tracker" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/protoregistry" "google.golang.org/grpc" ) diff --git a/internal/praefect/middleware/errorhandler_test.go b/internal/praefect/middleware/errorhandler_test.go index 490c4a99d3ca2c7d1916e91aedd277f0c26390d7..91ecbf172e703d4070ea2ca37d89eaff301b1d70 100644 --- a/internal/praefect/middleware/errorhandler_test.go +++ b/internal/praefect/middleware/errorhandler_test.go @@ -10,12 +10,12 @@ import ( "github.com/golang/protobuf/ptypes/empty" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/praefect/grpc-proxy/proxy" - "gitlab.com/gitlab-org/gitaly/internal/praefect/mock" - "gitlab.com/gitlab-org/gitaly/internal/praefect/nodes/tracker" - "gitlab.com/gitlab-org/gitaly/internal/praefect/protoregistry" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/grpc-proxy/proxy" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/mock" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/nodes/tracker" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/protoregistry" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" "google.golang.org/grpc" ) diff --git a/internal/praefect/middleware/methodtype.go b/internal/praefect/middleware/methodtype.go index c8a980dc090a6aae6b8efe50622b1373c42e281b..0e68f37310be4fd15e104181547a83f20676cc4b 100644 --- a/internal/praefect/middleware/methodtype.go +++ b/internal/praefect/middleware/methodtype.go @@ -4,8 +4,8 @@ import ( "context" "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/praefect/metrics" - "gitlab.com/gitlab-org/gitaly/internal/praefect/protoregistry" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/metrics" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/protoregistry" "google.golang.org/grpc" ) diff --git a/internal/praefect/mock/mock.pb.go b/internal/praefect/mock/mock.pb.go index 6f66b292bc5136e528687090542e247b4716bfef..e424fe10bdf1452a448a0b9f950fb4a8bc9d1b0b 100644 --- a/internal/praefect/mock/mock.pb.go +++ b/internal/praefect/mock/mock.pb.go @@ -10,7 +10,7 @@ import ( proto "github.com/golang/protobuf/proto" empty "github.com/golang/protobuf/ptypes/empty" - gitalypb "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + gitalypb "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/internal/praefect/mocksvc_test.go b/internal/praefect/mocksvc_test.go index e7b1c12579a8870d5e2bfb878e0e516685c9d522..5d4745ca1e48993a84dc308f3b0d465d20a84695 100644 --- a/internal/praefect/mocksvc_test.go +++ b/internal/praefect/mocksvc_test.go @@ -4,7 +4,7 @@ import ( "context" "github.com/golang/protobuf/ptypes/empty" - "gitlab.com/gitlab-org/gitaly/internal/praefect/mock" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/mock" ) type ( diff --git a/internal/praefect/nodes/disabled_elector.go b/internal/praefect/nodes/disabled_elector.go index 5464a8fd0dad5e43c03da01d19e7459160862b53..a85bc0249f8941b65933e06b5cf6fff8fa62fe3b 100644 --- a/internal/praefect/nodes/disabled_elector.go +++ b/internal/praefect/nodes/disabled_elector.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "gitlab.com/gitlab-org/gitaly/internal/praefect/metrics" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/metrics" ) // newDisabledElector returns a stub that always returns the same shard where the diff --git a/internal/praefect/nodes/health_manager.go b/internal/praefect/nodes/health_manager.go index 1e37beb81147d11e61be1426c7bef5edb647cdd4..a14f2bfe7478338e4bb4e551131407e267194171 100644 --- a/internal/praefect/nodes/health_manager.go +++ b/internal/praefect/nodes/health_manager.go @@ -9,8 +9,8 @@ import ( "github.com/lib/pq" "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore/glsql" "google.golang.org/grpc/health/grpc_health_v1" ) diff --git a/internal/praefect/nodes/health_manager_test.go b/internal/praefect/nodes/health_manager_test.go index 4e4a94b64414cd2a3d381948bb5cf718c53c63bc..a386c39d4153e243fd764bd669043be23c2f5825 100644 --- a/internal/praefect/nodes/health_manager_test.go +++ b/internal/praefect/nodes/health_manager_test.go @@ -8,9 +8,9 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore/glsql" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" "google.golang.org/grpc" "google.golang.org/grpc/health/grpc_health_v1" ) diff --git a/internal/praefect/nodes/init_test.go b/internal/praefect/nodes/init_test.go index 70c50dd305f5333917888a8a49979488d5e9e25c..3ce74a0fdf7ca7e7c2f79dc5b2af05fc1ca712c6 100644 --- a/internal/praefect/nodes/init_test.go +++ b/internal/praefect/nodes/init_test.go @@ -7,7 +7,7 @@ import ( "os" "testing" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore/glsql" ) func TestMain(m *testing.M) { diff --git a/internal/praefect/nodes/local_elector.go b/internal/praefect/nodes/local_elector.go index e72b47cdaf6842b36f859291d08b082b757db1cf..32756ab1880a5139e122e4ab3c08d39698aec978 100644 --- a/internal/praefect/nodes/local_elector.go +++ b/internal/praefect/nodes/local_elector.go @@ -6,7 +6,7 @@ import ( "time" "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/praefect/metrics" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/metrics" ) // localElector relies on an in-memory datastore to track the primary diff --git a/internal/praefect/nodes/local_elector_test.go b/internal/praefect/nodes/local_elector_test.go index 766f880a19d22ee08d63b5e2ef84ac8c3e6da933..6348cdd3cfb47e1f1dca7ca4ed464b9b2e2f4f08 100644 --- a/internal/praefect/nodes/local_elector_test.go +++ b/internal/praefect/nodes/local_elector_test.go @@ -6,9 +6,9 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper/promtest" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper/promtest" "google.golang.org/grpc" ) diff --git a/internal/praefect/nodes/manager.go b/internal/praefect/nodes/manager.go index 20c50201c50f7ea592ad79c8e6eb51ed58e12ddd..c08c18133d5d709cd5c472ac72399a1221afc635 100644 --- a/internal/praefect/nodes/manager.go +++ b/internal/praefect/nodes/manager.go @@ -12,17 +12,17 @@ import ( "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" "github.com/sirupsen/logrus" - gitalyauth "gitlab.com/gitlab-org/gitaly/auth" - "gitlab.com/gitlab-org/gitaly/client" - "gitlab.com/gitlab-org/gitaly/internal/metadata/featureflag" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/internal/praefect/grpc-proxy/proxy" - "gitlab.com/gitlab-org/gitaly/internal/praefect/metrics" - "gitlab.com/gitlab-org/gitaly/internal/praefect/middleware" - "gitlab.com/gitlab-org/gitaly/internal/praefect/nodes/tracker" - "gitlab.com/gitlab-org/gitaly/internal/praefect/protoregistry" - prommetrics "gitlab.com/gitlab-org/gitaly/internal/prometheus/metrics" + gitalyauth "gitlab.com/gitlab-org/gitaly/v13/auth" + "gitlab.com/gitlab-org/gitaly/v13/client" + "gitlab.com/gitlab-org/gitaly/v13/internal/metadata/featureflag" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/grpc-proxy/proxy" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/metrics" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/middleware" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/nodes/tracker" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/protoregistry" + prommetrics "gitlab.com/gitlab-org/gitaly/v13/internal/prometheus/metrics" "google.golang.org/grpc" healthpb "google.golang.org/grpc/health/grpc_health_v1" ) diff --git a/internal/praefect/nodes/manager_test.go b/internal/praefect/nodes/manager_test.go index 3da9f2b5700a52f1fc9d68853b8bff77c1bcd934..f892ec5f5cfcdf77a158fa9e4f9603dbc983b444 100644 --- a/internal/praefect/nodes/manager_test.go +++ b/internal/praefect/nodes/manager_test.go @@ -9,12 +9,12 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/client" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/internal/praefect/protoregistry" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper/promtest" + "gitlab.com/gitlab-org/gitaly/v13/client" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/protoregistry" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper/promtest" "google.golang.org/grpc" "google.golang.org/grpc/health" "google.golang.org/grpc/health/grpc_health_v1" diff --git a/internal/praefect/nodes/sql_elector.go b/internal/praefect/nodes/sql_elector.go index f5dbd1c9e5fb99cac5aff76deab8cfa4ad41d90d..3feddf9acf89718135e5f29f0a8df6f5bc190adb 100644 --- a/internal/praefect/nodes/sql_elector.go +++ b/internal/praefect/nodes/sql_elector.go @@ -13,8 +13,8 @@ import ( "github.com/google/uuid" "github.com/lib/pq" "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/internal/praefect/metrics" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/metrics" ) const ( diff --git a/internal/praefect/nodes/sql_elector_test.go b/internal/praefect/nodes/sql_elector_test.go index f942f2ff7283feb53b9927ea2e4e281a5add4de9..ba51587ab1ef0a7e70a07872abddca15fe5555ff 100644 --- a/internal/praefect/nodes/sql_elector_test.go +++ b/internal/praefect/nodes/sql_elector_test.go @@ -8,10 +8,10 @@ import ( "github.com/sirupsen/logrus/hooks/test" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore/glsql" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper/promtest" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper/promtest" "google.golang.org/grpc" "google.golang.org/grpc/health/grpc_health_v1" ) diff --git a/internal/praefect/nodes/tracker/errors_test.go b/internal/praefect/nodes/tracker/errors_test.go index 95b4a3ab9f49e64be66739bf9ce81895c359f71f..59b1317c436fec0c7e22c1fb5abc34adbd76eaba 100644 --- a/internal/praefect/nodes/tracker/errors_test.go +++ b/internal/praefect/nodes/tracker/errors_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestErrorTracker_IncrErrors(t *testing.T) { diff --git a/internal/praefect/protoregistry/find_oid.go b/internal/praefect/protoregistry/find_oid.go index abc87ccb0cbe299efabeb09b98261f471090f510..b50463310f2dfb1411e0ae536388f774e794563f 100644 --- a/internal/praefect/protoregistry/find_oid.go +++ b/internal/praefect/protoregistry/find_oid.go @@ -8,7 +8,7 @@ import ( "strconv" "github.com/golang/protobuf/proto" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) const ( diff --git a/internal/praefect/protoregistry/find_oid_test.go b/internal/praefect/protoregistry/find_oid_test.go index a040bb17bf298e7ed9e7ac5dd298218ace091f36..c1efa92f0fe274dd9469ec9b0caa05a9d488784c 100644 --- a/internal/praefect/protoregistry/find_oid_test.go +++ b/internal/praefect/protoregistry/find_oid_test.go @@ -7,8 +7,8 @@ import ( "github.com/golang/protobuf/proto" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/praefect/protoregistry" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/protoregistry" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func TestProtoRegistryTargetRepo(t *testing.T) { diff --git a/internal/praefect/protoregistry/protoregistry.go b/internal/praefect/protoregistry/protoregistry.go index 62fc906f9af7e9d6c1b07f49753dcb5be3f3a7cf..4c7bfa598d06628c9ea8cd51e6798622fbd09e72 100644 --- a/internal/praefect/protoregistry/protoregistry.go +++ b/internal/praefect/protoregistry/protoregistry.go @@ -10,8 +10,8 @@ import ( "github.com/golang/protobuf/proto" "github.com/golang/protobuf/protoc-gen-go/descriptor" - "gitlab.com/gitlab-org/gitaly/internal/protoutil" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/protoutil" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) // GitalyProtoFileDescriptors is a slice of all gitaly registered file descriptors diff --git a/internal/praefect/protoregistry/protoregistry_test.go b/internal/praefect/protoregistry/protoregistry_test.go index df787440409f69691d498970f66920c899d1e24f..c4705a29df4d81e6995bcece95f5e336e362474f 100644 --- a/internal/praefect/protoregistry/protoregistry_test.go +++ b/internal/praefect/protoregistry/protoregistry_test.go @@ -6,9 +6,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/praefect/protoregistry" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/protoregistry" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func TestNewProtoRegistry(t *testing.T) { diff --git a/internal/praefect/reconciler/reconciler.go b/internal/praefect/reconciler/reconciler.go index ec084cc6fe90f95cc71ba13584dbcf97d2970f36..cb745077f0c00a13da85c61232076b778a34caf1 100644 --- a/internal/praefect/reconciler/reconciler.go +++ b/internal/praefect/reconciler/reconciler.go @@ -7,9 +7,9 @@ import ( "github.com/lib/pq" "github.com/prometheus/client_golang/prometheus" "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore/glsql" - "gitlab.com/gitlab-org/gitaly/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/nodes" ) // Reconciler implements reconciliation logic for repairing outdated repository replicas. diff --git a/internal/praefect/reconciler/reconciler_benchmark_test.go b/internal/praefect/reconciler/reconciler_benchmark_test.go index 7ee0b12176ae30d85ac87fcd6991b1545a39c226..34feb9f2a2b524939bb73960dc77c17adf820149 100644 --- a/internal/praefect/reconciler/reconciler_benchmark_test.go +++ b/internal/praefect/reconciler/reconciler_benchmark_test.go @@ -8,8 +8,8 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func BenchmarkReconcile(b *testing.B) { diff --git a/internal/praefect/reconciler/reconciler_test.go b/internal/praefect/reconciler/reconciler_test.go index 320967ed4a4ea0db1ebc6f37b18ef978786d8652..32d45bbb8e741ad0adc7d862b7f723e7b3ef4f40 100644 --- a/internal/praefect/reconciler/reconciler_test.go +++ b/internal/praefect/reconciler/reconciler_test.go @@ -10,12 +10,12 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/middleware/metadatahandler" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore/glsql" - "gitlab.com/gitlab-org/gitaly/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/middleware/metadatahandler" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/praefect/replicator.go b/internal/praefect/replicator.go index ab56c5d07cf0183649167a6679631dc23509f475..974805614dec8a6958761872d22a2bc500df8fc6 100644 --- a/internal/praefect/replicator.go +++ b/internal/praefect/replicator.go @@ -8,14 +8,14 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/middleware/metadatahandler" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/internal/praefect/metrics" - "gitlab.com/gitlab-org/gitaly/internal/praefect/nodes" - prommetrics "gitlab.com/gitlab-org/gitaly/internal/prometheus/metrics" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/middleware/metadatahandler" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/metrics" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/nodes" + prommetrics "gitlab.com/gitlab-org/gitaly/v13/internal/prometheus/metrics" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "gitlab.com/gitlab-org/labkit/correlation" "golang.org/x/sync/errgroup" "google.golang.org/grpc" diff --git a/internal/praefect/replicator_test.go b/internal/praefect/replicator_test.go index 994c51f69bdd8a493ed654add706207ec2cbb1c8..b16e24f7f2845f5793ac921f3e153da39aab4296 100644 --- a/internal/praefect/replicator_test.go +++ b/internal/praefect/replicator_test.go @@ -18,27 +18,27 @@ import ( "github.com/sirupsen/logrus/hooks/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - gitalyauth "gitlab.com/gitlab-org/gitaly/auth" - "gitlab.com/gitlab-org/gitaly/internal/git/objectpool" - gitaly_config "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - serverPkg "gitlab.com/gitlab-org/gitaly/internal/gitaly/server" - objectpoolservice "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/objectpool" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/ref" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/remote" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/repository" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/ssh" - "gitlab.com/gitlab-org/gitaly/internal/middleware/metadatahandler" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/internal/praefect/protoregistry" - "gitlab.com/gitlab-org/gitaly/internal/praefect/transactions" - "gitlab.com/gitlab-org/gitaly/internal/storage" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper/promtest" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + gitalyauth "gitlab.com/gitlab-org/gitaly/v13/auth" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/objectpool" + gitaly_config "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + serverPkg "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/server" + objectpoolservice "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/objectpool" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/ref" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/remote" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/repository" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/ssh" + "gitlab.com/gitlab-org/gitaly/v13/internal/middleware/metadatahandler" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/protoregistry" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/transactions" + "gitlab.com/gitlab-org/gitaly/v13/internal/storage" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper/promtest" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "gitlab.com/gitlab-org/labkit/correlation" "google.golang.org/grpc" "google.golang.org/grpc/health" diff --git a/internal/praefect/router.go b/internal/praefect/router.go index 29513d67ae3db0d18c8bb3443e14100181b0068a..fa7903ccd0610a353351baf0b8699503651c860c 100644 --- a/internal/praefect/router.go +++ b/internal/praefect/router.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/nodes" "google.golang.org/grpc" ) diff --git a/internal/praefect/server.go b/internal/praefect/server.go index ea263b6025fed549ad34c16c6e444d1e6f8aab0c..5572e38f4c10bfb04aefaa21c6d57ded08a0164f 100644 --- a/internal/praefect/server.go +++ b/internal/praefect/server.go @@ -10,23 +10,23 @@ import ( grpc_ctxtags "github.com/grpc-ecosystem/go-grpc-middleware/tags" grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/server/auth" - "gitlab.com/gitlab-org/gitaly/internal/helper/fieldextractors" - "gitlab.com/gitlab-org/gitaly/internal/middleware/cancelhandler" - "gitlab.com/gitlab-org/gitaly/internal/middleware/metadatahandler" - "gitlab.com/gitlab-org/gitaly/internal/middleware/panichandler" - "gitlab.com/gitlab-org/gitaly/internal/middleware/sentryhandler" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/internal/praefect/grpc-proxy/proxy" - "gitlab.com/gitlab-org/gitaly/internal/praefect/middleware" - "gitlab.com/gitlab-org/gitaly/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/internal/praefect/protoregistry" - "gitlab.com/gitlab-org/gitaly/internal/praefect/service/info" - "gitlab.com/gitlab-org/gitaly/internal/praefect/service/server" - "gitlab.com/gitlab-org/gitaly/internal/praefect/service/transaction" - "gitlab.com/gitlab-org/gitaly/internal/praefect/transactions" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/server/auth" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/fieldextractors" + "gitlab.com/gitlab-org/gitaly/v13/internal/middleware/cancelhandler" + "gitlab.com/gitlab-org/gitaly/v13/internal/middleware/metadatahandler" + "gitlab.com/gitlab-org/gitaly/v13/internal/middleware/panichandler" + "gitlab.com/gitlab-org/gitaly/v13/internal/middleware/sentryhandler" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/grpc-proxy/proxy" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/middleware" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/protoregistry" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/service/info" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/service/server" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/service/transaction" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/transactions" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" grpccorrelation "gitlab.com/gitlab-org/labkit/correlation/grpc" grpctracing "gitlab.com/gitlab-org/labkit/tracing/grpc" "google.golang.org/grpc" diff --git a/internal/praefect/server_factory.go b/internal/praefect/server_factory.go index 568997089adfcedc80adbede551dae8b481a9866..d579723be596c65e4573ff6aa94f132a24296319 100644 --- a/internal/praefect/server_factory.go +++ b/internal/praefect/server_factory.go @@ -7,12 +7,12 @@ import ( "sync" "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/internal/praefect/grpc-proxy/proxy" - "gitlab.com/gitlab-org/gitaly/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/internal/praefect/protoregistry" - "gitlab.com/gitlab-org/gitaly/internal/praefect/transactions" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/grpc-proxy/proxy" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/protoregistry" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/transactions" "google.golang.org/grpc" "google.golang.org/grpc/credentials" ) diff --git a/internal/praefect/server_factory_test.go b/internal/praefect/server_factory_test.go index 5c57aaef27be40dd95bb159a8348524aeb860b25..bf7aae6fcb33ad92567c495fbe6f7f79827a93a6 100644 --- a/internal/praefect/server_factory_test.go +++ b/internal/praefect/server_factory_test.go @@ -10,19 +10,19 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/client" - "gitlab.com/gitlab-org/gitaly/internal/bootstrap/starter" - gconfig "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/server" - "gitlab.com/gitlab-org/gitaly/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/internal/praefect/protoregistry" - "gitlab.com/gitlab-org/gitaly/internal/praefect/transactions" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper/promtest" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/client" + "gitlab.com/gitlab-org/gitaly/v13/internal/bootstrap/starter" + gconfig "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/server" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/protoregistry" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/transactions" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper/promtest" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/credentials" healthpb "google.golang.org/grpc/health/grpc_health_v1" diff --git a/internal/praefect/server_test.go b/internal/praefect/server_test.go index bf6de086e5a9a56d35179839c4b66f27c7833675..e96675ae76ee1e463fa31c09efa1829fe27922ad 100644 --- a/internal/praefect/server_test.go +++ b/internal/praefect/server_test.go @@ -21,23 +21,23 @@ import ( "github.com/sirupsen/logrus/hooks/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git" - gconfig "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/internal/praefect/grpc-proxy/proxy" - "gitlab.com/gitlab-org/gitaly/internal/praefect/metadata" - "gitlab.com/gitlab-org/gitaly/internal/praefect/mock" - "gitlab.com/gitlab-org/gitaly/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/internal/praefect/nodes/tracker" - "gitlab.com/gitlab-org/gitaly/internal/praefect/protoregistry" - "gitlab.com/gitlab-org/gitaly/internal/praefect/transactions" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper/promtest" - "gitlab.com/gitlab-org/gitaly/internal/version" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + gconfig "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/grpc-proxy/proxy" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/metadata" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/mock" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/nodes/tracker" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/protoregistry" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/transactions" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper/promtest" + "gitlab.com/gitlab-org/gitaly/v13/internal/version" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/health" diff --git a/internal/praefect/service/info/consistencycheck.go b/internal/praefect/service/info/consistencycheck.go index 24510db79f31b7de1914e57cf20b343b6d218655..6b55996a9073934e1843bc1426c355f1dfe1a1b2 100644 --- a/internal/praefect/service/info/consistencycheck.go +++ b/internal/praefect/service/info/consistencycheck.go @@ -4,10 +4,10 @@ import ( "context" "io" - "gitlab.com/gitlab-org/gitaly/internal/middleware/metadatahandler" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/middleware/metadatahandler" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "gitlab.com/gitlab-org/labkit/correlation" "golang.org/x/sync/errgroup" "google.golang.org/grpc/codes" diff --git a/internal/praefect/service/info/dataloss.go b/internal/praefect/service/info/dataloss.go index cf657685fa149736e6592ab25ffd0b61e2fe10a0..b1ede1ab236b3e74e613c37b0b399672da677231 100644 --- a/internal/praefect/service/info/dataloss.go +++ b/internal/praefect/service/info/dataloss.go @@ -4,7 +4,7 @@ import ( "context" "sort" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func (s *Server) DatalossCheck(ctx context.Context, req *gitalypb.DatalossCheckRequest) (*gitalypb.DatalossCheckResponse, error) { diff --git a/internal/praefect/service/info/repositories.go b/internal/praefect/service/info/repositories.go index ec6e3ba6680c0642e40bd96f3f11bd1d0575da4f..67572b310ccea93040a4004f7757fa29dda9d593 100644 --- a/internal/praefect/service/info/repositories.go +++ b/internal/praefect/service/info/repositories.go @@ -3,9 +3,9 @@ package info import ( "context" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "golang.org/x/sync/errgroup" "google.golang.org/grpc" ) diff --git a/internal/praefect/service/info/server.go b/internal/praefect/service/info/server.go index 9a812a4d1769d5962f30a7982cc3215ca925cb20..c9037484a03cad255cec9b23a000186e810aace9 100644 --- a/internal/praefect/service/info/server.go +++ b/internal/praefect/service/info/server.go @@ -3,11 +3,11 @@ package info import ( "context" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) // Server is a InfoService server diff --git a/internal/praefect/service/server/disk_stats.go b/internal/praefect/service/server/disk_stats.go index 607bf334f7d6ba55f6b99c6f179618632d6f3e70..f5aee991daf12617316c22202aa0f7c45e325bf4 100644 --- a/internal/praefect/service/server/disk_stats.go +++ b/internal/praefect/service/server/disk_stats.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) // DiskStatistics sends DiskStatisticsRequest to all of a praefect server's internal gitaly nodes and aggregates the diff --git a/internal/praefect/service/server/info.go b/internal/praefect/service/server/info.go index 30c17374e0b3cc61ff4cded44882eb6a70a99af3..88ba77f4473d7c8166ed48de01d7980457f84c65 100644 --- a/internal/praefect/service/server/info.go +++ b/internal/praefect/service/server/info.go @@ -5,7 +5,7 @@ import ( "sync" "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) // ServerInfo sends ServerInfoRequest to all of a praefect server's internal gitaly nodes and aggregates the results into diff --git a/internal/praefect/service/server/server.go b/internal/praefect/service/server/server.go index 1788307ed5e48f6943449fa47782ab0b3ad49e6d..9e465ea899148332750a3f685fe2b249a47e5072 100644 --- a/internal/praefect/service/server/server.go +++ b/internal/praefect/service/server/server.go @@ -1,9 +1,9 @@ package server import ( - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) // Server is a ServerService server diff --git a/internal/praefect/service/transaction/server.go b/internal/praefect/service/transaction/server.go index 96fd12efd1089ac0b8370ffd53c29b9abccdca3d..675e4d7e643f8e04c99a85d354af562690a4c135 100644 --- a/internal/praefect/service/transaction/server.go +++ b/internal/praefect/service/transaction/server.go @@ -4,9 +4,9 @@ import ( "context" "errors" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/praefect/transactions" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/transactions" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/praefect/transaction_test.go b/internal/praefect/transaction_test.go index 71f5e3bc06a496912c7a645b0fa833117387820e..d04789b6e99988386c00468852e1c40dc1fe098e 100644 --- a/internal/praefect/transaction_test.go +++ b/internal/praefect/transaction_test.go @@ -11,10 +11,10 @@ import ( "github.com/prometheus/client_golang/prometheus/testutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/internal/praefect/transactions" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/transactions" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/internal/praefect/transactions/manager.go b/internal/praefect/transactions/manager.go index b663c4827ded54982a1a845d36ad5cc5afa7a326..c6163de6efe56e1d2f8e33bcf058c23c926cb2bd 100644 --- a/internal/praefect/transactions/manager.go +++ b/internal/praefect/transactions/manager.go @@ -14,7 +14,7 @@ import ( "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" "github.com/prometheus/client_golang/prometheus" "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" ) var ErrNotFound = errors.New("transaction not found") diff --git a/internal/praefect/transactions/transaction_test.go b/internal/praefect/transactions/transaction_test.go index 6a9ff1e5396074d617777d022f86967212dd866b..d92e2bb7d55483b8b11d52b375e3e9bf194253ec 100644 --- a/internal/praefect/transactions/transaction_test.go +++ b/internal/praefect/transactions/transaction_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestTransactionCancellationWithEmptyTransaction(t *testing.T) { diff --git a/internal/praefect/version.go b/internal/praefect/version.go index 25758f35a46d6e7e6824a6582e7a48fefbdae1fd..b82c78d1c7167fead59c3335874e77ff7859fe8b 100644 --- a/internal/praefect/version.go +++ b/internal/praefect/version.go @@ -3,7 +3,7 @@ package praefect import ( "fmt" - "gitlab.com/gitlab-org/gitaly/internal/version" + "gitlab.com/gitlab-org/gitaly/v13/internal/version" ) // GetVersionString returns a standard version header diff --git a/internal/protoutil/extension.go b/internal/protoutil/extension.go index 34e54d50445a398dbf5fb909948b0acd75031a5d..0af823574957c736eb201a79f0f58122fed7de45 100644 --- a/internal/protoutil/extension.go +++ b/internal/protoutil/extension.go @@ -6,7 +6,7 @@ import ( "github.com/golang/protobuf/proto" "github.com/golang/protobuf/protoc-gen-go/descriptor" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) // GetOpExtension gets the OperationMsg from a method descriptor diff --git a/internal/safe/file_writer_test.go b/internal/safe/file_writer_test.go index 308e3eb7a043ebf81796e6a260f357519ef92a5f..be34cc7484ae7f8fd2e9c504e25052d87b93dfeb 100644 --- a/internal/safe/file_writer_test.go +++ b/internal/safe/file_writer_test.go @@ -10,8 +10,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/safe" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/safe" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestFile(t *testing.T) { diff --git a/internal/storage/locator.go b/internal/storage/locator.go index 43fce7f5b139a71674f5efafa2d7ff1166311780..f4366a0d3125f73c4f54bc3ddb906fcfe2910644 100644 --- a/internal/storage/locator.go +++ b/internal/storage/locator.go @@ -6,7 +6,7 @@ import ( "path/filepath" "strings" - "gitlab.com/gitlab-org/gitaly/internal/git/repository" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/repository" ) // Locator allows to get info about location of the repository or storage at the local file system. diff --git a/internal/storage/metadata.go b/internal/storage/metadata.go index 67a84bf18dab2ccc34c5c5c366674a3ce3600c8e..1532f452859eb008de281358c435a052fdf310d7 100644 --- a/internal/storage/metadata.go +++ b/internal/storage/metadata.go @@ -6,7 +6,7 @@ import ( "path/filepath" "github.com/google/uuid" - "gitlab.com/gitlab-org/gitaly/internal/safe" + "gitlab.com/gitlab-org/gitaly/v13/internal/safe" ) const ( diff --git a/internal/stream/std_stream.go b/internal/stream/std_stream.go index a6ba0f0a2679d5f74f56f11e88f13e4786b807f8..e5813d788bec43a3aae7198fbfaf06c289cdcdf2 100644 --- a/internal/stream/std_stream.go +++ b/internal/stream/std_stream.go @@ -4,7 +4,7 @@ import ( "fmt" "io" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) // StdoutStderrResponse is an interface for RPC responses that need to stream stderr and stdout diff --git a/internal/supervisor/monitor.go b/internal/supervisor/monitor.go index a5f609cf6b0638be92aabf4f93bdf1d74af00c3f..860804ca6e6c813a5942b1d838fdedb81c8253df 100644 --- a/internal/supervisor/monitor.go +++ b/internal/supervisor/monitor.go @@ -5,7 +5,7 @@ import ( "github.com/prometheus/client_golang/prometheus" log "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/ps" + "gitlab.com/gitlab-org/gitaly/v13/internal/ps" ) var ( diff --git a/internal/supervisor/supervisor_test.go b/internal/supervisor/supervisor_test.go index 2af3b655fb1c9022f6a78c5986fb307667a06903..f8df9a0993877e8e6f16ed41964cf6ba8f0cc812 100644 --- a/internal/supervisor/supervisor_test.go +++ b/internal/supervisor/supervisor_test.go @@ -14,7 +14,7 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) var ( diff --git a/internal/tempdir/tempdir.go b/internal/tempdir/tempdir.go index 25969efc623f2a47092acd17f641a49841e2c48e..871aa689d7c7261bf486681459045c034c5f74cf 100644 --- a/internal/tempdir/tempdir.go +++ b/internal/tempdir/tempdir.go @@ -10,10 +10,10 @@ import ( "time" log "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/dontpanic" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/helper/housekeeping" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/dontpanic" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/housekeeping" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) const ( diff --git a/internal/tempdir/tempdir_test.go b/internal/tempdir/tempdir_test.go index 37595be8733e517b3cc0a783ea9c8db3e877ac4c..c3acde7cc2d6b1cbae1ad430de41d279f7b42313 100644 --- a/internal/tempdir/tempdir_test.go +++ b/internal/tempdir/tempdir_test.go @@ -9,10 +9,10 @@ import ( "github.com/sirupsen/logrus/hooks/test" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func TestNewAsRepositorySuccess(t *testing.T) { diff --git a/internal/tempdir/testhelper_test.go b/internal/tempdir/testhelper_test.go index acb32d1e35e6a59006adb3b2158bb1b514712a76..fcf37669082fab885fb9d15bf6a31681bb818d5b 100644 --- a/internal/tempdir/testhelper_test.go +++ b/internal/tempdir/testhelper_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/testhelper/commit.go b/internal/testhelper/commit.go index 12cdbf0eebef57c53f1723fba02657e6017f8b3d..c38690543c5bd64cc5ec7b4339bd0e0268cf5fb1 100644 --- a/internal/testhelper/commit.go +++ b/internal/testhelper/commit.go @@ -10,8 +10,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/text" ) // CreateCommitOpts holds extra options for CreateCommit. diff --git a/internal/testhelper/config_test.go b/internal/testhelper/config_test.go index 401f82c870ec887fe97c5af26175ea6ff99741ac..90e64a4ff69a613cb9c6275d674ed7be486fa59c 100644 --- a/internal/testhelper/config_test.go +++ b/internal/testhelper/config_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) var cfgData = ` diff --git a/internal/testhelper/git_protocol.go b/internal/testhelper/git_protocol.go index 0e0a3690a2b5bb52245cd4febfb0991a492662e6..a0f3ea2348157ab73256932df6366e5d9f4fbd32 100644 --- a/internal/testhelper/git_protocol.go +++ b/internal/testhelper/git_protocol.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" ) // EnableGitProtocolV2Support replaces the git binary in config with a diff --git a/internal/testhelper/githttp.go b/internal/testhelper/githttp.go index 106d60461064396995ae4b79e3df8551c8e78e2e..65989dfe622b404fa80600c1e896005ab850c9bf 100644 --- a/internal/testhelper/githttp.go +++ b/internal/testhelper/githttp.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" ) func GitServer(t testing.TB, repoPath string, middleware func(http.ResponseWriter, *http.Request, http.Handler)) (int, func() error) { diff --git a/internal/testhelper/grpc_test.go b/internal/testhelper/grpc_test.go index 6b1272c3f4b335f6e95d206770ef9f591f11e26b..6fa988cbc0737f423c5570f86f45b27d65d9d61a 100644 --- a/internal/testhelper/grpc_test.go +++ b/internal/testhelper/grpc_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" "google.golang.org/grpc" ) diff --git a/internal/testhelper/hook_env.go b/internal/testhelper/hook_env.go index 6960c924e18ac835b01a972617ca26f96139e696..5727a33b71ffc12400dd6a4d4205015627818423 100644 --- a/internal/testhelper/hook_env.go +++ b/internal/testhelper/hook_env.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git/hooks" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/hooks" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" ) // CaptureHookEnv creates a bogus 'update' Git hook to sniff out what @@ -45,7 +45,7 @@ func ConfigureGitalyHooksBinary() { "build", "-o", filepath.Join(config.Config.BinDir, "gitaly-hooks"), - "gitlab.com/gitlab-org/gitaly/cmd/gitaly-hooks", + "gitlab.com/gitlab-org/gitaly/v13/cmd/gitaly-hooks", } MustRunCommand(nil, nil, "go", goBuildArgs...) } diff --git a/internal/testhelper/tag.go b/internal/testhelper/tag.go index 3b94e84fda75c0e00ebe17aa781428583d89d451..f762f4c66da0f20edb5fc859b00f8e76776338f5 100644 --- a/internal/testhelper/tag.go +++ b/internal/testhelper/tag.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "gitlab.com/gitlab-org/gitaly/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/text" ) // CreateTagOpts holds extra options for CreateTag. diff --git a/internal/testhelper/testhelper.go b/internal/testhelper/testhelper.go index 134367ead745997d6f36283ad891784942fb23f1..c51fb363e9559687c78e310dae5558cdc3c8bc82 100644 --- a/internal/testhelper/testhelper.go +++ b/internal/testhelper/testhelper.go @@ -34,14 +34,14 @@ import ( log "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/helper/fieldextractors" - "gitlab.com/gitlab-org/gitaly/internal/helper/text" - gitalylog "gitlab.com/gitlab-org/gitaly/internal/log" - "gitlab.com/gitlab-org/gitaly/internal/metadata/featureflag" - "gitlab.com/gitlab-org/gitaly/internal/storage" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/fieldextractors" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/text" + gitalylog "gitlab.com/gitlab-org/gitaly/v13/internal/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/metadata/featureflag" + "gitlab.com/gitlab-org/gitaly/v13/internal/storage" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" @@ -604,7 +604,7 @@ func ConfigureGitalySSH() { "build", "-o", filepath.Join(config.Config.BinDir, "gitaly-ssh"), - "gitlab.com/gitlab-org/gitaly/cmd/gitaly-ssh", + "gitlab.com/gitlab-org/gitaly/v13/cmd/gitaly-ssh", } MustRunCommand(nil, nil, "go", goBuildArgs...) } @@ -619,7 +619,7 @@ func ConfigureGitalyGit2Go() { "build", "-tags", "static,system_libgit2", "-o", filepath.Join(config.Config.BinDir, "gitaly-git2go"), - "gitlab.com/gitlab-org/gitaly/cmd/gitaly-git2go", + "gitlab.com/gitlab-org/gitaly/v13/cmd/gitaly-git2go", } MustRunCommand(nil, nil, "go", goBuildArgs...) } diff --git a/internal/testhelper/testserver.go b/internal/testhelper/testserver.go index dcbab20a54399f698d43ce10c92a829b76daf813..d666f5f622a0182a1367df803765f590ab2f7b79 100644 --- a/internal/testhelper/testserver.go +++ b/internal/testhelper/testserver.go @@ -26,15 +26,15 @@ import ( grpc_ctxtags "github.com/grpc-ecosystem/go-grpc-middleware/tags" log "github.com/sirupsen/logrus" "github.com/stretchr/testify/require" - gitalyauth "gitlab.com/gitlab-org/gitaly/auth" - "gitlab.com/gitlab-org/gitaly/internal/git/hooks" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config/auth" - serverauth "gitlab.com/gitlab-org/gitaly/internal/gitaly/server/auth" - "gitlab.com/gitlab-org/gitaly/internal/gitlabshell" - "gitlab.com/gitlab-org/gitaly/internal/helper/fieldextractors" - praefectconfig "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + gitalyauth "gitlab.com/gitlab-org/gitaly/v13/auth" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/hooks" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config/auth" + serverauth "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/server/auth" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitlabshell" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/fieldextractors" + praefectconfig "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" grpccorrelation "gitlab.com/gitlab-org/labkit/correlation/grpc" "google.golang.org/grpc" "google.golang.org/grpc/health" diff --git a/proto/go/internal/cmd/protoc-gen-gitaly/main.go b/proto/go/internal/cmd/protoc-gen-gitaly/main.go index 3968c3fc5ecbf4bf24ec9848096dc8b44366cd34..2afa304cc6d3778a49160f7ad23d636f8d86db73 100644 --- a/proto/go/internal/cmd/protoc-gen-gitaly/main.go +++ b/proto/go/internal/cmd/protoc-gen-gitaly/main.go @@ -64,7 +64,7 @@ import ( "github.com/golang/protobuf/proto" plugin "github.com/golang/protobuf/protoc-gen-go/plugin" - "gitlab.com/gitlab-org/gitaly/proto/go/internal/linter" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/internal/linter" ) const ( diff --git a/proto/go/internal/linter/lint.go b/proto/go/internal/linter/lint.go index ca8606831bb24e84939e14ef6849aac3e2ce7039..9013909d1f360d49655a9dc22119fa35ebcb8cf4 100644 --- a/proto/go/internal/linter/lint.go +++ b/proto/go/internal/linter/lint.go @@ -7,8 +7,8 @@ import ( "github.com/golang/protobuf/proto" "github.com/golang/protobuf/protoc-gen-go/descriptor" plugin "github.com/golang/protobuf/protoc-gen-go/plugin" - "gitlab.com/gitlab-org/gitaly/internal/protoutil" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/protoutil" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) // ensureMethodOpType will ensure that method includes the op_type option. diff --git a/proto/go/internal/linter/lint_test.go b/proto/go/internal/linter/lint_test.go index ca530daae7f4e54d39797d6784e8fad900d0be19..0e516b3a3e100537bdaec325dba71be56763e27e 100644 --- a/proto/go/internal/linter/lint_test.go +++ b/proto/go/internal/linter/lint_test.go @@ -9,8 +9,8 @@ import ( plugin "github.com/golang/protobuf/protoc-gen-go/plugin" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/proto/go/internal" - _ "gitlab.com/gitlab-org/gitaly/proto/go/internal/linter/testdata" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/internal" + _ "gitlab.com/gitlab-org/gitaly/v13/proto/go/internal/linter/testdata" ) func TestLintFile(t *testing.T) { diff --git a/proto/go/internal/linter/method.go b/proto/go/internal/linter/method.go index 30f78e1b38f2e0c2c9dd769c1929bd2ec67237fd..71f164de76db912c850062101b09e1e3009a884a 100644 --- a/proto/go/internal/linter/method.go +++ b/proto/go/internal/linter/method.go @@ -7,8 +7,8 @@ import ( "github.com/golang/protobuf/protoc-gen-go/descriptor" plugin "github.com/golang/protobuf/protoc-gen-go/plugin" - "gitlab.com/gitlab-org/gitaly/internal/protoutil" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/protoutil" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) type methodLinter struct { diff --git a/proto/go/internal/linter/testdata/invalid.pb.go b/proto/go/internal/linter/testdata/invalid.pb.go index 5a0b4a51548d2c556f559affd42be26280ef366c..9b8812088b496fb00246eddf6be9fac1d1e06329 100644 --- a/proto/go/internal/linter/testdata/invalid.pb.go +++ b/proto/go/internal/linter/testdata/invalid.pb.go @@ -7,7 +7,7 @@ import ( context "context" fmt "fmt" proto "github.com/golang/protobuf/proto" - gitalypb "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + gitalypb "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/proto/go/internal/linter/testdata/valid.pb.go b/proto/go/internal/linter/testdata/valid.pb.go index 2402fa89f469a276f0a5eedb8ea8e6de8511a4f3..4302f00ddd695988b12f642e1327104274f3608d 100644 --- a/proto/go/internal/linter/testdata/valid.pb.go +++ b/proto/go/internal/linter/testdata/valid.pb.go @@ -7,7 +7,7 @@ import ( context "context" fmt "fmt" proto "github.com/golang/protobuf/proto" - gitalypb "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + gitalypb "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status"