diff --git a/.golangci.yml b/.golangci.yml index 961b81122de65a11eb1898cdc16d03f2dd7d9c95..9fa0b53db570c7e44c7da1dbe4da16ef238af7c9 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -56,9 +56,9 @@ linters-settings: exclude-functions: - (*database/sql.DB).Close - (*database/sql.Rows).Close - - (*gitlab.com/gitlab-org/gitaly/v16/internal/grpc/sidechannel.ServerConn).Close - - (*gitlab.com/gitlab-org/gitaly/v16/internal/streamcache.pipe).Close - - (*gitlab.com/gitlab-org/gitaly/v16/internal/streamcache.pipeReader).Close + - (*gitlab.com/gitlab-org/gitaly/v17/internal/grpc/sidechannel.ServerConn).Close + - (*gitlab.com/gitlab-org/gitaly/v17/internal/streamcache.pipe).Close + - (*gitlab.com/gitlab-org/gitaly/v17/internal/streamcache.pipeReader).Close - (*google.golang.org/grpc.ClientConn).Close - (*google.golang.org/grpc.ServerConn).Close - (*io.PipeReader).Close @@ -172,13 +172,13 @@ linters-settings: error_wrap: included-functions: - fmt.Errorf - - gitlab.com/gitlab-org/gitaly/v16/internal/structerr.* + - gitlab.com/gitlab-org/gitaly/v17/internal/structerr.* unavailable_code: included-functions: - - gitlab.com/gitlab-org/gitaly/v16/internal/structerr.NewUnavailable + - gitlab.com/gitlab-org/gitaly/v17/internal/structerr.NewUnavailable testhelper_run: included-functions: - - gitlab.com/gitlab-org/gitaly/v16/internal/testhelper.Run + - gitlab.com/gitlab-org/gitaly/v17/internal/testhelper.Run issues: exclude-use-default: false diff --git a/auth/extract_test.go b/auth/extract_test.go index 5b39b9e6ebcbca127b0e4feebb07f1ba0d5f28da..67b9fc8a4f594f8be57fd6b02336ccf74bfa2580 100644 --- a/auth/extract_test.go +++ b/auth/extract_test.go @@ -6,7 +6,7 @@ import ( "github.com/grpc-ecosystem/go-grpc-middleware/v2/metadata" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestCheckTokenV2(t *testing.T) { diff --git a/auth/testhelper_test.go b/auth/testhelper_test.go index cb7efe00050e96f58c315a97cb8bc290cbb8cabc..353f6813ba7506c5013c03f1b21e3e96e5df41ae 100644 --- a/auth/testhelper_test.go +++ b/auth/testhelper_test.go @@ -3,7 +3,7 @@ package gitalyauth import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/client/dial.go b/client/dial.go index ed4e02a6673fc752a0c9c3ce48242a2841618612..d18e20775e200c7f7d6f38a500b131c07aaddf68 100644 --- a/client/dial.go +++ b/client/dial.go @@ -7,11 +7,11 @@ import ( "time" "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/v16/internal/backoff" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/dnsresolver" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/sidechannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/backoff" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/dnsresolver" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/sidechannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" "google.golang.org/grpc" ) diff --git a/client/dial_test.go b/client/dial_test.go index 72738c23bc44cdf7f2ef4ce7512a15191bea9db9..d8c6a4ecb589e206026fa3c782b9404f459c7362 100644 --- a/client/dial_test.go +++ b/client/dial_test.go @@ -17,12 +17,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/uber/jaeger-client-go" - gitalyauth "gitlab.com/gitlab-org/gitaly/v16/auth" - internalclient "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/tracing" - gitalyx509 "gitlab.com/gitlab-org/gitaly/v16/internal/x509" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + gitalyauth "gitlab.com/gitlab-org/gitaly/v17/auth" + internalclient "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/tracing" + gitalyx509 "gitlab.com/gitlab-org/gitaly/v17/internal/x509" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "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 1354f726c71f853ee7509e636a70c27f56f55089..24e0468fc25e90347422e6dc3082ab0394a550f8 100644 --- a/client/pool.go +++ b/client/pool.go @@ -3,7 +3,7 @@ package client import ( "context" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" "google.golang.org/grpc" ) diff --git a/client/pool_test.go b/client/pool_test.go index 262fa85a5a961b9f3b1296806f99bd11c9316275..a8a21be72f477928bd63437e7d4384a0597739a3 100644 --- a/client/pool_test.go +++ b/client/pool_test.go @@ -8,11 +8,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - gitalyauth "gitlab.com/gitlab-org/gitaly/v16/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/bootstrap/starter" - gitalycfgauth "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/server/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + gitalyauth "gitlab.com/gitlab-org/gitaly/v17/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/bootstrap/starter" + gitalycfgauth "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/server/auth" + "gitlab.com/gitlab-org/gitaly/v17/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 2d8d68e44419ff32dcbbeb268f3f03a57ad9c9c8..3686627ebe808c26d97971daabd0cb799616b9e3 100644 --- a/client/receive_pack.go +++ b/client/receive_pack.go @@ -4,8 +4,8 @@ import ( "context" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/gitalyclient" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/gitalyclient" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" ) diff --git a/client/sidechannel.go b/client/sidechannel.go index b88d4155881382e4982658069180dce967a1d639..239e14c68d753611abdba7f4be61d6fb85712864 100644 --- a/client/sidechannel.go +++ b/client/sidechannel.go @@ -5,10 +5,10 @@ import ( "io" "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/listenmux" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/sidechannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/listenmux" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/sidechannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" "google.golang.org/grpc" "google.golang.org/grpc/credentials" ) diff --git a/client/testhelper_test.go b/client/testhelper_test.go index 137104d4d83555d8a67b3d1147855a4b4c807fc6..cacb27732a2746fa8d0d209b5b0e990da10a839b 100644 --- a/client/testhelper_test.go +++ b/client/testhelper_test.go @@ -3,7 +3,7 @@ package client import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/client/upload_archive.go b/client/upload_archive.go index 572e6bc9b385b79eaa833321e71c5814bc360994..44e2ea7e387dfcd785de721f8ee5eb0fe734146d 100644 --- a/client/upload_archive.go +++ b/client/upload_archive.go @@ -4,8 +4,8 @@ import ( "context" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/gitalyclient" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/gitalyclient" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" ) diff --git a/client/upload_pack.go b/client/upload_pack.go index 11033cc8e0794abde93a760c2d8bfc30c245f733..1a42a14380be814738daf80da4e6af2186e3b455 100644 --- a/client/upload_pack.go +++ b/client/upload_pack.go @@ -4,8 +4,8 @@ import ( "context" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/gitalyclient" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/gitalyclient" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" ) diff --git a/cmd/gitaly-backup/main.go b/cmd/gitaly-backup/main.go index 171e45476fd5b4d80dd96b3fe11b66e1bc9ee091..4973e97d83cb37ac471f3e8bfdb8b74ed32b0a37 100644 --- a/cmd/gitaly-backup/main.go +++ b/cmd/gitaly-backup/main.go @@ -3,7 +3,7 @@ package main import ( "os" - cli "gitlab.com/gitlab-org/gitaly/v16/internal/cli/gitalybackup" + cli "gitlab.com/gitlab-org/gitaly/v17/internal/cli/gitalybackup" ) func main() { diff --git a/cmd/gitaly-blackbox/main.go b/cmd/gitaly-blackbox/main.go index b71ab54f798ae6e866f44b3506604d26ed5c18c5..9c7ce26435606ad47a1dcb18075a85af6bf59914 100644 --- a/cmd/gitaly-blackbox/main.go +++ b/cmd/gitaly-blackbox/main.go @@ -6,9 +6,9 @@ import ( "os" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/blackbox" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/version" + "gitlab.com/gitlab-org/gitaly/v17/internal/blackbox" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/version" ) var flagVersion = flag.Bool("version", false, "Print version and exit") diff --git a/cmd/gitaly-debug/analyzehttp.go b/cmd/gitaly-debug/analyzehttp.go index f8cda3f434de247e3ce69fcfc9d74c7892ba64c1..b7915d5f8f9228a736f59c2d513b67bb6af998da 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/v16/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" ) func analyzeHTTPClone(cloneURL string) { diff --git a/cmd/gitaly-debug/bitmap.go b/cmd/gitaly-debug/bitmap.go index 8d6f89f4d0d5505f4a98540f452a40a912574da5..6f5219c75b26e4d143a3a49bf3830982ec0d1e01 100644 --- a/cmd/gitaly-debug/bitmap.go +++ b/cmd/gitaly-debug/bitmap.go @@ -5,8 +5,8 @@ import ( "fmt" "os" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/packfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/packfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) func listBitmapPack(logger log.Logger, idxFile string) { diff --git a/cmd/gitaly-debug/main.go b/cmd/gitaly-debug/main.go index 2d0d9e236508a33e8df72ce840a439daf6da1acd..1d42b6cd7df77807ea0b12e95e77a4fceb802c38 100644 --- a/cmd/gitaly-debug/main.go +++ b/cmd/gitaly-debug/main.go @@ -5,7 +5,7 @@ import ( "io" "os" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) const ( diff --git a/cmd/gitaly-debug/simulatehttp.go b/cmd/gitaly-debug/simulatehttp.go index 3b24ba843a0884e2cf3cf16e645ee4d125bed190..831a4b1994bec6011527a93728f0c44c211033b2 100644 --- a/cmd/gitaly-debug/simulatehttp.go +++ b/cmd/gitaly-debug/simulatehttp.go @@ -9,7 +9,7 @@ import ( "regexp" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/pktline" ) func simulateHTTPClone(gitDir string) { diff --git a/cmd/gitaly-gpg/main.go b/cmd/gitaly-gpg/main.go index de0b8406c89c244222759622af4502d7e4092cd9..0f07f43d68d00fe6070283cadd53a6fb71530664 100644 --- a/cmd/gitaly-gpg/main.go +++ b/cmd/gitaly-gpg/main.go @@ -9,8 +9,8 @@ import ( "time" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/signature" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/signature" ) func gpgApp() *cli.App { diff --git a/cmd/gitaly-gpg/main_test.go b/cmd/gitaly-gpg/main_test.go index c61c37a7203292714c4501dd4575c39d23700f8b..825a670f1053979eb478eb9ccccefcf0d539060f 100644 --- a/cmd/gitaly-gpg/main_test.go +++ b/cmd/gitaly-gpg/main_test.go @@ -10,7 +10,7 @@ import ( "github.com/ProtonMail/go-crypto/openpgp" "github.com/ProtonMail/go-crypto/openpgp/packet" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) var ( diff --git a/cmd/gitaly-gpg/testhelper_test.go b/cmd/gitaly-gpg/testhelper_test.go index 432115dc0309f4dd75780a0cc22dee780378aab5..e100347b188af1d47a35542c231016ad88b98581 100644 --- a/cmd/gitaly-gpg/testhelper_test.go +++ b/cmd/gitaly-gpg/testhelper_test.go @@ -3,7 +3,7 @@ package main import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/cmd/gitaly-hooks/hooks.go b/cmd/gitaly-hooks/hooks.go index aa53056fc57e49e95e540b89d92ff2422419005a..b24478f82614eb34b134b1b27f312820ae2812b3 100644 --- a/cmd/gitaly-hooks/hooks.go +++ b/cmd/gitaly-hooks/hooks.go @@ -10,17 +10,17 @@ import ( "path/filepath" "github.com/sirupsen/logrus" - gitalyauth "gitlab.com/gitlab-org/gitaly/v16/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/env" - "gitlab.com/gitlab-org/gitaly/v16/internal/stream" - "gitlab.com/gitlab-org/gitaly/v16/internal/tracing" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + gitalyauth "gitlab.com/gitlab-org/gitaly/v17/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/env" + "gitlab.com/gitlab-org/gitaly/v17/internal/stream" + "gitlab.com/gitlab-org/gitaly/v17/internal/tracing" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" labkitcorrelation "gitlab.com/gitlab-org/labkit/correlation/grpc" labkittracing "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 9b88cd52b13954fb04c9752145076d4b2e4617e6..afd758f54a3bd5e6134b5cd75e7f31b58743ff8c 100644 --- a/cmd/gitaly-hooks/hooks_test.go +++ b/cmd/gitaly-hooks/hooks_test.go @@ -13,32 +13,32 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/pktline" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/prometheus" - gitalyhook "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitlab" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/limiter" - gitalylog "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/prometheus" + gitalyhook "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitlab" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/limiter" + gitalylog "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "gitlab.com/gitlab-org/labkit/correlation" labkitcorrelation "gitlab.com/gitlab-org/labkit/correlation/grpc" labkittracing "gitlab.com/gitlab-org/labkit/tracing" diff --git a/cmd/gitaly-hooks/testhelper_test.go b/cmd/gitaly-hooks/testhelper_test.go index 432115dc0309f4dd75780a0cc22dee780378aab5..e100347b188af1d47a35542c231016ad88b98581 100644 --- a/cmd/gitaly-hooks/testhelper_test.go +++ b/cmd/gitaly-hooks/testhelper_test.go @@ -3,7 +3,7 @@ package main import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/cmd/gitaly-lfs-smudge/main.go b/cmd/gitaly-lfs-smudge/main.go index bbfede04c7e281d6fc59379565fc388d7ddbdb95..d79f953bf6b3b7f4066fd97cd96fce0853a99c1b 100644 --- a/cmd/gitaly-lfs-smudge/main.go +++ b/cmd/gitaly-lfs-smudge/main.go @@ -6,9 +6,9 @@ import ( "io" "os" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/smudge" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/smudge" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" "gitlab.com/gitlab-org/labkit/tracing" ) diff --git a/cmd/gitaly-lfs-smudge/main_test.go b/cmd/gitaly-lfs-smudge/main_test.go index b6b735579c6cb00f58f2c85373a20eafd1bf33ed..169db908494396f325d2e38c1d1775153b21559a 100644 --- a/cmd/gitaly-lfs-smudge/main_test.go +++ b/cmd/gitaly-lfs-smudge/main_test.go @@ -8,12 +8,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/smudge" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/smudge" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) type capturedOutput struct { diff --git a/cmd/gitaly-lfs-smudge/smudge.go b/cmd/gitaly-lfs-smudge/smudge.go index 69554e76684421664bc794385371dd04b7e9834a..95bf4860647441538dead684c4e19402ff5661c1 100644 --- a/cmd/gitaly-lfs-smudge/smudge.go +++ b/cmd/gitaly-lfs-smudge/smudge.go @@ -10,11 +10,11 @@ import ( "net/url" "github.com/git-lfs/git-lfs/v3/lfs" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/pktline" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/smudge" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitlab" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/smudge" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/prometheus" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitlab" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) func filter(ctx context.Context, cfg smudge.Config, to io.Writer, from io.Reader, logger log.Logger) (returnedErr error) { diff --git a/cmd/gitaly-lfs-smudge/smudge_test.go b/cmd/gitaly-lfs-smudge/smudge_test.go index 97689e286adf5477acd776cd975fd30dd97fc190..8d3e5403ef6873269420c532a378c2400e5875f0 100644 --- a/cmd/gitaly-lfs-smudge/smudge_test.go +++ b/cmd/gitaly-lfs-smudge/smudge_test.go @@ -8,11 +8,11 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/pktline" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/smudge" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitlab" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/smudge" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitlab" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) const ( diff --git a/cmd/gitaly-lfs-smudge/testhelper_test.go b/cmd/gitaly-lfs-smudge/testhelper_test.go index 122d6b7682628fbb8f0e276e372cd8157fa560a3..e191e1dbda0551d655f4a49cf4dcf49517f288d9 100644 --- a/cmd/gitaly-lfs-smudge/testhelper_test.go +++ b/cmd/gitaly-lfs-smudge/testhelper_test.go @@ -4,9 +4,9 @@ import ( "path/filepath" "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitlab" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitlab" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/cmd/gitaly-ssh/auth_test.go b/cmd/gitaly-ssh/auth_test.go index 54d165ed79e21d44400a079610a915cba4ecd23a..7a354be71382e5ceb39cff0853f656122c06332a 100644 --- a/cmd/gitaly-ssh/auth_test.go +++ b/cmd/gitaly-ssh/auth_test.go @@ -8,15 +8,15 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/setup" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/internal/x509" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/setup" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/x509" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/encoding/protojson" ) diff --git a/cmd/gitaly-ssh/main.go b/cmd/gitaly-ssh/main.go index e18350e0951b9568d571deddec0351be61fd9d10..98a9e1b9ecc26292b581f81322f9578ad370615f 100644 --- a/cmd/gitaly-ssh/main.go +++ b/cmd/gitaly-ssh/main.go @@ -8,11 +8,11 @@ import ( "strconv" "strings" - gitalyauth "gitlab.com/gitlab-org/gitaly/v16/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/sidechannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + gitalyauth "gitlab.com/gitlab-org/gitaly/v17/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/sidechannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" "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 640b7e5e651ff860ff3cfa88182497da678e7c82..17cb3c766ce56dfb11c9e2ffa0f29266ef863e3f 100644 --- a/cmd/gitaly-ssh/main_test.go +++ b/cmd/gitaly-ssh/main_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/sidechannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/sidechannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" "google.golang.org/grpc" ) diff --git a/cmd/gitaly-ssh/receive_pack.go b/cmd/gitaly-ssh/receive_pack.go index 268e3d69f4a769f7d22df227788c8195428e8023..59a1e8f3237dee1eb32949cc13df8fd6762475e9 100644 --- a/cmd/gitaly-ssh/receive_pack.go +++ b/cmd/gitaly-ssh/receive_pack.go @@ -5,9 +5,9 @@ import ( "fmt" "os" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/gitalyclient" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/sidechannel" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/gitalyclient" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/sidechannel" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/protobuf/encoding/protojson" ) diff --git a/cmd/gitaly-ssh/testhelper_test.go b/cmd/gitaly-ssh/testhelper_test.go index 432115dc0309f4dd75780a0cc22dee780378aab5..e100347b188af1d47a35542c231016ad88b98581 100644 --- a/cmd/gitaly-ssh/testhelper_test.go +++ b/cmd/gitaly-ssh/testhelper_test.go @@ -3,7 +3,7 @@ package main import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/cmd/gitaly-ssh/upload_archive.go b/cmd/gitaly-ssh/upload_archive.go index f92ffa96556f2e3777149f5f8f2fe4c3012341d7..acc8fe0e35019942ab6277fda17ffd40f7feeb6b 100644 --- a/cmd/gitaly-ssh/upload_archive.go +++ b/cmd/gitaly-ssh/upload_archive.go @@ -5,9 +5,9 @@ import ( "fmt" "os" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/gitalyclient" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/sidechannel" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/gitalyclient" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/sidechannel" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/protobuf/encoding/protojson" ) diff --git a/cmd/gitaly-ssh/upload_pack.go b/cmd/gitaly-ssh/upload_pack.go index 59b9915171cd41d26d182a60c01438a9f57a0f18..d2dcd63588b71ba67f81cd0ae1a04a2a1eec3821 100644 --- a/cmd/gitaly-ssh/upload_pack.go +++ b/cmd/gitaly-ssh/upload_pack.go @@ -5,9 +5,9 @@ import ( "fmt" "os" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/gitalyclient" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/sidechannel" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/gitalyclient" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/sidechannel" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/protobuf/encoding/protojson" ) diff --git a/cmd/gitaly-ssh/upload_pack_test.go b/cmd/gitaly-ssh/upload_pack_test.go index da700f8fd9a0713adc1600316fea93b1837e0ebc..4d82385c7c4a014209f99850083260511fbb1e29 100644 --- a/cmd/gitaly-ssh/upload_pack_test.go +++ b/cmd/gitaly-ssh/upload_pack_test.go @@ -7,13 +7,13 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/setup" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/setup" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/encoding/protojson" ) diff --git a/cmd/gitaly-wrapper/main.go b/cmd/gitaly-wrapper/main.go index 33c3343620738b5b53928af546bed49e13e38522..c3e9e0758746cb6b23d6348d31d5ae62b2e6585d 100644 --- a/cmd/gitaly-wrapper/main.go +++ b/cmd/gitaly-wrapper/main.go @@ -11,10 +11,10 @@ import ( "syscall" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/bootstrap" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/env" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/ps" + "gitlab.com/gitlab-org/gitaly/v17/internal/bootstrap" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/env" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/ps" "golang.org/x/sys/unix" ) diff --git a/cmd/gitaly-wrapper/main_test.go b/cmd/gitaly-wrapper/main_test.go index 84c97ddf7c1250a6c8b4a7ec9395ff971b7bf148..7a973df65dc7952744139cdfe37b631a24025920 100644 --- a/cmd/gitaly-wrapper/main_test.go +++ b/cmd/gitaly-wrapper/main_test.go @@ -13,10 +13,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/bootstrap" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/bootstrap" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) // TestStolenPid tests for regressions in https://gitlab.com/gitlab-org/gitaly/issues/1661 diff --git a/cmd/gitaly-wrapper/testhelper_test.go b/cmd/gitaly-wrapper/testhelper_test.go index 432115dc0309f4dd75780a0cc22dee780378aab5..e100347b188af1d47a35542c231016ad88b98581 100644 --- a/cmd/gitaly-wrapper/testhelper_test.go +++ b/cmd/gitaly-wrapper/testhelper_test.go @@ -3,7 +3,7 @@ package main import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/cmd/gitaly/check_test.go b/cmd/gitaly/check_test.go index 128d934a3824e42ec7e2c1ff1bcb8fff9a7c4438..7006dff5e6b2d312d3e0720b05c9fc3b3ea47c85 100644 --- a/cmd/gitaly/check_test.go +++ b/cmd/gitaly/check_test.go @@ -8,10 +8,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitlab" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitlab" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func createTestServer(t *testing.T) (user, password, url string, cleanup func()) { diff --git a/cmd/gitaly/main.go b/cmd/gitaly/main.go index 14190f3eba798742fef37f841d8c880a07128d9b..ce80df99432c69057b91635365b81546f376410b 100644 --- a/cmd/gitaly/main.go +++ b/cmd/gitaly/main.go @@ -4,7 +4,7 @@ import ( "log" "os" - cli "gitlab.com/gitlab-org/gitaly/v16/internal/cli/gitaly" + cli "gitlab.com/gitlab-org/gitaly/v17/internal/cli/gitaly" ) func main() { diff --git a/cmd/gitaly/main_test.go b/cmd/gitaly/main_test.go index 06d96618a1c10360994668f80b45aae06c396fd9..839d1e46c0d1dfc4ab1fac7bde546488231fbf5c 100644 --- a/cmd/gitaly/main_test.go +++ b/cmd/gitaly/main_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/version" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/version" ) func TestGitalyCLI(t *testing.T) { diff --git a/cmd/gitaly/testhelper_test.go b/cmd/gitaly/testhelper_test.go index 432115dc0309f4dd75780a0cc22dee780378aab5..e100347b188af1d47a35542c231016ad88b98581 100644 --- a/cmd/gitaly/testhelper_test.go +++ b/cmd/gitaly/testhelper_test.go @@ -3,7 +3,7 @@ package main import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/cmd/praefect/main.go b/cmd/praefect/main.go index f03cb78f421024123a3f8ea3f51f713d7227a8d4..d5119afa91b9b95a8e84e2022ebfed03b92cebfb 100644 --- a/cmd/praefect/main.go +++ b/cmd/praefect/main.go @@ -4,7 +4,7 @@ import ( "log" "os" - cli "gitlab.com/gitlab-org/gitaly/v16/internal/cli/praefect" + cli "gitlab.com/gitlab-org/gitaly/v17/internal/cli/praefect" ) func main() { diff --git a/cmd/validate.go b/cmd/validate.go index 8c7e3cc53064e0358b3d421ee3f9d77277f0e5f5..1170f9992ae34308d2c796c837bf320cf77c5366 100644 --- a/cmd/validate.go +++ b/cmd/validate.go @@ -7,7 +7,7 @@ import ( "io" "github.com/pelletier/go-toml/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/errors/cfgerror" + "gitlab.com/gitlab-org/gitaly/v17/internal/errors/cfgerror" ) // Validate invokes validator and processes the result. If there are any errors returned diff --git a/go.mod b/go.mod index 902c9163ad0688b8c50cb39e8008fb54dcb7c4b8..e2cf900467fca4f4cdfa9805e9b59c6b19eb3f0c 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module gitlab.com/gitlab-org/gitaly/v16 +module gitlab.com/gitlab-org/gitaly/v17 go 1.22.0 diff --git a/internal/archive/archive.go b/internal/archive/archive.go index 040ec879a8c4488cf7b710c8aa9c919e03c237b5..a8c2b97b818680f989be941e7c75398087ef4072 100644 --- a/internal/archive/archive.go +++ b/internal/archive/archive.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) const ( diff --git a/internal/archive/archive_test.go b/internal/archive/archive_test.go index 514e7e1c0194edd73d43d8fd45026f18f80da5a2..36128ad51a1175ed5fad97bacad06b666096d5cb 100644 --- a/internal/archive/archive_test.go +++ b/internal/archive/archive_test.go @@ -10,8 +10,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestWriteTarball(t *testing.T) { diff --git a/internal/archive/tar_builder.go b/internal/archive/tar_builder.go index 3f52d2dd4f8ac1cbd4102b320704ca963d9e84c6..0a03aa77bce64461c9e2ee9ee124286f0664a752 100644 --- a/internal/archive/tar_builder.go +++ b/internal/archive/tar_builder.go @@ -10,7 +10,7 @@ import ( "regexp" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode/permission" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode/permission" "golang.org/x/sys/unix" ) diff --git a/internal/archive/testhelper_test.go b/internal/archive/testhelper_test.go index b8f9015cb354ecd59630c40683bf9e17238142b1..d9062ddf53848459d110e3bb6f90b416caf07efc 100644 --- a/internal/archive/testhelper_test.go +++ b/internal/archive/testhelper_test.go @@ -3,7 +3,7 @@ package archive import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/backoff/testhelper_test.go b/internal/backoff/testhelper_test.go index cc3edbe5d08b499d6b2cc0bdba4d99db523ead53..f4bbc24fd020e73de762163c242e7ff6a8d665c2 100644 --- a/internal/backoff/testhelper_test.go +++ b/internal/backoff/testhelper_test.go @@ -3,7 +3,7 @@ package backoff import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/backup/backup.go b/internal/backup/backup.go index 6870bbf4adde54992077867de539351176c3db11..ab8889d71134859773b92f911484875c07989baf 100644 --- a/internal/backup/backup.go +++ b/internal/backup/backup.go @@ -12,17 +12,17 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/counter" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/migration" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/counter" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/migration" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/backup/backup_test.go b/internal/backup/backup_test.go index 0ab3045aa500ab8ca4d7390094a2656295be129a..19d1846391016a257ccab1bedb251cc587c6b16c 100644 --- a/internal/backup/backup_test.go +++ b/internal/backup/backup_test.go @@ -9,24 +9,24 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/archive" - "gitlab.com/gitlab-org/gitaly/v16/internal/backup" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/setup" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/counter" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/migration" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/archive" + "gitlab.com/gitlab-org/gitaly/v17/internal/backup" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/setup" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/counter" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/migration" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/proto" ) diff --git a/internal/backup/lazy_test.go b/internal/backup/lazy_test.go index 15cce107566045f8dad2edae1202ae8c6ad7e56c..f7b45b4baf16b43728ff1118582acf0022ab2406 100644 --- a/internal/backup/lazy_test.go +++ b/internal/backup/lazy_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestLazyWriter(t *testing.T) { diff --git a/internal/backup/locator.go b/internal/backup/locator.go index c52e6441020ef1c8c1888b2214b1566b251c753a..94495b2a128aac2bdd2f14f09fe168134c2e3fd4 100644 --- a/internal/backup/locator.go +++ b/internal/backup/locator.go @@ -9,9 +9,9 @@ import ( "strconv" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" ) // LegacyLocator locates backup paths for historic backups. This is the diff --git a/internal/backup/locator_test.go b/internal/backup/locator_test.go index 516807318cfb6a510056e35a43a4f52175da6d6d..882c7d5e253c5304a87cb8b297ab5673b77ed602 100644 --- a/internal/backup/locator_test.go +++ b/internal/backup/locator_test.go @@ -9,13 +9,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestLegacyLocator(t *testing.T) { diff --git a/internal/backup/log_entry.go b/internal/backup/log_entry.go index 3d2935b83bbbd15bb75ac62e92220f3c8c049abf..3be13729a0fa91a262ccb31380519071d826056e 100644 --- a/internal/backup/log_entry.go +++ b/internal/backup/log_entry.go @@ -11,11 +11,11 @@ import ( "time" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/archive" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - logging "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/archive" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + logging "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) const ( diff --git a/internal/backup/log_entry_test.go b/internal/backup/log_entry_test.go index bef0b03ecec205efb2d1755d3a5ed0c36c7d418e..c827853441d005b45dc911bfd7b9f78c8fec1972 100644 --- a/internal/backup/log_entry_test.go +++ b/internal/backup/log_entry_test.go @@ -15,12 +15,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/archive" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/archive" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) type mockPartition struct { diff --git a/internal/backup/manifest.go b/internal/backup/manifest.go index 19f659ed06d02f8fa4482ab39519a2276abb74ea..906088263579b42db6cc74ef42bfa4a3394dcbd4 100644 --- a/internal/backup/manifest.go +++ b/internal/backup/manifest.go @@ -6,7 +6,7 @@ import ( "path" "github.com/pelletier/go-toml/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" ) // ManifestLoader reads and writes manifest files from a Sink. Manifest files diff --git a/internal/backup/manifest_test.go b/internal/backup/manifest_test.go index 92cb48230451b0679241b746a918be30162f4527..d435a32292fae10f920a8052858f7b00cffd7e9a 100644 --- a/internal/backup/manifest_test.go +++ b/internal/backup/manifest_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestManifestLoader_ReadManifest(t *testing.T) { diff --git a/internal/backup/partition_backup.go b/internal/backup/partition_backup.go index f2db683d6e93e81d24d7325417250256f5862889..a9c820facd70f7212bc7cac52a5caa163d336cae 100644 --- a/internal/backup/partition_backup.go +++ b/internal/backup/partition_backup.go @@ -6,10 +6,10 @@ import ( "sync/atomic" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "golang.org/x/sync/errgroup" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/internal/backup/partition_backup_test.go b/internal/backup/partition_backup_test.go index 38ca581b11211656a73f79f703d31cf66ecaa7d5..88691ea464f9d3c0a8916f600b918f76898688c6 100644 --- a/internal/backup/partition_backup_test.go +++ b/internal/backup/partition_backup_test.go @@ -10,16 +10,16 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/backup" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/setup" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/backup" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/setup" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" ) diff --git a/internal/backup/pipeline.go b/internal/backup/pipeline.go index 2ae5b7cb66f5991e5be08a43494a7b122ce9464e..7e739005836a4503b246a265d889a466e2e3b30b 100644 --- a/internal/backup/pipeline.go +++ b/internal/backup/pipeline.go @@ -7,9 +7,9 @@ import ( "strings" "sync" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // repositoryKey uniquely identifies a repository, and is used here to key the diff --git a/internal/backup/pipeline_test.go b/internal/backup/pipeline_test.go index 01b85d735fdc61a46c754652f206c18bca34169a..7c9f92456ddc5a69d737b758206ece854435861a 100644 --- a/internal/backup/pipeline_test.go +++ b/internal/backup/pipeline_test.go @@ -10,9 +10,9 @@ import ( "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestPipeline(t *testing.T) { diff --git a/internal/backup/repository.go b/internal/backup/repository.go index fb1d221601e4421f8b034eedfc1afe9c8dcc0570..87a8fdc084a8fa154b33fbbccc26e7b2c2fd12b5 100644 --- a/internal/backup/repository.go +++ b/internal/backup/repository.go @@ -9,22 +9,22 @@ import ( "io" "math" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/repoutil" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/counter" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/migration" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/repoutil" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/counter" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/migration" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/internal/backup/repository_test.go b/internal/backup/repository_test.go index cc2d1d1f076be994c210500838f01dcb2f74d097..424f9b273786d213a8bb76b072e312984e410b4c 100644 --- a/internal/backup/repository_test.go +++ b/internal/backup/repository_test.go @@ -9,21 +9,21 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/backup" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/setup" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/counter" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/migration" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/backup" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/setup" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/counter" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/migration" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func removeHeadReference(refs []git.Reference) []git.Reference { diff --git a/internal/backup/server_side.go b/internal/backup/server_side.go index c266d621da401c73cec89a57643f7dfbd51a2e93..c19ecf77062cd347b41b1778d432884307d2fb4d 100644 --- a/internal/backup/server_side.go +++ b/internal/backup/server_side.go @@ -4,10 +4,10 @@ import ( "context" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/backup/server_side_test.go b/internal/backup/server_side_test.go index 28bf5a6ff53edf012772cfb23971d271f58f1d4d..4e48e0f9a7d7c4305a234313b780d463b2a3610f 100644 --- a/internal/backup/server_side_test.go +++ b/internal/backup/server_side_test.go @@ -6,17 +6,17 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/backup" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/setup" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/backup" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/setup" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestServerSideAdapter_Create(t *testing.T) { diff --git a/internal/backup/sink.go b/internal/backup/sink.go index d0fafc3279c2d183412718d8afa46572c1838879..58dd4c4380cb02f5b72b2d26ea55d87f0fa85d5a 100644 --- a/internal/backup/sink.go +++ b/internal/backup/sink.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" "gocloud.dev/blob" "gocloud.dev/blob/azureblob" "gocloud.dev/blob/fileblob" diff --git a/internal/backup/sink_test.go b/internal/backup/sink_test.go index ad3c4f79a058cf88f262a862b502af65d83d4691..53cf3e913feac55619fbf5d28e34587db39992e7 100644 --- a/internal/backup/sink_test.go +++ b/internal/backup/sink_test.go @@ -14,8 +14,8 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/container" "github.com/aws/aws-sdk-go-v2/service/s3" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" _ "gocloud.dev/blob/memblob" ) diff --git a/internal/backup/testhelper_test.go b/internal/backup/testhelper_test.go index 53f50c4ae75607c0aa6e4da0969153795c299acb..0d99646972b7abffc59469d0cc87eb4a35cf364c 100644 --- a/internal/backup/testhelper_test.go +++ b/internal/backup/testhelper_test.go @@ -3,7 +3,7 @@ package backup import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/blackbox/blackbox.go b/internal/blackbox/blackbox.go index 6321f75d22bf7be7cd5327169614da22f7101d95..b144c29d88fc52a7310457391d57323c17ab4e31 100644 --- a/internal/blackbox/blackbox.go +++ b/internal/blackbox/blackbox.go @@ -9,9 +9,9 @@ import ( "time" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" "gitlab.com/gitlab-org/labkit/monitoring" ) diff --git a/internal/blackbox/config.go b/internal/blackbox/config.go index a36ad767cb3f531333bc45e878a089eca5814ae3..0beaba218032834b9a5f1b04b059a5d7ad7beffa 100644 --- a/internal/blackbox/config.go +++ b/internal/blackbox/config.go @@ -6,8 +6,8 @@ import ( "time" "github.com/pelletier/go-toml/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/duration" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/duration" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) // Config is the configuration for gitaly-blackbox. diff --git a/internal/blackbox/config_test.go b/internal/blackbox/config_test.go index 476e747d5733e50c44c20700fa194e2ef6b37255..47c81628362e54a218d415a52116b3e6f07f8a84 100644 --- a/internal/blackbox/config_test.go +++ b/internal/blackbox/config_test.go @@ -7,7 +7,7 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/duration" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/duration" ) func TestConfigParseFailures(t *testing.T) { diff --git a/internal/blackbox/testhelper_test.go b/internal/blackbox/testhelper_test.go index e88e9446ddd2466636e129b443603b7bedb74979..babed5543db38f6a7071c0dd90f803855ce7de0b 100644 --- a/internal/blackbox/testhelper_test.go +++ b/internal/blackbox/testhelper_test.go @@ -3,7 +3,7 @@ package blackbox import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/bootstrap/bootstrap.go b/internal/bootstrap/bootstrap.go index 3618805c4528e93858823429fceb1ca990471e20..793c9f894290377917cd29d1202151d471271c3e 100644 --- a/internal/bootstrap/bootstrap.go +++ b/internal/bootstrap/bootstrap.go @@ -9,9 +9,9 @@ import ( "github.com/cloudflare/tableflip" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/env" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/env" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" "golang.org/x/sys/unix" ) diff --git a/internal/bootstrap/bootstrap_test.go b/internal/bootstrap/bootstrap_test.go index 4e3a84b036d862005dede709a39bb26b678f0034..850b446eb4f589ba1b3bc15faaa263b3ac372e1b 100644 --- a/internal/bootstrap/bootstrap_test.go +++ b/internal/bootstrap/bootstrap_test.go @@ -12,9 +12,9 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestBootstrap_unixListener(t *testing.T) { diff --git a/internal/bootstrap/starter/starter.go b/internal/bootstrap/starter/starter.go index b167f1f8d13e6e48d87393f1e1ffdef53a144d04..c1c6743bc79d5bab3eba36244cd9a1ebb5f93dfc 100644 --- a/internal/bootstrap/starter/starter.go +++ b/internal/bootstrap/starter/starter.go @@ -8,8 +8,8 @@ import ( "strings" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/bootstrap" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/bootstrap" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) const ( diff --git a/internal/bootstrap/starter/testhelper_test.go b/internal/bootstrap/starter/testhelper_test.go index ab294fdf6e49357d68a3f25300f00834c3bea1cb..3a102341c5f0ac6c008ba927d4e270d7f5f1361c 100644 --- a/internal/bootstrap/starter/testhelper_test.go +++ b/internal/bootstrap/starter/testhelper_test.go @@ -3,7 +3,7 @@ package starter import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/bootstrap/testhelper_test.go b/internal/bootstrap/testhelper_test.go index 26d268ccd80e31d874b2bb73788efd3681c0d95d..2475d8869f9c252da879a2fb31c90747eb16f517 100644 --- a/internal/bootstrap/testhelper_test.go +++ b/internal/bootstrap/testhelper_test.go @@ -3,7 +3,7 @@ package bootstrap import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/bundleuri/git_config.go b/internal/bundleuri/git_config.go index 6412e5c02c25b2fc3167610cede438244016d14e..422ef0dba1c8ff07c408eb9b1fd524cf98a46031 100644 --- a/internal/bundleuri/git_config.go +++ b/internal/bundleuri/git_config.go @@ -5,8 +5,8 @@ import ( "fmt" "strconv" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" ) // CapabilitiesGitConfig returns a slice of gitcmd.ConfigPairs that can be injected diff --git a/internal/bundleuri/git_config_test.go b/internal/bundleuri/git_config_test.go index 47027fa1b1b3cb1f0c90f5631428328a54bb4ddc..b77dcdd7b0b32de67eb481c1aaeaacd5579b4951 100644 --- a/internal/bundleuri/git_config_test.go +++ b/internal/bundleuri/git_config_test.go @@ -5,9 +5,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestCapabilitiesGitConfig(t *testing.T) { diff --git a/internal/bundleuri/manager.go b/internal/bundleuri/manager.go index 6a4d029ad7be5c8b8a12a8f170ee9ea10e223f9b..a40cbe186398b1f163889883d00a3b15a6a65549 100644 --- a/internal/bundleuri/manager.go +++ b/internal/bundleuri/manager.go @@ -9,14 +9,14 @@ import ( "strings" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/backup" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/backup" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/bundleuri/manager_test.go b/internal/bundleuri/manager_test.go index b3deff656139f8d8ee732535f2edcf57af38cc4d..4014817ed83616ce001dbd50cc5f1f58b550491a 100644 --- a/internal/bundleuri/manager_test.go +++ b/internal/bundleuri/manager_test.go @@ -7,12 +7,12 @@ import ( "github.com/prometheus/client_golang/prometheus/testutil" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestGenerationManager_Generate(t *testing.T) { diff --git a/internal/bundleuri/sink.go b/internal/bundleuri/sink.go index e5d18fadbf82519e271d6348f9d7ece1473f9068..35852d8385d7877ce908b36d4a9b45e459ada3f7 100644 --- a/internal/bundleuri/sink.go +++ b/internal/bundleuri/sink.go @@ -7,7 +7,7 @@ import ( "io" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" "gocloud.dev/blob" _ "gocloud.dev/blob/azureblob" // register Azure driver diff --git a/internal/bundleuri/sink_test.go b/internal/bundleuri/sink_test.go index 07b04ccfa935a38aa3fbd1433e522bfa515c0a21..febc8d7fad210c04fcdfb7b295ba383f16173219 100644 --- a/internal/bundleuri/sink_test.go +++ b/internal/bundleuri/sink_test.go @@ -6,12 +6,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestSink_SignedURL(t *testing.T) { diff --git a/internal/bundleuri/strategy.go b/internal/bundleuri/strategy.go index 5307ec2df143d6296cb766dfbc6b201ec9d71cdc..b881a2aa44010ee43854c8d219250ba331d68969 100644 --- a/internal/bundleuri/strategy.go +++ b/internal/bundleuri/strategy.go @@ -3,7 +3,7 @@ package bundleuri import ( "context" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" ) // StrategyCallbackFn defines a function type that the `Evaluate` method diff --git a/internal/bundleuri/strategy_occurences.go b/internal/bundleuri/strategy_occurences.go index 444da80d6ec0c9170f3d861be7553d41f2f9ee13..db61227accb05ee1d672b5f71eea856bcf47f54a 100644 --- a/internal/bundleuri/strategy_occurences.go +++ b/internal/bundleuri/strategy_occurences.go @@ -7,9 +7,9 @@ import ( "time" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) // evaluateRequest is a helper struct to pass along multiple diff --git a/internal/bundleuri/strategy_occurences_test.go b/internal/bundleuri/strategy_occurences_test.go index c2f3035bb34545416c38795ab395b9f1afc31548..bf9059f1e112f14a5dd0cdd0d50321f9a76ef76f 100644 --- a/internal/bundleuri/strategy_occurences_test.go +++ b/internal/bundleuri/strategy_occurences_test.go @@ -7,11 +7,11 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestOccurrenceStrategy_Evaluate(t *testing.T) { diff --git a/internal/bundleuri/strategy_simple.go b/internal/bundleuri/strategy_simple.go index 0263539d34835840ed5863687a6b354813be3784..737e40d6456bdbb2c08f5a32815d07c63dbf9661 100644 --- a/internal/bundleuri/strategy_simple.go +++ b/internal/bundleuri/strategy_simple.go @@ -3,7 +3,7 @@ package bundleuri import ( "context" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" ) // SimpleStrategy is a very simple strategy used diff --git a/internal/bundleuri/testhelper_test.go b/internal/bundleuri/testhelper_test.go index b2dd3cfea388360987cb6e5582021315fc51d4e7..6b869188b5a8627374e781d6669a1e80b8ca67ce 100644 --- a/internal/bundleuri/testhelper_test.go +++ b/internal/bundleuri/testhelper_test.go @@ -3,7 +3,7 @@ package bundleuri import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/cache/cache.go b/internal/cache/cache.go index aec6b508a12f0801f842c6e080479ccd15d843c6..577424a795f94bdabcad642d41678200eaefe689 100644 --- a/internal/cache/cache.go +++ b/internal/cache/cache.go @@ -4,7 +4,7 @@ import ( "context" "io" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/proto" ) diff --git a/internal/cache/diskcache.go b/internal/cache/diskcache.go index 0d9cfef73dd89f616baa015efe3a3cc885751a25..9e76b0b50b16843c765c871044a0d221fefb889f 100644 --- a/internal/cache/diskcache.go +++ b/internal/cache/diskcache.go @@ -9,13 +9,13 @@ import ( "sync" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/dontpanic" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/safe" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/dontpanic" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/safe" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/proto" ) diff --git a/internal/cache/diskcache_test.go b/internal/cache/diskcache_test.go index 273e29d03bb22fe6a606f7a27af95c1c50685603..31df79dfb960b9ca22bf8402ff98603e77b6e573 100644 --- a/internal/cache/diskcache_test.go +++ b/internal/cache/diskcache_test.go @@ -9,12 +9,12 @@ import ( promtest "github.com/prometheus/client_golang/prometheus/testutil" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestStreamDBNaiveKeyer(t *testing.T) { diff --git a/internal/cache/keyer.go b/internal/cache/keyer.go index e35461fb5a19bbe1b0eb6130ba153657264c5273..16ebad356a4a05f1beac009594eb1f43558bc034 100644 --- a/internal/cache/keyer.go +++ b/internal/cache/keyer.go @@ -14,13 +14,13 @@ import ( "time" "github.com/google/uuid" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/safe" - "gitlab.com/gitlab-org/gitaly/v16/internal/version" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/safe" + "gitlab.com/gitlab-org/gitaly/v17/internal/version" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/protobuf/proto" ) diff --git a/internal/cache/testhelper_test.go b/internal/cache/testhelper_test.go index 6c55da37a068a62f2b55197fdf75c3403cf2b942..dced38bf5641e8e96f4f8d88c0d461a07d02f8f7 100644 --- a/internal/cache/testhelper_test.go +++ b/internal/cache/testhelper_test.go @@ -3,7 +3,7 @@ package cache import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/cache/walker.go b/internal/cache/walker.go index 9444540c438a65a54e0ed3aaa37c068b0b7ffc95..37a105116f289531c74a32d5431fa0dfc4ccbe36 100644 --- a/internal/cache/walker.go +++ b/internal/cache/walker.go @@ -13,9 +13,9 @@ import ( "path/filepath" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/dontpanic" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/dontpanic" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" ) func (c *DiskCache) logWalkErr(err error, path, msg string) { diff --git a/internal/cache/walker_test.go b/internal/cache/walker_test.go index a5d09f6b02cd32d83cfe6cd66b4011be001e9b2e..1fff0acd58b7a08f73641e4f25c3f082927d893e 100644 --- a/internal/cache/walker_test.go +++ b/internal/cache/walker_test.go @@ -11,10 +11,10 @@ import ( promtest "github.com/prometheus/client_golang/prometheus/testutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestDiskCacheObjectWalker(t *testing.T) { diff --git a/internal/cgroups/cgroups.go b/internal/cgroups/cgroups.go index 8c918399e6c8387bfb0d62953b958033451fe4bc..6481be4f97441591b8cc959b2c3feba6940e3dec 100644 --- a/internal/cgroups/cgroups.go +++ b/internal/cgroups/cgroups.go @@ -5,9 +5,9 @@ import ( "os/exec" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/dontpanic" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/cgroups" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/dontpanic" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/cgroups" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) type addCommandCfg struct { diff --git a/internal/cgroups/cgroups_linux_test.go b/internal/cgroups/cgroups_linux_test.go index 80a307a941979afdcf14c8e936b8b2a91faaa14e..a72ed223cd5ba3c1bf64dc76cf3d1c8ecea7b1e9 100644 --- a/internal/cgroups/cgroups_linux_test.go +++ b/internal/cgroups/cgroups_linux_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/cgroups" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/cgroups" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestNewManagerNoop(t *testing.T) { diff --git a/internal/cgroups/handler_linux_test.go b/internal/cgroups/handler_linux_test.go index fd0da0c40ad8a7c9181333230b43211ea0cb7743..7628e71623161e46294fd4ffe08cdcbe996e6e7f 100644 --- a/internal/cgroups/handler_linux_test.go +++ b/internal/cgroups/handler_linux_test.go @@ -16,9 +16,9 @@ import ( cgrps "github.com/containerd/cgroups/v3" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/cgroups" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/cgroups" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func defaultCgroupsConfig() cgroups.Config { diff --git a/internal/cgroups/manager.go b/internal/cgroups/manager.go index 5697a90da878ac8f397f422ed82449f391730f33..4ac98791240b98ee89aefa8251d216dd88f1cb86 100644 --- a/internal/cgroups/manager.go +++ b/internal/cgroups/manager.go @@ -3,8 +3,8 @@ package cgroups import ( - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/cgroups" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/cgroups" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) func newCgroupManager(cgroups.Config, log.Logger, int) Manager { diff --git a/internal/cgroups/manager_linux.go b/internal/cgroups/manager_linux.go index f586e2989271cfa6d302dabc65480b90fd90546d..f7ff6164388ed236614131ba74fa37122e35343d 100644 --- a/internal/cgroups/manager_linux.go +++ b/internal/cgroups/manager_linux.go @@ -20,8 +20,8 @@ import ( cgrps "github.com/containerd/cgroups/v3" "github.com/opencontainers/runtime-spec/specs-go" "github.com/prometheus/client_golang/prometheus" - cgroupscfg "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/cgroups" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + cgroupscfg "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/cgroups" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) // cfs_period_us hardcoded to be 100ms. diff --git a/internal/cgroups/manager_linux_test.go b/internal/cgroups/manager_linux_test.go index 30068edc4df0b5fa994bd29b7e84ae11240c52ee..3bfcce28b49e3e449254e1842f181c242c5d2c08 100644 --- a/internal/cgroups/manager_linux_test.go +++ b/internal/cgroups/manager_linux_test.go @@ -10,8 +10,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/cgroups" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/cgroups" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) // mockRand is a mock for random number generator that implements randomizer interface of cgroups package. diff --git a/internal/cgroups/mock_linux_test.go b/internal/cgroups/mock_linux_test.go index 5cea6c9ad70087ef2413eb0f3442236676b3d816..f841c261bb1032beecd3b354993fd3a0755c0e6d 100644 --- a/internal/cgroups/mock_linux_test.go +++ b/internal/cgroups/mock_linux_test.go @@ -30,10 +30,10 @@ import ( cgrps "github.com/containerd/cgroups/v3" "github.com/containerd/cgroups/v3/cgroup1" "github.com/stretchr/testify/require" - cgroupscfg "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/cgroups" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + cgroupscfg "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/cgroups" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) type mockCgroup interface { diff --git a/internal/cgroups/testhelper_test.go b/internal/cgroups/testhelper_test.go index 32ab9c545ddc4f135c00ecd3e240adae982ded50..512fb367940b83fc2e74837e724dadfe4c53cc45 100644 --- a/internal/cgroups/testhelper_test.go +++ b/internal/cgroups/testhelper_test.go @@ -9,8 +9,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/cgroups" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/cgroups" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) // cmdArgs are Command arguments used processes to be added to a cgroup. diff --git a/internal/cgroups/v1_linux.go b/internal/cgroups/v1_linux.go index e7b1a2e5a1f4500e253cfd4c4e6f1cf5a48f3600..87606dc0073ea3122d9d07e75082b501dc0824a1 100644 --- a/internal/cgroups/v1_linux.go +++ b/internal/cgroups/v1_linux.go @@ -11,9 +11,9 @@ import ( "github.com/containerd/cgroups/v3/cgroup1" specs "github.com/opencontainers/runtime-spec/specs-go" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - cgroupscfg "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/cgroups" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + cgroupscfg "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/cgroups" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) type cgroupV1Handler struct { diff --git a/internal/cgroups/v2_linux.go b/internal/cgroups/v2_linux.go index 1683e13ae48a269b18847d961a8230e2bb0b6296..8599c0e50987933688625d753448f9cfd6319e7d 100644 --- a/internal/cgroups/v2_linux.go +++ b/internal/cgroups/v2_linux.go @@ -13,10 +13,10 @@ import ( "github.com/containerd/cgroups/v3/cgroup2" "github.com/opencontainers/runtime-spec/specs-go" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - cgroupscfg "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/cgroups" - "gitlab.com/gitlab-org/gitaly/v16/internal/kernel" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + cgroupscfg "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/cgroups" + "gitlab.com/gitlab-org/gitaly/v17/internal/kernel" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) type cgroupV2Handler struct { diff --git a/internal/cli/gitaly/app.go b/internal/cli/gitaly/app.go index b3c621083bb72f44acacae4275b3da462ce45de3..77198cdc5157157a091e306f40d60e37ec4b7fac 100644 --- a/internal/cli/gitaly/app.go +++ b/internal/cli/gitaly/app.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/version" + "gitlab.com/gitlab-org/gitaly/v17/internal/version" ) func init() { diff --git a/internal/cli/gitaly/serve.go b/internal/cli/gitaly/serve.go index 09a0d8649ffb3194047d3bba0641374c352cceb8..4aa882a12243f3b86418f8333a4d7c63a7dd2061 100644 --- a/internal/cli/gitaly/serve.go +++ b/internal/cli/gitaly/serve.go @@ -11,51 +11,51 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16" - "gitlab.com/gitlab-org/gitaly/v16/internal/backup" - "gitlab.com/gitlab-org/gitaly/v16/internal/bootstrap" - "gitlab.com/gitlab-org/gitaly/v16/internal/bootstrap/starter" - "gitlab.com/gitlab-org/gitaly/v16/internal/bundleuri" - "gitlab.com/gitlab-org/gitaly/v16/internal/cache" - "gitlab.com/gitlab-org/gitaly/v16/internal/cgroups" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping" - housekeepingmgr "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping/manager" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/sentry" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/maintenance" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/server" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/setup" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/counter" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue/databasemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mdfile" - nodeimpl "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/node" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/raftmgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/migration" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitlab" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/limithandler" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/env" - "gitlab.com/gitlab-org/gitaly/v16/internal/limiter" - "gitlab.com/gitlab-org/gitaly/v16/internal/limiter/watchers" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/streamcache" - "gitlab.com/gitlab-org/gitaly/v16/internal/tempdir" - "gitlab.com/gitlab-org/gitaly/v16/internal/tracing" - "gitlab.com/gitlab-org/gitaly/v16/internal/version" + "gitlab.com/gitlab-org/gitaly/v17" + "gitlab.com/gitlab-org/gitaly/v17/internal/backup" + "gitlab.com/gitlab-org/gitaly/v17/internal/bootstrap" + "gitlab.com/gitlab-org/gitaly/v17/internal/bootstrap/starter" + "gitlab.com/gitlab-org/gitaly/v17/internal/bundleuri" + "gitlab.com/gitlab-org/gitaly/v17/internal/cache" + "gitlab.com/gitlab-org/gitaly/v17/internal/cgroups" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping" + housekeepingmgr "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping/manager" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/sentry" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/maintenance" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/server" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/setup" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/counter" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue/databasemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mdfile" + nodeimpl "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/node" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/raftmgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/migration" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitlab" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/middleware/limithandler" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/env" + "gitlab.com/gitlab-org/gitaly/v17/internal/limiter" + "gitlab.com/gitlab-org/gitaly/v17/internal/limiter/watchers" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/streamcache" + "gitlab.com/gitlab-org/gitaly/v17/internal/tempdir" + "gitlab.com/gitlab-org/gitaly/v17/internal/tracing" + "gitlab.com/gitlab-org/gitaly/v17/internal/version" "gitlab.com/gitlab-org/labkit/fips" "gitlab.com/gitlab-org/labkit/monitoring" labkittracing "gitlab.com/gitlab-org/labkit/tracing" @@ -63,7 +63,7 @@ import ( "google.golang.org/grpc" // Import to register the proxy codec with gRPC. - _ "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/proxy" + _ "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/proxy" ) func newServeCommand() *cli.Command { diff --git a/internal/cli/gitaly/subcmd_badger_db.go b/internal/cli/gitaly/subcmd_badger_db.go index 841c3bd4f7a1f650e0aad65fca301f84ecd7ea15..3848fff4a2d4b9bfe1628f5fbdd5788bd49ba712 100644 --- a/internal/cli/gitaly/subcmd_badger_db.go +++ b/internal/cli/gitaly/subcmd_badger_db.go @@ -9,9 +9,9 @@ import ( "strconv" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/encoding/prototext" "google.golang.org/protobuf/proto" ) diff --git a/internal/cli/gitaly/subcmd_badger_db_test.go b/internal/cli/gitaly/subcmd_badger_db_test.go index 756691cfbb7e46da4545507fa9b5a230de0f00cf..755b60150dc409bb39c5fddf03a31c173dc1871a 100644 --- a/internal/cli/gitaly/subcmd_badger_db_test.go +++ b/internal/cli/gitaly/subcmd_badger_db_test.go @@ -8,10 +8,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/proto" ) diff --git a/internal/cli/gitaly/subcmd_bundleuri.go b/internal/cli/gitaly/subcmd_bundleuri.go index b6c92b5807537119b237d6df7096b5221323ce23..ed6c906d23f04d44ace95c60c8488b45eadb45b5 100644 --- a/internal/cli/gitaly/subcmd_bundleuri.go +++ b/internal/cli/gitaly/subcmd_bundleuri.go @@ -5,8 +5,8 @@ import ( "time" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func newBundleURICommand() *cli.Command { diff --git a/internal/cli/gitaly/subcmd_check.go b/internal/cli/gitaly/subcmd_check.go index 5c1a9e6fc782e0bd16a6abb950f2d2c641d18f83..4a956da68fd8a3c3a78f23daba9d3d78091cbddd 100644 --- a/internal/cli/gitaly/subcmd_check.go +++ b/internal/cli/gitaly/subcmd_check.go @@ -7,14 +7,14 @@ import ( "os" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitlab" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/prometheus" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitlab" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) func newCheckCommand() *cli.Command { diff --git a/internal/cli/gitaly/subcmd_configuration.go b/internal/cli/gitaly/subcmd_configuration.go index 6e5a2d702f6a96671e201f934a026a05922249fe..67d6a76bdd0a2c9d5d195cf9de8537bf612f529a 100644 --- a/internal/cli/gitaly/subcmd_configuration.go +++ b/internal/cli/gitaly/subcmd_configuration.go @@ -2,9 +2,9 @@ package gitaly import ( "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/cmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/cmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) const validationErrorCode = 2 diff --git a/internal/cli/gitaly/subcmd_configuration_test.go b/internal/cli/gitaly/subcmd_configuration_test.go index 153a939cedaeabfdb3cc1e7ba2df5166733fdbd6..9a27f23c88c76e1f1f4d213c3f26a43cf7f3b51b 100644 --- a/internal/cli/gitaly/subcmd_configuration_test.go +++ b/internal/cli/gitaly/subcmd_configuration_test.go @@ -10,9 +10,9 @@ import ( "github.com/pelletier/go-toml/v2" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestConfiguration(t *testing.T) { diff --git a/internal/cli/gitaly/subcmd_git.go b/internal/cli/gitaly/subcmd_git.go index 256f6125c97ed5c22bf115ef372cbe3259e1452c..044b36ee0ef4b59cb9b1319136d60b329c19f1ed 100644 --- a/internal/cli/gitaly/subcmd_git.go +++ b/internal/cli/gitaly/subcmd_git.go @@ -9,9 +9,9 @@ import ( "strings" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) func gitalyConfigFlag() *cli.StringFlag { diff --git a/internal/cli/gitaly/subcmd_git_test.go b/internal/cli/gitaly/subcmd_git_test.go index f7d491f6563c77bbc3a360bdc063826d9c8f49ca..b33b08b3e05a989ffa537b0f703fc38ea9542b55 100644 --- a/internal/cli/gitaly/subcmd_git_test.go +++ b/internal/cli/gitaly/subcmd_git_test.go @@ -8,9 +8,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestGitalyGitCommand(t *testing.T) { diff --git a/internal/cli/gitaly/subcmd_hooks.go b/internal/cli/gitaly/subcmd_hooks.go index 9b81003f3512e2a38fd09f3461979cdc57bd0c3c..a1ab4aeb3ea9c811c80172ac6c5d8c660550d1b6 100644 --- a/internal/cli/gitaly/subcmd_hooks.go +++ b/internal/cli/gitaly/subcmd_hooks.go @@ -8,12 +8,12 @@ import ( "time" "github.com/urfave/cli/v2" - gitalyauth "gitlab.com/gitlab-org/gitaly/v16/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + gitalyauth "gitlab.com/gitlab-org/gitaly/v17/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" "google.golang.org/grpc" ) diff --git a/internal/cli/gitaly/subcmd_hooks_test.go b/internal/cli/gitaly/subcmd_hooks_test.go index 01b4942a49f25f49ca57c8ec83c14ba9c0f92573..674fc82a0de769784ba5e6d4d8059b453a4eead0 100644 --- a/internal/cli/gitaly/subcmd_hooks_test.go +++ b/internal/cli/gitaly/subcmd_hooks_test.go @@ -10,18 +10,18 @@ import ( "testing" "github.com/stretchr/testify/require" - gitalyauth "gitlab.com/gitlab-org/gitaly/v16/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/archive" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/setup" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + gitalyauth "gitlab.com/gitlab-org/gitaly/v17/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/archive" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/setup" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" "google.golang.org/grpc" ) diff --git a/internal/cli/gitaly/subcmd_recovery.go b/internal/cli/gitaly/subcmd_recovery.go index b5893825258d7e51f2823bd73d89aefc5e7c8eb1..9c53e268220ba043c9a6f0b32aff77c186691525 100644 --- a/internal/cli/gitaly/subcmd_recovery.go +++ b/internal/cli/gitaly/subcmd_recovery.go @@ -15,23 +15,23 @@ import ( "time" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16" - "gitlab.com/gitlab-org/gitaly/v16/internal/backup" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue/databasemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - nodeimpl "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/node" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/migration" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17" + "gitlab.com/gitlab-org/gitaly/v17/internal/backup" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue/databasemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + nodeimpl "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/node" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/migration" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" "golang.org/x/sync/errgroup" ) diff --git a/internal/cli/gitaly/subcmd_recovery_test.go b/internal/cli/gitaly/subcmd_recovery_test.go index 24f89366c90c2ac2fdc0f723a71bc622588c28df..c5c937b3bf8d9a77d0eaa43cc99418ce82b39cd4 100644 --- a/internal/cli/gitaly/subcmd_recovery_test.go +++ b/internal/cli/gitaly/subcmd_recovery_test.go @@ -11,25 +11,25 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/repoutil" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/counter" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue/databasemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/node" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/repoutil" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/counter" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue/databasemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/node" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/proto" ) diff --git a/internal/cli/gitaly/testhelper_test.go b/internal/cli/gitaly/testhelper_test.go index 0aa8282d5ebdf889011ac026836c96bd3b504368..276c23c79afadea7232a4a14ad974e211459a6b0 100644 --- a/internal/cli/gitaly/testhelper_test.go +++ b/internal/cli/gitaly/testhelper_test.go @@ -3,7 +3,7 @@ package gitaly import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/cli/gitalybackup/create.go b/internal/cli/gitalybackup/create.go index 4127f4e6454a79e8cd6f7327f404f208f0f754e7..bfcd884894453bc1d391374ea10f9311c545536e 100644 --- a/internal/cli/gitalybackup/create.go +++ b/internal/cli/gitalybackup/create.go @@ -10,11 +10,11 @@ import ( "time" cli "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/backup" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/backup" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) type serverRepository struct { diff --git a/internal/cli/gitalybackup/create_test.go b/internal/cli/gitalybackup/create_test.go index a82ac02d29bbe8157371bf6f90987d2c7f5a57b2..fe28be7c98f23b5c945b894a6c34b5d44dc5b6f0 100644 --- a/internal/cli/gitalybackup/create_test.go +++ b/internal/cli/gitalybackup/create_test.go @@ -10,14 +10,14 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/backup" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/setup" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/backup" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/setup" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestCreateSubcommand(t *testing.T) { diff --git a/internal/cli/gitalybackup/main.go b/internal/cli/gitalybackup/main.go index 743c269895baa0ea9fa71303c4e1d63fd0983729..4a45868b501bb918f576fc5890aa51c8e6944f77 100644 --- a/internal/cli/gitalybackup/main.go +++ b/internal/cli/gitalybackup/main.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/version" + "gitlab.com/gitlab-org/gitaly/v17/internal/version" ) func init() { diff --git a/internal/cli/gitalybackup/partition.go b/internal/cli/gitalybackup/partition.go index 1a2c08d687c18bc1044cde0bead1d425130b95a5..b6d1424ec62d3a252c8465ab7b08d5647dd3e468 100644 --- a/internal/cli/gitalybackup/partition.go +++ b/internal/cli/gitalybackup/partition.go @@ -9,10 +9,10 @@ import ( "syscall" cli "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/backup" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/backup" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) type partitionCreateSubcommand struct { diff --git a/internal/cli/gitalybackup/partition_test.go b/internal/cli/gitalybackup/partition_test.go index 615ec856618e11a1aad436ef4481cac725fa6f67..d1f4472083fcaec5e9c5b535bbc7e4518caa1cfa 100644 --- a/internal/cli/gitalybackup/partition_test.go +++ b/internal/cli/gitalybackup/partition_test.go @@ -8,16 +8,16 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/archive" - "gitlab.com/gitlab-org/gitaly/v16/internal/backup" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/setup" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/archive" + "gitlab.com/gitlab-org/gitaly/v17/internal/backup" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/setup" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" ) func TestPartitionSubcommand_Create(t *testing.T) { diff --git a/internal/cli/gitalybackup/restore.go b/internal/cli/gitalybackup/restore.go index 9be9b2de7abec1a7eaaf5f94153c3f52a75ed2d4..f625c7d3ee5fc63806722f3bdacb3699e8aa7608 100644 --- a/internal/cli/gitalybackup/restore.go +++ b/internal/cli/gitalybackup/restore.go @@ -9,11 +9,11 @@ import ( "runtime" cli "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/backup" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/backup" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/cli/gitalybackup/restore_test.go b/internal/cli/gitalybackup/restore_test.go index 223642fef09e30be3116f41637330b52e87e14cd..aab4b95bc9ab66658e59b09dcbf19174f36aa59b 100644 --- a/internal/cli/gitalybackup/restore_test.go +++ b/internal/cli/gitalybackup/restore_test.go @@ -11,15 +11,15 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/backup" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/setup" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/backup" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/setup" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestRestoreSubcommand(t *testing.T) { diff --git a/internal/cli/gitalybackup/testhelper_test.go b/internal/cli/gitalybackup/testhelper_test.go index b0413c9be36958be5c1c8966afbae4c124cba810..63d2f59fa59a4619eb23219cf8c21613b1c868b3 100644 --- a/internal/cli/gitalybackup/testhelper_test.go +++ b/internal/cli/gitalybackup/testhelper_test.go @@ -3,7 +3,7 @@ package gitalybackup import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/cli/praefect/main.go b/internal/cli/praefect/main.go index 6ae5451665d2c5c5ab87e9ebc43d2e2b43a1e978..b7b5fd2085f6f1eb55115d8b1d350e90eb1f8b6c 100644 --- a/internal/cli/praefect/main.go +++ b/internal/cli/praefect/main.go @@ -19,8 +19,8 @@ import ( "slices" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/version" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/version" ) func init() { diff --git a/internal/cli/praefect/main_test.go b/internal/cli/praefect/main_test.go index 66664830f4fef954f7c91bb49c064b7a1ebeecb0..f9e3cc681227a76d2cd4ad89bfeeb29754cc7840 100644 --- a/internal/cli/praefect/main_test.go +++ b/internal/cli/praefect/main_test.go @@ -9,10 +9,10 @@ import ( "github.com/pelletier/go-toml/v2" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/bootstrap/starter" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/bootstrap/starter" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) type stubFlag struct{} diff --git a/internal/cli/praefect/serve.go b/internal/cli/praefect/serve.go index 82be8d648378cd22f73369606f468930d0ec0c6f..15aa24224ab480d612e160fbb5147e20afc8495b 100644 --- a/internal/cli/praefect/serve.go +++ b/internal/cli/praefect/serve.go @@ -15,27 +15,27 @@ import ( "github.com/prometheus/client_golang/prometheus/promauto" "github.com/prometheus/client_golang/prometheus/promhttp" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/bootstrap" - "gitlab.com/gitlab-org/gitaly/v16/internal/bootstrap/starter" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/sentry" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/sidechannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/glsql" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/metrics" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes/tracker" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/reconciler" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/repocleaner" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/service/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/transactions" - "gitlab.com/gitlab-org/gitaly/v16/internal/version" + "gitlab.com/gitlab-org/gitaly/v17/internal/bootstrap" + "gitlab.com/gitlab-org/gitaly/v17/internal/bootstrap/starter" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/sentry" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/sidechannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/metrics" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/nodes/tracker" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/reconciler" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/repocleaner" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/service/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/transactions" + "gitlab.com/gitlab-org/gitaly/v17/internal/version" "gitlab.com/gitlab-org/labkit/monitoring" "gitlab.com/gitlab-org/labkit/tracing" ) diff --git a/internal/cli/praefect/server_options.go b/internal/cli/praefect/server_options.go index 5989eb97707070f4df36334f54203f3120c11a02..b193f8621aefada6d477ee7e259ecec4cfad25e1 100644 --- a/internal/cli/praefect/server_options.go +++ b/internal/cli/praefect/server_options.go @@ -2,7 +2,7 @@ package praefect -import "gitlab.com/gitlab-org/gitaly/v16/internal/praefect" +import "gitlab.com/gitlab-org/gitaly/v17/internal/praefect" // defaultServerOptions are only required by our testing infrastructure. When spawning Praefect as // an external, proxying executable we want to be able to use test-only interceptors. So if the diff --git a/internal/cli/praefect/server_options_testing.go b/internal/cli/praefect/server_options_testing.go index f86439e41a6d3933a53b9b4901ee1a07a6c1fbc1..1c7c0a1859bf49a10b2aef98ad94b746938b3700 100644 --- a/internal/cli/praefect/server_options_testing.go +++ b/internal/cli/praefect/server_options_testing.go @@ -3,8 +3,8 @@ package praefect import ( - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" ) // defaultServerOptions are only required by our testing infrastructure. When spawning Praefect as diff --git a/internal/cli/praefect/subcmd.go b/internal/cli/praefect/subcmd.go index bb171b2a32a472fd9fa77bc6547f8cbdcc28abbf..ea15f1a86914e835a3f42c485568311e21946558 100644 --- a/internal/cli/praefect/subcmd.go +++ b/internal/cli/praefect/subcmd.go @@ -8,10 +8,10 @@ import ( "io" "time" - gitalyauth "gitlab.com/gitlab-org/gitaly/v16/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/glsql" + gitalyauth "gitlab.com/gitlab-org/gitaly/v17/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/glsql" "google.golang.org/grpc" ) diff --git a/internal/cli/praefect/subcmd_accept_dataloss.go b/internal/cli/praefect/subcmd_accept_dataloss.go index 6228940a0c89ba4df49f6cd1133a8c99d86cc4e7..bbfdfae89fec3f67bb04d6f28d5f0a4ff72c7520 100644 --- a/internal/cli/praefect/subcmd_accept_dataloss.go +++ b/internal/cli/praefect/subcmd_accept_dataloss.go @@ -4,8 +4,8 @@ import ( "fmt" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func newAcceptDatalossCommand() *cli.Command { diff --git a/internal/cli/praefect/subcmd_accept_dataloss_test.go b/internal/cli/praefect/subcmd_accept_dataloss_test.go index d2d4ae2dee413dfa4f0e8309e3c2d8d89fe0ad53..b83c52a5fa925299cdaca74a2961261afcc0f148 100644 --- a/internal/cli/praefect/subcmd_accept_dataloss_test.go +++ b/internal/cli/praefect/subcmd_accept_dataloss_test.go @@ -4,11 +4,11 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/service/info" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/service/info" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" ) func TestAcceptDatalossSubcommand(t *testing.T) { diff --git a/internal/cli/praefect/subcmd_check.go b/internal/cli/praefect/subcmd_check.go index 5d85136002edb5fe5e09d8ca2d866743af56a861..afd28a1b9c40749cf36762870eba3f9a58df49ab 100644 --- a/internal/cli/praefect/subcmd_check.go +++ b/internal/cli/praefect/subcmd_check.go @@ -8,8 +8,8 @@ import ( "time" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/service" ) func newCheckCommand(checkFuncs []service.CheckFunc) *cli.Command { diff --git a/internal/cli/praefect/subcmd_check_test.go b/internal/cli/praefect/subcmd_check_test.go index c970b8520d28910c9d910cc7ccf5c6443625f9c2..eb3811741d07942ee41ce06f06e5334b0b392e35 100644 --- a/internal/cli/praefect/subcmd_check_test.go +++ b/internal/cli/praefect/subcmd_check_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/service" ) func TestCheckSubcommand(t *testing.T) { diff --git a/internal/cli/praefect/subcmd_configuration_validate.go b/internal/cli/praefect/subcmd_configuration_validate.go index 949f297b5e5a2f73fc4e23de18331ae66faf0efc..b33dac6c7c9d19ea3cd99e239ab5cd5cf6a4c1b0 100644 --- a/internal/cli/praefect/subcmd_configuration_validate.go +++ b/internal/cli/praefect/subcmd_configuration_validate.go @@ -4,9 +4,9 @@ import ( "io" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/cmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/cmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" ) const validationErrorCode = 2 diff --git a/internal/cli/praefect/subcmd_configuration_validate_test.go b/internal/cli/praefect/subcmd_configuration_validate_test.go index 94ba135d8e712f87cf3e173f3ae580e4ac7c2532..185e625ee0b4d9ca312055f6dd6cb5c60dfd9c68 100644 --- a/internal/cli/praefect/subcmd_configuration_validate_test.go +++ b/internal/cli/praefect/subcmd_configuration_validate_test.go @@ -9,15 +9,15 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestConfiguration_validate(t *testing.T) { t.Parallel() - praefectBin := testcfg.BuildBinary(t, testhelper.TempDir(t), "gitlab.com/gitlab-org/gitaly/v16/cmd/praefect") + praefectBin := testcfg.BuildBinary(t, testhelper.TempDir(t), "gitlab.com/gitlab-org/gitaly/v17/cmd/praefect") for _, tc := range []struct { name string diff --git a/internal/cli/praefect/subcmd_dataloss.go b/internal/cli/praefect/subcmd_dataloss.go index e2fa1e5ea001efa550fd11e6367732ec7609664c..bca17364c4fc54e8f23ad5acafce28cf70b6db17 100644 --- a/internal/cli/praefect/subcmd_dataloss.go +++ b/internal/cli/praefect/subcmd_dataloss.go @@ -8,8 +8,8 @@ import ( "strings" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func newDatalossCommand() *cli.Command { diff --git a/internal/cli/praefect/subcmd_dataloss_test.go b/internal/cli/praefect/subcmd_dataloss_test.go index 0e2e76f7677e73956ac2080d2cd414f36677b39f..9c3351f6563dead93b03a2efacc71ebe2d4a22d4 100644 --- a/internal/cli/praefect/subcmd_dataloss_test.go +++ b/internal/cli/praefect/subcmd_dataloss_test.go @@ -6,11 +6,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/service/info" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/service/info" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" ) func TestDatalossSubcommand(t *testing.T) { diff --git a/internal/cli/praefect/subcmd_dial_nodes.go b/internal/cli/praefect/subcmd_dial_nodes.go index 7c2bda57eafed1c74a8b15e1c52f944c345f0f7e..15b0b33cddd1193f4d112392bbeb7cd88ad07bd7 100644 --- a/internal/cli/praefect/subcmd_dial_nodes.go +++ b/internal/cli/praefect/subcmd_dial_nodes.go @@ -4,8 +4,8 @@ import ( "context" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/nodes" ) func newDialNodesCommand() *cli.Command { diff --git a/internal/cli/praefect/subcmd_dial_nodes_test.go b/internal/cli/praefect/subcmd_dial_nodes_test.go index 37dc49d7a2fbe2bc84a5f0906ad8b1049ca76f31..8086b442d6af7cf090a3a84c5e380c9dca80e0d3 100644 --- a/internal/cli/praefect/subcmd_dial_nodes_test.go +++ b/internal/cli/praefect/subcmd_dial_nodes_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) type mockServerService struct { diff --git a/internal/cli/praefect/subcmd_list_storages.go b/internal/cli/praefect/subcmd_list_storages.go index c2b89202ca91327c23241d2cd2eba96f053019a4..bcf08365c4ef2bd9dd5b164b27491e3137d60081 100644 --- a/internal/cli/praefect/subcmd_list_storages.go +++ b/internal/cli/praefect/subcmd_list_storages.go @@ -5,7 +5,7 @@ import ( "github.com/olekukonko/tablewriter" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) func newListStoragesCommand() *cli.Command { diff --git a/internal/cli/praefect/subcmd_list_storages_test.go b/internal/cli/praefect/subcmd_list_storages_test.go index 44bcf9e7607ced419de7e97984a74e916ff702c1..e8e237979876a60f87cdb7747327ccb382cfbb5f 100644 --- a/internal/cli/praefect/subcmd_list_storages_test.go +++ b/internal/cli/praefect/subcmd_list_storages_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" ) func TestListStoragesSubcommand(t *testing.T) { diff --git a/internal/cli/praefect/subcmd_list_untracked_repositories.go b/internal/cli/praefect/subcmd_list_untracked_repositories.go index af356deba1cd9effc2f3355571b0e2985bcbc03e..28bda5a8753621c65d55939aebc7c6b5d543f67a 100644 --- a/internal/cli/praefect/subcmd_list_untracked_repositories.go +++ b/internal/cli/praefect/subcmd_list_untracked_repositories.go @@ -9,12 +9,12 @@ import ( "time" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/glsql" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/repocleaner" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/repocleaner" "gitlab.com/gitlab-org/labkit/correlation" "google.golang.org/grpc/metadata" ) diff --git a/internal/cli/praefect/subcmd_list_untracked_repositories_test.go b/internal/cli/praefect/subcmd_list_untracked_repositories_test.go index 7f530203269f18e5e34c0b25d2530b7e7d812119..4ad1a0a485fb97071d1ba7b83fc8ae6c7b3a0750 100644 --- a/internal/cli/praefect/subcmd_list_untracked_repositories_test.go +++ b/internal/cli/praefect/subcmd_list_untracked_repositories_test.go @@ -11,15 +11,15 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/setup" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/setup" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestListUntrackedRepositoriesCommand(t *testing.T) { diff --git a/internal/cli/praefect/subcmd_metadata.go b/internal/cli/praefect/subcmd_metadata.go index 44c7ef829320ef395f9ff1a355bf64e6996eebe5..cf9c8ce6c940b6b455e17739806ad19fdc3693f0 100644 --- a/internal/cli/praefect/subcmd_metadata.go +++ b/internal/cli/praefect/subcmd_metadata.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func newMetadataCommand() *cli.Command { diff --git a/internal/cli/praefect/subcmd_metadata_test.go b/internal/cli/praefect/subcmd_metadata_test.go index b2e901a3303efe2c1291cd1c045a4f14e6ef7a10..b994e674ff9a4d338d0fa0ae67d256d4d147a7f4 100644 --- a/internal/cli/praefect/subcmd_metadata_test.go +++ b/internal/cli/praefect/subcmd_metadata_test.go @@ -9,11 +9,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/service/info" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/service/info" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/cli/praefect/subcmd_remove_repository.go b/internal/cli/praefect/subcmd_remove_repository.go index 9fa906d4306ae7ff5431a32d31d97fcb2e69aae9..863a4489d7785a045b6ceac67bc076bad2a3dbfe 100644 --- a/internal/cli/praefect/subcmd_remove_repository.go +++ b/internal/cli/praefect/subcmd_remove_repository.go @@ -10,12 +10,12 @@ import ( "time" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/glsql" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "gitlab.com/gitlab-org/labkit/correlation" "google.golang.org/grpc/metadata" ) diff --git a/internal/cli/praefect/subcmd_remove_repository_test.go b/internal/cli/praefect/subcmd_remove_repository_test.go index 3f0a6b62b247194d749b35beb95f05530de62fd6..d5b26df45d36879ecaa8a6bd3b5d5bdc72964eb3 100644 --- a/internal/cli/praefect/subcmd_remove_repository_test.go +++ b/internal/cli/praefect/subcmd_remove_repository_test.go @@ -11,19 +11,19 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - gitalycfg "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/setup" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/glsql" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + gitalycfg "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/setup" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" ) diff --git a/internal/cli/praefect/subcmd_set_replication_factor.go b/internal/cli/praefect/subcmd_set_replication_factor.go index fa1d41800d8d65685d8e1ec8a171c4e084ea8925..8e12fd8bc71778045e32a97ab593008416f0b405 100644 --- a/internal/cli/praefect/subcmd_set_replication_factor.go +++ b/internal/cli/praefect/subcmd_set_replication_factor.go @@ -5,8 +5,8 @@ import ( "strings" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) const ( diff --git a/internal/cli/praefect/subcmd_set_replication_factor_test.go b/internal/cli/praefect/subcmd_set_replication_factor_test.go index 7c70d28ca61a6a3e840fa070173f64a5faf4dd12..75766bbf70c5634a57478a00790a969550abcfba 100644 --- a/internal/cli/praefect/subcmd_set_replication_factor_test.go +++ b/internal/cli/praefect/subcmd_set_replication_factor_test.go @@ -7,12 +7,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/service/info" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/service/info" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/cli/praefect/subcmd_sql_migrate.go b/internal/cli/praefect/subcmd_sql_migrate.go index a98b14aa9d25dc1c9f88b0cdfc090aa61925fbbb..3be6b9a4b05aa6b721cb501fa2bfd1d61875a8bc 100644 --- a/internal/cli/praefect/subcmd_sql_migrate.go +++ b/internal/cli/praefect/subcmd_sql_migrate.go @@ -6,9 +6,9 @@ import ( migrate "github.com/rubenv/sql-migrate" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/glsql" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/migrations" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/migrations" ) const ( diff --git a/internal/cli/praefect/subcmd_sql_migrate_down.go b/internal/cli/praefect/subcmd_sql_migrate_down.go index 4c643cc540198be68931ede3575b1a1154ccb55c..e1c035c7920970ddf851d43770e93be2b82a53dc 100644 --- a/internal/cli/praefect/subcmd_sql_migrate_down.go +++ b/internal/cli/praefect/subcmd_sql_migrate_down.go @@ -5,8 +5,8 @@ import ( "strconv" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" ) const sqlMigrateDownCmdName = "sql-migrate-down" diff --git a/internal/cli/praefect/subcmd_sql_migrate_down_test.go b/internal/cli/praefect/subcmd_sql_migrate_down_test.go index 70983f79afe3bb773edae6f0d2de6d95de60f729..7a03afa97a1298c6b7b318a4cf85338c7f7d852e 100644 --- a/internal/cli/praefect/subcmd_sql_migrate_down_test.go +++ b/internal/cli/praefect/subcmd_sql_migrate_down_test.go @@ -6,9 +6,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/migrations" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/migrations" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" ) func TestSQLMigrateDownSubcommand(t *testing.T) { diff --git a/internal/cli/praefect/subcmd_sql_migrate_status.go b/internal/cli/praefect/subcmd_sql_migrate_status.go index 45bdd80973018fde0071c9e646da1d50e685f563..8f780bd08d9347a3f8791b5b2d4d881710e7cadd 100644 --- a/internal/cli/praefect/subcmd_sql_migrate_status.go +++ b/internal/cli/praefect/subcmd_sql_migrate_status.go @@ -5,8 +5,8 @@ import ( "github.com/olekukonko/tablewriter" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" ) const sqlMigrateStatusCmdName = "sql-migrate-status" diff --git a/internal/cli/praefect/subcmd_sql_migrate_status_test.go b/internal/cli/praefect/subcmd_sql_migrate_status_test.go index a2c978314dfc86b1d94d193aa6be022eab055164..82d2ec52a7c6f57e62a8ab333821e3b75cf1487d 100644 --- a/internal/cli/praefect/subcmd_sql_migrate_status_test.go +++ b/internal/cli/praefect/subcmd_sql_migrate_status_test.go @@ -6,9 +6,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/migrations" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/migrations" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" ) func TestSQLMigrateStatusSubcommand(t *testing.T) { diff --git a/internal/cli/praefect/subcmd_sql_migrate_test.go b/internal/cli/praefect/subcmd_sql_migrate_test.go index 387dd758867c0835506ae35cc6d176b00d3bf553..681ffeea888fb7edd933ae875c391f6617c94232 100644 --- a/internal/cli/praefect/subcmd_sql_migrate_test.go +++ b/internal/cli/praefect/subcmd_sql_migrate_test.go @@ -7,9 +7,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/migrations" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/migrations" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" ) func TestSubCmdSqlMigrate(t *testing.T) { diff --git a/internal/cli/praefect/subcmd_sql_ping.go b/internal/cli/praefect/subcmd_sql_ping.go index 3811c8739fae56b1516bb39e6334754f059f3ea3..b6104b9214603e460020c24ae56ae38915b7b7de 100644 --- a/internal/cli/praefect/subcmd_sql_ping.go +++ b/internal/cli/praefect/subcmd_sql_ping.go @@ -4,8 +4,8 @@ import ( "fmt" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" ) const sqlPingCmdName = "sql-ping" diff --git a/internal/cli/praefect/subcmd_sql_ping_test.go b/internal/cli/praefect/subcmd_sql_ping_test.go index 525ce3aa592dd117aed1cd6c6342dc5cbb17405a..d1265b4906e732e7a89154974f35ac295fc61a86 100644 --- a/internal/cli/praefect/subcmd_sql_ping_test.go +++ b/internal/cli/praefect/subcmd_sql_ping_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" ) func TestSQLPingSubcommand(t *testing.T) { diff --git a/internal/cli/praefect/subcmd_test.go b/internal/cli/praefect/subcmd_test.go index 6b560404279873716345ca27434679dc54251f49..8b4d701715963c7ff2d12eb94d313a12b7d13493 100644 --- a/internal/cli/praefect/subcmd_test.go +++ b/internal/cli/praefect/subcmd_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/health" diff --git a/internal/cli/praefect/subcmd_track_repositories.go b/internal/cli/praefect/subcmd_track_repositories.go index bde162108aa9d4abaf90b547f3be5616ca2f2fde..5a526ba2fc0096226eeed8729e673c44e08d0933 100644 --- a/internal/cli/praefect/subcmd_track_repositories.go +++ b/internal/cli/praefect/subcmd_track_repositories.go @@ -10,8 +10,8 @@ import ( "os" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" "gitlab.com/gitlab-org/labkit/correlation" ) diff --git a/internal/cli/praefect/subcmd_track_repositories_test.go b/internal/cli/praefect/subcmd_track_repositories_test.go index 77a27186352f842e3c614dab446fef028c84dcc2..f5230ccecc9ebefb74dd6cabea1dd0fb166f2ea1 100644 --- a/internal/cli/praefect/subcmd_track_repositories_test.go +++ b/internal/cli/praefect/subcmd_track_repositories_test.go @@ -12,19 +12,19 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/setup" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/promtest" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/setup" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/promtest" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestTrackRepositoriesSubcommand(t *testing.T) { diff --git a/internal/cli/praefect/subcmd_track_repository.go b/internal/cli/praefect/subcmd_track_repository.go index d54adac78f6d564b744351025a2e5323fb495955..93e48b3b341e7a841de70dea8370329e1a199d25 100644 --- a/internal/cli/praefect/subcmd_track_repository.go +++ b/internal/cli/praefect/subcmd_track_repository.go @@ -10,14 +10,14 @@ import ( "time" "github.com/urfave/cli/v2" - glcli "gitlab.com/gitlab-org/gitaly/v16/internal/cli" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/glsql" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + glcli "gitlab.com/gitlab-org/gitaly/v17/internal/cli" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "gitlab.com/gitlab-org/labkit/correlation" "google.golang.org/grpc/metadata" ) diff --git a/internal/cli/praefect/subcmd_track_repository_test.go b/internal/cli/praefect/subcmd_track_repository_test.go index 332988d80168fd35472d0f92b1e406f954d9a81d..b11bc13b2d2ba57c7501aea41aac15051f88e997 100644 --- a/internal/cli/praefect/subcmd_track_repository_test.go +++ b/internal/cli/praefect/subcmd_track_repository_test.go @@ -7,19 +7,19 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/setup" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/promtest" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/setup" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/promtest" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestTrackRepositorySubcommand(t *testing.T) { diff --git a/internal/cli/praefect/subcmd_verify.go b/internal/cli/praefect/subcmd_verify.go index 6c5da4a56c2c7dc60acbf8fb21816470891307ab..d55055daf385eeff5f60fd469d0a5d1b3bb83284 100644 --- a/internal/cli/praefect/subcmd_verify.go +++ b/internal/cli/praefect/subcmd_verify.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) const verifyCmdName = "verify" diff --git a/internal/cli/praefect/subcmd_verify_test.go b/internal/cli/praefect/subcmd_verify_test.go index a2f63a35668cb51cd44801ddc98492957a18b96d..a24c0dc876807c100d0f7e265f60e391d5878744 100644 --- a/internal/cli/praefect/subcmd_verify_test.go +++ b/internal/cli/praefect/subcmd_verify_test.go @@ -8,11 +8,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/service/info" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/service/info" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" ) func TestVerifySubcommand(t *testing.T) { diff --git a/internal/cli/praefect/testhelper_test.go b/internal/cli/praefect/testhelper_test.go index 9817ac4d538d5011e912bc4a139490f8f35eb719..3ff41ce77d61f0ea4f8620e27493e22c64e672c4 100644 --- a/internal/cli/praefect/testhelper_test.go +++ b/internal/cli/praefect/testhelper_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/command/command.go b/internal/command/command.go index f943559064ca834cc86e3e641ef54102997d1578..d21133dc1a1724e2d29a812661561e8fb0193e4a 100644 --- a/internal/command/command.go +++ b/internal/command/command.go @@ -17,11 +17,11 @@ import ( "github.com/opentracing/opentracing-go" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "gitlab.com/gitlab-org/gitaly/v16/internal/command/commandcounter" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/requestinfohandler" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/tracing" + "gitlab.com/gitlab-org/gitaly/v17/internal/command/commandcounter" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/middleware/requestinfohandler" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/tracing" labkittracing "gitlab.com/gitlab-org/labkit/tracing" ) diff --git a/internal/command/command_test.go b/internal/command/command_test.go index b3cbdf8b179e336916a3c6fcdd93579d1ecf31b3..05b2bc9882dc40f3b0aca4db4ac230e7acf466da 100644 --- a/internal/command/command_test.go +++ b/internal/command/command_test.go @@ -19,8 +19,8 @@ import ( "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/cgroups" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/cgroups" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestNew_environment(t *testing.T) { diff --git a/internal/command/option.go b/internal/command/option.go index a7d2d68d37a0a49f9dacea0a9d9e1554861bbdba..b036465d416a90bb07bd7f0bea76f0325ddaaf29 100644 --- a/internal/command/option.go +++ b/internal/command/option.go @@ -4,9 +4,9 @@ import ( "context" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/cgroups" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/cgroups" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) type config struct { diff --git a/internal/command/subprocess_logger.go b/internal/command/subprocess_logger.go index 962c7016d3dc452aeb4c4c209440a23a84d37156..ef8fc5e886b95aca53e05de2c14774c094bc37f3 100644 --- a/internal/command/subprocess_logger.go +++ b/internal/command/subprocess_logger.go @@ -9,7 +9,7 @@ import ( "os" "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" "gitlab.com/gitlab-org/labkit/correlation" ) diff --git a/internal/command/subprocess_logger_test.go b/internal/command/subprocess_logger_test.go index df1901602896d312ad327ab81821fb83bd67d5e4..fa349527c3f51ca4f9700d06341c3c1a99dcf371 100644 --- a/internal/command/subprocess_logger_test.go +++ b/internal/command/subprocess_logger_test.go @@ -13,8 +13,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) type capturedOutput struct { diff --git a/internal/command/testdata/subprocess/main.go b/internal/command/testdata/subprocess/main.go index 58ae2843f7bc984e4831b231c7ab2a44edd5bccb..6d0cd3d6ef90c6733bacfefa4695bb5b0c147d66 100644 --- a/internal/command/testdata/subprocess/main.go +++ b/internal/command/testdata/subprocess/main.go @@ -10,7 +10,7 @@ import ( "os" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" ) // main implements a helper binary for testing subprocess loggers. It sets up a subprocess logger and diff --git a/internal/command/testhelper_test.go b/internal/command/testhelper_test.go index e0296fc34ec1ab6f03634f6957ded0774b4539d3..2fcec9bd9dd3b07a43580a9394aa062ca0641b38 100644 --- a/internal/command/testhelper_test.go +++ b/internal/command/testhelper_test.go @@ -3,7 +3,7 @@ package command import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/datastructure/testhelper_test.go b/internal/datastructure/testhelper_test.go index ec72a17896874ecd6215875885c93b8ab422abec..6c2c731644c730c66dd640208f25d7aac0053156 100644 --- a/internal/datastructure/testhelper_test.go +++ b/internal/datastructure/testhelper_test.go @@ -3,7 +3,7 @@ package datastructure import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/dontpanic/retry.go b/internal/dontpanic/retry.go index 8672619c4915bdb69b207a74947c8d4b9bc8991f..7d5e82c38278b4b69fbfe44cf5e26741ec589861 100644 --- a/internal/dontpanic/retry.go +++ b/internal/dontpanic/retry.go @@ -12,7 +12,7 @@ import ( "time" sentry "github.com/getsentry/sentry-go" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/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 ff65c39ca9734fc8f91b01bdea0b306e4b21571d..cb462fef9823c3a4346764b4754b96fddb021571 100644 --- a/internal/dontpanic/retry_test.go +++ b/internal/dontpanic/retry_test.go @@ -5,8 +5,8 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/dontpanic" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/dontpanic" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestTry(t *testing.T) { diff --git a/internal/dontpanic/testhelper_test.go b/internal/dontpanic/testhelper_test.go index 18067f32d0e0cedc872aee7adcf23ebc6adeca75..4c9d9a4994acee6718bd47cabf219b43b4d6d0ad 100644 --- a/internal/dontpanic/testhelper_test.go +++ b/internal/dontpanic/testhelper_test.go @@ -3,7 +3,7 @@ package dontpanic import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/errors/cfgerror/testhelper_test.go b/internal/errors/cfgerror/testhelper_test.go index 9ce72044ee8eba13d9b3130d4129ed41dad7aa09..adf55dab227f991ebd4b4bd5b4c22b6afbe2900f 100644 --- a/internal/errors/cfgerror/testhelper_test.go +++ b/internal/errors/cfgerror/testhelper_test.go @@ -3,7 +3,7 @@ package cfgerror import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/errors/cfgerror/validate_test.go b/internal/errors/cfgerror/validate_test.go index 0c9731cd9639e4bf68df6689a529602a64727a20..539feb2b429daf10db4a3ac42039999b5f297ec3 100644 --- a/internal/errors/cfgerror/validate_test.go +++ b/internal/errors/cfgerror/validate_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestValidationError_Error(t *testing.T) { diff --git a/internal/featureflag/context_test.go b/internal/featureflag/context_test.go index 5cebf88dbad8b76ef074c874460c712fb7ac828b..b0e4215a1b296497c8bd09a70f787388b352e27d 100644 --- a/internal/featureflag/context_test.go +++ b/internal/featureflag/context_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/stretchr/testify/require" - gitaly_metadata "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" + gitaly_metadata "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" "google.golang.org/grpc/metadata" ) diff --git a/internal/featureflag/featureflag.go b/internal/featureflag/featureflag.go index 0ccf7ba31d88873c30b51eaa31c80f8e75b278ea..221ac407eb5482f69b4eb41093c7d60c79960b2e 100644 --- a/internal/featureflag/featureflag.go +++ b/internal/featureflag/featureflag.go @@ -9,7 +9,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/env" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/env" "google.golang.org/grpc/metadata" ) diff --git a/internal/git/catfile/cache.go b/internal/git/catfile/cache.go index e3e9cf5b69387fd948305be2c8add8edb5627602..2f09178ca0385cc2b329b7fed4a0de4172249ad4 100644 --- a/internal/git/catfile/cache.go +++ b/internal/git/catfile/cache.go @@ -8,11 +8,11 @@ import ( "time" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/tracing" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/tracing" "gitlab.com/gitlab-org/labkit/correlation" ) diff --git a/internal/git/catfile/cache_test.go b/internal/git/catfile/cache_test.go index 6b233097a3ec25cf98512c0115aeb2e58a034fee..2d29ef39e5d30592b3968edf47491cbc6da556e6 100644 --- a/internal/git/catfile/cache_test.go +++ b/internal/git/catfile/cache_test.go @@ -10,12 +10,12 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" "gitlab.com/gitlab-org/labkit/correlation" "google.golang.org/grpc/metadata" ) diff --git a/internal/git/catfile/commit.go b/internal/git/catfile/commit.go index 31bc3a51c3e362c2b038f2b39cabb6c5ba7680e5..208c1c787f0a9cb456b99f0ca0c82b01fbd5ffe2 100644 --- a/internal/git/catfile/commit.go +++ b/internal/git/catfile/commit.go @@ -7,11 +7,11 @@ import ( "fmt" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/trailerparser" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/trailerparser" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // GetCommit looks up a commit by revision using an existing Batch instance. diff --git a/internal/git/catfile/commit_test.go b/internal/git/catfile/commit_test.go index 2142e56064930a40a7cac452a520898c34d26251..dfdb1228a81f7a4dc952e50c8bad2a65a78c337f 100644 --- a/internal/git/catfile/commit_test.go +++ b/internal/git/catfile/commit_test.go @@ -4,10 +4,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/metadata" ) diff --git a/internal/git/catfile/object_content_reader.go b/internal/git/catfile/object_content_reader.go index 379ea6608431cfbb52cf737ebcce74c9b9f37972..de179c0605585baa010b75f7f7231a0bbff90125 100644 --- a/internal/git/catfile/object_content_reader.go +++ b/internal/git/catfile/object_content_reader.go @@ -4,7 +4,7 @@ import ( "context" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" ) // ObjectContentReader is a reader for Git objects. diff --git a/internal/git/catfile/object_info_reader.go b/internal/git/catfile/object_info_reader.go index 7ccea1e68ad37e728f10d3d3c5f28d1d2a8d7bde..82cbc31e1fe731a02115c25d37c9e1562af17ff4 100644 --- a/internal/git/catfile/object_info_reader.go +++ b/internal/git/catfile/object_info_reader.go @@ -7,8 +7,8 @@ import ( "strconv" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" ) // ObjectInfoReader returns information about an object referenced by a given revision. diff --git a/internal/git/catfile/object_info_reader_fuzz.go b/internal/git/catfile/object_info_reader_fuzz.go index bc7258b7e55f10b3811e08a26ff6fce099970e1b..cd75e11df8234d37086b5eedd687b7ae05898743 100644 --- a/internal/git/catfile/object_info_reader_fuzz.go +++ b/internal/git/catfile/object_info_reader_fuzz.go @@ -6,7 +6,7 @@ import ( "bufio" "bytes" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" ) func Fuzz(data []byte) int { diff --git a/internal/git/catfile/object_reader.go b/internal/git/catfile/object_reader.go index 3f2c300e67190614b6d9c4578dee432b039f001d..078778a868109e2b80bac765b936573886573c8d 100644 --- a/internal/git/catfile/object_reader.go +++ b/internal/git/catfile/object_reader.go @@ -7,10 +7,10 @@ import ( "sync/atomic" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" ) // ObjectReader returns information about an object referenced by a given revision. diff --git a/internal/git/catfile/object_reader_test.go b/internal/git/catfile/object_reader_test.go index 78ec9782bb397b04d4a4817bd24adc71db3a13f1..143a35585f07d4c9168a8b21ce4bc33a22f6acef 100644 --- a/internal/git/catfile/object_reader_test.go +++ b/internal/git/catfile/object_reader_test.go @@ -11,12 +11,12 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/testutil" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestObjectReader_reader(t *testing.T) { diff --git a/internal/git/catfile/parse_commit.go b/internal/git/catfile/parse_commit.go index 6c96aeb89ec773d7cc9eb052922bf6c94c6f2c69..dbcc6b08aba1669f43a28d8a8f73646b11a9dbd5 100644 --- a/internal/git/catfile/parse_commit.go +++ b/internal/git/catfile/parse_commit.go @@ -7,9 +7,9 @@ import ( "io" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) const ( diff --git a/internal/git/catfile/parse_commit_test.go b/internal/git/catfile/parse_commit_test.go index e6bf8edfceefec2fc6e9a12f09df164373b2f3da..5d4f1c4015afaca4932fec9326dee649ada33ba8 100644 --- a/internal/git/catfile/parse_commit_test.go +++ b/internal/git/catfile/parse_commit_test.go @@ -7,10 +7,10 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/internal/git/catfile/parser.go b/internal/git/catfile/parser.go index 9a08411fc24e5e97d438e30fdb9b61d45e058ec6..b550175c2a978e0dec0372c618c948f53b4f7240 100644 --- a/internal/git/catfile/parser.go +++ b/internal/git/catfile/parser.go @@ -10,8 +10,8 @@ import ( "strings" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/internal/git/catfile/parser_test.go b/internal/git/catfile/parser_test.go index b54251965bb727c4c6d4a734103abc7c76e67cbc..2914092c73261f289143f362d64b9c60d7668bc2 100644 --- a/internal/git/catfile/parser_test.go +++ b/internal/git/catfile/parser_test.go @@ -5,9 +5,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/internal/git/catfile/request_queue.go b/internal/git/catfile/request_queue.go index 130898013b3844d17c02f7923e0a09978cf03548..c66f8ace81d28488fbb3e2e6d20da7f3a7327244 100644 --- a/internal/git/catfile/request_queue.go +++ b/internal/git/catfile/request_queue.go @@ -11,9 +11,9 @@ import ( "sync/atomic" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" ) const ( diff --git a/internal/git/catfile/request_queue_test.go b/internal/git/catfile/request_queue_test.go index 5bb2c5cb7921335213f4e96c4c1362a8f4afe932..04a522746de200b738580c4fac5b8d42a9e543da 100644 --- a/internal/git/catfile/request_queue_test.go +++ b/internal/git/catfile/request_queue_test.go @@ -10,14 +10,14 @@ import ( "unsafe" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestRequestQueue_ReadObject(t *testing.T) { diff --git a/internal/git/catfile/tag.go b/internal/git/catfile/tag.go index d47df1dabef47196d35ccf3b31d99c53db30fbe7..c163a56410650116819c3c65998f75a00e6c388e 100644 --- a/internal/git/catfile/tag.go +++ b/internal/git/catfile/tag.go @@ -6,10 +6,10 @@ import ( "fmt" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/tracing" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/tracing" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // GetTag looks up a commit by tagID using an existing catfile.Batch instance. Note: we pass diff --git a/internal/git/catfile/tag_test.go b/internal/git/catfile/tag_test.go index 69d5c664e767287ae7202e9c0bbbeb29435fbe94..f17bfe65c9fc008b30694436812b9214d3b27bc6 100644 --- a/internal/git/catfile/tag_test.go +++ b/internal/git/catfile/tag_test.go @@ -6,11 +6,11 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestGetTag(t *testing.T) { diff --git a/internal/git/catfile/testhelper_test.go b/internal/git/catfile/testhelper_test.go index 11cf5d94daedbe4c8b9a5ae1095ea1ea3621ba2a..b80869af9d8c277e6d42bbd3d6b48c1d4bf72cc4 100644 --- a/internal/git/catfile/testhelper_test.go +++ b/internal/git/catfile/testhelper_test.go @@ -8,16 +8,16 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestMain(m *testing.M) { diff --git a/internal/git/catfile/tracing.go b/internal/git/catfile/tracing.go index 3fff31360d7c3a4d97366ef52c5fc38a5f175890..b31dcc529ceea18ec06499a85626a928a1f401e0 100644 --- a/internal/git/catfile/tracing.go +++ b/internal/git/catfile/tracing.go @@ -6,7 +6,7 @@ import ( "github.com/opentracing/opentracing-go" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/tracing" + "gitlab.com/gitlab-org/gitaly/v17/internal/tracing" ) type trace struct { diff --git a/internal/git/catfile/tree_entries.go b/internal/git/catfile/tree_entries.go index df6caeeb119c3b332f20cd6ab026aa8b5e36b4d9..cf241389fd30adb8098d8e676574373961186e4d 100644 --- a/internal/git/catfile/tree_entries.go +++ b/internal/git/catfile/tree_entries.go @@ -11,9 +11,9 @@ import ( "path/filepath" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/tracing" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/tracing" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) type revisionPath struct{ revision, path string } diff --git a/internal/git/conflict/parser_test.go b/internal/git/conflict/parser_test.go index 35f315d8935d4e0e5b3d75d18db993cacba7e8f6..ef32f789120ab8596efc1d9f602064281fdc094b 100644 --- a/internal/git/conflict/parser_test.go +++ b/internal/git/conflict/parser_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" ) func TestFile_Resolve(t *testing.T) { diff --git a/internal/git/conflict/resolve.go b/internal/git/conflict/resolve.go index 1b970220e926021f1beca4bbde6c94dcde81e98c..56f4f4703524a906fffb8d11405f961422531de6 100644 --- a/internal/git/conflict/resolve.go +++ b/internal/git/conflict/resolve.go @@ -9,7 +9,7 @@ import ( "io" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" ) // section denotes the various conflict sections diff --git a/internal/git/conflict/resolve_test.go b/internal/git/conflict/resolve_test.go index 878479446d3aabca452c101d7c9cb2849d025142..4c21912e73c45a60b99184a3fb02b6432c9cc981 100644 --- a/internal/git/conflict/resolve_test.go +++ b/internal/git/conflict/resolve_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" ) func TestResolve(t *testing.T) { diff --git a/internal/git/conflict/testhelper_test.go b/internal/git/conflict/testhelper_test.go index 2de131e4b1a8768b23983042fbff3630261b0bf6..24a105ee810badf9195d66f97e4184ec63abfe4f 100644 --- a/internal/git/conflict/testhelper_test.go +++ b/internal/git/conflict/testhelper_test.go @@ -3,7 +3,7 @@ package conflict import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/git/dirs.go b/internal/git/dirs.go index 7bfd7197a742172915be593a05d0c864e9dff59f..7d486ff09bbbebffede2327f3502c7ef9db22207 100644 --- a/internal/git/dirs.go +++ b/internal/git/dirs.go @@ -7,7 +7,7 @@ import ( "path/filepath" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) // alternateOutsideStorageError is returned when an alternates file contains an diff --git a/internal/git/dirs_test.go b/internal/git/dirs_test.go index 170315843dbd4296068fc0a2cde2fd59711f1c2f..b271f08e96e2566a41ff9edde9cafb1b27d27e18 100644 --- a/internal/git/dirs_test.go +++ b/internal/git/dirs_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestObjectDirs(t *testing.T) { diff --git a/internal/git/gitattributes/check_attr.go b/internal/git/gitattributes/check_attr.go index b94007a9ae3d6d3ed36512f6c7ad72cd2e7d783e..f4bee21e2ace61117aa45fa0eb3c13d265322f8e 100644 --- a/internal/git/gitattributes/check_attr.go +++ b/internal/git/gitattributes/check_attr.go @@ -8,10 +8,10 @@ import ( "strings" "sync" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" ) // CheckAttrCmd can be used to get the gitattributes(5) for a set of files in a diff --git a/internal/git/gitattributes/check_attr_test.go b/internal/git/gitattributes/check_attr_test.go index cb051ec723e966104ec8d599dbe108d91ea2f47e..10384a87f7a02d101f5ddc134acf76dc7390b4a4 100644 --- a/internal/git/gitattributes/check_attr_test.go +++ b/internal/git/gitattributes/check_attr_test.go @@ -4,12 +4,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestCheckAttr(t *testing.T) { diff --git a/internal/git/gitattributes/testhelper_test.go b/internal/git/gitattributes/testhelper_test.go index a7037d0873ae16db39c8dda3fb720ddff9da9f8e..95fa355a932725207c70ca1492e737561e803e9a 100644 --- a/internal/git/gitattributes/testhelper_test.go +++ b/internal/git/gitattributes/testhelper_test.go @@ -3,7 +3,7 @@ package gitattributes import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/git/gitcmd/bitmap.go b/internal/git/gitcmd/bitmap.go index d0b684cab69cd22b758140021b7927deb11c82e2..9cf29ad742ab0e85599a6796713eaed6eb5ec156 100644 --- a/internal/git/gitcmd/bitmap.go +++ b/internal/git/gitcmd/bitmap.go @@ -8,10 +8,10 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/requestinfohandler" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/middleware/requestinfohandler" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) var badBitmapRequestCount = promauto.NewCounterVec( diff --git a/internal/git/gitcmd/blob.go b/internal/git/gitcmd/blob.go index 6c554f4fcc7af374840f2ef2b774569cd7095632..cb082a173dcce45d2fdee0da293d703d101f6dcc 100644 --- a/internal/git/gitcmd/blob.go +++ b/internal/git/gitcmd/blob.go @@ -6,9 +6,9 @@ import ( "io" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" ) // WriteBlobConfig is the configuration used to write blobs into the repository. diff --git a/internal/git/gitcmd/command_description.go b/internal/git/gitcmd/command_description.go index 5899e4ace405ad8fc968722634fdba834b489bcc..f1f8e715939da2fc472f072413afd3f654091569 100644 --- a/internal/git/gitcmd/command_description.go +++ b/internal/git/gitcmd/command_description.go @@ -7,8 +7,8 @@ import ( "runtime" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" ) const ( diff --git a/internal/git/gitcmd/command_description_test.go b/internal/git/gitcmd/command_description_test.go index 686701eda4bea40a866f292cdfea10f6ad5bf664..f4779f5a01dbff762fbfce00c91f62fbd5390c29 100644 --- a/internal/git/gitcmd/command_description_test.go +++ b/internal/git/gitcmd/command_description_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestCommandDescriptions_revListPositionalArgs(t *testing.T) { diff --git a/internal/git/gitcmd/command_factory.go b/internal/git/gitcmd/command_factory.go index a1533b83239c279d99f10165cbd88aca2f9d2795..bc78b5950e7253ecbbc68bc2a90c9cd11a647a22 100644 --- a/internal/git/gitcmd/command_factory.go +++ b/internal/git/gitcmd/command_factory.go @@ -11,17 +11,17 @@ import ( "sync" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/cgroups" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/alternates" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/trace2" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/trace2hooks" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/tracing" + "gitlab.com/gitlab-org/gitaly/v17/internal/cgroups" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/alternates" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/trace2" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/trace2hooks" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/tracing" "gitlab.com/gitlab-org/labkit/correlation" "golang.org/x/time/rate" ) diff --git a/internal/git/gitcmd/command_factory_cgroup_test.go b/internal/git/gitcmd/command_factory_cgroup_test.go index 7332e2d28f5ae93c05816226d437b70a130987ee..89c18ab00c6e7ff0e837dca0c330d1672a55a1b8 100644 --- a/internal/git/gitcmd/command_factory_cgroup_test.go +++ b/internal/git/gitcmd/command_factory_cgroup_test.go @@ -6,11 +6,11 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/cgroups" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/cgroups" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) type mockCgroupsManager struct { diff --git a/internal/git/gitcmd/command_factory_test.go b/internal/git/gitcmd/command_factory_test.go index ad3083261170a6922ca7c0b62607fcf358219220..a11bb9f4ee7afd47e5705565ffe338fa4ec6bd82 100644 --- a/internal/git/gitcmd/command_factory_test.go +++ b/internal/git/gitcmd/command_factory_test.go @@ -13,19 +13,19 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/trace2" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/trace2hooks" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/tracing" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/trace2" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/trace2hooks" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/tracing" "golang.org/x/time/rate" ) diff --git a/internal/git/gitcmd/command_options.go b/internal/git/gitcmd/command_options.go index f01273cf57eea402ee4957a5a5eb43c47c52f618..6b2e92617bcd8b4d2b8193d616d09f62ec7396ca 100644 --- a/internal/git/gitcmd/command_options.go +++ b/internal/git/gitcmd/command_options.go @@ -8,14 +8,14 @@ import ( "regexp" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/x509" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/x509" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "gitlab.com/gitlab-org/labkit/correlation" "google.golang.org/protobuf/encoding/protojson" ) diff --git a/internal/git/gitcmd/command_options_test.go b/internal/git/gitcmd/command_options_test.go index a5aef34ed652eb81203446de5f18c18a2b6d7870..8b1faf0d2b3610c535e17a66dd24379caec4a786 100644 --- a/internal/git/gitcmd/command_options_test.go +++ b/internal/git/gitcmd/command_options_test.go @@ -7,12 +7,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/errors/cfgerror" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/errors/cfgerror" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "gitlab.com/gitlab-org/labkit/correlation" "google.golang.org/grpc/metadata" "google.golang.org/protobuf/encoding/protojson" diff --git a/internal/git/gitcmd/decoder.go b/internal/git/gitcmd/decoder.go index 1c93b93086835b8fb0310165794a3fc4ef6afd16..779b8895dd3bc5b6804a962556c56455fd2c2b34 100644 --- a/internal/git/gitcmd/decoder.go +++ b/internal/git/gitcmd/decoder.go @@ -6,7 +6,7 @@ import ( "io" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" ) // ShowRefDecoder parses the output format of git-show-ref diff --git a/internal/git/gitcmd/decoder_test.go b/internal/git/gitcmd/decoder_test.go index 3315f3947eff77befd4b605f846bb5804773ff63..ce9e75c3856d22366a4c037600216e98808106e6 100644 --- a/internal/git/gitcmd/decoder_test.go +++ b/internal/git/gitcmd/decoder_test.go @@ -7,11 +7,11 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestShowRefDecoder(t *testing.T) { diff --git a/internal/git/gitcmd/execution_environment.go b/internal/git/gitcmd/execution_environment.go index 3cf80b1a02c19566d7ebb666b8b15df741176e77..eacd80bc8cd510411e560a7d0ae63f4c1eccf9ff 100644 --- a/internal/git/gitcmd/execution_environment.go +++ b/internal/git/gitcmd/execution_environment.go @@ -8,8 +8,8 @@ import ( "os/exec" "path/filepath" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" "golang.org/x/sys/unix" ) diff --git a/internal/git/gitcmd/execution_environment_test.go b/internal/git/gitcmd/execution_environment_test.go index caeb2424817656a3907641a6f9aedb1173cdeb9a..a6869e32d442e3b44696d0871a13bc4867ad6614 100644 --- a/internal/git/gitcmd/execution_environment_test.go +++ b/internal/git/gitcmd/execution_environment_test.go @@ -7,11 +7,11 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestDistributedGitEnvironmentConstructor(t *testing.T) { diff --git a/internal/git/gitcmd/fetch_scanner.go b/internal/git/gitcmd/fetch_scanner.go index 19b7a430f607e3e3980aed620c17bd633ccda5cc..02dac539b48e612cb1cecd4dd2f77d85cf5b81e3 100644 --- a/internal/git/gitcmd/fetch_scanner.go +++ b/internal/git/gitcmd/fetch_scanner.go @@ -8,7 +8,7 @@ import ( "io" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" ) // RefUpdateType represents the type of update a FetchStatusLine is. The diff --git a/internal/git/gitcmd/fetch_scanner_test.go b/internal/git/gitcmd/fetch_scanner_test.go index fb41a7c0baac1fdf8552f5724a5aa46e28c84fa6..078ee0df83df334f63e8eb6bdcf7a3eafe44bc5e 100644 --- a/internal/git/gitcmd/fetch_scanner_test.go +++ b/internal/git/gitcmd/fetch_scanner_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" ) func TestFetchScannerScan(t *testing.T) { diff --git a/internal/git/gitcmd/hooks_options.go b/internal/git/gitcmd/hooks_options.go index fadb62b5d764815f7032824e376d11e2d44f9141..09884a4b9242c47ad1b6ffaae9938f0439b671f2 100644 --- a/internal/git/gitcmd/hooks_options.go +++ b/internal/git/gitcmd/hooks_options.go @@ -5,13 +5,13 @@ import ( "errors" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" labkittracing "gitlab.com/gitlab-org/labkit/tracing" ) diff --git a/internal/git/gitcmd/hooks_options_test.go b/internal/git/gitcmd/hooks_options_test.go index 6f96d61e33ee1f0cf2817b11f7de5c574effe9d4..0d26ad7184b04c7555c27557dbe1f52f5f22cd96 100644 --- a/internal/git/gitcmd/hooks_options_test.go +++ b/internal/git/gitcmd/hooks_options_test.go @@ -5,13 +5,13 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" grpcmetadata "google.golang.org/grpc/metadata" ) diff --git a/internal/git/gitcmd/hooks_payload.go b/internal/git/gitcmd/hooks_payload.go index dd7768ca94fdbce1a5d28f7683d95f08d42bb9c9..2e65cfa3a032aa609bbc0ed4cdd205a194295055 100644 --- a/internal/git/gitcmd/hooks_payload.go +++ b/internal/git/gitcmd/hooks_payload.go @@ -8,13 +8,13 @@ import ( "fmt" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/encoding/protojson" ) diff --git a/internal/git/gitcmd/hooks_payload_test.go b/internal/git/gitcmd/hooks_payload_test.go index 4350cedb5f763100ab3304a667e63c2da1dfafcd..f46217703a9a13692cd087826b3f5a9e601e76b0 100644 --- a/internal/git/gitcmd/hooks_payload_test.go +++ b/internal/git/gitcmd/hooks_payload_test.go @@ -5,13 +5,13 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" ) func TestHooksPayload(t *testing.T) { diff --git a/internal/git/gitcmd/object_id.go b/internal/git/gitcmd/object_id.go index 2d8846a0d90e4db4f7010da23c8b1429125e5ed2..626fba94dd800a81f9a8861d4909ae2d7bd0cac1 100644 --- a/internal/git/gitcmd/object_id.go +++ b/internal/git/gitcmd/object_id.go @@ -9,7 +9,7 @@ import ( "path/filepath" "regexp" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" ) var regexpObjectFormat = regexp.MustCompile(`^[ \t]*(?i:objectformat)[ \t]*=[ \t]*(.*)[ \t;#]?`) diff --git a/internal/git/gitcmd/object_id_test.go b/internal/git/gitcmd/object_id_test.go index 97dd5e02dba13aecb6033e6be922f846002572ed..16a38f3ced297d77c4e07b01fcef12a989d47be4 100644 --- a/internal/git/gitcmd/object_id_test.go +++ b/internal/git/gitcmd/object_id_test.go @@ -5,13 +5,13 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestDetectObjectHash(t *testing.T) { diff --git a/internal/git/gitcmd/protocol.go b/internal/git/gitcmd/protocol.go index df67c345d8ff67f71ff583a2cd7d7ba4c6c3a372..698079d8762ca5562ac57d93a5b4b09d51207bdb 100644 --- a/internal/git/gitcmd/protocol.go +++ b/internal/git/gitcmd/protocol.go @@ -6,9 +6,9 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/requestinfohandler" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/middleware/requestinfohandler" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) const ( diff --git a/internal/git/gitcmd/protocol_test.go b/internal/git/gitcmd/protocol_test.go index b02823012f9d66021c9b1488b024d40a123a7eb0..5215828317f6b7314947747bf77e0cac7b91be0e 100644 --- a/internal/git/gitcmd/protocol_test.go +++ b/internal/git/gitcmd/protocol_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) type fakeProtocolMessage struct { diff --git a/internal/git/gitcmd/reference.go b/internal/git/gitcmd/reference.go index a54f46743564be18fe391b3d5eec7584a12fe599..73bf6d3cb69b0d61a55c45dd3834af296ef543bd 100644 --- a/internal/git/gitcmd/reference.go +++ b/internal/git/gitcmd/reference.go @@ -8,7 +8,7 @@ import ( "fmt" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" ) // GetReferencesConfig is configuration that can be passed to GetReferences in order to change its default behaviour. diff --git a/internal/git/gitcmd/reference_backend.go b/internal/git/gitcmd/reference_backend.go index cd59f7f8a69d955cf2f289947ba4ffe6a35a6ee4..a69447a198aeb0c428c673ad1e819c0a99c49d90 100644 --- a/internal/git/gitcmd/reference_backend.go +++ b/internal/git/gitcmd/reference_backend.go @@ -9,7 +9,7 @@ import ( "path/filepath" "regexp" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" ) var regexpReferenceBackend = regexp.MustCompile(`^[ \t]*(?i:refstorage)[ \t]*=[ \t]*(.*)[ \t;#]?`) diff --git a/internal/git/gitcmd/repository.go b/internal/git/gitcmd/repository.go index c25563f0087f352feff9470d1f8413b4facb5970..e6b22500c19743147ea9e2bb71d5c352d0607d84 100644 --- a/internal/git/gitcmd/repository.go +++ b/internal/git/gitcmd/repository.go @@ -3,9 +3,9 @@ package gitcmd import ( "context" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" ) // Repository is the common interface of different repository implementations. diff --git a/internal/git/gitcmd/ssh.go b/internal/git/gitcmd/ssh.go index e17d58f49e2bdc5376a8846e6fef578ffc1cd5ba..4c4128eee61611af0fdccb0446c661a066199608 100644 --- a/internal/git/gitcmd/ssh.go +++ b/internal/git/gitcmd/ssh.go @@ -7,8 +7,8 @@ import ( "path/filepath" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) // BuildSSHInvocation builds a command line to invoke SSH with the provided key and known hosts. diff --git a/internal/git/gitcmd/ssh_test.go b/internal/git/gitcmd/ssh_test.go index 21783244fbcbd0d6fc0cd1cef4850353a8f96e5f..1ed50c81feb3e8c2fc10dcf06cc086a07820fc63 100644 --- a/internal/git/gitcmd/ssh_test.go +++ b/internal/git/gitcmd/ssh_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestBuildSSHInvocation(t *testing.T) { diff --git a/internal/git/gitcmd/testhelper_test.go b/internal/git/gitcmd/testhelper_test.go index e9aa833437f7ca9815e62bbefb669a985206185d..22e4ca1346901794e56c256b039a7cdfc0b2e75b 100644 --- a/internal/git/gitcmd/testhelper_test.go +++ b/internal/git/gitcmd/testhelper_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/git/gitio/testhelper_test.go b/internal/git/gitio/testhelper_test.go index 39575eb47e0483f2d82cf7e83a172757c107826c..b0056bf6f2349cccf8b9a297b33c4a23cb0c69d1 100644 --- a/internal/git/gitio/testhelper_test.go +++ b/internal/git/gitio/testhelper_test.go @@ -3,7 +3,7 @@ package gitio import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/git/gitpipe/catfile_info.go b/internal/git/gitpipe/catfile_info.go index ac40ff7e532fb638d0e36fcc1d201ef2b7611944..85aa08518c813856730818b9ef4b404b8b5a51bc 100644 --- a/internal/git/gitpipe/catfile_info.go +++ b/internal/git/gitpipe/catfile_info.go @@ -9,11 +9,11 @@ import ( "io" "sync/atomic" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" ) // CatfileInfoResult is a result for the CatfileInfo pipeline step. diff --git a/internal/git/gitpipe/catfile_info_iterator.go b/internal/git/gitpipe/catfile_info_iterator.go index ef4efdeabfefb8aa7965cf47c20f58ce8ef5c0ac..0a635f7b32eba227431ecac1b03e91145fe83a7b 100644 --- a/internal/git/gitpipe/catfile_info_iterator.go +++ b/internal/git/gitpipe/catfile_info_iterator.go @@ -3,7 +3,7 @@ package gitpipe import ( "context" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" ) // CatfileInfoIterator is an iterator returned by the Revlist function. diff --git a/internal/git/gitpipe/catfile_info_test.go b/internal/git/gitpipe/catfile_info_test.go index 8d5cd03d46f47536f07b8df514d0a3a5996d8a65..4fa3c49a66c14f97ad6c9ae655a6d25dfc90bf79 100644 --- a/internal/git/gitpipe/catfile_info_test.go +++ b/internal/git/gitpipe/catfile_info_test.go @@ -8,12 +8,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" "google.golang.org/grpc/metadata" ) diff --git a/internal/git/gitpipe/catfile_object.go b/internal/git/gitpipe/catfile_object.go index 1ca4c083196ca41ee157159ec3d9a3adea0ce5a2..cb5508cd784dd5f08c189c3637af6aaa35e3aa55 100644 --- a/internal/git/gitpipe/catfile_object.go +++ b/internal/git/gitpipe/catfile_object.go @@ -8,8 +8,8 @@ import ( "sync" "sync/atomic" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" ) // CatfileObjectResult is a result for the CatfileObject pipeline step. diff --git a/internal/git/gitpipe/catfile_object_iterator.go b/internal/git/gitpipe/catfile_object_iterator.go index 3aa6ef0256bb5ba5276ec16df7e4bc0310c8bfa8..4f9ca2bfb138543e3d16cc528376c7f1944c3d8c 100644 --- a/internal/git/gitpipe/catfile_object_iterator.go +++ b/internal/git/gitpipe/catfile_object_iterator.go @@ -3,7 +3,7 @@ package gitpipe import ( "context" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" ) // CatfileObjectIterator is an iterator returned by the Revlist function. diff --git a/internal/git/gitpipe/catfile_object_test.go b/internal/git/gitpipe/catfile_object_test.go index 59872be1395ee9779964b3878376e40962c6ef86..105d738fe00876d457445052d66acc47ffe55b53 100644 --- a/internal/git/gitpipe/catfile_object_test.go +++ b/internal/git/gitpipe/catfile_object_test.go @@ -9,11 +9,11 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" "google.golang.org/grpc/metadata" ) diff --git a/internal/git/gitpipe/diff_tree.go b/internal/git/gitpipe/diff_tree.go index 1b0a3607ebbc5c931a354ba3139f145ca29eb1c4..efea728adf47fd6335fdcf7f207d9a3240b0dabb 100644 --- a/internal/git/gitpipe/diff_tree.go +++ b/internal/git/gitpipe/diff_tree.go @@ -7,9 +7,9 @@ import ( "fmt" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" ) // diffTreeConfig is configuration for the DiffTree pipeline step. diff --git a/internal/git/gitpipe/diff_tree_test.go b/internal/git/gitpipe/diff_tree_test.go index a883d3b0de42299fcca3a96d1efa617cb73faa35..631f7b0c8b8399d3e43aec163e427279171d3040 100644 --- a/internal/git/gitpipe/diff_tree_test.go +++ b/internal/git/gitpipe/diff_tree_test.go @@ -6,11 +6,11 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestDiffTree(t *testing.T) { diff --git a/internal/git/gitpipe/ls_tree.go b/internal/git/gitpipe/ls_tree.go index 5ff7867e7e82309ec368d13954fcd394cd79be2b..3df5caed1a3ac6fe1e49896bcb7aeb999aa5a0ed 100644 --- a/internal/git/gitpipe/ls_tree.go +++ b/internal/git/gitpipe/ls_tree.go @@ -7,8 +7,8 @@ import ( "io" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" ) // lsTreeConfig is configuration for the LsTree pipeline step. diff --git a/internal/git/gitpipe/ls_tree_test.go b/internal/git/gitpipe/ls_tree_test.go index 1b69673afd1fa630c58b44516b9ef2331b5f0415..587a08db4afc2cd26aa64a19db470d9231b641e6 100644 --- a/internal/git/gitpipe/ls_tree_test.go +++ b/internal/git/gitpipe/ls_tree_test.go @@ -6,11 +6,11 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestLsTree(t *testing.T) { diff --git a/internal/git/gitpipe/object_iterator.go b/internal/git/gitpipe/object_iterator.go index e013ff518d91b2bd9ec1ed9308b0f68a9a1ffc0f..7522bb1083f594c35f3d49d8fc6a3f15cd68a4c4 100644 --- a/internal/git/gitpipe/object_iterator.go +++ b/internal/git/gitpipe/object_iterator.go @@ -1,6 +1,6 @@ package gitpipe -import "gitlab.com/gitlab-org/gitaly/v16/internal/git" +import "gitlab.com/gitlab-org/gitaly/v17/internal/git" // ObjectIterator is a common interface that is shared across the pipeline steps that work with // objects. diff --git a/internal/git/gitpipe/pipeline_test.go b/internal/git/gitpipe/pipeline_test.go index ec41836752f1d5ce4a64768c53e9843b0a945ac0..d2f8ab8e689a7d3d5ff788f74a7aa6b466658c41 100644 --- a/internal/git/gitpipe/pipeline_test.go +++ b/internal/git/gitpipe/pipeline_test.go @@ -8,12 +8,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestPipeline_revlist(t *testing.T) { diff --git a/internal/git/gitpipe/revision.go b/internal/git/gitpipe/revision.go index d294045f08280062d4581d5403d07bd8301db4bb..bd984fbf7105885da564548ac11773b21cdc78b9 100644 --- a/internal/git/gitpipe/revision.go +++ b/internal/git/gitpipe/revision.go @@ -10,9 +10,9 @@ import ( "strings" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" ) // RevisionResult is a result for the revlist pipeline step. diff --git a/internal/git/gitpipe/revision_iterator.go b/internal/git/gitpipe/revision_iterator.go index 3f4b91f5fa1bb17da4c82eabee1e644831202eda..d7535ae8a17a4e66a6e0471baa70bf901e8ff6b0 100644 --- a/internal/git/gitpipe/revision_iterator.go +++ b/internal/git/gitpipe/revision_iterator.go @@ -3,7 +3,7 @@ package gitpipe import ( "context" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" ) // RevisionIterator is an iterator returned by the Revlist function. diff --git a/internal/git/gitpipe/revision_test.go b/internal/git/gitpipe/revision_test.go index 97ab4a942c7bc97a3d6796187e16e56e5a9ffc98..32657d217d4deb320b88832998122d22e30742a2 100644 --- a/internal/git/gitpipe/revision_test.go +++ b/internal/git/gitpipe/revision_test.go @@ -9,11 +9,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestRevlist(t *testing.T) { diff --git a/internal/git/gitpipe/testhelper_test.go b/internal/git/gitpipe/testhelper_test.go index df850aec7906d3a62b29f7870374f8e70ba31e1a..54a052662690f90f6da64cf753870c94d7dd68db 100644 --- a/internal/git/gitpipe/testhelper_test.go +++ b/internal/git/gitpipe/testhelper_test.go @@ -3,9 +3,9 @@ package gitpipe import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/git/gittest/blob.go b/internal/git/gittest/blob.go index cc3b858f0b45077f7fc514d90c7c4ab987caf710..34d36638af5d3c3993b55b86caaf025ec9c68356 100644 --- a/internal/git/gittest/blob.go +++ b/internal/git/gittest/blob.go @@ -7,10 +7,10 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) // WriteBlobs writes n distinct blobs into the git repository's object diff --git a/internal/git/gittest/command.go b/internal/git/gittest/command.go index ab964a84a165bb0d41096d2c5c75a34ac036703b..22483ffee5d632ca36e67ed32779797848c4f75c 100644 --- a/internal/git/gittest/command.go +++ b/internal/git/gittest/command.go @@ -10,13 +10,13 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // ExecConfig contains configuration for ExecOpts. diff --git a/internal/git/gittest/command_factory.go b/internal/git/gittest/command_factory.go index b0b0b5ad0d94af62b4e7e49c732e314c798eaa19..85ba558ded703442cf4b44e9b286d33b6d63d855 100644 --- a/internal/git/gittest/command_factory.go +++ b/internal/git/gittest/command_factory.go @@ -5,9 +5,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) // NewCommandFactory creates a new Git command factory. diff --git a/internal/git/gittest/command_test.go b/internal/git/gittest/command_test.go index 7438995cae0b1dcec0d725765489b9c47818e665..a6475c1a84b8a942ed641a0a8091bc482ff54389 100644 --- a/internal/git/gittest/command_test.go +++ b/internal/git/gittest/command_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" ) func TestExecOpts(t *testing.T) { diff --git a/internal/git/gittest/commit.go b/internal/git/gittest/commit.go index 88e28c703a8fc3349a7c5c33a5ae3e1fd3ad14a5..4669be978adf915c069cb4b3e165b8a5f1a94e50 100644 --- a/internal/git/gittest/commit.go +++ b/internal/git/gittest/commit.go @@ -10,11 +10,11 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/internal/git/gittest/commit_test.go b/internal/git/gittest/commit_test.go index 9efb5a9ac1aab8e7f5e135cba0adfaf5c7b4a707..66febb2d37258c7eed8ae868b3fa5723be3427d5 100644 --- a/internal/git/gittest/commit_test.go +++ b/internal/git/gittest/commit_test.go @@ -6,8 +6,8 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" ) func TestWriteCommit(t *testing.T) { diff --git a/internal/git/gittest/counting_command_factory.go b/internal/git/gittest/counting_command_factory.go index c41cf6061e632f254f490ffbdbf2b1fe36bb55c1..b8e517041c6c4d871445417e8cfd3710970e8297 100644 --- a/internal/git/gittest/counting_command_factory.go +++ b/internal/git/gittest/counting_command_factory.go @@ -6,10 +6,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" ) var _ gitcmd.CommandFactory = &CountingCommandFactory{} diff --git a/internal/git/gittest/counting_command_factory_test.go b/internal/git/gittest/counting_command_factory_test.go index e25a103e8c4da7f009b54d5690b4a64ff5859fa0..752b88cc3fb3a73eabf20b759d91a519f7e20854 100644 --- a/internal/git/gittest/counting_command_factory_test.go +++ b/internal/git/gittest/counting_command_factory_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestCountingCommandFactory(t *testing.T) { diff --git a/internal/git/gittest/delta_islands.go b/internal/git/gittest/delta_islands.go index 213f15e4f24ec95a977f863b93adb1c4ffd58921..e35cc5b0d882016714e04e59b2c1930d489c12bb 100644 --- a/internal/git/gittest/delta_islands.go +++ b/internal/git/gittest/delta_islands.go @@ -5,9 +5,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" ) // TestDeltaIslands checks whether functions that repack objects in a repository correctly set up diff --git a/internal/git/gittest/hooks.go b/internal/git/gittest/hooks.go index b93a74741eae317a352c344c57fa168cf72e894f..8d33cae42d9faa6112cd177690a0ee11d54a164f 100644 --- a/internal/git/gittest/hooks.go +++ b/internal/git/gittest/hooks.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) // WriteEnvToCustomHook dumps the env vars that the custom hooks receives to a file diff --git a/internal/git/gittest/http_server.go b/internal/git/gittest/http_server.go index fe48604e3d3733dca3ab628b4698af6e94c5140a..b3ba6375f5e67922701e90307238a0f22e72700c 100644 --- a/internal/git/gittest/http_server.go +++ b/internal/git/gittest/http_server.go @@ -10,9 +10,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) // HTTPServer starts an HTTP server with git-http-backend(1) as CGI handler. The repository is diff --git a/internal/git/gittest/intercepting_command_factory.go b/internal/git/gittest/intercepting_command_factory.go index e67389773a641cbe303965550bada5a295604c2f..1a487471e9137435b854bc27a711fb9c804b02b6 100644 --- a/internal/git/gittest/intercepting_command_factory.go +++ b/internal/git/gittest/intercepting_command_factory.go @@ -6,12 +6,12 @@ import ( "path/filepath" "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) var _ gitcmd.CommandFactory = &InterceptingCommandFactory{} diff --git a/internal/git/gittest/intercepting_command_factory_test.go b/internal/git/gittest/intercepting_command_factory_test.go index 5876a8e9773cff93d39b0a9c5ddd7bf96d10f827..80b6ce315f7d57f815644e308e8e2132feccb3d1 100644 --- a/internal/git/gittest/intercepting_command_factory_test.go +++ b/internal/git/gittest/intercepting_command_factory_test.go @@ -6,9 +6,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestInterceptingCommandFactory(t *testing.T) { diff --git a/internal/git/gittest/object_hash.go b/internal/git/gittest/object_hash.go index 5306b5c33f52df2f68c3cceeaaf73606e4f7ba23..a5e8cd15d5a1d5f7955ee9ea024845118c4af6d4 100644 --- a/internal/git/gittest/object_hash.go +++ b/internal/git/gittest/object_hash.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" ) // DefaultObjectHash is the default object hash used for running tests. diff --git a/internal/git/gittest/objectpool.go b/internal/git/gittest/objectpool.go index 4ea1237a1c1671d3e5f0928c64ca481474a4d67a..38de501b842f39e860390d76618c704fb33c8b75 100644 --- a/internal/git/gittest/objectpool.go +++ b/internal/git/gittest/objectpool.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" ) diff --git a/internal/git/gittest/objects.go b/internal/git/gittest/objects.go index fd07e38db03073746cc1272d5ffe50376ce5e6b0..9fb26457bf498f32c6d49eda22d93aeb2f452c88 100644 --- a/internal/git/gittest/objects.go +++ b/internal/git/gittest/objects.go @@ -9,9 +9,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" ) // ListObjects returns a list of all object IDs in the repository. diff --git a/internal/git/gittest/pktline.go b/internal/git/gittest/pktline.go index 12ccd6dc992d6a8b38fda96f782facd73f64d860..d4c1eb7fc75ab7d629ccdece6e46bf5e18627f92 100644 --- a/internal/git/gittest/pktline.go +++ b/internal/git/gittest/pktline.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/pktline" ) // Pktlinef formats the given formatting string into a pktline. diff --git a/internal/git/gittest/protocol.go b/internal/git/gittest/protocol.go index 75eef0b4ad1dd0bc7b7fd4c369f06ac98d7dacdf..dd6ff0611e5222363397aaf8203673b682fa1554 100644 --- a/internal/git/gittest/protocol.go +++ b/internal/git/gittest/protocol.go @@ -8,9 +8,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) // ProtocolDetectingCommandFactory is an intercepting Git command factory that allows the protocol diff --git a/internal/git/gittest/ref.go b/internal/git/gittest/ref.go index 54db894ec3ce94c936c8f78233e4f1588d70364b..fede22e575c158cd79eacdb6108cc8446e4c98ba 100644 --- a/internal/git/gittest/ref.go +++ b/internal/git/gittest/ref.go @@ -7,12 +7,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // WriteRef writes a reference into the repository pointing to the given object ID. diff --git a/internal/git/gittest/ref_test.go b/internal/git/gittest/ref_test.go index 30ccf0bd7a73ec9235155655e9decdb481861048..0e26f9026d7149ff9254130026338a40b4e2f303 100644 --- a/internal/git/gittest/ref_test.go +++ b/internal/git/gittest/ref_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" ) func TestResolveRevision(t *testing.T) { diff --git a/internal/git/gittest/reference_backend.go b/internal/git/gittest/reference_backend.go index 29307ef868054d612ce663dd4051d9fefd065349..92c337d626d274466767d7d8b24d5c67258f320a 100644 --- a/internal/git/gittest/reference_backend.go +++ b/internal/git/gittest/reference_backend.go @@ -9,9 +9,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" ) // DefaultReferenceBackend is the default reftable backend used for running tests. diff --git a/internal/git/gittest/repo.go b/internal/git/gittest/repo.go index f3a5dd42e921e28266db98db3065d39aeba3791f..f3e17bda52746a5a7ddbcd34d47a718c7d9e7595 100644 --- a/internal/git/gittest/repo.go +++ b/internal/git/gittest/repo.go @@ -10,17 +10,17 @@ import ( "testing" "github.com/stretchr/testify/require" - gitalyauth "gitlab.com/gitlab-org/gitaly/v16/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/transactiontest" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + gitalyauth "gitlab.com/gitlab-org/gitaly/v17/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/transactiontest" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/internal/git/gittest/repository_suite.go b/internal/git/gittest/repository_suite.go index 2bcee5b3dfaeb57729ad4a24ffa684cd80b958e0..ed294a4f11d80faab95c70e04073f16263ad35a5 100644 --- a/internal/git/gittest/repository_suite.go +++ b/internal/git/gittest/repository_suite.go @@ -5,9 +5,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) // RepositorySuiteState is the state used by TestRepository. diff --git a/internal/git/gittest/tag.go b/internal/git/gittest/tag.go index 760d6c9ba2638557d5365864d1ef29d6e8099c38..5e9feaff2253090e3b941583efc64266d35f6520 100644 --- a/internal/git/gittest/tag.go +++ b/internal/git/gittest/tag.go @@ -7,9 +7,9 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" ) // WriteTagConfig holds extra options for WriteTag. diff --git a/internal/git/gittest/testhelper_test.go b/internal/git/gittest/testhelper_test.go index 029fbbdeca277e7e6f51d765d6bc7a6179457956..a3c159a5742ed365c977e08e2acd4be9614b3dc5 100644 --- a/internal/git/gittest/testhelper_test.go +++ b/internal/git/gittest/testhelper_test.go @@ -3,10 +3,10 @@ package gittest import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestMain(m *testing.M) { diff --git a/internal/git/gittest/tree.go b/internal/git/gittest/tree.go index e9c8ab0e22cf9a8fd0cc38db9e5c827d2b7d03c2..38c277da447b735ad3f5e771f6c11c6d5faece91 100644 --- a/internal/git/gittest/tree.go +++ b/internal/git/gittest/tree.go @@ -10,10 +10,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // TreeEntry represents an entry of a git tree object. diff --git a/internal/git/gittest/tree_test.go b/internal/git/gittest/tree_test.go index 35d37ef0f5e0f7ec0c7f28f8db0ebdeb3ce22083..c8659eab7a4ec32ced4fd9aa2c7672430d3ba3c7 100644 --- a/internal/git/gittest/tree_test.go +++ b/internal/git/gittest/tree_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" ) func TestWriteTree(t *testing.T) { diff --git a/internal/git/gittest/user.go b/internal/git/gittest/user.go index 3e0ce95077cd0d231486493d533bb5af99049616..2890d54f5cc30fa977eb5ecd4bde811ab3b1fd7f 100644 --- a/internal/git/gittest/user.go +++ b/internal/git/gittest/user.go @@ -1,7 +1,7 @@ package gittest import ( - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) const ( diff --git a/internal/git/gittest/version.go b/internal/git/gittest/version.go index 03a9910918681a07f6d0c45baf47c95a990c65ed..a61a981a96355f81c3d6b06ed3cec439866fc280 100644 --- a/internal/git/gittest/version.go +++ b/internal/git/gittest/version.go @@ -5,10 +5,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) // IsGitVersionLessThan checks if the Git version in use is less than then specified version. diff --git a/internal/git/housekeeping/clean_stale_data.go b/internal/git/housekeeping/clean_stale_data.go index 1e3c671045f3627dc1a0b30b5cd76a8df0354691..759544aa126d612566f5ad5095643f21649a273f 100644 --- a/internal/git/housekeeping/clean_stale_data.go +++ b/internal/git/housekeeping/clean_stale_data.go @@ -11,11 +11,11 @@ import ( "strings" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/safe" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/safe" ) const ( diff --git a/internal/git/housekeeping/clean_stale_data_test.go b/internal/git/housekeeping/clean_stale_data_test.go index 98711eaae9af19bf243727f0183262d238b0dfd2..1d07a653d04f659dc7ef4d44a59477427926fb46 100644 --- a/internal/git/housekeeping/clean_stale_data_test.go +++ b/internal/git/housekeeping/clean_stale_data_test.go @@ -8,12 +8,12 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) const ( diff --git a/internal/git/housekeeping/commit_graph.go b/internal/git/housekeeping/commit_graph.go index e690502432c221c01b727c0496fe727adbde6062..7a2f2eccaa4173fe2b0e5b7c8344f8e19c60823d 100644 --- a/internal/git/housekeeping/commit_graph.go +++ b/internal/git/housekeeping/commit_graph.go @@ -4,11 +4,11 @@ import ( "bytes" "context" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" ) // WriteCommitGraphConfigForRepository returns the optimal default-configuration for the given repo. diff --git a/internal/git/housekeeping/commit_graph_test.go b/internal/git/housekeeping/commit_graph_test.go index 8051765635f792a3a6b162adc78552dd8440267c..ee9876f6d69a7e26ae45b6f04b21cd72e096127b 100644 --- a/internal/git/housekeeping/commit_graph_test.go +++ b/internal/git/housekeeping/commit_graph_test.go @@ -4,11 +4,11 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestWriteCommitGraphConfigForRepository(t *testing.T) { diff --git a/internal/git/housekeeping/manager/manager.go b/internal/git/housekeeping/manager/manager.go index 4de73dfc902c66a161628e4525761cf0e4bc7a42..ed11bb8182a5db75e6fe6dc08dfe40247a5d1c00 100644 --- a/internal/git/housekeeping/manager/manager.go +++ b/internal/git/housekeeping/manager/manager.go @@ -5,12 +5,12 @@ import ( "sync" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - gitalycfgprom "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + gitalycfgprom "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/prometheus" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) // Manager is a housekeeping manager. It is supposed to handle housekeeping tasks for repositories diff --git a/internal/git/housekeeping/manager/optimize_repository.go b/internal/git/housekeeping/manager/optimize_repository.go index d25a5fa55662c6c6c5b84eb36e68093192055c9e..a8029262cdb87f663ecfef4823797e686b9f65f5 100644 --- a/internal/git/housekeeping/manager/optimize_repository.go +++ b/internal/git/housekeeping/manager/optimize_repository.go @@ -7,15 +7,15 @@ import ( "fmt" "os" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/tracing" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/tracing" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/git/housekeeping/manager/optimize_repository_ext_test.go b/internal/git/housekeeping/manager/optimize_repository_ext_test.go index fd222c94d47c55444f063f774e281795a6eb26fb..4ec0e75eab5745ef325bb88a86e96b91ce77f3e8 100644 --- a/internal/git/housekeeping/manager/optimize_repository_ext_test.go +++ b/internal/git/housekeeping/manager/optimize_repository_ext_test.go @@ -8,15 +8,15 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - housekeepingmgr "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping/manager" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/setup" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + housekeepingmgr "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping/manager" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/setup" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" ) func TestPruneIfNeeded(t *testing.T) { diff --git a/internal/git/housekeeping/manager/optimize_repository_test.go b/internal/git/housekeeping/manager/optimize_repository_test.go index 462e5a60d06940fbad6205860de57be3b354b549..c15de8a67a8964db84a9f8f6fbaa73857f2be916 100644 --- a/internal/git/housekeeping/manager/optimize_repository_test.go +++ b/internal/git/housekeeping/manager/optimize_repository_test.go @@ -14,25 +14,25 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - gitalycfg "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - gitalycfgprom "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/perm" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + gitalycfg "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + gitalycfgprom "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/prometheus" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/perm" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/peer" ) diff --git a/internal/git/housekeeping/manager/testhelper_test.go b/internal/git/housekeeping/manager/testhelper_test.go index f1b463bfac47bdf0e2ca734fa22e743576f1f8d0..d4f910ee166f4fd5f804660fccf2101e11ff5ed9 100644 --- a/internal/git/housekeeping/manager/testhelper_test.go +++ b/internal/git/housekeeping/manager/testhelper_test.go @@ -11,22 +11,22 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue/databasemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - nodeimpl "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/node" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue/databasemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + nodeimpl "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/node" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestMain(m *testing.M) { diff --git a/internal/git/housekeeping/metrics.go b/internal/git/housekeeping/metrics.go index fb424af9759f5e6e3cb8a291d2d2c07703eacad4..7a351e8c0d5c81733a918bf09f9d84ede37fcd59 100644 --- a/internal/git/housekeeping/metrics.go +++ b/internal/git/housekeeping/metrics.go @@ -5,8 +5,8 @@ import ( "time" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - gitalycfgprom "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/prometheus" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + gitalycfgprom "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/prometheus" ) // Metrics stores prometheus metrics of housekeeping tasks. diff --git a/internal/git/housekeeping/objects.go b/internal/git/housekeeping/objects.go index 8f779c24a6f0a4119145d4530dc652e52cae157f..c2804fd27dee821f9e6ce896775967de6dad3d38 100644 --- a/internal/git/housekeeping/objects.go +++ b/internal/git/housekeeping/objects.go @@ -10,13 +10,13 @@ import ( "strings" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" ) const ( diff --git a/internal/git/housekeeping/objects_test.go b/internal/git/housekeeping/objects_test.go index d1c444610fff4c36e731df4e98a481dd7ae78c96..375dc81c4a3c6d7b91404af8232e38847916cfbe 100644 --- a/internal/git/housekeeping/objects_test.go +++ b/internal/git/housekeeping/objects_test.go @@ -10,17 +10,17 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestRepackObjects(t *testing.T) { diff --git a/internal/git/housekeeping/offloading.go b/internal/git/housekeeping/offloading.go index df8bad1158f9d8f839438aac470037bd7cf57ff0..72abeb66afd24c172631627fcae72b36b1d772f6 100644 --- a/internal/git/housekeeping/offloading.go +++ b/internal/git/housekeeping/offloading.go @@ -7,12 +7,12 @@ import ( "path/filepath" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" ) // OffloadingPromisorRemote is the name of the Git remote used for offloading. diff --git a/internal/git/housekeeping/offloading_test.go b/internal/git/housekeeping/offloading_test.go index b225ea86db11f8d9e395644ed88f9d41a76f4d12..e85821537217a887fe2aaa03dfec06467bb30f5a 100644 --- a/internal/git/housekeeping/offloading_test.go +++ b/internal/git/housekeeping/offloading_test.go @@ -9,15 +9,15 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/packfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/packfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestSetOffloadingGitConfig(t *testing.T) { diff --git a/internal/git/housekeeping/optimization_strategy.go b/internal/git/housekeeping/optimization_strategy.go index ea6e3f20e71f6a6b7582fe2ee72f63dc0ee2ef98..f1cd24059286e0e454638758e786f2dccfa410d7 100644 --- a/internal/git/housekeeping/optimization_strategy.go +++ b/internal/git/housekeeping/optimization_strategy.go @@ -6,9 +6,9 @@ import ( "math" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" ) const ( diff --git a/internal/git/housekeeping/optimization_strategy_test.go b/internal/git/housekeeping/optimization_strategy_test.go index 33627208cd87b867d223feb81882ca8132decd32..9fa1393c7edbb388b8d6dd660caae5609c4690ab 100644 --- a/internal/git/housekeeping/optimization_strategy_test.go +++ b/internal/git/housekeeping/optimization_strategy_test.go @@ -5,10 +5,10 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestHeuristicalOptimizationStrategy_ShouldRepackObjects(t *testing.T) { diff --git a/internal/git/housekeeping/testhelper_test.go b/internal/git/housekeeping/testhelper_test.go index b3d7fac005d3baf23b0d0df433cb63bd357e87bf..8cbd5bb57f36f8cefe48ae7f5b5a0701fe608059 100644 --- a/internal/git/housekeeping/testhelper_test.go +++ b/internal/git/housekeeping/testhelper_test.go @@ -4,10 +4,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/git/housekeeping/worktrees.go b/internal/git/housekeeping/worktrees.go index e0eac4aaad03ae9e58507997bcdcda4b3b07aed0..dfeca1b9a25d5d65668b7b1d09aa3f3649dcba30 100644 --- a/internal/git/housekeeping/worktrees.go +++ b/internal/git/housekeeping/worktrees.go @@ -11,10 +11,10 @@ import ( "strings" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" ) const ( diff --git a/internal/git/housekeeping/worktrees_test.go b/internal/git/housekeeping/worktrees_test.go index 0262900447e2d0dac556ff04821c76f96226f662..fe66e77daf7e6df3af1d75dae8ed8894a3f936a7 100644 --- a/internal/git/housekeeping/worktrees_test.go +++ b/internal/git/housekeeping/worktrees_test.go @@ -6,13 +6,13 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestCleanupDisconnectedWorktrees_doesNothingWithoutWorktrees(t *testing.T) { diff --git a/internal/git/localrepo/blob.go b/internal/git/localrepo/blob.go index 1399bea5cea9e613f3f69d78f87b2ac0d189e9ef..2b123670a7dd402d5872abba3fe5108525e36af0 100644 --- a/internal/git/localrepo/blob.go +++ b/internal/git/localrepo/blob.go @@ -4,8 +4,8 @@ import ( "context" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" ) // WriteBlobConfig is the configuration used to write blobs into the repository. diff --git a/internal/git/localrepo/blob_test.go b/internal/git/localrepo/blob_test.go index b6b20d0fdff59927fc9e95588bccdbe9a4047df0..f8ab9897e14d60a15f89d15d249b9826e80f3e35 100644 --- a/internal/git/localrepo/blob_test.go +++ b/internal/git/localrepo/blob_test.go @@ -11,9 +11,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) type ReaderFunc func([]byte) (int, error) diff --git a/internal/git/localrepo/bundle.go b/internal/git/localrepo/bundle.go index 949480073bde8ae2b27933e4f8d3dd9109b6859a..7722efb0eb8c631f185c6bb057e4c88e51cc8df4 100644 --- a/internal/git/localrepo/bundle.go +++ b/internal/git/localrepo/bundle.go @@ -10,13 +10,13 @@ import ( "path/filepath" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/tempdir" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/tempdir" ) // ErrEmptyBundle is returned when the bundle to be created would have been empty. diff --git a/internal/git/localrepo/bundle_test.go b/internal/git/localrepo/bundle_test.go index 53a7b8359a43a6e81c0c94e0f312566771fc6ed3..b56d8aed40fca9b49b2beed493a5e783ae86a78f 100644 --- a/internal/git/localrepo/bundle_test.go +++ b/internal/git/localrepo/bundle_test.go @@ -12,16 +12,16 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestRepoCreateBundle(t *testing.T) { diff --git a/internal/git/localrepo/commit.go b/internal/git/localrepo/commit.go index 703dd4242873f2b2e0c0fe05cf4dfebd4169b463..d02e3d2b2fdb1ddba52a05c549a97e23447fc878 100644 --- a/internal/git/localrepo/commit.go +++ b/internal/git/localrepo/commit.go @@ -10,15 +10,15 @@ import ( "strings" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) var ( diff --git a/internal/git/localrepo/commit_test.go b/internal/git/localrepo/commit_test.go index 16a6fc2321c950631be5a1c4f9cb119bd73ac8ea..e0d5779338291df69c347e394a9593bbec0a1497 100644 --- a/internal/git/localrepo/commit_test.go +++ b/internal/git/localrepo/commit_test.go @@ -12,15 +12,15 @@ import ( "github.com/ProtonMail/go-crypto/openpgp" "github.com/ProtonMail/go-crypto/openpgp/packet" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/signature" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/signature" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/internal/git/localrepo/config.go b/internal/git/localrepo/config.go index 21dd7597991c8d1e6c88f1c9725ee6902cf24f55..67829e06742058300406cbc64669283594fa19d0 100644 --- a/internal/git/localrepo/config.go +++ b/internal/git/localrepo/config.go @@ -7,12 +7,12 @@ import ( "path/filepath" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/safe" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/safe" ) func isExitWithCode(err error, code int) bool { diff --git a/internal/git/localrepo/config_test.go b/internal/git/localrepo/config_test.go index 6ba4f947fd24543754e5604b2560ccd0c94d9ab4..87d41bd860c13766da32f9888b1c0e098425f001 100644 --- a/internal/git/localrepo/config_test.go +++ b/internal/git/localrepo/config_test.go @@ -8,16 +8,16 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/safe" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/safe" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" "google.golang.org/grpc/peer" ) diff --git a/internal/git/localrepo/factory.go b/internal/git/localrepo/factory.go index bed810fd76337b2838c67930a9d3e5362b8794a4..6ab0b8791fe1266edcece4782d99f1c33a927ea0 100644 --- a/internal/git/localrepo/factory.go +++ b/internal/git/localrepo/factory.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // Factory builds Repo instances. diff --git a/internal/git/localrepo/factory_test.go b/internal/git/localrepo/factory_test.go index 9c1d97408ce26b63ee4fad5fc0151c54c46a03bb..4661e37f7196c456dde4f07720108cfe8224acf8 100644 --- a/internal/git/localrepo/factory_test.go +++ b/internal/git/localrepo/factory_test.go @@ -5,13 +5,13 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestFactory(t *testing.T) { diff --git a/internal/git/localrepo/merge.go b/internal/git/localrepo/merge.go index 2acdc93963fe2092f5ff45764d25f2b4cdf22d5c..15211ad2cfef157ed8a5b79e3f9acdec0c0e1332 100644 --- a/internal/git/localrepo/merge.go +++ b/internal/git/localrepo/merge.go @@ -7,11 +7,11 @@ import ( "strconv" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" ) // MergeStage denotes the stage indicated by git-merge-tree(1) in the conflicting diff --git a/internal/git/localrepo/merge_test.go b/internal/git/localrepo/merge_test.go index 702f71e70e6ec9b5b9f7b89fdd5f66c322ad304d..5d493bd8eec8fc0cae211bfa0ec5cb3c05cab2e7 100644 --- a/internal/git/localrepo/merge_test.go +++ b/internal/git/localrepo/merge_test.go @@ -8,11 +8,11 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestMergeTree(t *testing.T) { diff --git a/internal/git/localrepo/objects.go b/internal/git/localrepo/objects.go index 85f571e7148cefd27b0b7fe2cd31612b1e95948e..94dff8d2f1a65c78e4a3c3e755954078826800ea 100644 --- a/internal/git/localrepo/objects.go +++ b/internal/git/localrepo/objects.go @@ -7,10 +7,10 @@ import ( "fmt" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" ) // ObjectType is an Enum for the type of object of diff --git a/internal/git/localrepo/objects_test.go b/internal/git/localrepo/objects_test.go index 1e219ae4db3de87c6574af82d102d54f23835ae5..97361188371271ec06d7c011b17bcbc06c0d475b 100644 --- a/internal/git/localrepo/objects_test.go +++ b/internal/git/localrepo/objects_test.go @@ -8,12 +8,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" "google.golang.org/grpc/metadata" ) diff --git a/internal/git/localrepo/parser.go b/internal/git/localrepo/parser.go index 1b8c7469ca613fb016d9b5633e50ffc955066119..09d23712816016d50cb98aa124eeb8826239eb08 100644 --- a/internal/git/localrepo/parser.go +++ b/internal/git/localrepo/parser.go @@ -6,7 +6,7 @@ import ( "fmt" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" ) // ErrParse is returned when the parse of an entry was unsuccessful diff --git a/internal/git/localrepo/parser_test.go b/internal/git/localrepo/parser_test.go index 8edbea8a80b6d0f4713c04b3730d3efbf9f25e2c..668da1fc0ac1279f091ba0cef302bf3d4b62444a 100644 --- a/internal/git/localrepo/parser_test.go +++ b/internal/git/localrepo/parser_test.go @@ -7,10 +7,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestParser(t *testing.T) { diff --git a/internal/git/localrepo/paths.go b/internal/git/localrepo/paths.go index e463334b7361214b418543f12b3ed42113e94f13..e673dbc3def144a17f0aa8adade344bf92129f27 100644 --- a/internal/git/localrepo/paths.go +++ b/internal/git/localrepo/paths.go @@ -7,8 +7,8 @@ import ( "path/filepath" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" ) // Path returns the on-disk path of the repository. diff --git a/internal/git/localrepo/paths_test.go b/internal/git/localrepo/paths_test.go index 6d737639a4d6549e709af2cdce549b38f3f6bf71..0704c3599f1d6d76c5e3de04bdd74638e0d95488 100644 --- a/internal/git/localrepo/paths_test.go +++ b/internal/git/localrepo/paths_test.go @@ -6,16 +6,16 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/quarantine" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/quarantine" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "google.golang.org/protobuf/proto" diff --git a/internal/git/localrepo/rebase.go b/internal/git/localrepo/rebase.go index f187eb1ab3cb9d366286bc415921f8079e14c172..71ac73230a6acfe80104c0fdb44c3e9314b98153 100644 --- a/internal/git/localrepo/rebase.go +++ b/internal/git/localrepo/rebase.go @@ -9,11 +9,11 @@ import ( "strings" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) type rebaseConfig struct { diff --git a/internal/git/localrepo/rebase_test.go b/internal/git/localrepo/rebase_test.go index a44816889e18ed390073d27a062bf9152c609ebe..f1e1289f496354418a85c2989bcfd412ff724219 100644 --- a/internal/git/localrepo/rebase_test.go +++ b/internal/git/localrepo/rebase_test.go @@ -7,13 +7,13 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/internal/git/localrepo/refs.go b/internal/git/localrepo/refs.go index 39e224d9cbb41744eaabae4986c5a8cc8a11a708..871b364c85feb01718d3e53db34b9b7101a61aea 100644 --- a/internal/git/localrepo/refs.go +++ b/internal/git/localrepo/refs.go @@ -9,11 +9,11 @@ import ( "io" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" ) // ErrMismatchingState is similar to updateref.MismatchingStateError. It's declared separately to avoid diff --git a/internal/git/localrepo/refs_external_test.go b/internal/git/localrepo/refs_external_test.go index 2bfee949034665088469c3a67351bba4c725493b..6c47599163dfbfde90892c87b47ad5c551fb62d7 100644 --- a/internal/git/localrepo/refs_external_test.go +++ b/internal/git/localrepo/refs_external_test.go @@ -9,24 +9,24 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/peer" ) diff --git a/internal/git/localrepo/refs_test.go b/internal/git/localrepo/refs_test.go index e95fdc52782798674930a23a9481a788226b0c2c..8dd5030268d1d2f4ae15b8409d5b3bc670a9dec8 100644 --- a/internal/git/localrepo/refs_test.go +++ b/internal/git/localrepo/refs_test.go @@ -9,15 +9,15 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestRepo_ContainsRef(t *testing.T) { diff --git a/internal/git/localrepo/remote.go b/internal/git/localrepo/remote.go index 7fd9934257eec5eaf0fdfce87dd7cc36529051b1..ac8d43fbf292534882975716b19666ca690dcbfa 100644 --- a/internal/git/localrepo/remote.go +++ b/internal/git/localrepo/remote.go @@ -8,8 +8,8 @@ import ( "io" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // FetchOptsTags controls what tags needs to be imported on fetch. diff --git a/internal/git/localrepo/remote_extra_test.go b/internal/git/localrepo/remote_extra_test.go index 4f08f187c60274e6207b27ebe35dab2ff724a1b4..15a3da780da8085671f26f765ff012e0c39b6b4d 100644 --- a/internal/git/localrepo/remote_extra_test.go +++ b/internal/git/localrepo/remote_extra_test.go @@ -6,18 +6,18 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/repository" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/ssh" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/repository" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/ssh" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" ) diff --git a/internal/git/localrepo/remote_test.go b/internal/git/localrepo/remote_test.go index 7e8be98c06d4772ff75e9abc214ffa2fdec62f5a..05cef65f54315d882ce57e0fc7f2542598f087a5 100644 --- a/internal/git/localrepo/remote_test.go +++ b/internal/git/localrepo/remote_test.go @@ -10,13 +10,13 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestRepo_FetchRemote(t *testing.T) { diff --git a/internal/git/localrepo/repo.go b/internal/git/localrepo/repo.go index d43ff99096947765a4a6899e9c2b0dd5d0cb3e16..55cf129e20ab0af2209ed2b4abc831e2d5dc850b 100644 --- a/internal/git/localrepo/repo.go +++ b/internal/git/localrepo/repo.go @@ -12,19 +12,19 @@ import ( "github.com/sirupsen/logrus" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/quarantine" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/quarantine" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/proto" ) diff --git a/internal/git/localrepo/repo_test.go b/internal/git/localrepo/repo_test.go index a9c6d7ae9619e762efb0385da5e67a8c361a3a53..915fdf8a093d17b6e12bf97fe0768b63daed3d2e 100644 --- a/internal/git/localrepo/repo_test.go +++ b/internal/git/localrepo/repo_test.go @@ -8,14 +8,14 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestRepo(t *testing.T) { diff --git a/internal/git/localrepo/snapshot.go b/internal/git/localrepo/snapshot.go index 08ab194639d619df80385a8255cd6ae5a3a7b4db..d138bf29e9d1a33acc44b403e8eb810ffc0b69c7 100644 --- a/internal/git/localrepo/snapshot.go +++ b/internal/git/localrepo/snapshot.go @@ -9,9 +9,9 @@ import ( "path/filepath" "regexp" - "gitlab.com/gitlab-org/gitaly/v16/internal/archive" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/archive" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" ) var objectFiles = []*regexp.Regexp{ diff --git a/internal/git/localrepo/snapshot_test.go b/internal/git/localrepo/snapshot_test.go index 6f1a0c5a38f3f966cb55c73206703ff4b1eb4348..f3626e89338ee73b4dd8cd341033adf52b7829e9 100644 --- a/internal/git/localrepo/snapshot_test.go +++ b/internal/git/localrepo/snapshot_test.go @@ -11,11 +11,11 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/archive" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/archive" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestCreateSnapshot(t *testing.T) { diff --git a/internal/git/localrepo/tag.go b/internal/git/localrepo/tag.go index 59b8da8d8d9eef7d14fa077b92b681aa7a11efbc..8da670486c1e865dfcd5a4c87498d131fc4e8cb5 100644 --- a/internal/git/localrepo/tag.go +++ b/internal/git/localrepo/tag.go @@ -7,9 +7,9 @@ import ( "strings" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" ) // FormatTagError is used by FormatTag() below diff --git a/internal/git/localrepo/tag_test.go b/internal/git/localrepo/tag_test.go index ed4b3703ad91a1fdcf2dc01fa39cb62b3ed16bf4..b156791af62e3a8ef499dd12b276f1b4011d0650 100644 --- a/internal/git/localrepo/tag_test.go +++ b/internal/git/localrepo/tag_test.go @@ -6,10 +6,10 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestFormatTag(t *testing.T) { diff --git a/internal/git/localrepo/testhelper_test.go b/internal/git/localrepo/testhelper_test.go index 88c431582731f681f8e105d0b224e6602d45e90d..6399554f060842510a1aef40cdfac5703c102c2c 100644 --- a/internal/git/localrepo/testhelper_test.go +++ b/internal/git/localrepo/testhelper_test.go @@ -3,12 +3,12 @@ package localrepo import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestMain(m *testing.M) { diff --git a/internal/git/localrepo/tree.go b/internal/git/localrepo/tree.go index b56e172d31880d54359dff122cdb516e4ca636c2..e8386f686e79816c8454442d5a0d3e910339cd6a 100644 --- a/internal/git/localrepo/tree.go +++ b/internal/git/localrepo/tree.go @@ -10,11 +10,11 @@ import ( "sort" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" ) // Entries holds every ls-tree Entry diff --git a/internal/git/localrepo/tree_test.go b/internal/git/localrepo/tree_test.go index d17400f236cdd86dc256f9f6a9652ee02ee657b5..cb875e8a89de531bac23460c5f17f4e11a477dcc 100644 --- a/internal/git/localrepo/tree_test.go +++ b/internal/git/localrepo/tree_test.go @@ -11,12 +11,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestTreeEntry_Write(t *testing.T) { diff --git a/internal/git/log/last_commit.go b/internal/git/log/last_commit.go index d63be7f2a63eedc38db3cad1588cbf8ccb74a352..45807fd73f8cd402254bfe28e3045b1433e145e8 100644 --- a/internal/git/log/last_commit.go +++ b/internal/git/log/last_commit.go @@ -6,11 +6,11 @@ import ( "regexp" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) var badRevisionRegex = regexp.MustCompile(`^fatal: bad revision '.*'\n$`) diff --git a/internal/git/log/parser.go b/internal/git/log/parser.go index f8197111431f1100ab8736c6711124e524c17400..7fc9cac1c54ad940edde89433db2589482b75e68 100644 --- a/internal/git/log/parser.go +++ b/internal/git/log/parser.go @@ -6,10 +6,10 @@ import ( "fmt" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // Parser holds necessary state for parsing a git log stream diff --git a/internal/git/object_id.go b/internal/git/object_id.go index 546947524f2f744f303acaf30e83c7d7c1d28e47..d38e57dff5c82da23a91ecdf0c951b08a72facea 100644 --- a/internal/git/object_id.go +++ b/internal/git/object_id.go @@ -7,7 +7,7 @@ import ( "fmt" "hash" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) var ( diff --git a/internal/git/object_id_test.go b/internal/git/object_id_test.go index bac844e06e4f2689d8888dbfc84053f002d40bd3..5222c238b9ae8442a2d4af275b086925c001d899 100644 --- a/internal/git/object_id_test.go +++ b/internal/git/object_id_test.go @@ -9,14 +9,14 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestObjectHashByFormat(t *testing.T) { diff --git a/internal/git/objectpool/create.go b/internal/git/objectpool/create.go index d5a6ed1f04170d6f1442ee7c5d29f054d95abd01..e977e8fb44e533937a17a8ceb2c5deee1ed2333e 100644 --- a/internal/git/objectpool/create.go +++ b/internal/git/objectpool/create.go @@ -7,17 +7,17 @@ import ( "fmt" "os" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - housekeepingmgr "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping/manager" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + housekeepingmgr "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping/manager" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // Create creates an object pool for the given source repository. This is done by creating a local diff --git a/internal/git/objectpool/create_test.go b/internal/git/objectpool/create_test.go index ec0521d6d2205c87b3d9551de39fccd76f5d3af6..085089b1591688753072978fb19a08f2183dd948 100644 --- a/internal/git/objectpool/create_test.go +++ b/internal/git/objectpool/create_test.go @@ -8,20 +8,20 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - housekeepingmgr "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping/manager" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + housekeepingmgr "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping/manager" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestCreate(t *testing.T) { diff --git a/internal/git/objectpool/disconnect.go b/internal/git/objectpool/disconnect.go index dcf8e02e34d13b21f1a3be940f69a081606eeced..6ecd6b4a4aab56b0dfef5246405e6ff44dcb6797 100644 --- a/internal/git/objectpool/disconnect.go +++ b/internal/git/objectpool/disconnect.go @@ -11,14 +11,14 @@ import ( "strings" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" ) // Disconnect disconnects the specified repository from its object pool. If the repository does not diff --git a/internal/git/objectpool/disconnect_test.go b/internal/git/objectpool/disconnect_test.go index 70d067183e6c019c8e5c6290a3dd0d36d61318c6..7303e8720b634eaff46290a8231a7e5c5b2cb905 100644 --- a/internal/git/objectpool/disconnect_test.go +++ b/internal/git/objectpool/disconnect_test.go @@ -13,23 +13,23 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - housekeepingmgr "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping/manager" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + housekeepingmgr "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping/manager" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/peer" ) diff --git a/internal/git/objectpool/fetch.go b/internal/git/objectpool/fetch.go index 0e11cb480330184afbadb5f586fef2edd8ba5b28..97ae2c697ddedb2b58060be8fd9a2481cc3a026c 100644 --- a/internal/git/objectpool/fetch.go +++ b/internal/git/objectpool/fetch.go @@ -8,18 +8,18 @@ import ( "io" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) var objectPoolRefspec = fmt.Sprintf("+refs/*:%s/*", git.ObjectPoolRefNamespace) diff --git a/internal/git/objectpool/fetch_test.go b/internal/git/objectpool/fetch_test.go index e50efd05e5a549f11b87a3033c82c93f79106589..85cef696fd07a544db2ad70f1172be49c27765da 100644 --- a/internal/git/objectpool/fetch_test.go +++ b/internal/git/objectpool/fetch_test.go @@ -10,24 +10,24 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue/databasemgr" - nodeimpl "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/node" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue/databasemgr" + nodeimpl "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/node" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestFetchFromOrigin_dangling(t *testing.T) { diff --git a/internal/git/objectpool/link.go b/internal/git/objectpool/link.go index ce3ef69c27be3498dfed45d8511d6b0d85f5c7c2..1b5d4b856781777878233bed7cd1defdf2808398 100644 --- a/internal/git/objectpool/link.go +++ b/internal/git/objectpool/link.go @@ -8,12 +8,12 @@ import ( "path/filepath" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/safe" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/safe" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" ) // Link calls the non-receiver method version of Link with the parameters diff --git a/internal/git/objectpool/link_test.go b/internal/git/objectpool/link_test.go index 3e3abf724977b7fcf50ca57a37e92ac798ef534c..5a7ba444f14fa52d05ee4c0e1b9fbff783de7b1a 100644 --- a/internal/git/objectpool/link_test.go +++ b/internal/git/objectpool/link_test.go @@ -9,16 +9,16 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" "google.golang.org/grpc/peer" ) diff --git a/internal/git/objectpool/pool.go b/internal/git/objectpool/pool.go index cd1d297ee8c0564ce9a76bbbf3b97847ef16080e..22c2ec5794e22d4f76567883df0d9bbddbb98c52 100644 --- a/internal/git/objectpool/pool.go +++ b/internal/git/objectpool/pool.go @@ -8,15 +8,15 @@ import ( "path/filepath" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - housekeepingmgr "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping/manager" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + housekeepingmgr "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping/manager" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) var ( diff --git a/internal/git/objectpool/pool_test.go b/internal/git/objectpool/pool_test.go index 6ed52644ae73a7b81ac9a204c2ee6fd0c7a711a6..279ec88f042e146fcfd1bc2d397a6ed23925f2bd 100644 --- a/internal/git/objectpool/pool_test.go +++ b/internal/git/objectpool/pool_test.go @@ -6,13 +6,13 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestFromProto(t *testing.T) { diff --git a/internal/git/objectpool/testhelper_test.go b/internal/git/objectpool/testhelper_test.go index 600424d89ee4cd68820650b092a35ff4831aed55..f5994638be69ac08933a766d5b2ef672018f96e7 100644 --- a/internal/git/objectpool/testhelper_test.go +++ b/internal/git/objectpool/testhelper_test.go @@ -5,18 +5,18 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - housekeepingmgr "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping/manager" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + housekeepingmgr "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping/manager" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestMain(m *testing.M) { diff --git a/internal/git/packfile/bitmap.go b/internal/git/packfile/bitmap.go index 5be97e32760c4117717d3d0e3e25df1d18b6f279..c22134fdf7860a12e44fa1194086c0c9b8460473 100644 --- a/internal/git/packfile/bitmap.go +++ b/internal/git/packfile/bitmap.go @@ -12,7 +12,7 @@ import ( "math/big" "os" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitio" + "gitlab.com/gitlab-org/gitaly/v17/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 05ba1eb43ad663c4d12a8fa0208beb05cfa11f49..82d2c2af53701d4ebfb2479a836f859107d11538 100644 --- a/internal/git/packfile/index.go +++ b/internal/git/packfile/index.go @@ -15,12 +15,12 @@ import ( "strconv" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" ) // Index is an in-memory representation of a packfile .idx file. diff --git a/internal/git/packfile/index_test.go b/internal/git/packfile/index_test.go index 0aacb78959d43be327dfd0480c2e12116df4f1c0..be07182faac3289611dd078e0da31ed4b9b193fc 100644 --- a/internal/git/packfile/index_test.go +++ b/internal/git/packfile/index_test.go @@ -8,14 +8,14 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/packfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/packfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestReadIndexWithGitCmdFactory(t *testing.T) { diff --git a/internal/git/packfile/testhelper_test.go b/internal/git/packfile/testhelper_test.go index 5c11ab6051a0f722b85c0d7ffae8a680a72b45d1..4c9db499a0d28b784a951defbb213f14d5c33b48 100644 --- a/internal/git/packfile/testhelper_test.go +++ b/internal/git/packfile/testhelper_test.go @@ -3,7 +3,7 @@ package packfile_test import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/git/packfile_test.go b/internal/git/packfile_test.go index 4d9690d92329c18413a165ed82d261a5e81e2be3..69e77f1e1700c2917e8484de6eb1c5f6efd10ac3 100644 --- a/internal/git/packfile_test.go +++ b/internal/git/packfile_test.go @@ -5,10 +5,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestListPackfiles(t *testing.T) { diff --git a/internal/git/pktline/read_monitor.go b/internal/git/pktline/read_monitor.go index 177a2ec3d63f253275775498248eae14dfc0a708..878153132b54b794359f3e0604b18c877c774be2 100644 --- a/internal/git/pktline/read_monitor.go +++ b/internal/git/pktline/read_monitor.go @@ -7,7 +7,7 @@ import ( "os" "sync" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" ) // ReadMonitor monitors an io.Reader, waiting for a specified packet. If the diff --git a/internal/git/pktline/read_monitor_test.go b/internal/git/pktline/read_monitor_test.go index f66dff56924097debb6b49f76d2dcaf9c64cbc60..fc02fc9be3b581aea6c6f0444500b040a4a8f85b 100644 --- a/internal/git/pktline/read_monitor_test.go +++ b/internal/git/pktline/read_monitor_test.go @@ -10,8 +10,8 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestReadMonitorTimeout(t *testing.T) { diff --git a/internal/git/pktline/testhelper_test.go b/internal/git/pktline/testhelper_test.go index 528293c8c88f4de2dd0276d2645ab60326a9caac..392e28294d66bd28680b5bfa8d52089801e43339 100644 --- a/internal/git/pktline/testhelper_test.go +++ b/internal/git/pktline/testhelper_test.go @@ -3,7 +3,7 @@ package pktline import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/git/quarantine/quarantine.go b/internal/git/quarantine/quarantine.go index e04849241a43f5c6afc5460b525288d33e7990f4..1161454cd074cc0168427970429667642d8995d0 100644 --- a/internal/git/quarantine/quarantine.go +++ b/internal/git/quarantine/quarantine.go @@ -9,13 +9,13 @@ import ( "sort" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/safe" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/tempdir" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/safe" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/tempdir" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/proto" ) diff --git a/internal/git/quarantine/quarantine_ext_test.go b/internal/git/quarantine/quarantine_ext_test.go index 97fc28f851fa388c015595ed1e16ddbe4e0ca04a..ac1c73409556d5fabd0ff47bf648c7896537a4c2 100644 --- a/internal/git/quarantine/quarantine_ext_test.go +++ b/internal/git/quarantine/quarantine_ext_test.go @@ -5,13 +5,13 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/quarantine" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/quarantine" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestQuarantine_localrepo(t *testing.T) { diff --git a/internal/git/quarantine/quarantine_test.go b/internal/git/quarantine/quarantine_test.go index 208af699e9bef02ff10fc501ab4f12ee00cfe01f..735b01fe62e2d83dd1ed78b72d8a03e97a1ff7da 100644 --- a/internal/git/quarantine/quarantine_test.go +++ b/internal/git/quarantine/quarantine_test.go @@ -7,12 +7,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/proto" ) diff --git a/internal/git/quarantine/testhelper_test.go b/internal/git/quarantine/testhelper_test.go index b2771ec16291b2cbb970cee4d0d8d819b0de76f0..5605a99b88f4d56e4e0fc8808e4d39522c88f835 100644 --- a/internal/git/quarantine/testhelper_test.go +++ b/internal/git/quarantine/testhelper_test.go @@ -3,7 +3,7 @@ package quarantine import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/git/rawdiff/testhelper_test.go b/internal/git/rawdiff/testhelper_test.go index f52f567c2282f19b8dff4d9fe19b2403bf3a6782..a2be4db75db841dfe78ce3733563b8f3aaec825c 100644 --- a/internal/git/rawdiff/testhelper_test.go +++ b/internal/git/rawdiff/testhelper_test.go @@ -3,7 +3,7 @@ package rawdiff import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/git/reference_test.go b/internal/git/reference_test.go index d4231067980f2a40371fa3a29a28a5d31b7c03af..fe586b215963d5dfb05342a239de992ab9f56b1f 100644 --- a/internal/git/reference_test.go +++ b/internal/git/reference_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestValidateReference(t *testing.T) { diff --git a/internal/git/reftable_test.go b/internal/git/reftable_test.go index e2be2e38cbc7b456305613bde8bc0fc0366ca6b4..50d6cc3ad7bd1930bcd0e7468448e8702f390b38 100644 --- a/internal/git/reftable_test.go +++ b/internal/git/reftable_test.go @@ -10,10 +10,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func getReftables(repoPath string) []string { diff --git a/internal/git/remoterepo/repository.go b/internal/git/remoterepo/repository.go index 22adf597968bef664f1fc40814de1433e59cf4a4..6e34abd8a1b98108cc30d610ba057484faf9a5d7 100644 --- a/internal/git/remoterepo/repository.go +++ b/internal/git/remoterepo/repository.go @@ -5,10 +5,10 @@ import ( "fmt" "sync" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" ) diff --git a/internal/git/remoterepo/repository_test.go b/internal/git/remoterepo/repository_test.go index d73934266516815b72dbe54bedca6db43bbfc2d8..1c85deddbdae0d466a6fcd44dc1a7723b22b957c 100644 --- a/internal/git/remoterepo/repository_test.go +++ b/internal/git/remoterepo/repository_test.go @@ -8,16 +8,16 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/remoterepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/remoterepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestRepository(t *testing.T) { diff --git a/internal/git/remoterepo/testhelper_test.go b/internal/git/remoterepo/testhelper_test.go index ce54d6e044675ffcbeef27f78e80a2ad08845217..e8e2faad9551e1cc54f3cb172c301af9940983ac 100644 --- a/internal/git/remoterepo/testhelper_test.go +++ b/internal/git/remoterepo/testhelper_test.go @@ -3,16 +3,16 @@ package remoterepo_test import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/commit" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/ref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/repository" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/commit" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/ref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/repository" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" ) diff --git a/internal/git/signature.go b/internal/git/signature.go index 300ad7a83b3af53c7900bd6b78fd5afe9729c085..048d49669126edab9db3bdf302d6b7df2055372b 100644 --- a/internal/git/signature.go +++ b/internal/git/signature.go @@ -5,7 +5,7 @@ import ( "strings" "time" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/internal/git/signature_test.go b/internal/git/signature_test.go index 8fc1f929498684a501586a04e7ff534a6cda6696..347cd7f251c15f48aca5c78da6dcf6c25e7b27f1 100644 --- a/internal/git/signature_test.go +++ b/internal/git/signature_test.go @@ -8,7 +8,7 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/internal/git/smudge/config.go b/internal/git/smudge/config.go index 4ff6f9930ba096294c81f2da7de36d7e26a30659..0b34400b1a3b89351d25cf304600f5957f14ff7e 100644 --- a/internal/git/smudge/config.go +++ b/internal/git/smudge/config.go @@ -5,9 +5,9 @@ import ( "errors" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/env" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/env" ) // ConfigEnvironmentKey is the key that gitaly-lfs-smudge expects the configuration to exist at. The diff --git a/internal/git/smudge/config_test.go b/internal/git/smudge/config_test.go index 7885ef06d42d6778f7175096440848377618c0fc..6fa6450c24d63cd0cb3a30d8a3d1054cf584a7d4 100644 --- a/internal/git/smudge/config_test.go +++ b/internal/git/smudge/config_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" ) func TestConfigFromEnvironment(t *testing.T) { diff --git a/internal/git/smudge/testhelper_test.go b/internal/git/smudge/testhelper_test.go index b19dd75b5ed92d6843773eeb12dd58bdc6ceffc6..6f753c390d55e4a1983d32ee142d1de623daffdf 100644 --- a/internal/git/smudge/testhelper_test.go +++ b/internal/git/smudge/testhelper_test.go @@ -3,7 +3,7 @@ package smudge import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/git/stats/commit_graph_test.go b/internal/git/stats/commit_graph_test.go index 894070b99a2de6ce13a01e0de6694d4c87e777c3..848a732d156adbe24749ed5f084e6d9c116f61c9 100644 --- a/internal/git/stats/commit_graph_test.go +++ b/internal/git/stats/commit_graph_test.go @@ -5,9 +5,9 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestCommitGraphInfoForRepository(t *testing.T) { diff --git a/internal/git/stats/fetch_pack.go b/internal/git/stats/fetch_pack.go index e6a77a181e2bdd516350faf5d1bb24066c22d310..68e1a0fde2a04eeb5e0b76d8d7ea0d510800cf41 100644 --- a/internal/git/stats/fetch_pack.go +++ b/internal/git/stats/fetch_pack.go @@ -7,7 +7,7 @@ import ( "io" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/pktline" ) // FetchPack is used to parse the response body of a git-fetch-pack(1) request. diff --git a/internal/git/stats/http_clone_test.go b/internal/git/stats/http_clone_test.go index ecda64e6a97eab7cc18b0c5143667e246596c73b..6a99dc484de8ebd7ba07c46b70df6cf52100bf07 100644 --- a/internal/git/stats/http_clone_test.go +++ b/internal/git/stats/http_clone_test.go @@ -8,9 +8,9 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestClone(t *testing.T) { diff --git a/internal/git/stats/http_fetch_pack.go b/internal/git/stats/http_fetch_pack.go index 5cbd6731c95e974f0188c17a3e2d739591dcdc47..638565054127e83dcb9f7e9bebc853eba5855b07 100644 --- a/internal/git/stats/http_fetch_pack.go +++ b/internal/git/stats/http_fetch_pack.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/pktline" ) // HTTPFetchPack is a FetchPack obtained via a clone of a target repository via HTTP. It contains diff --git a/internal/git/stats/http_push.go b/internal/git/stats/http_push.go index 384e511c2f372b0959aa624c97a3d951225a1c76..3b1b2d88f96310b5f4eb440d83d96890a14a090b 100644 --- a/internal/git/stats/http_push.go +++ b/internal/git/stats/http_push.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" ) // HTTPPush hosts information about a typical HTTP-based push. diff --git a/internal/git/stats/http_push_test.go b/internal/git/stats/http_push_test.go index 0b5353e50ae1297fe357f5b18c08f945f8a434a3..6bd063bbf08b379ff152eb64b21a3ae02885dfcc 100644 --- a/internal/git/stats/http_push_test.go +++ b/internal/git/stats/http_push_test.go @@ -11,11 +11,11 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestPerformHTTPPush(t *testing.T) { diff --git a/internal/git/stats/http_send_pack.go b/internal/git/stats/http_send_pack.go index 3630b87e0979006bc147b71316aeb001fa33e464..a5ed73ec055ed43e23acd6f8228fdc7cefd08fca 100644 --- a/internal/git/stats/http_send_pack.go +++ b/internal/git/stats/http_send_pack.go @@ -9,8 +9,8 @@ import ( "net/http" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/pktline" ) // ResponseBody returns how long it took to receive the last bytes of the response body. diff --git a/internal/git/stats/packfile_negotiation.go b/internal/git/stats/packfile_negotiation.go index 95a47d5a8f5ea7b87dfb641794eabddcb9b95d99..6e5cf311024b79252ff0e7f373c395e0d078c75a 100644 --- a/internal/git/stats/packfile_negotiation.go +++ b/internal/git/stats/packfile_negotiation.go @@ -7,10 +7,10 @@ import ( "strings" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/pktline" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) //nolint:revive // This is unintentionally missing documentation. diff --git a/internal/git/stats/packfile_negotiation_test.go b/internal/git/stats/packfile_negotiation_test.go index bc6621669bc802f5bb4698fd1a99e5d3463e8826..6bd85c3a0cdb09de08f1ee8b3be1fe8f24472387 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/v16/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" ) const ( diff --git a/internal/git/stats/reference_discovery.go b/internal/git/stats/reference_discovery.go index 7f373b2ee1faaec46e1f631fee0fb0874d2d056d..92984290fa8389efb1f79fd91155f7c3d24b2c00 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/v16/internal/git/pktline" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v17/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 7b3a1eca4906d0744c449a3ec1efdc81a76f0562..2ef153464bc19c6554729551f7942326ccc461b7 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/v16/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" ) func TestSingleRefParses(t *testing.T) { diff --git a/internal/git/stats/repository_info.go b/internal/git/stats/repository_info.go index 7c998bc4b8fcbaa5c1f638061ae6c21fde910c61..e7eddf1be3782db81e9bb69a03806036c2754b5d 100644 --- a/internal/git/stats/repository_info.go +++ b/internal/git/stats/repository_info.go @@ -14,10 +14,10 @@ import ( "strings" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) const ( diff --git a/internal/git/stats/repository_info_test.go b/internal/git/stats/repository_info_test.go index 608c717492b780fd6cbe35fc9658c85c7bf54ef7..df272ac907a29ef122aacd6c9a082a8b1bbfebf5 100644 --- a/internal/git/stats/repository_info_test.go +++ b/internal/git/stats/repository_info_test.go @@ -13,13 +13,13 @@ import ( "github.com/sirupsen/logrus" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestRepositoryProfile(t *testing.T) { diff --git a/internal/git/stats/send_pack.go b/internal/git/stats/send_pack.go index 60b2b772db62ebebb1479ad164f7682a80bcfe6a..b6af2d39b1243651c06f6c726127d6ee7e065b26 100644 --- a/internal/git/stats/send_pack.go +++ b/internal/git/stats/send_pack.go @@ -7,7 +7,7 @@ import ( "io" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/pktline" ) // SendPack is used to parse the response body of a git-send-pack(1) request. diff --git a/internal/git/stats/send_pack_test.go b/internal/git/stats/send_pack_test.go index 7a2b33cb2784fff36bc659a777124b2b2a9d6be6..b3a6900955ef0e263afb98958bb4784acadc3ff6 100644 --- a/internal/git/stats/send_pack_test.go +++ b/internal/git/stats/send_pack_test.go @@ -7,7 +7,7 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" ) func TestSendPack_Parse(t *testing.T) { diff --git a/internal/git/stats/testhelper_test.go b/internal/git/stats/testhelper_test.go index 14396236c492bf719f7c92f3c527d4c11090c26d..7c8df4f93ce5743d96be3d4a5cc377cace8ef760 100644 --- a/internal/git/stats/testhelper_test.go +++ b/internal/git/stats/testhelper_test.go @@ -3,7 +3,7 @@ package stats import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/git/testhelper_test.go b/internal/git/testhelper_test.go index d1cf5577aad73e3ca5200af8bf64bc9d9c956cc3..c783b518c5a7687576602a7e64234844d1f33c0b 100644 --- a/internal/git/testhelper_test.go +++ b/internal/git/testhelper_test.go @@ -3,7 +3,7 @@ package git import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/git/trace2/manager_test.go b/internal/git/trace2/manager_test.go index 032ff3bd9a6b681795d3301c08d7314f0358d7c3..e16728f22796a7389e22782efbaaa860ccab87ce 100644 --- a/internal/git/trace2/manager_test.go +++ b/internal/git/trace2/manager_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) type dummyHook struct { diff --git a/internal/git/trace2/parser.go b/internal/git/trace2/parser.go index e5ecbdec744b7051bce84baddeea759afdb25348..802bebccac149169779aebebcc16e8cb9745d2f7 100644 --- a/internal/git/trace2/parser.go +++ b/internal/git/trace2/parser.go @@ -9,8 +9,8 @@ import ( "strings" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/tracing" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/tracing" ) // Parse parses the events generated by Git Trace2 API into a tree data structure. diff --git a/internal/git/trace2/parser_test.go b/internal/git/trace2/parser_test.go index 744b84a5781a84c4ceaff12a0457e17e0f54b1c7..b5d8f0dde175f3db8c05819f07d4fc1fc05908d4 100644 --- a/internal/git/trace2/parser_test.go +++ b/internal/git/trace2/parser_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestParser_Parse(t *testing.T) { diff --git a/internal/git/trace2/testhelper_test.go b/internal/git/trace2/testhelper_test.go index 4500d74040c3011633b4a1d97b18d3a0264a14ca..582fb2bf68ca17676288b79cce0cc7c72b5b79f5 100644 --- a/internal/git/trace2/testhelper_test.go +++ b/internal/git/trace2/testhelper_test.go @@ -3,7 +3,7 @@ package trace2 import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/git/trace2hooks/log_exporter.go b/internal/git/trace2hooks/log_exporter.go index c1fa639838d920376b00544f95d02f3e6e68aab4..c17a223a5a7a7d30b0138fc9a70b7bd37b779920 100644 --- a/internal/git/trace2hooks/log_exporter.go +++ b/internal/git/trace2hooks/log_exporter.go @@ -5,8 +5,8 @@ import ( "encoding/json" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/trace2" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/trace2" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" "golang.org/x/time/rate" ) diff --git a/internal/git/trace2hooks/log_exporter_test.go b/internal/git/trace2hooks/log_exporter_test.go index c7e3818260bd50dc36af6d7bcadb2fa1c38ba554..3b9ec0bc6d0cbb3a97472e75f252e9546ccad5a9 100644 --- a/internal/git/trace2hooks/log_exporter_test.go +++ b/internal/git/trace2hooks/log_exporter_test.go @@ -10,8 +10,8 @@ import ( "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/trace2" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/trace2" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" "golang.org/x/time/rate" ) diff --git a/internal/git/trace2hooks/packobjects_metrics.go b/internal/git/trace2hooks/packobjects_metrics.go index f9fd5515e9eab53121980c595b21c3a22da918cb..e8da8f53104cbb698565339250719ab617b9e214 100644 --- a/internal/git/trace2hooks/packobjects_metrics.go +++ b/internal/git/trace2hooks/packobjects_metrics.go @@ -5,8 +5,8 @@ import ( "strconv" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/trace2" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/trace2" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) var statsIntData = map[string]string{ diff --git a/internal/git/trace2hooks/packobjects_metrics_ext_test.go b/internal/git/trace2hooks/packobjects_metrics_ext_test.go index 011f5f15e09da92b79517fc830b3f9459e040036..fa2c1f6b103deec7b3bafa0fbe336b212d4b7a82 100644 --- a/internal/git/trace2hooks/packobjects_metrics_ext_test.go +++ b/internal/git/trace2hooks/packobjects_metrics_ext_test.go @@ -7,16 +7,16 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/trace2" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/trace2hooks" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/trace2" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/trace2hooks" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestPackObjectsMetrics(t *testing.T) { diff --git a/internal/git/trace2hooks/packobjects_metrics_test.go b/internal/git/trace2hooks/packobjects_metrics_test.go index 6acf8fd0babb6dd472a15bfd38afc7fab50c7b2d..8874172246911c711a9a3eef0b156fd10fbd6fcd 100644 --- a/internal/git/trace2hooks/packobjects_metrics_test.go +++ b/internal/git/trace2hooks/packobjects_metrics_test.go @@ -5,9 +5,9 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/trace2" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/trace2" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestPackObjectsMetrics_Handle(t *testing.T) { diff --git a/internal/git/trace2hooks/testhelper_test.go b/internal/git/trace2hooks/testhelper_test.go index 772af35433c711bfdbf9a75999df8dc27da4dd77..54cf0cdcc11f08835856601cbb8e31c276b5fa52 100644 --- a/internal/git/trace2hooks/testhelper_test.go +++ b/internal/git/trace2hooks/testhelper_test.go @@ -3,7 +3,7 @@ package trace2hooks import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/git/trace2hooks/trace_helper_test.go b/internal/git/trace2hooks/trace_helper_test.go index 26771199095cf93386fc3a6d1faddfb58b6cc816..bf7e6afc0792609a32078e9abce3771583dd105e 100644 --- a/internal/git/trace2hooks/trace_helper_test.go +++ b/internal/git/trace2hooks/trace_helper_test.go @@ -3,7 +3,7 @@ package trace2hooks import ( "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/trace2" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/trace2" ) func createExampleTrace(startTime time.Time) *trace2.Trace { diff --git a/internal/git/trace2hooks/tracingexporter.go b/internal/git/trace2hooks/tracingexporter.go index c79721239823a3225c72409db894c8a51b3c3be8..c3029586c07501bd0577c3d616d917342288150f 100644 --- a/internal/git/trace2hooks/tracingexporter.go +++ b/internal/git/trace2hooks/tracingexporter.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/opentracing/opentracing-go" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/trace2" - "gitlab.com/gitlab-org/gitaly/v16/internal/tracing" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/trace2" + "gitlab.com/gitlab-org/gitaly/v17/internal/tracing" ) // NewTracingExporter initializes TracingExporter, which is a hook to convert Trace2 events to diff --git a/internal/git/trace2hooks/tracingexporter_test.go b/internal/git/trace2hooks/tracingexporter_test.go index 0c7ab5a916cf547d37a09e66477d1cc462f11d99..53296b59697268fc77e8fa33e29237732f0cb943 100644 --- a/internal/git/trace2hooks/tracingexporter_test.go +++ b/internal/git/trace2hooks/tracingexporter_test.go @@ -6,9 +6,9 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/trace2" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/tracing" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/trace2" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/tracing" ) func TestTracingExporter_Handle(t *testing.T) { diff --git a/internal/git/trailerparser/testhelper_test.go b/internal/git/trailerparser/testhelper_test.go index b26271c1ae5b42ff0c532008f2c032087561c4c2..05634daea18dca0fdfd6df68b18037058471dd26 100644 --- a/internal/git/trailerparser/testhelper_test.go +++ b/internal/git/trailerparser/testhelper_test.go @@ -3,7 +3,7 @@ package trailerparser import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/git/trailerparser/trailerparser.go b/internal/git/trailerparser/trailerparser.go index 6ae75be71d2b9505be88b3cb12ff18272571a5b8..9fc23a214ec8cd8bbbea3df17ad94366d5d335f2 100644 --- a/internal/git/trailerparser/trailerparser.go +++ b/internal/git/trailerparser/trailerparser.go @@ -3,7 +3,7 @@ package trailerparser import ( "bytes" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) const ( diff --git a/internal/git/tree_entry.go b/internal/git/tree_entry.go index 3dcec05625947afcc97caba8fe48abeb10f3162e..bec7a605c709f4f006a59825498460d78c42612c 100644 --- a/internal/git/tree_entry.go +++ b/internal/git/tree_entry.go @@ -5,7 +5,7 @@ import ( "path/filepath" "strconv" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // NewTreeEntry is a helper to construct a gitalypb.TreeEntry from the provided parameters. diff --git a/internal/git/updateref/testhelper_test.go b/internal/git/updateref/testhelper_test.go index bd3c3117a5ad055c1adc21e41f716b2c9bd75fae..4a699bddc352602628f44ab00445c5312088cbec 100644 --- a/internal/git/updateref/testhelper_test.go +++ b/internal/git/updateref/testhelper_test.go @@ -3,7 +3,7 @@ package updateref import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/git/updateref/updateref.go b/internal/git/updateref/updateref.go index 06caf7ccb22ce9a3095b75611d2c0712f389a97d..88d38de9b36273a5851606de9dfd49fc1aeea340 100644 --- a/internal/git/updateref/updateref.go +++ b/internal/git/updateref/updateref.go @@ -7,10 +7,10 @@ import ( "errors" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" ) var ( diff --git a/internal/git/updateref/updateref_test.go b/internal/git/updateref/updateref_test.go index 6edae338f182fd78ee67399d9472af3d1fc5e9d3..3d0e0b1f2def5a045201e7aae2b6891b3a294ace 100644 --- a/internal/git/updateref/updateref_test.go +++ b/internal/git/updateref/updateref_test.go @@ -12,14 +12,14 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func setupUpdater(tb testing.TB, ctx context.Context) (config.Cfg, gittest.RepositoryPathExecutor, string, *Updater) { diff --git a/internal/gitaly/config/cgroups/cgroups.go b/internal/gitaly/config/cgroups/cgroups.go index 90865a308ccd4b54de7c24328dc42253cb572c90..c8b2f71c8b6deed18db7190571dcf177f5432b49 100644 --- a/internal/gitaly/config/cgroups/cgroups.go +++ b/internal/gitaly/config/cgroups/cgroups.go @@ -1,7 +1,7 @@ package cgroups import ( - "gitlab.com/gitlab-org/gitaly/v16/internal/errors/cfgerror" + "gitlab.com/gitlab-org/gitaly/v17/internal/errors/cfgerror" ) // Config is a struct for cgroups config diff --git a/internal/gitaly/config/cgroups/cgroups_test.go b/internal/gitaly/config/cgroups/cgroups_test.go index 5527415eac54b28923f46768bb28499df60ebc17..4e9adc6424a370030147b94dc4af9b62254976be 100644 --- a/internal/gitaly/config/cgroups/cgroups_test.go +++ b/internal/gitaly/config/cgroups/cgroups_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/errors/cfgerror" + "gitlab.com/gitlab-org/gitaly/v17/internal/errors/cfgerror" ) func TestFallbackToOldVersion(t *testing.T) { diff --git a/internal/gitaly/config/cgroups/testhelper_test.go b/internal/gitaly/config/cgroups/testhelper_test.go index 2eabe651036019b45f499ff65dbfb14539df032d..ee0cd67e6623ac6e337c44c94fb3f0beefe4c8ff 100644 --- a/internal/gitaly/config/cgroups/testhelper_test.go +++ b/internal/gitaly/config/cgroups/testhelper_test.go @@ -3,7 +3,7 @@ package cgroups import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/config/config.go b/internal/gitaly/config/config.go index f047733fc5bb889f1f1bd9ba319b95a8c55a5c7d..dd1dd21fb3620bd8735b11bd66cf72c0fcbc1e1d 100644 --- a/internal/gitaly/config/config.go +++ b/internal/gitaly/config/config.go @@ -19,14 +19,14 @@ import ( "github.com/google/uuid" "github.com/pelletier/go-toml/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/errors/cfgerror" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/cgroups" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/sentry" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/duration" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/errors/cfgerror" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/cgroups" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/prometheus" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/sentry" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/duration" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) const ( diff --git a/internal/gitaly/config/config_test.go b/internal/gitaly/config/config_test.go index d1ea9ae253dac180e1e0aa2b1366585f68e57571..98752a0330e23617f43ab56a1295faf5a839569a 100644 --- a/internal/gitaly/config/config_test.go +++ b/internal/gitaly/config/config_test.go @@ -14,14 +14,14 @@ import ( "github.com/pelletier/go-toml/v2" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/errors/cfgerror" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/cgroups" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/sentry" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/duration" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/errors/cfgerror" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/cgroups" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/prometheus" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/sentry" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/duration" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestBinaryPath(t *testing.T) { diff --git a/internal/gitaly/config/locator.go b/internal/gitaly/config/locator.go index 449b0244d9db4e7750490ee0fe7f3827982760df..70ffa8a33eb7f26130366682ac92d69382788267 100644 --- a/internal/gitaly/config/locator.go +++ b/internal/gitaly/config/locator.go @@ -6,8 +6,8 @@ import ( "os" "path/filepath" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" ) const ( diff --git a/internal/gitaly/config/locator_test.go b/internal/gitaly/config/locator_test.go index 07d95f9e12d2d7b6f67b6ba69fc0177ce7679169..7b5afc98ba3439c788af2964ebf3f52c0ac54db8 100644 --- a/internal/gitaly/config/locator_test.go +++ b/internal/gitaly/config/locator_test.go @@ -7,16 +7,16 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/setup" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/setup" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestConfigLocator_GetRepoPath(t *testing.T) { diff --git a/internal/gitaly/config/prometheus/config.go b/internal/gitaly/config/prometheus/config.go index 499ebc7d6aecfb6de2ee6b6bbbab008b03627057..2cfa7b0c8bb8c3514d0854167e2ecdfd731a5c61 100644 --- a/internal/gitaly/config/prometheus/config.go +++ b/internal/gitaly/config/prometheus/config.go @@ -7,9 +7,9 @@ import ( grpcprometheus "github.com/grpc-ecosystem/go-grpc-prometheus" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/errors/cfgerror" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/duration" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/errors/cfgerror" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/duration" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) // Config contains additional configuration data for prometheus diff --git a/internal/gitaly/config/prometheus/config_test.go b/internal/gitaly/config/prometheus/config_test.go index 1b8bce1a505964e8332506dfa77e33605155559d..e84b870c766779d791a38d1c8b03173e7ed01686 100644 --- a/internal/gitaly/config/prometheus/config_test.go +++ b/internal/gitaly/config/prometheus/config_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/errors/cfgerror" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/duration" + "gitlab.com/gitlab-org/gitaly/v17/internal/errors/cfgerror" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/duration" ) func TestConfig_Validate(t *testing.T) { diff --git a/internal/gitaly/config/prometheus/testhelper_test.go b/internal/gitaly/config/prometheus/testhelper_test.go index 9653a830e5e938c4ee8b48abcfb4d78b08052a3f..a9dfa812417fcd4656dc52214a00a9ea604f40aa 100644 --- a/internal/gitaly/config/prometheus/testhelper_test.go +++ b/internal/gitaly/config/prometheus/testhelper_test.go @@ -3,7 +3,7 @@ package prometheus import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/config/sentry/sentry.go b/internal/gitaly/config/sentry/sentry.go index 40a27d4a15e65be73141798f882e16b5a56f7d56..dc2b02ab48bb07b84e92f0a53e87fe69e41455ae 100644 --- a/internal/gitaly/config/sentry/sentry.go +++ b/internal/gitaly/config/sentry/sentry.go @@ -4,8 +4,8 @@ import ( "fmt" sentry "github.com/getsentry/sentry-go" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/panichandler" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/middleware/panichandler" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) // Config contains configuration for sentry diff --git a/internal/gitaly/config/temp_dir.go b/internal/gitaly/config/temp_dir.go index 59b0a49ad64f40abb4ecea393829555479bee5b4..29003a92d16c06f539b9d88c2d6d1311844ce0cd 100644 --- a/internal/gitaly/config/temp_dir.go +++ b/internal/gitaly/config/temp_dir.go @@ -9,7 +9,7 @@ import ( "strings" "syscall" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) // PruneOldGitalyProcessDirectories removes leftover temporary directories that belonged to processes that diff --git a/internal/gitaly/config/temp_dir_test.go b/internal/gitaly/config/temp_dir_test.go index a451cc692a85c6763fcb7b1ce4aceadf8d7158c8..a2d30640aa175fec0575b362f7cbf559dcbd88a4 100644 --- a/internal/gitaly/config/temp_dir_test.go +++ b/internal/gitaly/config/temp_dir_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestPruneOldGitalyProcessDirectories(t *testing.T) { diff --git a/internal/gitaly/config/testhelper_test.go b/internal/gitaly/config/testhelper_test.go index fba4fa2c61e341c8754e646b2031d10b859e15b4..a4f7d39e588c427b279c03e5d1b86b91b2a51d98 100644 --- a/internal/gitaly/config/testhelper_test.go +++ b/internal/gitaly/config/testhelper_test.go @@ -3,7 +3,7 @@ package config import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/diff/diff.go b/internal/gitaly/diff/diff.go index 5b2d4bd7f033c28458b10b1a8fac04a70c77a898..e1c7914d6fa7e7b5dbc9639945c96877ba981910 100644 --- a/internal/gitaly/diff/diff.go +++ b/internal/gitaly/diff/diff.go @@ -10,9 +10,9 @@ import ( "regexp" "strconv" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" ) // Diff represents a single parsed diff entry diff --git a/internal/gitaly/diff/diff_test.go b/internal/gitaly/diff/diff_test.go index cf7f7dbd690ed1d53c500740c6fb2d870ff0e087..f2085d9b8f92330078597ac7dc0f82876910bca2 100644 --- a/internal/gitaly/diff/diff_test.go +++ b/internal/gitaly/diff/diff_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" ) var ( diff --git a/internal/gitaly/diff/testhelper_test.go b/internal/gitaly/diff/testhelper_test.go index 053cf6df009a021d843a62bbafb94f352bcb8896..d3482a68886f78e88147f1395a212f3bf17a9a5f 100644 --- a/internal/gitaly/diff/testhelper_test.go +++ b/internal/gitaly/diff/testhelper_test.go @@ -3,7 +3,7 @@ package diff import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/gitalyclient/receive_pack.go b/internal/gitaly/gitalyclient/receive_pack.go index 0610f9e103450b41daf959dd43dd10b4c89d5e07..b8f883cbf26db5be266db5fd6f3a08a40297227d 100644 --- a/internal/gitaly/gitalyclient/receive_pack.go +++ b/internal/gitaly/gitalyclient/receive_pack.go @@ -4,9 +4,9 @@ import ( "context" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/stream" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/stream" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" "google.golang.org/grpc" ) diff --git a/internal/gitaly/gitalyclient/upload_archive.go b/internal/gitaly/gitalyclient/upload_archive.go index 03e883d028fb682da39d52fff659e6630a92d771..7347b5f4a4b82c5218bc7da928765376dfe55626 100644 --- a/internal/gitaly/gitalyclient/upload_archive.go +++ b/internal/gitaly/gitalyclient/upload_archive.go @@ -5,9 +5,9 @@ import ( "fmt" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/stream" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/stream" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" "google.golang.org/grpc" ) diff --git a/internal/gitaly/gitalyclient/upload_pack.go b/internal/gitaly/gitalyclient/upload_pack.go index ca8b2f710c588c8becfa5ec9e55d4ae5cc16d1a6..6f080ec5669b2e31c264f6728905135d4fe5097c 100644 --- a/internal/gitaly/gitalyclient/upload_pack.go +++ b/internal/gitaly/gitalyclient/upload_pack.go @@ -4,9 +4,9 @@ import ( "context" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/sidechannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/stream" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/sidechannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/stream" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" ) diff --git a/internal/gitaly/hook/check.go b/internal/gitaly/hook/check.go index 76825d941019ca5793e570cb6c445ef493280d97..9e6bc7af5577509c49aa0838c8ea60ed5b079e5c 100644 --- a/internal/gitaly/hook/check.go +++ b/internal/gitaly/hook/check.go @@ -3,7 +3,7 @@ package hook import ( "context" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitlab" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitlab" ) //nolint:revive // This is unintentionally missing documentation. diff --git a/internal/gitaly/hook/custom.go b/internal/gitaly/hook/custom.go index e1403cf1516155d59b16de114280e9bf16b88864..2cdd96d8982366f76cecb512df420d93ac10ba5b 100644 --- a/internal/gitaly/hook/custom.go +++ b/internal/gitaly/hook/custom.go @@ -9,11 +9,11 @@ import ( "path/filepath" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/env" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/env" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "golang.org/x/sys/unix" ) diff --git a/internal/gitaly/hook/custom_test.go b/internal/gitaly/hook/custom_test.go index cd38e7ea019032c42d102a6d520dcffed7d9fb96..594310387dd1dd24e41bc86067749dae0438fdac 100644 --- a/internal/gitaly/hook/custom_test.go +++ b/internal/gitaly/hook/custom_test.go @@ -11,14 +11,14 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/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 6c694a0bc9aa4accdfa14ace4c6310a56f247728..6972a3298a97bd2c60b0e2e530bd8a92b8171eb7 100644 --- a/internal/gitaly/hook/manager.go +++ b/internal/gitaly/hook/manager.go @@ -4,14 +4,14 @@ import ( "context" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitlab" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitlab" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // ReferenceTransactionState is the state of the Git reference transaction. It reflects the first diff --git a/internal/gitaly/hook/manager_mock.go b/internal/gitaly/hook/manager_mock.go index 205cab91ab03fbfb34ac89c7aa7bb476c8a64146..a003a8c99a9950c302fb9b245020f5c9b836654b 100644 --- a/internal/gitaly/hook/manager_mock.go +++ b/internal/gitaly/hook/manager_mock.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // MockManager mocks the Manager interface for Git hooks (e.g. pre-receive, post-receive) diff --git a/internal/gitaly/hook/postreceive.go b/internal/gitaly/hook/postreceive.go index 23f3ff571f37f4e223fed74cf38c680c752b7d0c..0bc1080c9f4b9f647d85f1aa7f50e061d4f002d0 100644 --- a/internal/gitaly/hook/postreceive.go +++ b/internal/gitaly/hook/postreceive.go @@ -9,11 +9,11 @@ import ( "math" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitlab" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitlab" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) const ( diff --git a/internal/gitaly/hook/postreceive_test.go b/internal/gitaly/hook/postreceive_test.go index f6cd89b992b32d0f9f4df5b90ffb0e62e83b9e56..b9e2705545ad79c4d76246293a73c4c4646dacfd 100644 --- a/internal/gitaly/hook/postreceive_test.go +++ b/internal/gitaly/hook/postreceive_test.go @@ -10,22 +10,22 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/quarantine" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitlab" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/quarantine" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitlab" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestPrintAlert(t *testing.T) { diff --git a/internal/gitaly/hook/prereceive.go b/internal/gitaly/hook/prereceive.go index bf638e7b780d96eac5165a070f635cd3a8878a04..74d8fbdaa92ca9b77d3253968354d3811cc11e16 100644 --- a/internal/gitaly/hook/prereceive.go +++ b/internal/gitaly/hook/prereceive.go @@ -9,11 +9,11 @@ import ( "path/filepath" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitlab" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/env" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitlab" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/env" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // NotAllowedError is needed to report internal API errors that diff --git a/internal/gitaly/hook/prereceive_test.go b/internal/gitaly/hook/prereceive_test.go index 66e407607f4a82376743c7e1ea9d4b38370d7286..c966c79d971c8649a503b5711a410008973223aa 100644 --- a/internal/gitaly/hook/prereceive_test.go +++ b/internal/gitaly/hook/prereceive_test.go @@ -9,23 +9,23 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/quarantine" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitlab" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/quarantine" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitlab" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestPrereceive_customHooks(t *testing.T) { diff --git a/internal/gitaly/hook/procreceive_handler.go b/internal/gitaly/hook/procreceive_handler.go index a9c078bec93f179fbbf9ccf789186137f613c220..c620a8e289ae580fad12c09138125f42ae88b81c 100644 --- a/internal/gitaly/hook/procreceive_handler.go +++ b/internal/gitaly/hook/procreceive_handler.go @@ -6,10 +6,10 @@ import ( "io" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/pktline" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" ) type procReceiveHandler struct { diff --git a/internal/gitaly/hook/procreceive_handler_test.go b/internal/gitaly/hook/procreceive_handler_test.go index 1cdef1c1d2ce8cca7dbf443c016b60fa082e92c0..4ba729fc7e8911a82133b6d31660dc47d2ee0c40 100644 --- a/internal/gitaly/hook/procreceive_handler_test.go +++ b/internal/gitaly/hook/procreceive_handler_test.go @@ -9,12 +9,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/pktline" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestProcReceiveHandler(t *testing.T) { diff --git a/internal/gitaly/hook/procreceive_registry.go b/internal/gitaly/hook/procreceive_registry.go index d5aa569bc86b6004ca32c8b28e8d7d47c7130b6b..241062f05ac3f158c8cd556c4b8eff1d3b0d74e9 100644 --- a/internal/gitaly/hook/procreceive_registry.go +++ b/internal/gitaly/hook/procreceive_registry.go @@ -5,8 +5,8 @@ import ( "fmt" "sync" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" ) // ReferenceUpdate denotes a single reference update to be made. diff --git a/internal/gitaly/hook/procreceive_registry_test.go b/internal/gitaly/hook/procreceive_registry_test.go index dcca8ceb16ce54635aa2f6e915b4c311c7f4a7b5..24138b3dc17b157e78e222f7623827d3d68e4096 100644 --- a/internal/gitaly/hook/procreceive_registry_test.go +++ b/internal/gitaly/hook/procreceive_registry_test.go @@ -9,13 +9,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/pktline" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestProcReceiveRegistry(t *testing.T) { diff --git a/internal/gitaly/hook/receivepack/receive_pack.go b/internal/gitaly/hook/receivepack/receive_pack.go index e8b4b43e59b9a5a109774a23d5116de713261aea..85d43573220fc19161dc44554e4d41a2a4d75f70 100644 --- a/internal/gitaly/hook/receivepack/receive_pack.go +++ b/internal/gitaly/hook/receivepack/receive_pack.go @@ -7,17 +7,17 @@ import ( "io" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // RegisterProcReceiveHook is intended for use by the receive-pack RPC handlers when transactions diff --git a/internal/gitaly/hook/receivepack/receive_pack_test.go b/internal/gitaly/hook/receivepack/receive_pack_test.go index 8fc759ce5fdc5cf8705370a86ddcbbbfc383a395..92f601dd9d9d8f1b041fdd08c04f3246072d8936 100644 --- a/internal/gitaly/hook/receivepack/receive_pack_test.go +++ b/internal/gitaly/hook/receivepack/receive_pack_test.go @@ -10,17 +10,17 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/pktline" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestRegisterProcReceiveHook(t *testing.T) { diff --git a/internal/gitaly/hook/receivepack/testhelper_test.go b/internal/gitaly/hook/receivepack/testhelper_test.go index a6f8a3ea7837c7fde52ac9d076db58805594b9e2..d825d3a0f07b50223479df111c7a7d2351894927 100644 --- a/internal/gitaly/hook/receivepack/testhelper_test.go +++ b/internal/gitaly/hook/receivepack/testhelper_test.go @@ -3,7 +3,7 @@ package receivepack import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/hook/referencetransaction.go b/internal/gitaly/hook/referencetransaction.go index 58d3b8c4e84192fd766ebcbf3f018049bb34a8da..073345ba6e4d06f5fcc4115ba1a429fd38b34378 100644 --- a/internal/gitaly/hook/referencetransaction.go +++ b/internal/gitaly/hook/referencetransaction.go @@ -9,10 +9,10 @@ import ( "io" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" ) // ReferenceTransactionHook captures all reference updates taking place in the diff --git a/internal/gitaly/hook/sidechannel.go b/internal/gitaly/hook/sidechannel.go index 7b894f7899e6b1d1ae13830bf53662841baf007b..11a577d0cf75b63bab69fc684d9e771db8106b78 100644 --- a/internal/gitaly/hook/sidechannel.go +++ b/internal/gitaly/hook/sidechannel.go @@ -11,9 +11,9 @@ import ( "path/filepath" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - gitaly_metadata "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + gitaly_metadata "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" "google.golang.org/grpc/metadata" ) diff --git a/internal/gitaly/hook/sidechannel_test.go b/internal/gitaly/hook/sidechannel_test.go index a11a7aa80c7c879bc81c62fa4b8fd679ea7bebb1..5393ef4b1bd6ef45b5752165c3af52dc18afbd53 100644 --- a/internal/gitaly/hook/sidechannel_test.go +++ b/internal/gitaly/hook/sidechannel_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" grpc_metadata "google.golang.org/grpc/metadata" ) diff --git a/internal/gitaly/hook/testhelper_test.go b/internal/gitaly/hook/testhelper_test.go index c6b80c636daf170ed6bb55b26902bffbfc4062b7..f8adc0d0a448a3c83e0ab1da6842157d1ffa1863 100644 --- a/internal/gitaly/hook/testhelper_test.go +++ b/internal/gitaly/hook/testhelper_test.go @@ -10,13 +10,13 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/hook/transactions.go b/internal/gitaly/hook/transactions.go index 19610b297b4a8285cf0015ce19997b758fa9a837..fa22b7a09a461735c6ffa01187ff4eed6ea1c7c4 100644 --- a/internal/gitaly/hook/transactions.go +++ b/internal/gitaly/hook/transactions.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" ) func isPrimary(payload gitcmd.HooksPayload) bool { diff --git a/internal/gitaly/hook/transactions_test.go b/internal/gitaly/hook/transactions_test.go index 19e3461e8cd0c53d98aa97e551a52c270191b5ba..d36731e64bdc88ea83258368527b92014706fe00 100644 --- a/internal/gitaly/hook/transactions_test.go +++ b/internal/gitaly/hook/transactions_test.go @@ -9,18 +9,18 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitlab" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitlab" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" ) func TestHookManager_stopCalled(t *testing.T) { diff --git a/internal/gitaly/hook/update.go b/internal/gitaly/hook/update.go index ee61df4224624812b0266c142c8a6c4735cd5cae..16be33bedd423b7982510327b81b23727bf2f49a 100644 --- a/internal/gitaly/hook/update.go +++ b/internal/gitaly/hook/update.go @@ -5,10 +5,10 @@ import ( "fmt" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) //nolint:revive // This is unintentionally missing documentation. diff --git a/internal/gitaly/hook/update_test.go b/internal/gitaly/hook/update_test.go index 4287d271683e19a16a236ac2939fae2e4dd0a0d7..5b0b86085ec4ba6d8d55ac6b7e34f900c01bca7a 100644 --- a/internal/gitaly/hook/update_test.go +++ b/internal/gitaly/hook/update_test.go @@ -7,21 +7,21 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/quarantine" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitlab" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/quarantine" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitlab" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestUpdate_customHooks(t *testing.T) { diff --git a/internal/gitaly/hook/updateref/testhelper_test.go b/internal/gitaly/hook/updateref/testhelper_test.go index d52247f7f854169d3e248cc9419e73e8ac688e02..0774536c8b5fc2414e4d657ac5c0f15971743da3 100644 --- a/internal/gitaly/hook/updateref/testhelper_test.go +++ b/internal/gitaly/hook/updateref/testhelper_test.go @@ -3,7 +3,7 @@ package updateref_test import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/hook/updateref/update_with_hooks.go b/internal/gitaly/hook/updateref/update_with_hooks.go index 6e8256efad6a4f1e8a2fdf43dac357346d259b02..15bd07dd06e005306a8cd95b38e6d55076303ea4 100644 --- a/internal/gitaly/hook/updateref/update_with_hooks.go +++ b/internal/gitaly/hook/updateref/update_with_hooks.go @@ -7,19 +7,19 @@ import ( "fmt" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/quarantine" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/quarantine" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // UpdaterWithHooks updates a ref with Git hooks. diff --git a/internal/gitaly/hook/updateref/update_with_hooks_test.go b/internal/gitaly/hook/updateref/update_with_hooks_test.go index 72b743c672b42ce34208a486c90e32938decd2a1..b3eb3c3ad9d9ec4d1758d0943571b16de1f9ecf4 100644 --- a/internal/gitaly/hook/updateref/update_with_hooks_test.go +++ b/internal/gitaly/hook/updateref/update_with_hooks_test.go @@ -9,22 +9,22 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/quarantine" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - hookservice "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/quarantine" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + hookservice "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" ) diff --git a/internal/gitaly/linguist/file_instance.go b/internal/gitaly/linguist/file_instance.go index c2d94c08a449913e1307beb34bc39b3541238997..cd09740d3377e8ab6337f07303920d3a7448b97c 100644 --- a/internal/gitaly/linguist/file_instance.go +++ b/internal/gitaly/linguist/file_instance.go @@ -5,8 +5,8 @@ import ( "io" "github.com/go-enry/go-enry/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitattributes" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitpipe" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitattributes" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitpipe" ) const ( diff --git a/internal/gitaly/linguist/language_stats.go b/internal/gitaly/linguist/language_stats.go index 1b432b6d1cf8cb974a2f76249685182cbcd528b5..b8bb84f6e48f1ab2af85fe69c4b11db7bf075087 100644 --- a/internal/gitaly/linguist/language_stats.go +++ b/internal/gitaly/linguist/language_stats.go @@ -9,9 +9,9 @@ import ( "path/filepath" "sync" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" ) const ( diff --git a/internal/gitaly/linguist/language_stats_test.go b/internal/gitaly/linguist/language_stats_test.go index c93adffc39b88945d2264dbe3dc3d51ef0f47b00..825692038563cb7a8fbf4b6e96c62c2aa9e0f00e 100644 --- a/internal/gitaly/linguist/language_stats_test.go +++ b/internal/gitaly/linguist/language_stats_test.go @@ -9,12 +9,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestInitLanguageStats(t *testing.T) { diff --git a/internal/gitaly/linguist/linguist.go b/internal/gitaly/linguist/linguist.go index 168e9f7685c26319f50db572b51e589427d62ae4..ac4cdb909db0a1a31368284316673bf1b8888939 100644 --- a/internal/gitaly/linguist/linguist.go +++ b/internal/gitaly/linguist/linguist.go @@ -7,15 +7,15 @@ import ( "io" "github.com/go-enry/go-enry/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitattributes" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitpipe" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitattributes" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitpipe" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) // ByteCountPerLanguage represents a counter value (bytes) per language. diff --git a/internal/gitaly/linguist/linguist_test.go b/internal/gitaly/linguist/linguist_test.go index f1e755a2d4db3946f0f82c07b06af3f1948b7a97..60c84ceab939f70e2e11b58474dc65dcc0d86866 100644 --- a/internal/gitaly/linguist/linguist_test.go +++ b/internal/gitaly/linguist/linguist_test.go @@ -8,17 +8,17 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestInstance_Stats(t *testing.T) { diff --git a/internal/gitaly/linguist/testhelper_test.go b/internal/gitaly/linguist/testhelper_test.go index 199d589a38d44a4fbbc5bd432a068d929dbdedee..a6920e12d3543bb8119abe06785a86eb2e9bf55d 100644 --- a/internal/gitaly/linguist/testhelper_test.go +++ b/internal/gitaly/linguist/testhelper_test.go @@ -3,7 +3,7 @@ package linguist import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/maintenance/daily.go b/internal/gitaly/maintenance/daily.go index 9fee61c66fdfefa80cc6a0ff744bd0f0de69b1ca..478f96dea3ad317e32dac850fbbb423b68bd3520 100644 --- a/internal/gitaly/maintenance/daily.go +++ b/internal/gitaly/maintenance/daily.go @@ -4,9 +4,9 @@ import ( "context" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/dontpanic" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/dontpanic" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) // 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 6ae906c57f0545c12e2296f5a9b6f2d8cfa77622..019d70b2ad1fea15f66bb777b605deb31a8d7062 100644 --- a/internal/gitaly/maintenance/daily_test.go +++ b/internal/gitaly/maintenance/daily_test.go @@ -6,10 +6,10 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/duration" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/duration" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestStartDaily(t *testing.T) { diff --git a/internal/gitaly/maintenance/optimize.go b/internal/gitaly/maintenance/optimize.go index 05a9d5f84f7f56490cf312acf8c7711043961172..630894f038a6bac451b0da697bd786489bbaddb6 100644 --- a/internal/gitaly/maintenance/optimize.go +++ b/internal/gitaly/maintenance/optimize.go @@ -9,11 +9,11 @@ import ( "path/filepath" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // WorkerFunc is a function that does a unit of work meant to run in the background diff --git a/internal/gitaly/maintenance/optimize_test.go b/internal/gitaly/maintenance/optimize_test.go index bf6fa1250af42bf27935d3a106a4020b9f37f708..301aac5301a5ac9e46cef7341f9c95789157d60f 100644 --- a/internal/gitaly/maintenance/optimize_test.go +++ b/internal/gitaly/maintenance/optimize_test.go @@ -6,19 +6,19 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - housekeepingmgr "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping/manager" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + housekeepingmgr "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping/manager" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) type mockOptimizer struct { diff --git a/internal/gitaly/maintenance/randomwalker_test.go b/internal/gitaly/maintenance/randomwalker_test.go index cb88c143bd2476195d24eddd071b06c533fdf084..ce89395f42720255141e7481740b3d50a91bdf90 100644 --- a/internal/gitaly/maintenance/randomwalker_test.go +++ b/internal/gitaly/maintenance/randomwalker_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestRandomWalk(t *testing.T) { diff --git a/internal/gitaly/maintenance/testhelper_test.go b/internal/gitaly/maintenance/testhelper_test.go index c6832ae05765e697bc0579ad1fc18e7ab992ce52..7cc2f24dad5aa8a6da55c53e5a7fa396afa3021e 100644 --- a/internal/gitaly/maintenance/testhelper_test.go +++ b/internal/gitaly/maintenance/testhelper_test.go @@ -3,7 +3,7 @@ package maintenance import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/rangediff/range_diff.go b/internal/gitaly/rangediff/range_diff.go index 88672177844ceba53249d3699c4509297c567a44..fc6cab0f6d03c1ae8e6928bebc1b56b3bf9ca203 100644 --- a/internal/gitaly/rangediff/range_diff.go +++ b/internal/gitaly/rangediff/range_diff.go @@ -7,7 +7,7 @@ import ( "io" "regexp" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) const ( diff --git a/internal/gitaly/rangediff/range_diff_test.go b/internal/gitaly/rangediff/range_diff_test.go index 280edb3a56dfc422d3cc54fa82229652666baebe..d7f231a113345cd2bd1d024cc98ebab1ae139639 100644 --- a/internal/gitaly/rangediff/range_diff_test.go +++ b/internal/gitaly/rangediff/range_diff_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestRangeDiffParserOneLineEqual(t *testing.T) { diff --git a/internal/gitaly/rangediff/testhelper_test.go b/internal/gitaly/rangediff/testhelper_test.go index 5f5af15055ea0669117fbe4e298dfb9ae6bc4574..4bc246f52fac1471d998de7c1a51141176e1927e 100644 --- a/internal/gitaly/rangediff/testhelper_test.go +++ b/internal/gitaly/rangediff/testhelper_test.go @@ -3,7 +3,7 @@ package rangediff import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/repoutil/create.go b/internal/gitaly/repoutil/create.go index bf8aeb0ac0b5ebd17c1895f8bdf5a06a34e72306..856b494831b47e856ac3ca99008f091b66f8a51b 100644 --- a/internal/gitaly/repoutil/create.go +++ b/internal/gitaly/repoutil/create.go @@ -12,23 +12,23 @@ import ( "runtime/trace" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping" - housekeepingcfg "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/counter" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/safe" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/tempdir" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping" + housekeepingcfg "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/counter" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/safe" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/tempdir" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) type createConfig struct { diff --git a/internal/gitaly/repoutil/create_test.go b/internal/gitaly/repoutil/create_test.go index 698ef7928011d31d05e586536339fce668c514e2..de090bd729ce71ff307f74654ca63b488cbf5d98 100644 --- a/internal/gitaly/repoutil/create_test.go +++ b/internal/gitaly/repoutil/create_test.go @@ -12,24 +12,24 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/counter" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/safe" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/counter" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/safe" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/peer" ) diff --git a/internal/gitaly/repoutil/custom_hooks.go b/internal/gitaly/repoutil/custom_hooks.go index 39448676feab10f75a35c1ac04ffb754517a77a4..3541d8af9729746d18c0e603e8531eaf8616371b 100644 --- a/internal/gitaly/repoutil/custom_hooks.go +++ b/internal/gitaly/repoutil/custom_hooks.go @@ -12,17 +12,17 @@ import ( "path/filepath" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/archive" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/safe" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/tempdir" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/internal/archive" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/safe" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/tempdir" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" ) // CustomHooksDir is the directory in which the custom hooks are stored in the repository. diff --git a/internal/gitaly/repoutil/custom_hooks_test.go b/internal/gitaly/repoutil/custom_hooks_test.go index a915553c3a026913d587d968d465cf4df1442f58..97af67515292f8e3aea1c615daf7d7b75255475f 100644 --- a/internal/gitaly/repoutil/custom_hooks_test.go +++ b/internal/gitaly/repoutil/custom_hooks_test.go @@ -16,15 +16,15 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/archive" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/internal/archive" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" "google.golang.org/grpc/peer" ) diff --git a/internal/gitaly/repoutil/lock.go b/internal/gitaly/repoutil/lock.go index 71cab6ca80a28dbb3b6cc105a53a66345e646c8c..7bb381ea92298d44f9047f0b45814188c916d275 100644 --- a/internal/gitaly/repoutil/lock.go +++ b/internal/gitaly/repoutil/lock.go @@ -5,11 +5,11 @@ import ( "os" "path/filepath" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/safe" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/safe" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" ) // Lock attempts to lock the entire repository directory such that only one diff --git a/internal/gitaly/repoutil/lock_test.go b/internal/gitaly/repoutil/lock_test.go index f87538c5a9070f557e3c9502662d946c534f7749..ddb4fd72fea655fe330103d3fdb7ac18041faf70 100644 --- a/internal/gitaly/repoutil/lock_test.go +++ b/internal/gitaly/repoutil/lock_test.go @@ -4,13 +4,13 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/safe" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/safe" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestLock(t *testing.T) { diff --git a/internal/gitaly/repoutil/remove.go b/internal/gitaly/repoutil/remove.go index d74429e7224c63231612652110e92143e9769dea..9772e7bfbfecbe1534f9b5a91a54e3fa0ec5440d 100644 --- a/internal/gitaly/repoutil/remove.go +++ b/internal/gitaly/repoutil/remove.go @@ -7,15 +7,15 @@ import ( "os" "path/filepath" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/counter" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/safe" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/counter" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/safe" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" ) // Remove will remove a repository in a race-free way with proper transactional semantics. diff --git a/internal/gitaly/repoutil/remove_test.go b/internal/gitaly/repoutil/remove_test.go index 417bd9014b58c685eb5f460266d7e4290a651535..f68531bea0fa8065d84e5fefc0a84940cbf50c27 100644 --- a/internal/gitaly/repoutil/remove_test.go +++ b/internal/gitaly/repoutil/remove_test.go @@ -6,15 +6,15 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/counter" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/counter" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestRemove(t *testing.T) { diff --git a/internal/gitaly/repoutil/testhelper_test.go b/internal/gitaly/repoutil/testhelper_test.go index 15c915dc3c21229f3447c36df4a0b9a17f662554..27d90bd909d2d1c12df9ded59b9d193b17270bff 100644 --- a/internal/gitaly/repoutil/testhelper_test.go +++ b/internal/gitaly/repoutil/testhelper_test.go @@ -3,7 +3,7 @@ package repoutil import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/server/auth/auth.go b/internal/gitaly/server/auth/auth.go index bf7843c64a38aafdbec9d62e2bb7bd57e55e40b8..11357266eee77b422edb2e1919fa3caa7b488bfe 100644 --- a/internal/gitaly/server/auth/auth.go +++ b/internal/gitaly/server/auth/auth.go @@ -7,8 +7,8 @@ import ( grpcmwauth "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/auth" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - gitalyauth "gitlab.com/gitlab-org/gitaly/v16/auth" - gitalycfgauth "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/auth" + gitalyauth "gitlab.com/gitlab-org/gitaly/v17/auth" + gitalycfgauth "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/auth" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/health/grpc_health_v1" diff --git a/internal/gitaly/server/auth_test.go b/internal/gitaly/server/auth_test.go index cf914c5992e20974b72123e77dc619cd1ca51587..3e53aed3eb9d4c6cf04843fea2dd3b10b7b27f6e 100644 --- a/internal/gitaly/server/auth_test.go +++ b/internal/gitaly/server/auth_test.go @@ -11,27 +11,27 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - gitalyauth "gitlab.com/gitlab-org/gitaly/v16/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/cache" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/server" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/setup" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitlab" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/limithandler" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + gitalyauth "gitlab.com/gitlab-org/gitaly/v17/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/cache" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/server" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/setup" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitlab" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/middleware/limithandler" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "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 3c28d64f06cef04c4123191c3b7f53f8020598b4..542a6bb584f56dcc1812589dc6e01626590fb621 100644 --- a/internal/gitaly/server/server.go +++ b/internal/gitaly/server/server.go @@ -8,22 +8,22 @@ import ( grpcmwlogrus "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/selector" grpcprometheus "github.com/grpc-ecosystem/go-grpc-prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/server/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/grpcstats" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/listenmux" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/cache" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/customfieldshandler" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/loghandler" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/panichandler" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/requestinfohandler" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/sentryhandler" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/statushandler" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - gitalylog "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/server/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/grpcstats" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/listenmux" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/middleware/cache" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/middleware/customfieldshandler" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/middleware/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/middleware/loghandler" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/middleware/panichandler" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/middleware/requestinfohandler" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/middleware/sentryhandler" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/middleware/statushandler" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + gitalylog "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" 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 b23ae840aa7593aa041aa7f0761ab08ee6f78435..39faf538da3a010342b8f1107105927f8a991acd 100644 --- a/internal/gitaly/server/server_factory.go +++ b/internal/gitaly/server/server_factory.go @@ -3,11 +3,11 @@ package server import ( "sync" - "gitlab.com/gitlab-org/gitaly/v16/internal/cache" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/limithandler" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/cache" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/middleware/limithandler" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" "google.golang.org/grpc" ) diff --git a/internal/gitaly/server/server_factory_test.go b/internal/gitaly/server/server_factory_test.go index c6e27d372122d5d62114865c4fa0d25f2905973a..a4b0af265f6d9673135458a97b0f31be676cba19 100644 --- a/internal/gitaly/server/server_factory_test.go +++ b/internal/gitaly/server/server_factory_test.go @@ -10,13 +10,13 @@ import ( "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/bootstrap/starter" - "gitlab.com/gitlab-org/gitaly/v16/internal/cache" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/bootstrap/starter" + "gitlab.com/gitlab-org/gitaly/v17/internal/cache" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" "golang.org/x/sync/errgroup" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/internal/gitaly/server/testhelper_test.go b/internal/gitaly/server/testhelper_test.go index 7846a01f9d704d556661308a1a068606bb9a2243..ced620b38323d1b818fc0c9b8572c120e6829a09 100644 --- a/internal/gitaly/server/testhelper_test.go +++ b/internal/gitaly/server/testhelper_test.go @@ -3,7 +3,7 @@ package server import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/service/analysis/check_generated.go b/internal/gitaly/service/analysis/check_generated.go index becb87ab13f57387f48b630c01ea64efe04f8ee2..a43bd792b05a3520a637e5739a4f66b387d8a669 100644 --- a/internal/gitaly/service/analysis/check_generated.go +++ b/internal/gitaly/service/analysis/check_generated.go @@ -6,10 +6,10 @@ import ( "io" "github.com/go-enry/go-enry/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "golang.org/x/sync/errgroup" "google.golang.org/protobuf/proto" ) diff --git a/internal/gitaly/service/analysis/check_generated_test.go b/internal/gitaly/service/analysis/check_generated_test.go index bdc88070be6160b46cc7d5b3a421b141ca0ab385..dc24f8cfd182ed1c23ec0a9b602386dfb071d4c0 100644 --- a/internal/gitaly/service/analysis/check_generated_test.go +++ b/internal/gitaly/service/analysis/check_generated_test.go @@ -6,14 +6,14 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/repository" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/repository" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) diff --git a/internal/gitaly/service/analysis/server.go b/internal/gitaly/service/analysis/server.go index 1884bcc5d023b436a07a4aaae62182bd9ad4985e..81f6bda03c787c253aa06a1a82a7bf955c6d7a81 100644 --- a/internal/gitaly/service/analysis/server.go +++ b/internal/gitaly/service/analysis/server.go @@ -1,12 +1,12 @@ package analysis import ( - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) type server struct { diff --git a/internal/gitaly/service/analysis/testhelper_test.go b/internal/gitaly/service/analysis/testhelper_test.go index 4b3cbd7ddacaa9f5a229df3d10abc635f3bff4d7..05ce239e1a0c11bd07413a8c44cbf38ab913120d 100644 --- a/internal/gitaly/service/analysis/testhelper_test.go +++ b/internal/gitaly/service/analysis/testhelper_test.go @@ -3,7 +3,7 @@ package analysis import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/service/blob/blobs.go b/internal/gitaly/service/blob/blobs.go index 3065ec0946afbb6ae1ec816a957be2e45fd23a71..8654b7c7773b1b781240149bd0dab41bb951cf1b 100644 --- a/internal/gitaly/service/blob/blobs.go +++ b/internal/gitaly/service/blob/blobs.go @@ -5,15 +5,15 @@ import ( "errors" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitpipe" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitpipe" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" "google.golang.org/protobuf/proto" ) diff --git a/internal/gitaly/service/blob/blobs_test.go b/internal/gitaly/service/blob/blobs_test.go index 690539c0b5bb31fb99c5b07b2997cc8d797cd7f6..e8bfcc1d53adf2eea60a609dcc52a578bb5e9c5e 100644 --- a/internal/gitaly/service/blob/blobs_test.go +++ b/internal/gitaly/service/blob/blobs_test.go @@ -8,13 +8,13 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/quarantine" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/quarantine" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/metadata" "google.golang.org/protobuf/proto" ) diff --git a/internal/gitaly/service/blob/get_blob.go b/internal/gitaly/service/blob/get_blob.go index 69ea397e8edf22f31dd65e4218d93c36cb3c1225..d7d78f99f7a129f2cc8e18dfa969bea2dc4431c6 100644 --- a/internal/gitaly/service/blob/get_blob.go +++ b/internal/gitaly/service/blob/get_blob.go @@ -5,12 +5,12 @@ import ( "errors" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) func (s *server) GetBlob(in *gitalypb.GetBlobRequest, stream gitalypb.BlobService_GetBlobServer) error { diff --git a/internal/gitaly/service/blob/get_blob_test.go b/internal/gitaly/service/blob/get_blob_test.go index 453cc2340c8ec43f361245657785c7e29a408841..ce6699a60bc8836e80eb7bc037fc4e73c70b4cfb 100644 --- a/internal/gitaly/service/blob/get_blob_test.go +++ b/internal/gitaly/service/blob/get_blob_test.go @@ -7,12 +7,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) func TestGetBlob_successful(t *testing.T) { diff --git a/internal/gitaly/service/blob/get_blobs.go b/internal/gitaly/service/blob/get_blobs.go index 7251323c3004946a22b04e209dfbd53bf4d6bb70..094faa393bd0c966172b5d2d76f862fcf34bbb9a 100644 --- a/internal/gitaly/service/blob/get_blobs.go +++ b/internal/gitaly/service/blob/get_blobs.go @@ -6,12 +6,12 @@ import ( "errors" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) var treeEntryToObjectType = map[gitalypb.TreeEntry_EntryType]gitalypb.ObjectType{ diff --git a/internal/gitaly/service/blob/get_blobs_test.go b/internal/gitaly/service/blob/get_blobs_test.go index 2020ab431fee84869694fa1576ca116ee97ce734..0cf6c518de731264e4893fec89b9fb5fb135e564 100644 --- a/internal/gitaly/service/blob/get_blobs_test.go +++ b/internal/gitaly/service/blob/get_blobs_test.go @@ -6,12 +6,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestGetBlobs(t *testing.T) { diff --git a/internal/gitaly/service/blob/lfs_pointers.go b/internal/gitaly/service/blob/lfs_pointers.go index 9a5abb940f1bdc8a01673f9cd1dfbe9e3fdc1ea5..f8243a5371afa684bd4b0b91b42311c254398334 100644 --- a/internal/gitaly/service/blob/lfs_pointers.go +++ b/internal/gitaly/service/blob/lfs_pointers.go @@ -6,13 +6,13 @@ import ( "fmt" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitpipe" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitpipe" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/proto" ) diff --git a/internal/gitaly/service/blob/lfs_pointers_test.go b/internal/gitaly/service/blob/lfs_pointers_test.go index 687d371c23781babcb25e745c1d5e054bbb4b455..43bd3676ed84837f238146d7cf9c496b5cd8f388 100644 --- a/internal/gitaly/service/blob/lfs_pointers_test.go +++ b/internal/gitaly/service/blob/lfs_pointers_test.go @@ -11,19 +11,19 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/quarantine" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/quarantine" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/metadata" ) diff --git a/internal/gitaly/service/blob/server.go b/internal/gitaly/service/blob/server.go index 109592eae0a69f7ce4458fabfee713794db8b94f..13577df43bd21561b17aa9ee5a647a0cb1cb3e37 100644 --- a/internal/gitaly/service/blob/server.go +++ b/internal/gitaly/service/blob/server.go @@ -1,12 +1,12 @@ package blob import ( - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/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 dab65e125f1c46956533f54b3afbce7bdb3762b7..6861800bffc3e13745d3b3bf2d9090a124f1ad4f 100644 --- a/internal/gitaly/service/blob/testhelper_test.go +++ b/internal/gitaly/service/blob/testhelper_test.go @@ -5,13 +5,13 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/repository" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/repository" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) 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 8523d78e4cec1f8f8392cf4a0a38a2e16752472e..28f6a4c472da7b20a56579c7488b229e49e5579c 100644 --- a/internal/gitaly/service/cleanup/apply_bfg_object_map_stream.go +++ b/internal/gitaly/service/cleanup/apply_bfg_object_map_stream.go @@ -5,11 +5,11 @@ import ( "errors" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" "google.golang.org/protobuf/proto" ) 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 e467b24f03675fd86027cdd66856d2de557d1d7c..88f14d10146daea08833b5e7ee8f7e6aa191c110 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 @@ -10,13 +10,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestApplyBfgObjectMapStreamSuccess(t *testing.T) { diff --git a/internal/gitaly/service/cleanup/cleaner.go b/internal/gitaly/service/cleanup/cleaner.go index 129ecb8e346bfa5e221f07442848d297be3374ef..9ed37058f0f8314df8f7b24f1f39bd0896cc80cf 100644 --- a/internal/gitaly/service/cleanup/cleaner.go +++ b/internal/gitaly/service/cleanup/cleaner.go @@ -7,10 +7,10 @@ import ( "io" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) // forEachFunc can be called for every entry in the filter-repo or BFG object diff --git a/internal/gitaly/service/cleanup/notifier.go b/internal/gitaly/service/cleanup/notifier.go index 0a436e630d66c8cb178d3abd55789b2c1e0f638d..df7b814d7b5d0d6d6fbc7ff13e9f4271702d9695 100644 --- a/internal/gitaly/service/cleanup/notifier.go +++ b/internal/gitaly/service/cleanup/notifier.go @@ -3,11 +3,11 @@ package cleanup import ( "context" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // notifier sends messages stating that an OID has been rewritten, looking diff --git a/internal/gitaly/service/cleanup/rewrite_history.go b/internal/gitaly/service/cleanup/rewrite_history.go index 16bf818cfef52b33f10eba18fcffabceb381ca39..08c982de52d164988ecb0f79c2769610279ddf70 100644 --- a/internal/gitaly/service/cleanup/rewrite_history.go +++ b/internal/gitaly/service/cleanup/rewrite_history.go @@ -11,12 +11,12 @@ import ( "os/exec" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/tempdir" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/tempdir" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // RewriteHistory uses git-filter-repo(1) to remove specified blobs from commit history and diff --git a/internal/gitaly/service/cleanup/rewrite_history_test.go b/internal/gitaly/service/cleanup/rewrite_history_test.go index b5d7eac900f589beb6974263d2699d797d83b541..a2db417328fa8b0ff69769543db3aa5dffe1c0fe 100644 --- a/internal/gitaly/service/cleanup/rewrite_history_test.go +++ b/internal/gitaly/service/cleanup/rewrite_history_test.go @@ -5,13 +5,13 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestRewriteHistory(t *testing.T) { diff --git a/internal/gitaly/service/cleanup/server.go b/internal/gitaly/service/cleanup/server.go index 2dbc5a30fba66db98db2c4d7b78db2a5fe4f49c6..9aff7c9490f6ea9d06a0b598a176b74d9f8021c7 100644 --- a/internal/gitaly/service/cleanup/server.go +++ b/internal/gitaly/service/cleanup/server.go @@ -1,14 +1,14 @@ package cleanup import ( - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/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 8dd085f22baaf23060d7695b71b0cd1662763d4c..a48da77e5dc2039f3e027932f8d8d61fb546079b 100644 --- a/internal/gitaly/service/cleanup/testhelper_test.go +++ b/internal/gitaly/service/cleanup/testhelper_test.go @@ -4,16 +4,16 @@ import ( "context" "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - hookservice "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/objectpool" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/repository" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + hookservice "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/objectpool" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/repository" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) diff --git a/internal/gitaly/service/commit/check_objects_exist.go b/internal/gitaly/service/commit/check_objects_exist.go index e5ad7ab8a95c7478da82ef3f79687da487ed7485..53bbdb16b27c744c85781f8c5f0f23ca4b6ca371 100644 --- a/internal/gitaly/service/commit/check_objects_exist.go +++ b/internal/gitaly/service/commit/check_objects_exist.go @@ -5,11 +5,11 @@ import ( "errors" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/proto" ) diff --git a/internal/gitaly/service/commit/check_objects_exist_test.go b/internal/gitaly/service/commit/check_objects_exist_test.go index 5380285dd06d13abe98613aaed495d4f7888e5f0..51ab74f53af2c5d2a81e5a83e5acfe3c012bb696 100644 --- a/internal/gitaly/service/commit/check_objects_exist_test.go +++ b/internal/gitaly/service/commit/check_objects_exist_test.go @@ -6,11 +6,11 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/commit/commit_messages.go b/internal/gitaly/service/commit/commit_messages.go index afd90e2ff52c65c1acea65108dbbdb546f5711ec..4337d32cc801500c2dc55d4b5283a138744ef32d 100644 --- a/internal/gitaly/service/commit/commit_messages.go +++ b/internal/gitaly/service/commit/commit_messages.go @@ -6,12 +6,12 @@ import ( "fmt" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/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 7dd10e305548a2b3aba0ed6775478ea7c4c060c3..c2d4f78baa42f2eae847b3785d0c8b3198fff099 100644 --- a/internal/gitaly/service/commit/commit_messages_test.go +++ b/internal/gitaly/service/commit/commit_messages_test.go @@ -7,12 +7,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestSuccessfulGetCommitMessagesRequest(t *testing.T) { diff --git a/internal/gitaly/service/commit/commits_by_message.go b/internal/gitaly/service/commit/commits_by_message.go index 44a9d13a9c89f0dcd148d0e0d15a1011769c1a74..271c4c572c86ab335ed299af5efbb1c12fdfca22 100644 --- a/internal/gitaly/service/commit/commits_by_message.go +++ b/internal/gitaly/service/commit/commits_by_message.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/proto" ) diff --git a/internal/gitaly/service/commit/commits_by_message_test.go b/internal/gitaly/service/commit/commits_by_message_test.go index ae27696b4aa2472f4f0e2887db156d084646a904..e7b976b0fbd50182df27be11bd06fa2f87b44357 100644 --- a/internal/gitaly/service/commit/commits_by_message_test.go +++ b/internal/gitaly/service/commit/commits_by_message_test.go @@ -6,12 +6,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/commit/commits_helper.go b/internal/gitaly/service/commit/commits_helper.go index 1225311617f3e8091010514cb5428a067c3eba7e..214f72cabf64bbe335c836d850b0605817191c8f 100644 --- a/internal/gitaly/service/commit/commits_helper.go +++ b/internal/gitaly/service/commit/commits_helper.go @@ -3,11 +3,11 @@ package commit import ( "context" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - gitlog "gitlab.com/gitlab-org/gitaly/v16/internal/git/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + gitlog "gitlab.com/gitlab-org/gitaly/v17/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) sendCommits( diff --git a/internal/gitaly/service/commit/commits_sender.go b/internal/gitaly/service/commit/commits_sender.go index c74238fcfa929f58682da2dbdea29268a4a3f6be..7658b77a489dc29fd4fb4a32c870b96ade328856 100644 --- a/internal/gitaly/service/commit/commits_sender.go +++ b/internal/gitaly/service/commit/commits_sender.go @@ -1,7 +1,7 @@ package commit import ( - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/proto" ) diff --git a/internal/gitaly/service/commit/count_commits.go b/internal/gitaly/service/commit/count_commits.go index 10bbfa3a599eb9f658f230f94aeb57560be798b5..1c4e858f5c0b14073f7dd4ef77a17db333cfaa3a 100644 --- a/internal/gitaly/service/commit/count_commits.go +++ b/internal/gitaly/service/commit/count_commits.go @@ -8,11 +8,11 @@ import ( "strconv" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) CountCommits(ctx context.Context, in *gitalypb.CountCommitsRequest) (*gitalypb.CountCommitsResponse, error) { diff --git a/internal/gitaly/service/commit/count_commits_test.go b/internal/gitaly/service/commit/count_commits_test.go index 6ebf8cb7876ce8e92cebc76e5d730a12f6267906..12cb5cf7894a06e3baa4439d14031192c841b124 100644 --- a/internal/gitaly/service/commit/count_commits_test.go +++ b/internal/gitaly/service/commit/count_commits_test.go @@ -4,11 +4,11 @@ import ( "testing" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/timestamppb" diff --git a/internal/gitaly/service/commit/count_diverging_commits.go b/internal/gitaly/service/commit/count_diverging_commits.go index ffea9b2d8454fa8e06640c5846b3098b1b0279e9..eaed05042311da3f13e6a5d32d9ec1795564bd1e 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/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/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 07260ad9c5f1d430094fe03474f049815bf635b3..d270b4072df3ec205d5f3d9585200dd005848799 100644 --- a/internal/gitaly/service/commit/count_diverging_commits_test.go +++ b/internal/gitaly/service/commit/count_diverging_commits_test.go @@ -7,12 +7,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/commit/filter_shas_with_signatures.go b/internal/gitaly/service/commit/filter_shas_with_signatures.go index e607893773d398941e862e6877a9472a5554d8da..d464d52256c00baea2c253547d6a015b14ad3745 100644 --- a/internal/gitaly/service/commit/filter_shas_with_signatures.go +++ b/internal/gitaly/service/commit/filter_shas_with_signatures.go @@ -5,11 +5,11 @@ import ( "errors" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/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 1f12d84ebc03d350d4f0963eeffb451529dac2f6..4845ba0832aa2cd444cf4eeed597158b22395f80 100644 --- a/internal/gitaly/service/commit/filter_shas_with_signatures_test.go +++ b/internal/gitaly/service/commit/filter_shas_with_signatures_test.go @@ -7,13 +7,13 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestFilterShasWithSignatures(t *testing.T) { diff --git a/internal/gitaly/service/commit/find_all_commits.go b/internal/gitaly/service/commit/find_all_commits.go index a058291f7f764f90d93d38ff4d97799992eceda1..a3e8ae91194551969ce6e6c4a84c96dfd7db12cb 100644 --- a/internal/gitaly/service/commit/find_all_commits.go +++ b/internal/gitaly/service/commit/find_all_commits.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) FindAllCommits(in *gitalypb.FindAllCommitsRequest, stream gitalypb.CommitService_FindAllCommitsServer) error { diff --git a/internal/gitaly/service/commit/find_all_commits_test.go b/internal/gitaly/service/commit/find_all_commits_test.go index 344d104cf64a79175377e67afe6aad322374e0d7..e0b89430f16894ef9d9261d3b3fbe0ddd7cae432 100644 --- a/internal/gitaly/service/commit/find_all_commits_test.go +++ b/internal/gitaly/service/commit/find_all_commits_test.go @@ -5,12 +5,12 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/commit/find_commit.go b/internal/gitaly/service/commit/find_commit.go index dd1db7e9869046b626f317539fae75c3f30c71ba..0c6c5a37dd8b8e54400a21c4d183dbeedbbc1631 100644 --- a/internal/gitaly/service/commit/find_commit.go +++ b/internal/gitaly/service/commit/find_commit.go @@ -4,11 +4,11 @@ import ( "context" "errors" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func validateFindCommitRequest(ctx context.Context, locator storage.Locator, in *gitalypb.FindCommitRequest) error { diff --git a/internal/gitaly/service/commit/find_commit_test.go b/internal/gitaly/service/commit/find_commit_test.go index 5c1dc305e0df13b9ae6a0746d608eef29e2357d0..b4839cb48e0451f0a480c59c4641236601eab9c5 100644 --- a/internal/gitaly/service/commit/find_commit_test.go +++ b/internal/gitaly/service/commit/find_commit_test.go @@ -6,15 +6,15 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "golang.org/x/text/encoding/charmap" "google.golang.org/grpc/metadata" ) diff --git a/internal/gitaly/service/commit/find_commits.go b/internal/gitaly/service/commit/find_commits.go index 6cfe5d49d5e90f048dff10e7b582f4576fde7ed8..ca59b1f9961729cb116c81d874a2b6c9457733d7 100644 --- a/internal/gitaly/service/commit/find_commits.go +++ b/internal/gitaly/service/commit/find_commits.go @@ -11,15 +11,15 @@ import ( "strconv" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/trailerparser" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/trailerparser" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) var statsPattern = regexp.MustCompile(`\s(\d+)\sfiles? changed(,\s(\d+)\sinsertions?\(\+\))?(,\s(\d+)\sdeletions?\(-\))?`) diff --git a/internal/gitaly/service/commit/find_commits_test.go b/internal/gitaly/service/commit/find_commits_test.go index 21807b28cab84b2357d2387853cf1e4382bf6598..e61756ad005624335eeb9d4d2e9bdc7eb92298bd 100644 --- a/internal/gitaly/service/commit/find_commits_test.go +++ b/internal/gitaly/service/commit/find_commits_test.go @@ -10,14 +10,14 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "golang.org/x/text/encoding/charmap" "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" diff --git a/internal/gitaly/service/commit/get_commit_signatures.go b/internal/gitaly/service/commit/get_commit_signatures.go index 87426dfa16f235b37d331de9565d9d8b2f531ae5..6909101a6b97726fbd614a148987d78fd1a0302d 100644 --- a/internal/gitaly/service/commit/get_commit_signatures.go +++ b/internal/gitaly/service/commit/get_commit_signatures.go @@ -6,12 +6,12 @@ import ( "fmt" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/signature" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/signature" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) func (s *server) GetCommitSignatures(request *gitalypb.GetCommitSignaturesRequest, stream gitalypb.CommitService_GetCommitSignaturesServer) error { diff --git a/internal/gitaly/service/commit/get_commit_signatures_test.go b/internal/gitaly/service/commit/get_commit_signatures_test.go index 7549e49ba87b4d78632565f20522b389a7a4aca3..1bb6249b13cc3d6d0407425e17c64661a3dcfd5e 100644 --- a/internal/gitaly/service/commit/get_commit_signatures_test.go +++ b/internal/gitaly/service/commit/get_commit_signatures_test.go @@ -8,17 +8,17 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/commit/get_tree_entries.go b/internal/gitaly/service/commit/get_tree_entries.go index 8112db459740898c713be68014e044122cf01feb..bac21b661258e57ff44035c94f5c494f0a34e6e4 100644 --- a/internal/gitaly/service/commit/get_tree_entries.go +++ b/internal/gitaly/service/commit/get_tree_entries.go @@ -9,14 +9,14 @@ import ( "path/filepath" "sort" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/proto" ) diff --git a/internal/gitaly/service/commit/get_tree_entries_test.go b/internal/gitaly/service/commit/get_tree_entries_test.go index bf8437114fa260d4282950f570bd1115e4635c10..1923c8876ad93b940a91b484ce176976da3a4aad 100644 --- a/internal/gitaly/service/commit/get_tree_entries_test.go +++ b/internal/gitaly/service/commit/get_tree_entries_test.go @@ -8,14 +8,14 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" spb "google.golang.org/genproto/googleapis/rpc/status" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/internal/gitaly/service/commit/isancestor.go b/internal/gitaly/service/commit/isancestor.go index 129225492e337c6d59db1c37ae1503a92c78970e..b3943c9534182bd8a41e0139e9865144baa08f3a 100644 --- a/internal/gitaly/service/commit/isancestor.go +++ b/internal/gitaly/service/commit/isancestor.go @@ -4,11 +4,11 @@ import ( "context" "errors" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func validateCommitIsAncestorRequest(ctx context.Context, locator storage.Locator, in *gitalypb.CommitIsAncestorRequest) error { diff --git a/internal/gitaly/service/commit/isancestor_test.go b/internal/gitaly/service/commit/isancestor_test.go index d30171046c5c6dc563b9a54f84578dcd94d5fbdc..ac3825d9a751ef78a5e59fddbd47b89ce84ed6bd 100644 --- a/internal/gitaly/service/commit/isancestor_test.go +++ b/internal/gitaly/service/commit/isancestor_test.go @@ -4,12 +4,12 @@ import ( "path/filepath" "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/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/languages.go b/internal/gitaly/service/commit/languages.go index 19253f0cfb239e085a9686556af5b8662eac2cfd..7398137ad39e6ead670f2590d3d9f0278cd1cfac 100644 --- a/internal/gitaly/service/commit/languages.go +++ b/internal/gitaly/service/commit/languages.go @@ -9,12 +9,12 @@ import ( "sort" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/linguist" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/linguist" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) var errAmbigRef = errors.New("ambiguous reference") diff --git a/internal/gitaly/service/commit/languages_test.go b/internal/gitaly/service/commit/languages_test.go index 8a9d1c9df15e3d948d70ec8dc0097f7df8a0aa6d..ad9009a27155b4598d70ebd8ca954bac7587a877 100644 --- a/internal/gitaly/service/commit/languages_test.go +++ b/internal/gitaly/service/commit/languages_test.go @@ -3,13 +3,13 @@ package commit import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) const ( diff --git a/internal/gitaly/service/commit/last_commit_for_path.go b/internal/gitaly/service/commit/last_commit_for_path.go index ad1e08ac0939b62e6bc6dd7f19689098d18f2053..a544bc73ec32009907d84dc0db019d8d5068c315 100644 --- a/internal/gitaly/service/commit/last_commit_for_path.go +++ b/internal/gitaly/service/commit/last_commit_for_path.go @@ -5,12 +5,12 @@ import ( "errors" "path/filepath" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/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 b3423a0eb96d4732bd714c874c07769a50d7844d..28a79049b07ec6725d5a2784c1b805e64565ccde 100644 --- a/internal/gitaly/service/commit/last_commit_for_path_test.go +++ b/internal/gitaly/service/commit/last_commit_for_path_test.go @@ -3,12 +3,12 @@ package commit import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestLastCommitForPath(t *testing.T) { diff --git a/internal/gitaly/service/commit/list_all_commits.go b/internal/gitaly/service/commit/list_all_commits.go index cfdcc15f825f963dff73b75d28b1cb2a933cc0d5..e4acb997fb1232ce8237d94a200dfabd31595ed1 100644 --- a/internal/gitaly/service/commit/list_all_commits.go +++ b/internal/gitaly/service/commit/list_all_commits.go @@ -3,13 +3,13 @@ package commit import ( "context" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitpipe" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitpipe" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func verifyListAllCommitsRequest(ctx context.Context, locator storage.Locator, request *gitalypb.ListAllCommitsRequest) error { diff --git a/internal/gitaly/service/commit/list_all_commits_test.go b/internal/gitaly/service/commit/list_all_commits_test.go index 9acbcc408d4896d5513060a1521bed2feb9e5f29..48d6dfeb6eac5c93ec84535d8bcc0f9434a089bc 100644 --- a/internal/gitaly/service/commit/list_all_commits_test.go +++ b/internal/gitaly/service/commit/list_all_commits_test.go @@ -9,15 +9,15 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/metadata" ) diff --git a/internal/gitaly/service/commit/list_commits.go b/internal/gitaly/service/commit/list_commits.go index 0c393b7fbf0fd283ecde77570a9c04d671f91be8..8ae8b137deed682bac845ff7ae033d7a01fafa9f 100644 --- a/internal/gitaly/service/commit/list_commits.go +++ b/internal/gitaly/service/commit/list_commits.go @@ -4,13 +4,13 @@ import ( "context" "errors" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitpipe" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitpipe" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func verifyListCommitsRequest(ctx context.Context, locator storage.Locator, request *gitalypb.ListCommitsRequest) error { diff --git a/internal/gitaly/service/commit/list_commits_by_oid.go b/internal/gitaly/service/commit/list_commits_by_oid.go index 7ce6397b3d0d6507fa135438b6a7fa0ddd58749d..8afe91069501eef6a12e97a2bc7b51b66ebd91f4 100644 --- a/internal/gitaly/service/commit/list_commits_by_oid.go +++ b/internal/gitaly/service/commit/list_commits_by_oid.go @@ -5,11 +5,11 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/proto" ) 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 4668954377f8f7f78224c2724bee8c69c730626d..d0b915bd38a2b40276e77861eede6de29228ded2 100644 --- a/internal/gitaly/service/commit/list_commits_by_oid_test.go +++ b/internal/gitaly/service/commit/list_commits_by_oid_test.go @@ -7,11 +7,11 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestListCommitsByOid(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 2a5bb702faac19830a5a3efc637b49781b0ddd38..4d06b81897d4bada6b19d43fed047549feaf02c8 100644 --- a/internal/gitaly/service/commit/list_commits_by_ref_name.go +++ b/internal/gitaly/service/commit/list_commits_by_ref_name.go @@ -3,11 +3,11 @@ package commit import ( "errors" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/proto" ) 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 df813698549042400ef3bb58a1eb15f8d062e01a..28cc743443ec36917a274231e2784a71291662a3 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 @@ -8,12 +8,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestListCommitsByRefName(t *testing.T) { diff --git a/internal/gitaly/service/commit/list_commits_test.go b/internal/gitaly/service/commit/list_commits_test.go index f1b43d13dc821c59c5eb6ee189e6a79d52174fdc..86c91d823fed50a8ea73153a7ac7c97c59a89560 100644 --- a/internal/gitaly/service/commit/list_commits_test.go +++ b/internal/gitaly/service/commit/list_commits_test.go @@ -5,12 +5,12 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/internal/gitaly/service/commit/list_files.go b/internal/gitaly/service/commit/list_files.go index 40f7a9405b2194ed27067ce9e5e923a2d61b82d6..52f8d61e7566749ddf63b13b1260c0ff30fe7527 100644 --- a/internal/gitaly/service/commit/list_files.go +++ b/internal/gitaly/service/commit/list_files.go @@ -6,14 +6,14 @@ import ( "fmt" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/proto" ) diff --git a/internal/gitaly/service/commit/list_files_test.go b/internal/gitaly/service/commit/list_files_test.go index b616727e761ad74ec2f9a29b257298fc842285b7..93f45f0cf57b4e558a4cdba8e5f8aca05f248789 100644 --- a/internal/gitaly/service/commit/list_files_test.go +++ b/internal/gitaly/service/commit/list_files_test.go @@ -4,12 +4,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestListFiles(t *testing.T) { 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 40f612bd9981fba4407db8c24879c7b0a2ac1a86..2c4346cec652fd5edc664273e9692ffca998950f 100644 --- a/internal/gitaly/service/commit/list_last_commits_for_tree.go +++ b/internal/gitaly/service/commit/list_last_commits_for_tree.go @@ -7,14 +7,14 @@ import ( "io" "sort" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) var maxNumStatBatchSize = 10 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 f42eca89a5d5dffa0d0d38819864717c21b2a5b6..1ae67552ebd2886fe1c2f0e78d55286662cf30a4 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 @@ -6,13 +6,13 @@ import ( "unicode/utf8" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestListLastCommitsForTree(t *testing.T) { diff --git a/internal/gitaly/service/commit/raw_blame.go b/internal/gitaly/service/commit/raw_blame.go index ed53cf14ce83ab2db130a4b306f513b5b415bbd7..f8c90f4d8387b8a7e3225cb130b96937dfd3250e 100644 --- a/internal/gitaly/service/commit/raw_blame.go +++ b/internal/gitaly/service/commit/raw_blame.go @@ -10,14 +10,14 @@ import ( "strconv" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) var ( diff --git a/internal/gitaly/service/commit/raw_blame_test.go b/internal/gitaly/service/commit/raw_blame_test.go index 08c572a6e23f3fed94aef7d1cab799291a2bee66..6720fff1b18e824790fe91c1f32faef699ca4a19 100644 --- a/internal/gitaly/service/commit/raw_blame_test.go +++ b/internal/gitaly/service/commit/raw_blame_test.go @@ -7,12 +7,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" spb "google.golang.org/genproto/googleapis/rpc/status" "google.golang.org/protobuf/testing/protocmp" ) diff --git a/internal/gitaly/service/commit/server.go b/internal/gitaly/service/commit/server.go index b8ec1f3b1e623c589a3ad0c38e1a5d8979342fce..09d8f7b61deb39a29f868811e1702e29bb41f774 100644 --- a/internal/gitaly/service/commit/server.go +++ b/internal/gitaly/service/commit/server.go @@ -1,14 +1,14 @@ package commit import ( - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) type server struct { diff --git a/internal/gitaly/service/commit/stats.go b/internal/gitaly/service/commit/stats.go index ebc9f346834a98e96a9a814f179f0713b0297d8c..294a996045d6e1dd0fb3b4df97ab2b05a7b38c28 100644 --- a/internal/gitaly/service/commit/stats.go +++ b/internal/gitaly/service/commit/stats.go @@ -7,11 +7,11 @@ import ( "strconv" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func validateCommitStatsRequest(ctx context.Context, locator storage.Locator, in *gitalypb.CommitStatsRequest) error { diff --git a/internal/gitaly/service/commit/stats_test.go b/internal/gitaly/service/commit/stats_test.go index f02ad725f6d9d32fb73d13fa7e62dbeefe349dbd..d8a18f62ccb0a31dedff7a2b6fe091c07e28cbaa 100644 --- a/internal/gitaly/service/commit/stats_test.go +++ b/internal/gitaly/service/commit/stats_test.go @@ -3,11 +3,11 @@ package commit import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestCommitStatsSuccess(t *testing.T) { diff --git a/internal/gitaly/service/commit/testhelper_test.go b/internal/gitaly/service/commit/testhelper_test.go index f6c08005fa4dd9f909a05e6c2efe58641c320d0d..0cb2063653d1c9bad05aca8b3385f36a4aedc7ed 100644 --- a/internal/gitaly/service/commit/testhelper_test.go +++ b/internal/gitaly/service/commit/testhelper_test.go @@ -8,17 +8,17 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/repository" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/repository" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) diff --git a/internal/gitaly/service/commit/tree_entry.go b/internal/gitaly/service/commit/tree_entry.go index 594000a516cb35c4a73d9499314a4795aa37a009..166525e9742883f409be0ed99fbe3468b18ae137 100644 --- a/internal/gitaly/service/commit/tree_entry.go +++ b/internal/gitaly/service/commit/tree_entry.go @@ -6,12 +6,12 @@ import ( "io" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) func sendTreeEntry( diff --git a/internal/gitaly/service/commit/tree_entry_test.go b/internal/gitaly/service/commit/tree_entry_test.go index 19e6b53580cbc1e83de7ed73343fcd8c637f997d..68284c02e7d03469c9e27432ffe122eb66305107 100644 --- a/internal/gitaly/service/commit/tree_entry_test.go +++ b/internal/gitaly/service/commit/tree_entry_test.go @@ -4,11 +4,11 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestTreeEntry(t *testing.T) { diff --git a/internal/gitaly/service/conflicts/list_conflict_files.go b/internal/gitaly/service/conflicts/list_conflict_files.go index 0bb926fe52dc3364c4318afc72f8efbe42db969c..fe04adaab5c7d212aef37c06a2b5f7c5469bd870 100644 --- a/internal/gitaly/service/conflicts/list_conflict_files.go +++ b/internal/gitaly/service/conflicts/list_conflict_files.go @@ -8,12 +8,12 @@ import ( "io" "unicode/utf8" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) func (s *server) ListConflictFiles(request *gitalypb.ListConflictFilesRequest, stream gitalypb.ConflictsService_ListConflictFilesServer) error { diff --git a/internal/gitaly/service/conflicts/list_conflict_files_test.go b/internal/gitaly/service/conflicts/list_conflict_files_test.go index bc38621248623d45fd966c041e9e472ea15f192c..e1817c3c5631cc8fa66721376842c487e980c65d 100644 --- a/internal/gitaly/service/conflicts/list_conflict_files_test.go +++ b/internal/gitaly/service/conflicts/list_conflict_files_test.go @@ -8,11 +8,11 @@ import ( "strings" "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) type conflictFile struct { diff --git a/internal/gitaly/service/conflicts/resolve_conflicts.go b/internal/gitaly/service/conflicts/resolve_conflicts.go index c412efd902351488d1a8065d5a7a22f0f460c8a0..3f7e4cc2b635f4755f78b248592aa056ba9d6679 100644 --- a/internal/gitaly/service/conflicts/resolve_conflicts.go +++ b/internal/gitaly/service/conflicts/resolve_conflicts.go @@ -11,13 +11,13 @@ import ( "sort" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/conflict" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/remoterepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/conflict" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/remoterepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) ResolveConflicts(stream gitalypb.ConflictsService_ResolveConflictsServer) error { diff --git a/internal/gitaly/service/conflicts/resolve_conflicts_test.go b/internal/gitaly/service/conflicts/resolve_conflicts_test.go index dc4f5e15bbae0d38cee008e2cfc54b15b822dacf..52f411b29b78386dd5e9504fc6a28d81d6d2cac4 100644 --- a/internal/gitaly/service/conflicts/resolve_conflicts_test.go +++ b/internal/gitaly/service/conflicts/resolve_conflicts_test.go @@ -9,17 +9,17 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/metadata" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/internal/gitaly/service/conflicts/server.go b/internal/gitaly/service/conflicts/server.go index a1178a071a175c2516798320cefb8ecc5157af52..777bfbd6626910f026b4a8f5f6656bffb4b86e85 100644 --- a/internal/gitaly/service/conflicts/server.go +++ b/internal/gitaly/service/conflicts/server.go @@ -3,17 +3,17 @@ package conflicts import ( "context" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/quarantine" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/quarantine" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/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 382c2f39af338015b9c8df0c526681cbe5dc1c65..0695e99819e131aa5898efa844fca4f4f5d291fd 100644 --- a/internal/gitaly/service/conflicts/testhelper_test.go +++ b/internal/gitaly/service/conflicts/testhelper_test.go @@ -3,17 +3,17 @@ package conflicts import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/commit" - hookservice "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/repository" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/ssh" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/commit" + hookservice "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/repository" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/ssh" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) diff --git a/internal/gitaly/service/dependencies.go b/internal/gitaly/service/dependencies.go index 800f902d5aed74c83d6f21e4fe80daafd15d9188..a9ed08537e043f2876e8fac7047cd0a358e50425 100644 --- a/internal/gitaly/service/dependencies.go +++ b/internal/gitaly/service/dependencies.go @@ -1,29 +1,29 @@ package service import ( - "gitlab.com/gitlab-org/gitaly/v16/internal/backup" - "gitlab.com/gitlab-org/gitaly/v16/internal/bundleuri" - "gitlab.com/gitlab-org/gitaly/v16/internal/cache" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - housekeepingmgr "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping/manager" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - gitalyhook "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/counter" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/raftmgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/migration" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitlab" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/limithandler" - "gitlab.com/gitlab-org/gitaly/v16/internal/limiter" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/streamcache" + "gitlab.com/gitlab-org/gitaly/v17/internal/backup" + "gitlab.com/gitlab-org/gitaly/v17/internal/bundleuri" + "gitlab.com/gitlab-org/gitaly/v17/internal/cache" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + housekeepingmgr "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping/manager" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + gitalyhook "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/counter" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/raftmgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/migration" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitlab" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/middleware/limithandler" + "gitlab.com/gitlab-org/gitaly/v17/internal/limiter" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/streamcache" ) // Dependencies assembles set of components required by different kinds of services. diff --git a/internal/gitaly/service/diff/commit_delta.go b/internal/gitaly/service/diff/commit_delta.go index 213763ec1b09e92fe25b2a10c5b58e9efb770a40..a556c0626b77fa6890ff8f04d16cde9d8d024d63 100644 --- a/internal/gitaly/service/diff/commit_delta.go +++ b/internal/gitaly/service/diff/commit_delta.go @@ -3,11 +3,11 @@ package diff import ( "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/diff" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/diff" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) CommitDelta(in *gitalypb.CommitDeltaRequest, stream gitalypb.DiffService_CommitDeltaServer) error { diff --git a/internal/gitaly/service/diff/commit_delta_test.go b/internal/gitaly/service/diff/commit_delta_test.go index 64b8ffce00e4849f0ef8b7749b6cb6ed163f05a2..244d1c2323d11949248f0d0e8fe7c6c3551d0afa 100644 --- a/internal/gitaly/service/diff/commit_delta_test.go +++ b/internal/gitaly/service/diff/commit_delta_test.go @@ -6,11 +6,11 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestCommitDelta_successful(t *testing.T) { diff --git a/internal/gitaly/service/diff/commit_diff.go b/internal/gitaly/service/diff/commit_diff.go index 505ab230ad8d3738eb103e16b87d6197ce24c156..77b998068318e72b95205c12717b4adca3f63d5c 100644 --- a/internal/gitaly/service/diff/commit_diff.go +++ b/internal/gitaly/service/diff/commit_diff.go @@ -3,11 +3,11 @@ package diff import ( "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/diff" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/diff" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) CommitDiff(in *gitalypb.CommitDiffRequest, stream gitalypb.DiffService_CommitDiffServer) error { diff --git a/internal/gitaly/service/diff/commit_diff_test.go b/internal/gitaly/service/diff/commit_diff_test.go index a95f4680155d97814df14725b3a616f939a7a812..e6180232b561271d08ef52b66ace0307631697fa 100644 --- a/internal/gitaly/service/diff/commit_diff_test.go +++ b/internal/gitaly/service/diff/commit_diff_test.go @@ -7,12 +7,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/diff" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/diff" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestCommitDiff(t *testing.T) { diff --git a/internal/gitaly/service/diff/diff_blobs.go b/internal/gitaly/service/diff/diff_blobs.go index bb9dfac14cab6f7648c5af2eb072e207d689c5ab..d767eb82168be39a309253da02b87a88895196fc 100644 --- a/internal/gitaly/service/diff/diff_blobs.go +++ b/internal/gitaly/service/diff/diff_blobs.go @@ -7,14 +7,14 @@ import ( "fmt" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/quarantine" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/diff" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/quarantine" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/diff" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) DiffBlobs(request *gitalypb.DiffBlobsRequest, stream gitalypb.DiffService_DiffBlobsServer) error { diff --git a/internal/gitaly/service/diff/diff_blobs_test.go b/internal/gitaly/service/diff/diff_blobs_test.go index ed734f2cf5db3beabb01471afd03d8a318daac31..fabf94c3baa3a22b3cd89e1ed15d93b64c48232a 100644 --- a/internal/gitaly/service/diff/diff_blobs_test.go +++ b/internal/gitaly/service/diff/diff_blobs_test.go @@ -8,10 +8,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestDiffBlobs(t *testing.T) { diff --git a/internal/gitaly/service/diff/find_changed_paths.go b/internal/gitaly/service/diff/find_changed_paths.go index 830f5698a1bfeb4f07a2e7bc5d9aecd3914435ca..f0fc336055136ff6a3b3320561490514c2c4008e 100644 --- a/internal/gitaly/service/diff/find_changed_paths.go +++ b/internal/gitaly/service/diff/find_changed_paths.go @@ -10,12 +10,12 @@ import ( "strconv" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/proto" ) diff --git a/internal/gitaly/service/diff/find_changed_paths_test.go b/internal/gitaly/service/diff/find_changed_paths_test.go index ce4897962611f7f41125ad0082c4507399b4394a..019d624fc2c3206b5f9f8183f698ec5022f71881 100644 --- a/internal/gitaly/service/diff/find_changed_paths_test.go +++ b/internal/gitaly/service/diff/find_changed_paths_test.go @@ -6,11 +6,11 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) type commitRequest struct { diff --git a/internal/gitaly/service/diff/numstat.go b/internal/gitaly/service/diff/numstat.go index dc4ad9633e3e7241ecd97fa965da7b694383f0e4..9f010f71fc60ef227e8f6bb05a4541a84c1e7251 100644 --- a/internal/gitaly/service/diff/numstat.go +++ b/internal/gitaly/service/diff/numstat.go @@ -4,10 +4,10 @@ import ( "errors" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/diff" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/diff" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) var maxNumStatBatchSize = 1000 diff --git a/internal/gitaly/service/diff/numstat_test.go b/internal/gitaly/service/diff/numstat_test.go index 45703981aafeafc6740608a3814ef0de0750ba45..0a3663f53c58701939e35661199fb36ec8dfa376 100644 --- a/internal/gitaly/service/diff/numstat_test.go +++ b/internal/gitaly/service/diff/numstat_test.go @@ -6,11 +6,11 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestDiffStats_successful(t *testing.T) { diff --git a/internal/gitaly/service/diff/patch_id.go b/internal/gitaly/service/diff/patch_id.go index f2802915663c94c6f56791e576efcc9aa988a327..fda89e95a4ec75c6a9c67511e2d2a2594b103b7b 100644 --- a/internal/gitaly/service/diff/patch_id.go +++ b/internal/gitaly/service/diff/patch_id.go @@ -5,11 +5,11 @@ import ( "errors" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) GetPatchID(ctx context.Context, in *gitalypb.GetPatchIDRequest) (*gitalypb.GetPatchIDResponse, error) { diff --git a/internal/gitaly/service/diff/patch_id_test.go b/internal/gitaly/service/diff/patch_id_test.go index 0daecc444b054797368abfe11115851de5a83fd2..43570ea812ecb4b4003a43f0f06f4655eadaa538 100644 --- a/internal/gitaly/service/diff/patch_id_test.go +++ b/internal/gitaly/service/diff/patch_id_test.go @@ -7,12 +7,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestGetPatchID(t *testing.T) { diff --git a/internal/gitaly/service/diff/range_diff.go b/internal/gitaly/service/diff/range_diff.go index 04b0a69fe5c29868130734931c6436e27807cdad..2b26755bef514cb4bce65af1d9c104679f7727d8 100644 --- a/internal/gitaly/service/diff/range_diff.go +++ b/internal/gitaly/service/diff/range_diff.go @@ -6,12 +6,12 @@ import ( "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" log "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/rangediff" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/rangediff" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) RangeDiff(in *gitalypb.RangeDiffRequest, stream gitalypb.DiffService_RangeDiffServer) error { diff --git a/internal/gitaly/service/diff/range_diff_test.go b/internal/gitaly/service/diff/range_diff_test.go index 9c5024553da9f0475e443324de9ae43aec1ae6c7..1b97f88abbcafed1a082ee699118b5fd3e942e66 100644 --- a/internal/gitaly/service/diff/range_diff_test.go +++ b/internal/gitaly/service/diff/range_diff_test.go @@ -12,12 +12,12 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/rangediff" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/rangediff" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestRangeDiff_successful(t *testing.T) { diff --git a/internal/gitaly/service/diff/raw.go b/internal/gitaly/service/diff/raw.go index 6951222ca7744352dc2f5dbf9c0c74acd708e098..aaa320883b2ba1e5503e527d45ef6458de2f716c 100644 --- a/internal/gitaly/service/diff/raw.go +++ b/internal/gitaly/service/diff/raw.go @@ -5,10 +5,10 @@ import ( "context" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) func (s *server) RawDiff(in *gitalypb.RawDiffRequest, stream gitalypb.DiffService_RawDiffServer) error { diff --git a/internal/gitaly/service/diff/raw_range_diff.go b/internal/gitaly/service/diff/raw_range_diff.go index c4eb6492d2af1b8c27efebbd4c8aa532a1d4d469..7ea34f6465bd824739097cb689e574b747588f6d 100644 --- a/internal/gitaly/service/diff/raw_range_diff.go +++ b/internal/gitaly/service/diff/raw_range_diff.go @@ -7,12 +7,12 @@ import ( "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" log "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) func (s *server) RawRangeDiff(in *gitalypb.RawRangeDiffRequest, stream gitalypb.DiffService_RawRangeDiffServer) error { diff --git a/internal/gitaly/service/diff/raw_range_diff_test.go b/internal/gitaly/service/diff/raw_range_diff_test.go index 8c7bc40e80f608d8f23cc9c2d941224fc9728443..8ac4b66fd4dc73ebda5c5852567aba0429915df8 100644 --- a/internal/gitaly/service/diff/raw_range_diff_test.go +++ b/internal/gitaly/service/diff/raw_range_diff_test.go @@ -7,12 +7,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) func TestRawRawRangeDiff_successful(t *testing.T) { diff --git a/internal/gitaly/service/diff/raw_test.go b/internal/gitaly/service/diff/raw_test.go index 43ef42b733c18e8ed8cce8f03ab48b040447370d..018f9f214f2acbef03bdc8dea9f806994c735d96 100644 --- a/internal/gitaly/service/diff/raw_test.go +++ b/internal/gitaly/service/diff/raw_test.go @@ -6,12 +6,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) func TestRawDiff_successful(t *testing.T) { diff --git a/internal/gitaly/service/diff/server.go b/internal/gitaly/service/diff/server.go index e5c01afc807e7436726c988a42179d76d4f41712..f299c552fb66f43c02025d7e117a67ee5444d4d9 100644 --- a/internal/gitaly/service/diff/server.go +++ b/internal/gitaly/service/diff/server.go @@ -1,13 +1,13 @@ package diff import ( - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/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 7aa383966d596b8e4b0adacf0868e927432aaf54..7a933b095bafb561f40175326ce3f6c1f885fe6d 100644 --- a/internal/gitaly/service/diff/testhelper_test.go +++ b/internal/gitaly/service/diff/testhelper_test.go @@ -4,13 +4,13 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/repository" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/repository" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) diff --git a/internal/gitaly/service/diff/utils.go b/internal/gitaly/service/diff/utils.go index b93c01f1f232fe471c52b7a89d88a0c004641db7..231643ca7bb75dc90ec95495c25a04c98711ea51 100644 --- a/internal/gitaly/service/diff/utils.go +++ b/internal/gitaly/service/diff/utils.go @@ -5,12 +5,12 @@ import ( "errors" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/diff" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/diff" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) type requestWithLeftRightCommitIDs interface { diff --git a/internal/gitaly/service/hook/pack_objects.go b/internal/gitaly/service/hook/pack_objects.go index 9672890ab923b47069c47a96a78bc596cdab4cbb..2d858f10c9522bee89c337c2297988970087b7ce 100644 --- a/internal/gitaly/service/hook/pack_objects.go +++ b/internal/gitaly/service/hook/pack_objects.go @@ -17,15 +17,15 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/pktline" - gitalyhook "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/stream" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/pktline" + gitalyhook "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/stream" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/encoding/protojson" ) diff --git a/internal/gitaly/service/hook/pack_objects_test.go b/internal/gitaly/service/hook/pack_objects_test.go index 694cf5707f9f44ee541ca01b2c16c84986a180d4..8eebe3828b97daa99fb60386017f9cdb5350aa80 100644 --- a/internal/gitaly/service/hook/pack_objects_test.go +++ b/internal/gitaly/service/hook/pack_objects_test.go @@ -17,21 +17,21 @@ import ( "github.com/prometheus/client_golang/prometheus/testutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/pktline" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - hookPkg "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/limiter" - "gitlab.com/gitlab-org/gitaly/v16/internal/streamcache" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + hookPkg "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/limiter" + "gitlab.com/gitlab-org/gitaly/v17/internal/streamcache" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/hook/post_receive.go b/internal/gitaly/service/hook/post_receive.go index 8ad81547742d62c4ececa9761c906dcbec18718b..35f9899f345c1c60fd8cfddfdf5205863bb682fb 100644 --- a/internal/gitaly/service/hook/post_receive.go +++ b/internal/gitaly/service/hook/post_receive.go @@ -7,10 +7,10 @@ import ( "os/exec" "sync" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/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 5ed1144a59ea95e83b5bf1c9887cd74a4a4e54fd..0ba3b9bcf8f61a85bfb7b56ed7d15f0056383bdb 100644 --- a/internal/gitaly/service/hook/post_receive_test.go +++ b/internal/gitaly/service/hook/post_receive_test.go @@ -9,22 +9,22 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitlab" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/prometheus" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitlab" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) func TestPostReceiveInvalidArgument(t *testing.T) { diff --git a/internal/gitaly/service/hook/pre_receive.go b/internal/gitaly/service/hook/pre_receive.go index 4062546dc2acc2d07b1543170a3a6240e58a453b..515d67df5311a11f9edd63ebf988a9d51fd1b1a5 100644 --- a/internal/gitaly/service/hook/pre_receive.go +++ b/internal/gitaly/service/hook/pre_receive.go @@ -7,10 +7,10 @@ import ( "os/exec" "sync" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) func (s *server) PreReceiveHook(stream gitalypb.HookService_PreReceiveHookServer) error { diff --git a/internal/gitaly/service/hook/pre_receive_test.go b/internal/gitaly/service/hook/pre_receive_test.go index b0d50c11a8b0104fe428ed3275e0e0fe10c59ec3..76b0b3449e54c44958fa948dac94351c59db86a8 100644 --- a/internal/gitaly/service/hook/pre_receive_test.go +++ b/internal/gitaly/service/hook/pre_receive_test.go @@ -12,23 +12,23 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitlab" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/prometheus" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitlab" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" "google.golang.org/grpc/metadata" ) diff --git a/internal/gitaly/service/hook/proc_receive.go b/internal/gitaly/service/hook/proc_receive.go index 9e8906479f5b94bc251f1d22764e449f4504ad7a..4786a7e71b1d31c0f674a0dd4d7ddeab92fadb7a 100644 --- a/internal/gitaly/service/hook/proc_receive.go +++ b/internal/gitaly/service/hook/proc_receive.go @@ -4,10 +4,10 @@ import ( "fmt" "sync" - gitalyhook "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + gitalyhook "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) func sendProcReceiveHookResponse(stream gitalypb.HookService_ProcReceiveHookServer, code int32, stderr string) error { diff --git a/internal/gitaly/service/hook/proc_receive_test.go b/internal/gitaly/service/hook/proc_receive_test.go index e08d6531d0405caee7a183b27081805897f0b4a9..9e8610e5038e62229442ccd6fcaa8413b8f01aa9 100644 --- a/internal/gitaly/service/hook/proc_receive_test.go +++ b/internal/gitaly/service/hook/proc_receive_test.go @@ -8,17 +8,17 @@ import ( "testing" "github.com/stretchr/testify/assert" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/pktline" - gitalyhook "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/pktline" + gitalyhook "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestProcReceiveHook(t *testing.T) { diff --git a/internal/gitaly/service/hook/reference_transaction.go b/internal/gitaly/service/hook/reference_transaction.go index 410e3b0a8973e217c0f450396f1690a0103e3b11..7d9a3a596808bc339aa25d11f5b5bbfe7bc4884e 100644 --- a/internal/gitaly/service/hook/reference_transaction.go +++ b/internal/gitaly/service/hook/reference_transaction.go @@ -4,12 +4,12 @@ import ( "context" "errors" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) func validateReferenceTransactionHookRequest(ctx context.Context, locator storage.Locator, 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 486bc9f78054f3ecffa9b23716df2e216c324d38..29bca5f173037c3d66c8ad0cff2e308ff3befc8d 100644 --- a/internal/gitaly/service/hook/reference_transaction_test.go +++ b/internal/gitaly/service/hook/reference_transaction_test.go @@ -8,18 +8,18 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) diff --git a/internal/gitaly/service/hook/server.go b/internal/gitaly/service/hook/server.go index 26f3ee5f02eb29150943ffa39ae1825546b0bfa1..a55df2881b171e15e215dbdd9a2efa47fca881df 100644 --- a/internal/gitaly/service/hook/server.go +++ b/internal/gitaly/service/hook/server.go @@ -4,15 +4,15 @@ import ( "context" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - gitalyhook "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/limiter" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/streamcache" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + gitalyhook "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/limiter" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/streamcache" + "gitlab.com/gitlab-org/gitaly/v17/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 da46b90fd9c2e14bf0d1ca2b2c06dc7a336f31f8..2ca134483cd398fe3332886be6d6e2dc177b8bd4 100644 --- a/internal/gitaly/service/hook/testhelper_test.go +++ b/internal/gitaly/service/hook/testhelper_test.go @@ -3,16 +3,16 @@ package hook import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - gitalyhook "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/repository" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + gitalyhook "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/repository" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) diff --git a/internal/gitaly/service/hook/update.go b/internal/gitaly/service/hook/update.go index 9147d12acb530c65a167367ef515952eb2bb8216..86b7636007d0c6055455365dbc28e8116eb0e948 100644 --- a/internal/gitaly/service/hook/update.go +++ b/internal/gitaly/service/hook/update.go @@ -6,10 +6,10 @@ import ( "os/exec" "sync" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) func validateUpdateHookRequest(ctx context.Context, locator storage.Locator, in *gitalypb.UpdateHookRequest) error { diff --git a/internal/gitaly/service/hook/update_test.go b/internal/gitaly/service/hook/update_test.go index 1a9226bce478720c6dc26cf5720df9f69d521f48..e83156d1e2dd57b8368607e458f3248f0f13d69c 100644 --- a/internal/gitaly/service/hook/update_test.go +++ b/internal/gitaly/service/hook/update_test.go @@ -10,15 +10,15 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestUpdateInvalidArgument(t *testing.T) { diff --git a/internal/gitaly/service/internalgitaly/server.go b/internal/gitaly/service/internalgitaly/server.go index a275ae252cbded8668be4843c723a481dd157245..7aa41c6769048aa17d26026ea493b58f64e23f5f 100644 --- a/internal/gitaly/service/internalgitaly/server.go +++ b/internal/gitaly/service/internalgitaly/server.go @@ -1,11 +1,11 @@ package internalgitaly import ( - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/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 995360d811cdc5eec89218ec40a25a86b5d8219b..48d02f701995a53a778778f1b670ac371eb4ffde 100644 --- a/internal/gitaly/service/internalgitaly/testhelper_test.go +++ b/internal/gitaly/service/internalgitaly/testhelper_test.go @@ -4,11 +4,11 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) diff --git a/internal/gitaly/service/internalgitaly/walkrepos.go b/internal/gitaly/service/internalgitaly/walkrepos.go index e0e90fe9a9b9e0fd20410f6cd8e30bd79ca8b189..d41618605083000318219e5bfb5ae8d2f47855e7 100644 --- a/internal/gitaly/service/internalgitaly/walkrepos.go +++ b/internal/gitaly/service/internalgitaly/walkrepos.go @@ -3,9 +3,9 @@ package internalgitaly import ( "io/fs" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/walk" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/walk" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/internal/gitaly/service/internalgitaly/walkrepos_test.go b/internal/gitaly/service/internalgitaly/walkrepos_test.go index c67a18c9212b4461eca706a3b139ceea2e0c1d26..71768df131faa823e28d996e6c547974ca5a02c8 100644 --- a/internal/gitaly/service/internalgitaly/walkrepos_test.go +++ b/internal/gitaly/service/internalgitaly/walkrepos_test.go @@ -10,14 +10,14 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) type serverWrapper struct { diff --git a/internal/gitaly/service/objectpool/alternates.go b/internal/gitaly/service/objectpool/alternates.go index 34c2b6d8c3388f0a20043b388a213c21fa19dd01..5a66b950872c51dec29427f1570c8d6d4ec66a6c 100644 --- a/internal/gitaly/service/objectpool/alternates.go +++ b/internal/gitaly/service/objectpool/alternates.go @@ -4,10 +4,10 @@ import ( "context" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/objectpool" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/objectpool" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // DisconnectGitAlternates is a slightly dangerous RPC. It optimistically hard-links all alternate diff --git a/internal/gitaly/service/objectpool/alternates_test.go b/internal/gitaly/service/objectpool/alternates_test.go index e4443cd6eace60239ffae423334ffed5dad3a81a..0a4a8818ca2781a4f49a2bdac5471a59dabb3ea7 100644 --- a/internal/gitaly/service/objectpool/alternates_test.go +++ b/internal/gitaly/service/objectpool/alternates_test.go @@ -5,13 +5,13 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/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 bcec11a9a86ad3be2ac048b8390761c1d097bdca..0082061e8217aeb38411a2401e0134369f4c79b1 100644 --- a/internal/gitaly/service/objectpool/create.go +++ b/internal/gitaly/service/objectpool/create.go @@ -3,11 +3,11 @@ package objectpool import ( "context" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/objectpool" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/repoutil" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/objectpool" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/repoutil" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // errMissingOriginRepository is returned when the request is missing the diff --git a/internal/gitaly/service/objectpool/create_test.go b/internal/gitaly/service/objectpool/create_test.go index a8e82f790fd969e1d0b45ad4c3e313270d691ab8..16ff0d50e18106aaf95bf0426b4dec3db025a4e9 100644 --- a/internal/gitaly/service/objectpool/create_test.go +++ b/internal/gitaly/service/objectpool/create_test.go @@ -8,22 +8,22 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - housekeepingmgr "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping/manager" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/objectpool" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/transactiontest" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + housekeepingmgr "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping/manager" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/objectpool" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/transactiontest" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestCreate(t *testing.T) { diff --git a/internal/gitaly/service/objectpool/delete.go b/internal/gitaly/service/objectpool/delete.go index e7bc8b31b1c31e1b6723e58482317ca2a0e3d3ef..92b5b8a47fe2e3ac6d5603c57368c773097b02b6 100644 --- a/internal/gitaly/service/objectpool/delete.go +++ b/internal/gitaly/service/objectpool/delete.go @@ -5,11 +5,11 @@ import ( "errors" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/objectpool" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/repoutil" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/objectpool" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/repoutil" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) DeleteObjectPool(ctx context.Context, in *gitalypb.DeleteObjectPoolRequest) (*gitalypb.DeleteObjectPoolResponse, error) { diff --git a/internal/gitaly/service/objectpool/delete_test.go b/internal/gitaly/service/objectpool/delete_test.go index d9a0b2769d052dff08fc0245a16ff14eca2a373e..3915b4e4482ad8463231018a8aaef12d34f03575 100644 --- a/internal/gitaly/service/objectpool/delete_test.go +++ b/internal/gitaly/service/objectpool/delete_test.go @@ -8,12 +8,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/codes" "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 e2445394a4342f91a0b14d75a33383e6d1ec49a0..49e95b10c697c6e517543f4e0ae60804b6fd646b 100644 --- a/internal/gitaly/service/objectpool/fetch_into_object_pool.go +++ b/internal/gitaly/service/objectpool/fetch_into_object_pool.go @@ -5,12 +5,12 @@ import ( "errors" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/objectpool" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/objectpool" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/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 145edb0e80e38091c678b340313009b36ba14a2b..e2414b94302aae5bb46f4b5f4874fdde7068b9ef 100644 --- a/internal/gitaly/service/objectpool/fetch_into_object_pool_test.go +++ b/internal/gitaly/service/objectpool/fetch_into_object_pool_test.go @@ -11,19 +11,19 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/credentials/insecure" diff --git a/internal/gitaly/service/objectpool/get.go b/internal/gitaly/service/objectpool/get.go index 4ae326fffc706d6e22bbeee11ad1108697770824..3a9e2ab1cb7f5da0b2d804aa744dec761087fedd 100644 --- a/internal/gitaly/service/objectpool/get.go +++ b/internal/gitaly/service/objectpool/get.go @@ -4,10 +4,10 @@ import ( "context" "errors" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/objectpool" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/objectpool" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/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 5b2dfc9c17b44bf4550e7314e5923b0115690493..6e48eb76df3ffc8d69ed85ab9d2d987ad20433cd 100644 --- a/internal/gitaly/service/objectpool/get_test.go +++ b/internal/gitaly/service/objectpool/get_test.go @@ -6,12 +6,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/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 236ab6906cad0e4d5e818e47711ce73d26f75d04..b86d2c04dc8a0a192472b1545ecd19aaf4a698d7 100644 --- a/internal/gitaly/service/objectpool/link.go +++ b/internal/gitaly/service/objectpool/link.go @@ -3,8 +3,8 @@ package objectpool import ( "context" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) LinkRepositoryToObjectPool(ctx context.Context, req *gitalypb.LinkRepositoryToObjectPoolRequest) (*gitalypb.LinkRepositoryToObjectPoolResponse, error) { diff --git a/internal/gitaly/service/objectpool/link_test.go b/internal/gitaly/service/objectpool/link_test.go index 76a53a7804e9cc54f3c4fb378f461905d6f93b10..8cfd2da6af6baea2e68bbabb9010fd023503ba90 100644 --- a/internal/gitaly/service/objectpool/link_test.go +++ b/internal/gitaly/service/objectpool/link_test.go @@ -6,16 +6,16 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestCompleteForkCreationFlow(t *testing.T) { diff --git a/internal/gitaly/service/objectpool/server.go b/internal/gitaly/service/objectpool/server.go index 0ebaf184d122d29e114ad709b51334742444edb5..aa03690f10a7b5c2ab3701e532db2a2b3509860d 100644 --- a/internal/gitaly/service/objectpool/server.go +++ b/internal/gitaly/service/objectpool/server.go @@ -1,17 +1,17 @@ package objectpool import ( - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - housekeepingmgr "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping/manager" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/counter" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/migration" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + housekeepingmgr "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping/manager" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/counter" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/migration" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/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 e608278bbf0ac60fc1eed2d9cfb07a258e80aa19..b3a773658343f5c0c0b587c9a8e95679a292da58 100644 --- a/internal/gitaly/service/objectpool/testhelper_test.go +++ b/internal/gitaly/service/objectpool/testhelper_test.go @@ -5,24 +5,24 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - housekeepingmgr "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping/manager" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/objectpool" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/commit" - hookservice "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/repository" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/ssh" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/transactiontest" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + housekeepingmgr "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping/manager" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/objectpool" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/commit" + hookservice "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/repository" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/ssh" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/transactiontest" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" ) diff --git a/internal/gitaly/service/objectpool/util.go b/internal/gitaly/service/objectpool/util.go index 3770a57cc86aa5e99d4a635caeb153a69773aa20..44b5a072316df312f31e791f81e7135941fe9089 100644 --- a/internal/gitaly/service/objectpool/util.go +++ b/internal/gitaly/service/objectpool/util.go @@ -4,9 +4,9 @@ import ( "context" "errors" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/objectpool" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/objectpool" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) var ( diff --git a/internal/gitaly/service/operations/apply_patch.go b/internal/gitaly/service/operations/apply_patch.go index 196acd4f75658ec4afc343260f6f17ef26ce0943..1e618409eadb6e83e034d2c4844b255349249672 100644 --- a/internal/gitaly/service/operations/apply_patch.go +++ b/internal/gitaly/service/operations/apply_patch.go @@ -9,15 +9,15 @@ import ( "path/filepath" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) var errNoDefaultBranch = errors.New("no default branch") diff --git a/internal/gitaly/service/operations/apply_patch_test.go b/internal/gitaly/service/operations/apply_patch_test.go index 7427a6a80a7301e20d9b5f55870f00f2f4a857f0..4a9347aa21f0fb4db4ec319f9d3ca27112d30214 100644 --- a/internal/gitaly/service/operations/apply_patch_test.go +++ b/internal/gitaly/service/operations/apply_patch_test.go @@ -9,19 +9,19 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/peer" "google.golang.org/grpc/status" diff --git a/internal/gitaly/service/operations/cherry_pick.go b/internal/gitaly/service/operations/cherry_pick.go index dbd12c8116b1b4b05fb7e525a82686e40f8f722e..dfdb40be651810f411d4e95a1fb7cd21ff939635 100644 --- a/internal/gitaly/service/operations/cherry_pick.go +++ b/internal/gitaly/service/operations/cherry_pick.go @@ -7,11 +7,11 @@ import ( "strings" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // UserCherryPick tries to perform a cherry-pick of a given commit onto a diff --git a/internal/gitaly/service/operations/cherry_pick_test.go b/internal/gitaly/service/operations/cherry_pick_test.go index 5b963ad35246ceb0b1aa1b44ceeb9fc465956cae..1c72f11e0f00aabe47445fe204d6938d729b1423 100644 --- a/internal/gitaly/service/operations/cherry_pick_test.go +++ b/internal/gitaly/service/operations/cherry_pick_test.go @@ -8,19 +8,19 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/signature" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/signature" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/timestamppb" diff --git a/internal/gitaly/service/operations/commit_files.go b/internal/gitaly/service/operations/commit_files.go index 8e29c6717b9cde759eb3cb229ebd6740006295ff..82500878391475faa1495dca0db8fb4b44a600d5 100644 --- a/internal/gitaly/service/operations/commit_files.go +++ b/internal/gitaly/service/operations/commit_files.go @@ -10,15 +10,15 @@ import ( "path/filepath" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/remoterepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/remoterepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // unknownIndexError is an unspecified error that was produced by performing an invalid operation on the index. diff --git a/internal/gitaly/service/operations/commit_files_test.go b/internal/gitaly/service/operations/commit_files_test.go index e4f7dcf568980273979b05ec8495ba70db877c91..19d1d15c8ee6deeb78d13585ec929d29ee0aa31a 100644 --- a/internal/gitaly/service/operations/commit_files_test.go +++ b/internal/gitaly/service/operations/commit_files_test.go @@ -13,19 +13,19 @@ import ( "github.com/ProtonMail/go-crypto/openpgp" "github.com/ProtonMail/go-crypto/openpgp/packet" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/signature" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/signature" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/metadata" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/internal/gitaly/service/operations/ff_branch.go b/internal/gitaly/service/operations/ff_branch.go index e78c8c5e00a27ebf296d445d95a1b54741b5b372..592b5e3d2be112fca4a68dc99c07dad6921afe51 100644 --- a/internal/gitaly/service/operations/ff_branch.go +++ b/internal/gitaly/service/operations/ff_branch.go @@ -5,11 +5,11 @@ import ( "errors" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // UserFFBranch tries to perform a fast-forward merge of a given commit into the given branch. diff --git a/internal/gitaly/service/operations/ff_branch_test.go b/internal/gitaly/service/operations/ff_branch_test.go index 48853475459f296ae359156fb8e3f3eabd0f13ff..3ca4f92a9ac274feccb0f14398bf229825c9061d 100644 --- a/internal/gitaly/service/operations/ff_branch_test.go +++ b/internal/gitaly/service/operations/ff_branch_test.go @@ -5,13 +5,13 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb/testproto" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb/testproto" ) func TestUserFFBranch(t *testing.T) { diff --git a/internal/gitaly/service/operations/merge_branch.go b/internal/gitaly/service/operations/merge_branch.go index d8066d1257d753923f147a463bcf5af7fb547ef4..6fc4df9e96bea62a7888901882ce723976424d50 100644 --- a/internal/gitaly/service/operations/merge_branch.go +++ b/internal/gitaly/service/operations/merge_branch.go @@ -5,14 +5,14 @@ import ( "errors" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/conflict/refdb" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/conflict/refdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // UserMergeBranch is a two stage streaming RPC that will merge two commits together and diff --git a/internal/gitaly/service/operations/merge_branch_test.go b/internal/gitaly/service/operations/merge_branch_test.go index efb709d035882f981b21ebf3a005a254ae968a46..571d7a0201c32896ce2c1b2d87b70f72a57a10f7 100644 --- a/internal/gitaly/service/operations/merge_branch_test.go +++ b/internal/gitaly/service/operations/merge_branch_test.go @@ -13,24 +13,24 @@ import ( "github.com/ProtonMail/go-crypto/openpgp" "github.com/ProtonMail/go-crypto/openpgp/packet" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitlab" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/signature" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb/testproto" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitlab" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/signature" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb/testproto" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/internal/gitaly/service/operations/merge_to_ref.go b/internal/gitaly/service/operations/merge_to_ref.go index 3b01b3d645f1065b6deb8f6d0ccf3819450490b7..ef17710358afeaa3bd905d332b8b6bfade9e12b0 100644 --- a/internal/gitaly/service/operations/merge_to_ref.go +++ b/internal/gitaly/service/operations/merge_to_ref.go @@ -6,11 +6,11 @@ import ( "fmt" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // UserMergeToRef overwrites the given TargetRef to point to either Branch or diff --git a/internal/gitaly/service/operations/merge_to_ref_test.go b/internal/gitaly/service/operations/merge_to_ref_test.go index 486ebc773623aaafdcc0426cbe12e3f4e515a203..770833d0a3848e86477798e267ccb89ea4932d1c 100644 --- a/internal/gitaly/service/operations/merge_to_ref_test.go +++ b/internal/gitaly/service/operations/merge_to_ref_test.go @@ -6,13 +6,13 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/internal/gitaly/service/operations/merge_utils.go b/internal/gitaly/service/operations/merge_utils.go index 77c6c9c2a074fbd570e0cb7b56117aa276b877de..501f6c0d52264c81e9ed97248cb850c248d983d6 100644 --- a/internal/gitaly/service/operations/merge_utils.go +++ b/internal/gitaly/service/operations/merge_utils.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" ) func (s *Server) merge( diff --git a/internal/gitaly/service/operations/rebase_confirmable.go b/internal/gitaly/service/operations/rebase_confirmable.go index 0f4a1d0301051457ccb39b3630e4cc31a0a58cb9..d4a19a38143e24c41e18ef6095da9f87cdf5facf 100644 --- a/internal/gitaly/service/operations/rebase_confirmable.go +++ b/internal/gitaly/service/operations/rebase_confirmable.go @@ -6,12 +6,12 @@ import ( "fmt" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // UserRebaseConfirmable rebases the given remote branch to the target branch. diff --git a/internal/gitaly/service/operations/rebase_confirmable_test.go b/internal/gitaly/service/operations/rebase_confirmable_test.go index f405506091714eb18f1e58d790c58408f60d6a84..b4984282da4322c829184a0099561c741d060a76 100644 --- a/internal/gitaly/service/operations/rebase_confirmable_test.go +++ b/internal/gitaly/service/operations/rebase_confirmable_test.go @@ -7,19 +7,19 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/timestamppb" diff --git a/internal/gitaly/service/operations/rebase_to_ref.go b/internal/gitaly/service/operations/rebase_to_ref.go index ddb8fde1761b64369c6a73ac6350315b3f88390e..87619760d47fe75c49907b199b4499ea8706e40f 100644 --- a/internal/gitaly/service/operations/rebase_to_ref.go +++ b/internal/gitaly/service/operations/rebase_to_ref.go @@ -4,10 +4,10 @@ import ( "context" "errors" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // UserRebaseToRef overwrites the given TargetRef with the result of rebasing diff --git a/internal/gitaly/service/operations/rebase_to_ref_test.go b/internal/gitaly/service/operations/rebase_to_ref_test.go index 6362c6e1a6c4aaef796e4aaf70f830a5d41747b1..84be3554e98189b203581267f4da61bb3bedca4c 100644 --- a/internal/gitaly/service/operations/rebase_to_ref_test.go +++ b/internal/gitaly/service/operations/rebase_to_ref_test.go @@ -7,14 +7,14 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/internal/gitaly/service/operations/revert.go b/internal/gitaly/service/operations/revert.go index 760e625eb704d80417ae622c8b898fc4afbece6d..69575be2591933a7b7682de723c767940f324d39 100644 --- a/internal/gitaly/service/operations/revert.go +++ b/internal/gitaly/service/operations/revert.go @@ -5,13 +5,13 @@ import ( "errors" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/remoterepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/remoterepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) //nolint:revive // This is unintentionally missing documentation. diff --git a/internal/gitaly/service/operations/revert_test.go b/internal/gitaly/service/operations/revert_test.go index b1bf1a730311f0baefe6dfb418ed33e8e5f57fed..69cbd83d8b122c5f3725c5164b519e975b3d95f1 100644 --- a/internal/gitaly/service/operations/revert_test.go +++ b/internal/gitaly/service/operations/revert_test.go @@ -7,18 +7,18 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/signature" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/signature" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/timestamppb" diff --git a/internal/gitaly/service/operations/server.go b/internal/gitaly/service/operations/server.go index 2842fb3aa8f9ea502a58412df58752823f99368c..ecf3e5fe9e5a1fba600f8b10fee4c3269481068e 100644 --- a/internal/gitaly/service/operations/server.go +++ b/internal/gitaly/service/operations/server.go @@ -3,19 +3,19 @@ package operations import ( "context" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/quarantine" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/quarantine" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) //nolint:revive // This is unintentionally missing documentation. diff --git a/internal/gitaly/service/operations/squash.go b/internal/gitaly/service/operations/squash.go index afd80cd6c81027ac947189221d0aa7f5355836a0..29e9af0f8fd4ae7d2b0e56ccc8c5111958d5b29e 100644 --- a/internal/gitaly/service/operations/squash.go +++ b/internal/gitaly/service/operations/squash.go @@ -6,13 +6,13 @@ import ( "strings" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // UserSquash collapses a range of commits identified via a start and end revision into a single diff --git a/internal/gitaly/service/operations/squash_test.go b/internal/gitaly/service/operations/squash_test.go index 327f445bb13caa3b5ae722b6cac2c97afcb3c84f..84224ce03d4406b1306131607969fe620f59d6fe 100644 --- a/internal/gitaly/service/operations/squash_test.go +++ b/internal/gitaly/service/operations/squash_test.go @@ -8,22 +8,22 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/signature" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/signature" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/timestamppb" diff --git a/internal/gitaly/service/operations/submodules.go b/internal/gitaly/service/operations/submodules.go index cdf9cfce2646f39ec3ed1178a9b4cd94a05c2141..5ee01580c258e2a0a8238c61cde84329106b5bbf 100644 --- a/internal/gitaly/service/operations/submodules.go +++ b/internal/gitaly/service/operations/submodules.go @@ -6,12 +6,12 @@ import ( "fmt" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // Error strings present in the legacy Ruby implementation. diff --git a/internal/gitaly/service/operations/submodules_test.go b/internal/gitaly/service/operations/submodules_test.go index ae14396a77c71bcfea1063ed9c3f83966f8e60dc..82dd0da45edef4c155305effddd0a6366f088d31 100644 --- a/internal/gitaly/service/operations/submodules_test.go +++ b/internal/gitaly/service/operations/submodules_test.go @@ -8,14 +8,14 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestUserUpdateSubmodule(t *testing.T) { diff --git a/internal/gitaly/service/operations/tags.go b/internal/gitaly/service/operations/tags.go index 604299bc241f7e7850f6ddc9894b0fea4678b018..57821337463cd036cb704b7a5f33dffd74b4e38d 100644 --- a/internal/gitaly/service/operations/tags.go +++ b/internal/gitaly/service/operations/tags.go @@ -7,14 +7,14 @@ import ( "fmt" "regexp" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func validateUserDeleteTagRequest(ctx context.Context, locator storage.Locator, in *gitalypb.UserDeleteTagRequest) error { diff --git a/internal/gitaly/service/operations/tags_test.go b/internal/gitaly/service/operations/tags_test.go index d1e2390ee46d8ca85b0f1f9ea31d99b8c95f4aa8..45f4d016c54876d5c0e53171483d54ec0e771d4c 100644 --- a/internal/gitaly/service/operations/tags_test.go +++ b/internal/gitaly/service/operations/tags_test.go @@ -8,19 +8,19 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/internal/gitaly/service/operations/testhelper_test.go b/internal/gitaly/service/operations/testhelper_test.go index a7037dd9f1930cba2a716d203f8e0f77f8135811..3915c1f63c930b787221d2dd16fae0858fa1909c 100644 --- a/internal/gitaly/service/operations/testhelper_test.go +++ b/internal/gitaly/service/operations/testhelper_test.go @@ -5,22 +5,22 @@ import ( "testing" "github.com/stretchr/testify/require" - gitalyauth "gitlab.com/gitlab-org/gitaly/v16/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/blob" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/commit" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/ref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/repository" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/ssh" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitlab" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + gitalyauth "gitlab.com/gitlab-org/gitaly/v17/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/blob" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/commit" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/ref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/repository" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/ssh" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitlab" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" "google.golang.org/protobuf/proto" diff --git a/internal/gitaly/service/operations/update_with_hooks.go b/internal/gitaly/service/operations/update_with_hooks.go index 73df5e153211092b05bc839936c5928ca24b7251..bb8de316b3ab8fb090bf70804503f218cefecc74 100644 --- a/internal/gitaly/service/operations/update_with_hooks.go +++ b/internal/gitaly/service/operations/update_with_hooks.go @@ -3,9 +3,9 @@ package operations import ( "context" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/quarantine" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/quarantine" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *Server) updateReferenceWithHooks( diff --git a/internal/gitaly/service/operations/user_create_branch.go b/internal/gitaly/service/operations/user_create_branch.go index 5210f445498b01cf7437731bf1f4eb03c9ee10f2..9951c03ad40d29bbc306b6828c24d0c1b0a34df4 100644 --- a/internal/gitaly/service/operations/user_create_branch.go +++ b/internal/gitaly/service/operations/user_create_branch.go @@ -5,11 +5,11 @@ import ( "errors" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func validateUserCreateBranchRequest(ctx context.Context, locator storage.Locator, in *gitalypb.UserCreateBranchRequest) error { diff --git a/internal/gitaly/service/operations/user_create_branch_test.go b/internal/gitaly/service/operations/user_create_branch_test.go index 74e4dee9093607a948c7689225952e506966e139..585bb8a837c132263c9a08323784f85711d7c3cc 100644 --- a/internal/gitaly/service/operations/user_create_branch_test.go +++ b/internal/gitaly/service/operations/user_create_branch_test.go @@ -4,20 +4,20 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/internal/gitaly/service/operations/user_delete_branch.go b/internal/gitaly/service/operations/user_delete_branch.go index 9d187831835329fcb9846b4867971bba2418e885..286d0bafaf67e9977e0f791295c30c496e565a9d 100644 --- a/internal/gitaly/service/operations/user_delete_branch.go +++ b/internal/gitaly/service/operations/user_delete_branch.go @@ -5,12 +5,12 @@ import ( "errors" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func validateUserDeleteBranchRequest(ctx context.Context, locator storage.Locator, in *gitalypb.UserDeleteBranchRequest) error { diff --git a/internal/gitaly/service/operations/user_delete_branch_test.go b/internal/gitaly/service/operations/user_delete_branch_test.go index ae1fceb17552206c2c44bc9f3826e5d6146a41cd..e383672d851d17f357b1d033f3456eb46d65dd2b 100644 --- a/internal/gitaly/service/operations/user_delete_branch_test.go +++ b/internal/gitaly/service/operations/user_delete_branch_test.go @@ -8,22 +8,22 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitlab" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb/testproto" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitlab" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb/testproto" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/internal/gitaly/service/operations/user_update_branch.go b/internal/gitaly/service/operations/user_update_branch.go index 08bc7db1a041b3af9f6d34493144cd08d541305c..eb7547ef7e3680dfc873d5b96939174ce048875d 100644 --- a/internal/gitaly/service/operations/user_update_branch.go +++ b/internal/gitaly/service/operations/user_update_branch.go @@ -5,11 +5,11 @@ import ( "errors" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func validateUserUpdateBranchGo(ctx context.Context, locator storage.Locator, req *gitalypb.UserUpdateBranchRequest) error { diff --git a/internal/gitaly/service/operations/user_update_branch_test.go b/internal/gitaly/service/operations/user_update_branch_test.go index 4b111f5ccdaccdd431493b02faa3a1195c778059..1e2e1325338bfb08f1a223a0829e9ad297c05fac 100644 --- a/internal/gitaly/service/operations/user_update_branch_test.go +++ b/internal/gitaly/service/operations/user_update_branch_test.go @@ -4,12 +4,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestUserUpdateBranch(t *testing.T) { diff --git a/internal/gitaly/service/operations/utils.go b/internal/gitaly/service/operations/utils.go index bd234519855379cff5e37a21ec3835a09909c40f..9464268f72973cba7008a210139c126f2fd9842d 100644 --- a/internal/gitaly/service/operations/utils.go +++ b/internal/gitaly/service/operations/utils.go @@ -5,10 +5,10 @@ import ( "errors" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) type cherryPickOrRevertRequest interface { diff --git a/internal/gitaly/service/partition/backup_partition.go b/internal/gitaly/service/partition/backup_partition.go index ee7b0826f93319b6a2a0eaa1db1a607f7393fccc..4854bed75e090b7043f30231f3d3273849b72a63 100644 --- a/internal/gitaly/service/partition/backup_partition.go +++ b/internal/gitaly/service/partition/backup_partition.go @@ -10,12 +10,12 @@ import ( "path/filepath" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/archive" - "gitlab.com/gitlab-org/gitaly/v16/internal/backup" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/archive" + "gitlab.com/gitlab-org/gitaly/v17/internal/backup" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/encoding/protodelim" ) diff --git a/internal/gitaly/service/partition/backup_partition_test.go b/internal/gitaly/service/partition/backup_partition_test.go index 564180929ab76c4e9855ca65b8879aef477e7b1e..6161663b483641402d10d7aea1c47c5ca0eb8496 100644 --- a/internal/gitaly/service/partition/backup_partition_test.go +++ b/internal/gitaly/service/partition/backup_partition_test.go @@ -12,17 +12,17 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/archive" - "gitlab.com/gitlab-org/gitaly/v16/internal/backup" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/partition" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/archive" + "gitlab.com/gitlab-org/gitaly/v17/internal/backup" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/partition" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/encoding/protodelim" ) diff --git a/internal/gitaly/service/partition/list_partitions.go b/internal/gitaly/service/partition/list_partitions.go index bf2457e2377684e4a5dd564f16131a5fa59b9c51..30a2afe262be8ecafb31246af85a6bb32a4d2ef2 100644 --- a/internal/gitaly/service/partition/list_partitions.go +++ b/internal/gitaly/service/partition/list_partitions.go @@ -7,9 +7,9 @@ import ( "fmt" "strconv" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) const invalidPartitionID = storage.PartitionID(0) diff --git a/internal/gitaly/service/partition/list_partitions_test.go b/internal/gitaly/service/partition/list_partitions_test.go index e34605c2d5b59b55ed46996922a042130bfebc4d..5b46cc0c9d7e6a34848f16a59fd3dd06e6ca46cf 100644 --- a/internal/gitaly/service/partition/list_partitions_test.go +++ b/internal/gitaly/service/partition/list_partitions_test.go @@ -6,12 +6,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestListPartitions(t *testing.T) { diff --git a/internal/gitaly/service/partition/server.go b/internal/gitaly/service/partition/server.go index 65dd2b887165b08a82101b18a0b7cf80bb18c173..f7a8e231d5de3c05ca0940f13ec3a8498d14d22c 100644 --- a/internal/gitaly/service/partition/server.go +++ b/internal/gitaly/service/partition/server.go @@ -1,12 +1,12 @@ package partition import ( - "gitlab.com/gitlab-org/gitaly/v16/internal/backup" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/backup" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) type server struct { diff --git a/internal/gitaly/service/partition/testhelper_test.go b/internal/gitaly/service/partition/testhelper_test.go index e020b7e695fccaacf0b1cd580114c7c711c6f9fa..1ebfb7cf9dcbdb6c272ff19b6d8e14585730270a 100644 --- a/internal/gitaly/service/partition/testhelper_test.go +++ b/internal/gitaly/service/partition/testhelper_test.go @@ -4,13 +4,13 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/setup" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/setup" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/service/raft/send_message.go b/internal/gitaly/service/raft/send_message.go index 4dd561dec77bc48c4794fca08ed8a145983797d9..6032279aa452a32968701237412404e7bf0945ed 100644 --- a/internal/gitaly/service/raft/send_message.go +++ b/internal/gitaly/service/raft/send_message.go @@ -4,8 +4,8 @@ import ( "errors" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // SendMessage is a gRPC method for sending a Raft message across nodes. diff --git a/internal/gitaly/service/raft/send_message_test.go b/internal/gitaly/service/raft/send_message_test.go index 3575662707829a6c24768684199c966b59caa092..f81edb8e03f94af7e46e1480880dd1c019c03b0f 100644 --- a/internal/gitaly/service/raft/send_message_test.go +++ b/internal/gitaly/service/raft/send_message_test.go @@ -5,13 +5,13 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "go.etcd.io/etcd/raft/v3/raftpb" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/internal/gitaly/service/raft/server.go b/internal/gitaly/service/raft/server.go index 8763c735af54562ab9e15021329d86fe327ac359..fd473fb8bfd3abcf8e000fc5804c28a16e9b008f 100644 --- a/internal/gitaly/service/raft/server.go +++ b/internal/gitaly/service/raft/server.go @@ -1,11 +1,11 @@ package raft import ( - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/raftmgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/raftmgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // Server is a gRPC server for the Raft service. diff --git a/internal/gitaly/service/raft/testhelper_test.go b/internal/gitaly/service/raft/testhelper_test.go index d19eb4461ec14445a2fa7fc60c12a36f84f652b2..553b56a2aae1a7049da8f4d6aa8d75b9f5fcd6b3 100644 --- a/internal/gitaly/service/raft/testhelper_test.go +++ b/internal/gitaly/service/raft/testhelper_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" "go.etcd.io/etcd/raft/v3/raftpb" ) diff --git a/internal/gitaly/service/ref/branches.go b/internal/gitaly/service/ref/branches.go index a2361251550197af5e389ff1a87e1822793bd533..3cc522c6b22aadcc2a70f9e988a8ab4a63f458b1 100644 --- a/internal/gitaly/service/ref/branches.go +++ b/internal/gitaly/service/ref/branches.go @@ -4,9 +4,9 @@ import ( "context" "errors" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) FindBranch(ctx context.Context, req *gitalypb.FindBranchRequest) (*gitalypb.FindBranchResponse, error) { diff --git a/internal/gitaly/service/ref/branches_test.go b/internal/gitaly/service/ref/branches_test.go index fefbbf6ae65d2b905243ab5a67c74b8e23b435b2..a96542e31cfe205472024907c70f3a4bc8347d9a 100644 --- a/internal/gitaly/service/ref/branches_test.go +++ b/internal/gitaly/service/ref/branches_test.go @@ -4,13 +4,13 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/ref/delete_refs.go b/internal/gitaly/service/ref/delete_refs.go index cdda858970e376bb1d8c6610ab2e71d5bb357586..e05b888010dcf09d76cf5e14210b1383d40fbb6d 100644 --- a/internal/gitaly/service/ref/delete_refs.go +++ b/internal/gitaly/service/ref/delete_refs.go @@ -6,15 +6,15 @@ import ( "fmt" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) DeleteRefs(ctx context.Context, in *gitalypb.DeleteRefsRequest) (_ *gitalypb.DeleteRefsResponse, returnedErr error) { diff --git a/internal/gitaly/service/ref/delete_refs_test.go b/internal/gitaly/service/ref/delete_refs_test.go index 2cf7c803a5aed4c87163df7c3403d82ce6a8c74a..3e6382fb6f48688344c9ffe9886c7a5dee1a55fd 100644 --- a/internal/gitaly/service/ref/delete_refs_test.go +++ b/internal/gitaly/service/ref/delete_refs_test.go @@ -4,22 +4,22 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - hookservice "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/repository" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + hookservice "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/repository" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/internal/gitaly/service/ref/find_all_branches.go b/internal/gitaly/service/ref/find_all_branches.go index 77cbc3db70852b735a21edebd00a2bfb3c45ad9b..9c4f2f5a16dfc5cb8e45e7b1d33a7884e82e9340 100644 --- a/internal/gitaly/service/ref/find_all_branches.go +++ b/internal/gitaly/service/ref/find_all_branches.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) FindAllBranches(in *gitalypb.FindAllBranchesRequest, stream gitalypb.RefService_FindAllBranchesServer) error { diff --git a/internal/gitaly/service/ref/find_all_branches_test.go b/internal/gitaly/service/ref/find_all_branches_test.go index ebe9b82fdd79b71c296f5efe889b3ada78d04172..e8cbfe7001ba57c0670b3ac17e0290992f9b91fc 100644 --- a/internal/gitaly/service/ref/find_all_branches_test.go +++ b/internal/gitaly/service/ref/find_all_branches_test.go @@ -5,12 +5,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestFindAllBranches(t *testing.T) { diff --git a/internal/gitaly/service/ref/find_all_remote_branches.go b/internal/gitaly/service/ref/find_all_remote_branches.go index 772e112ba89064c68190643e6a71bd62d48386d7..3a7b5a17efda43145e6c8035ff387c04296291e1 100644 --- a/internal/gitaly/service/ref/find_all_remote_branches.go +++ b/internal/gitaly/service/ref/find_all_remote_branches.go @@ -6,10 +6,10 @@ import ( "fmt" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) FindAllRemoteBranches(req *gitalypb.FindAllRemoteBranchesRequest, stream gitalypb.RefService_FindAllRemoteBranchesServer) error { diff --git a/internal/gitaly/service/ref/find_all_remote_branches_test.go b/internal/gitaly/service/ref/find_all_remote_branches_test.go index f55645751792320d80cf29a7abc895da79d25306..2e78a3a0e9222eb82da84280944c3d8aed1c8313 100644 --- a/internal/gitaly/service/ref/find_all_remote_branches_test.go +++ b/internal/gitaly/service/ref/find_all_remote_branches_test.go @@ -4,12 +4,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestFindAllRemoteBranches(t *testing.T) { diff --git a/internal/gitaly/service/ref/find_all_tags.go b/internal/gitaly/service/ref/find_all_tags.go index c85d4a62ec1e807df9565fe2357a9684ade4a589..035f57995e6804bd0b1c34281e304cf9a01d66eb 100644 --- a/internal/gitaly/service/ref/find_all_tags.go +++ b/internal/gitaly/service/ref/find_all_tags.go @@ -7,12 +7,12 @@ import ( "fmt" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitpipe" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitpipe" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/proto" ) diff --git a/internal/gitaly/service/ref/find_all_tags_test.go b/internal/gitaly/service/ref/find_all_tags_test.go index 362c9d14b6cf3364bbfd8257458702f9725dcb46..0847c34adf9cde295ffc040c877795a56d2d09aa 100644 --- a/internal/gitaly/service/ref/find_all_tags_test.go +++ b/internal/gitaly/service/ref/find_all_tags_test.go @@ -10,15 +10,15 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/internal/gitaly/service/ref/find_default_branch_name.go b/internal/gitaly/service/ref/find_default_branch_name.go index 97b1997307d4642c760a3f15e94d4342693160a3..b418ca8e963a0faa0b1dbf521240d0c5f7ec58ab 100644 --- a/internal/gitaly/service/ref/find_default_branch_name.go +++ b/internal/gitaly/service/ref/find_default_branch_name.go @@ -3,8 +3,8 @@ package ref import ( "context" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // FindDefaultBranchName returns the default branch name for the given repository diff --git a/internal/gitaly/service/ref/find_default_branch_name_test.go b/internal/gitaly/service/ref/find_default_branch_name_test.go index 17c2fbe63224999d08e16917beb415dd87398bba..0dffc847ee4a82a4c1142ab3f5ba5734fc9403cd 100644 --- a/internal/gitaly/service/ref/find_default_branch_name_test.go +++ b/internal/gitaly/service/ref/find_default_branch_name_test.go @@ -4,13 +4,13 @@ import ( "context" "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestFindDefaultBranchName(t *testing.T) { diff --git a/internal/gitaly/service/ref/find_local_branches.go b/internal/gitaly/service/ref/find_local_branches.go index 875a7c66f08351ebfec0ecf2b028941e9c73c9bb..957319966605dd0547fef77e707a15f724b9f0bb 100644 --- a/internal/gitaly/service/ref/find_local_branches.go +++ b/internal/gitaly/service/ref/find_local_branches.go @@ -4,10 +4,10 @@ import ( "errors" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/lines" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/lines" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // FindLocalBranches creates a stream of branches for all local branches in the given repository diff --git a/internal/gitaly/service/ref/find_local_branches_test.go b/internal/gitaly/service/ref/find_local_branches_test.go index 1d89cfe6ab42e870f962c3462d422b7e146ed9a3..3be5b71115ba3d540a414f028ebb50b210f4de24 100644 --- a/internal/gitaly/service/ref/find_local_branches_test.go +++ b/internal/gitaly/service/ref/find_local_branches_test.go @@ -7,13 +7,13 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestFindLocalBranches(t *testing.T) { diff --git a/internal/gitaly/service/ref/find_refs_by_oid.go b/internal/gitaly/service/ref/find_refs_by_oid.go index d957f5f0c08f64f70486af2416cceeaf35004b61..69e247349256276e781fc993e763f137490ec8a3 100644 --- a/internal/gitaly/service/ref/find_refs_by_oid.go +++ b/internal/gitaly/service/ref/find_refs_by_oid.go @@ -5,10 +5,10 @@ import ( "errors" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitpipe" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitpipe" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) FindRefsByOID(ctx context.Context, in *gitalypb.FindRefsByOIDRequest) (*gitalypb.FindRefsByOIDResponse, error) { diff --git a/internal/gitaly/service/ref/find_refs_by_oid_test.go b/internal/gitaly/service/ref/find_refs_by_oid_test.go index 3b1e5b0d225c1150fbccb31a66670064fb65ea1c..6fbf85474323b4adbb94cd424ae0b1a794435e9c 100644 --- a/internal/gitaly/service/ref/find_refs_by_oid_test.go +++ b/internal/gitaly/service/ref/find_refs_by_oid_test.go @@ -8,11 +8,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/ref/find_tag.go b/internal/gitaly/service/ref/find_tag.go index ccfbfb5612ca540d1a032f3b574de44c8bf0b7cb..b52c67da83a96ebe99e394ebca1ae31a507497bf 100644 --- a/internal/gitaly/service/ref/find_tag.go +++ b/internal/gitaly/service/ref/find_tag.go @@ -7,11 +7,11 @@ import ( "fmt" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) FindTag(ctx context.Context, in *gitalypb.FindTagRequest) (*gitalypb.FindTagResponse, error) { diff --git a/internal/gitaly/service/ref/find_tag_test.go b/internal/gitaly/service/ref/find_tag_test.go index 64385eca091f6d19635745e3f6464fb843b0dcc3..21eb1f2494b9582893aa53da79bb60011983a8d4 100644 --- a/internal/gitaly/service/ref/find_tag_test.go +++ b/internal/gitaly/service/ref/find_tag_test.go @@ -7,13 +7,13 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/internal/gitaly/service/ref/list_refs.go b/internal/gitaly/service/ref/list_refs.go index dfacf47701f595df8bc69c5a293c95e94a5308f2..5e7f5e0ec58bd71d9313a000f1f0debad40646be 100644 --- a/internal/gitaly/service/ref/list_refs.go +++ b/internal/gitaly/service/ref/list_refs.go @@ -6,12 +6,12 @@ import ( "fmt" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/lines" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/lines" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) ListRefs(in *gitalypb.ListRefsRequest, stream gitalypb.RefService_ListRefsServer) error { diff --git a/internal/gitaly/service/ref/list_refs_test.go b/internal/gitaly/service/ref/list_refs_test.go index bffdb0986a747b59473b475068eb27306214c8e3..31904660167e4206b4e0b36fa4330216c0bee16e 100644 --- a/internal/gitaly/service/ref/list_refs_test.go +++ b/internal/gitaly/service/ref/list_refs_test.go @@ -7,12 +7,12 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/ref/refexists.go b/internal/gitaly/service/ref/refexists.go index 33dfeb2310eec78fd8a5579913c1fefabebadc09..7c2ecf05e5646b27660517bfb9309bb802e30288 100644 --- a/internal/gitaly/service/ref/refexists.go +++ b/internal/gitaly/service/ref/refexists.go @@ -4,10 +4,10 @@ import ( "context" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/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 da99c62f7061a8952f654a6f0b671607e02543b0..0215bf0404ad7d6ba3db3e8b24a43dd5175b5397 100644 --- a/internal/gitaly/service/ref/refexists_test.go +++ b/internal/gitaly/service/ref/refexists_test.go @@ -3,12 +3,12 @@ package ref import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestRefExists(t *testing.T) { diff --git a/internal/gitaly/service/ref/refnames_containing.go b/internal/gitaly/service/ref/refnames_containing.go index 148ff46be2c5a3e92a868ae53c9d033d920de60f..f88a6961c01758742d0f130c52bfcefadeedff9b 100644 --- a/internal/gitaly/service/ref/refnames_containing.go +++ b/internal/gitaly/service/ref/refnames_containing.go @@ -6,10 +6,10 @@ import ( "fmt" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/wrapperspb" ) diff --git a/internal/gitaly/service/ref/refnames_containing_test.go b/internal/gitaly/service/ref/refnames_containing_test.go index b392750f1059cdcab4ece7223bdf5d8f7e2f6ed1..62fcb4e5d6d5a34246498e20fdffe741e3535881 100644 --- a/internal/gitaly/service/ref/refnames_containing_test.go +++ b/internal/gitaly/service/ref/refnames_containing_test.go @@ -4,12 +4,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestListTagNamesContainingCommit(t *testing.T) { diff --git a/internal/gitaly/service/ref/server.go b/internal/gitaly/service/ref/server.go index 9b3fc60348a5f56f26c55f64c0dd297bc8f07ebc..98941546c5f1000eaa228bd2771618c98db763df 100644 --- a/internal/gitaly/service/ref/server.go +++ b/internal/gitaly/service/ref/server.go @@ -1,13 +1,13 @@ package ref import ( - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/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 5526a85141cdc9fa184aa05930ca080d666d79a1..d15565176e10f97398f8267ee6312195091fa503 100644 --- a/internal/gitaly/service/ref/tag_messages.go +++ b/internal/gitaly/service/ref/tag_messages.go @@ -6,12 +6,12 @@ import ( "fmt" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) func (s *server) GetTagMessages(request *gitalypb.GetTagMessagesRequest, stream gitalypb.RefService_GetTagMessagesServer) error { diff --git a/internal/gitaly/service/ref/tag_messages_test.go b/internal/gitaly/service/ref/tag_messages_test.go index e5864ae9ba92d49aa760f9d2a4a7d7d3eaf0f024..9d30dbc0e67b5370f0e725888e2c5ad54392f90a 100644 --- a/internal/gitaly/service/ref/tag_messages_test.go +++ b/internal/gitaly/service/ref/tag_messages_test.go @@ -7,12 +7,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestSuccessfulGetTagMessagesRequest(t *testing.T) { diff --git a/internal/gitaly/service/ref/tag_signatures.go b/internal/gitaly/service/ref/tag_signatures.go index 13a3cbc5b48852eb64a04cf644c839a5ba5065ee..c4888cee0577baf6b2f7d48f5902ab133a136cf2 100644 --- a/internal/gitaly/service/ref/tag_signatures.go +++ b/internal/gitaly/service/ref/tag_signatures.go @@ -5,13 +5,13 @@ import ( "errors" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitpipe" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitpipe" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/proto" ) diff --git a/internal/gitaly/service/ref/tag_signatures_test.go b/internal/gitaly/service/ref/tag_signatures_test.go index 37b19de5b6f3eefdc70d89baad9b453844c42d92..2c6e1143df527f2e75d6867b687f6f636f930f3a 100644 --- a/internal/gitaly/service/ref/tag_signatures_test.go +++ b/internal/gitaly/service/ref/tag_signatures_test.go @@ -6,13 +6,13 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/ref/testhelper_test.go b/internal/gitaly/service/ref/testhelper_test.go index 430939c795d6692548b018ef801bfebb2de9eee2..9ac2a7eb9bd4c04295b8a082fd00f5c6b339fed6 100644 --- a/internal/gitaly/service/ref/testhelper_test.go +++ b/internal/gitaly/service/ref/testhelper_test.go @@ -5,18 +5,18 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - hookservice "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/repository" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/lines" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + hookservice "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/repository" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/lines" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) diff --git a/internal/gitaly/service/ref/update_references.go b/internal/gitaly/service/ref/update_references.go index bb84674a4c578a5fa48ad3caef8dc77119d640b1..34e42862ecb7f7635e3ca5c1d4f5ac93129b341f 100644 --- a/internal/gitaly/service/ref/update_references.go +++ b/internal/gitaly/service/ref/update_references.go @@ -5,10 +5,10 @@ import ( "fmt" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // UpdateReferences updates a set of references atomically. It allows for reference creations, deletions and updates in diff --git a/internal/gitaly/service/ref/update_references_test.go b/internal/gitaly/service/ref/update_references_test.go index 8d4768000fcfeb93988e10f3bd19877852224889..2f0436badd3e5510d2e5306407b408458a1ea66b 100644 --- a/internal/gitaly/service/ref/update_references_test.go +++ b/internal/gitaly/service/ref/update_references_test.go @@ -5,15 +5,15 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb/testproto" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb/testproto" ) func TestUpdateReferences(t *testing.T) { diff --git a/internal/gitaly/service/ref/util.go b/internal/gitaly/service/ref/util.go index e0a080235d75e4adc2693cf1cafbe46f0c0b3f10..21bd250b1e37c6c8efa4d855e88f14375e1a5fe5 100644 --- a/internal/gitaly/service/ref/util.go +++ b/internal/gitaly/service/ref/util.go @@ -10,12 +10,12 @@ import ( "strings" "syscall" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/lines" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/lines" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) var localBranchFormatFields = []string{"%(refname)", "%(objectname)"} diff --git a/internal/gitaly/service/remote/find_remote_repository.go b/internal/gitaly/service/remote/find_remote_repository.go index 40e73125d2424deb0c0062f25b941ee953d3de87..1ff1587d4e7638e3cfce0748350b83ac7cd04911 100644 --- a/internal/gitaly/service/remote/find_remote_repository.go +++ b/internal/gitaly/service/remote/find_remote_repository.go @@ -4,10 +4,10 @@ import ( "bytes" "context" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) FindRemoteRepository(ctx context.Context, req *gitalypb.FindRemoteRepositoryRequest) (*gitalypb.FindRemoteRepositoryResponse, error) { diff --git a/internal/gitaly/service/remote/find_remote_repository_test.go b/internal/gitaly/service/remote/find_remote_repository_test.go index ea0eebe91a334e2a3e0264805530ba01f8c601ea..9f28c61cdd0cd27cc412f4a62a658566c37364d0 100644 --- a/internal/gitaly/service/remote/find_remote_repository_test.go +++ b/internal/gitaly/service/remote/find_remote_repository_test.go @@ -7,10 +7,10 @@ import ( "path/filepath" "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestFindRemoteRepository(t *testing.T) { diff --git a/internal/gitaly/service/remote/find_remote_root_ref.go b/internal/gitaly/service/remote/find_remote_root_ref.go index a16650b02021c5582f289e65d1a28469de2577d5..9350f24bb4d0ad13bcf96b4581ea5826f4c71fd8 100644 --- a/internal/gitaly/service/remote/find_remote_root_ref.go +++ b/internal/gitaly/service/remote/find_remote_root_ref.go @@ -6,10 +6,10 @@ import ( "fmt" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) const headPrefix = "HEAD branch: " 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 c7b65702d4969dc504f840d36f220a732ddbe936..7231743143a8b28cfd14605f3a37150e31976cc9 100644 --- a/internal/gitaly/service/remote/find_remote_root_ref_test.go +++ b/internal/gitaly/service/remote/find_remote_root_ref_test.go @@ -7,14 +7,14 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/remote/server.go b/internal/gitaly/service/remote/server.go index 0c2f25b3076bfc00b7d457d8e88f3a0a0a526acc..cfa4b7192809a5fe18dbf1ba7959e71bdab50f14 100644 --- a/internal/gitaly/service/remote/server.go +++ b/internal/gitaly/service/remote/server.go @@ -1,15 +1,15 @@ package remote import ( - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/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 75a1dc1dd48f9f15942ae78fe99dc9e83050252e..54eed03b62f6b8fde9566b9d201fe00b9980cfd0 100644 --- a/internal/gitaly/service/remote/testhelper_test.go +++ b/internal/gitaly/service/remote/testhelper_test.go @@ -4,13 +4,13 @@ import ( "context" "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/repository" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/repository" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) diff --git a/internal/gitaly/service/remote/update_remote_mirror.go b/internal/gitaly/service/remote/update_remote_mirror.go index bfb4ba4493751a6deec20b32ab4b4b9fab0eb1a0..6e51371197b251a8a5ced374defec890057b6d4d 100644 --- a/internal/gitaly/service/remote/update_remote_mirror.go +++ b/internal/gitaly/service/remote/update_remote_mirror.go @@ -8,13 +8,13 @@ import ( "regexp" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) const ( diff --git a/internal/gitaly/service/remote/update_remote_mirror_test.go b/internal/gitaly/service/remote/update_remote_mirror_test.go index 836e3d4880274b212bbb166b88714672dfaa3e30..8fb83cc47d7cb66201e66daace6991f04ac73362 100644 --- a/internal/gitaly/service/remote/update_remote_mirror_test.go +++ b/internal/gitaly/service/remote/update_remote_mirror_test.go @@ -8,21 +8,21 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - repositorysvc "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/repository" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + repositorysvc "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/repository" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/repository/archive.go b/internal/gitaly/service/repository/archive.go index 50ae8917446b587691b3bb23c523ad62b34e0573..13a6fad156aac9099efff6f65b22e4c77c68579f 100644 --- a/internal/gitaly/service/repository/archive.go +++ b/internal/gitaly/service/repository/archive.go @@ -9,15 +9,15 @@ import ( "os" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/smudge" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/smudge" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" "google.golang.org/protobuf/proto" ) diff --git a/internal/gitaly/service/repository/archive_test.go b/internal/gitaly/service/repository/archive_test.go index cb6e7952a691e8ac5ede7f9740a4c37a7e6dd85c..7c2a55d1a35c37bea2783519456ea8ce9d88c747 100644 --- a/internal/gitaly/service/repository/archive_test.go +++ b/internal/gitaly/service/repository/archive_test.go @@ -13,20 +13,20 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/smudge" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitlab" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/smudge" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitlab" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" "gitlab.com/gitlab-org/labkit/correlation" ) diff --git a/internal/gitaly/service/repository/backup_repository.go b/internal/gitaly/service/repository/backup_repository.go index 3ac8b135b214bde6e5ae19859b20491012df89c0..f9f526541bac98f03ff358da1e6ca3c5220c60db 100644 --- a/internal/gitaly/service/repository/backup_repository.go +++ b/internal/gitaly/service/repository/backup_repository.go @@ -5,10 +5,10 @@ import ( "errors" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/backup" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/backup" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // BackupRepository creates a full or incremental backup streamed directly to object-storage. diff --git a/internal/gitaly/service/repository/backup_repository_test.go b/internal/gitaly/service/repository/backup_repository_test.go index aea0da26b626fe33e204a9ea4a71dfd764d84da9..80ef3abd922dc568d85ec7a446c4eb6581fcff97 100644 --- a/internal/gitaly/service/repository/backup_repository_test.go +++ b/internal/gitaly/service/repository/backup_repository_test.go @@ -8,15 +8,15 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/backup" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/backup" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestServerBackupRepository(t *testing.T) { diff --git a/internal/gitaly/service/repository/bundle_uri.go b/internal/gitaly/service/repository/bundle_uri.go index fdc22ebf014c0ff91317a9a0722ef17863ef04bb..bc33d40c83699837cb7ffae59821fbfd32574dec 100644 --- a/internal/gitaly/service/repository/bundle_uri.go +++ b/internal/gitaly/service/repository/bundle_uri.go @@ -3,8 +3,8 @@ package repository import ( "context" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // GenerateBundleURI generates a bundle on the server for bundle-URI use. diff --git a/internal/gitaly/service/repository/bundle_uri_test.go b/internal/gitaly/service/repository/bundle_uri_test.go index 8edaa96844b34fcdf1eddad9dafb247a445c0d1a..963de47c67a1be2df81269ac38f54f5dfa45adab 100644 --- a/internal/gitaly/service/repository/bundle_uri_test.go +++ b/internal/gitaly/service/repository/bundle_uri_test.go @@ -7,14 +7,14 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/bundleuri" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/bundleuri" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestServer_GenerateBundleURI(t *testing.T) { diff --git a/internal/gitaly/service/repository/calculate_checksum.go b/internal/gitaly/service/repository/calculate_checksum.go index 7623a761aadce0dac5fb6cdad81c9fd037ee5b4f..013bbc4747e98d26132773f85fbef1c3427052c9 100644 --- a/internal/gitaly/service/repository/calculate_checksum.go +++ b/internal/gitaly/service/repository/calculate_checksum.go @@ -7,10 +7,10 @@ import ( "encoding/hex" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) CalculateChecksum(ctx context.Context, in *gitalypb.CalculateChecksumRequest) (*gitalypb.CalculateChecksumResponse, error) { diff --git a/internal/gitaly/service/repository/calculate_checksum_test.go b/internal/gitaly/service/repository/calculate_checksum_test.go index 9505687f3b94e4a2e770a7c54955e99f7895a2fa..1e14cd0f94bfe2e6664164d8f739871b8e9d7f53 100644 --- a/internal/gitaly/service/repository/calculate_checksum_test.go +++ b/internal/gitaly/service/repository/calculate_checksum_test.go @@ -10,13 +10,13 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/repository/config.go b/internal/gitaly/service/repository/config.go index f1ce785cff6f4249ccc5ac80bc149b85de70c3ef..670a71c6bb9c022c127f1aa0e8aecf31e12779f2 100644 --- a/internal/gitaly/service/repository/config.go +++ b/internal/gitaly/service/repository/config.go @@ -5,10 +5,10 @@ import ( "os" "path/filepath" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) // GetConfig reads the repository's gitconfig file and returns its contents. diff --git a/internal/gitaly/service/repository/config_test.go b/internal/gitaly/service/repository/config_test.go index cbd58c01e66316927ff672ec24244941dfccff5a..1b9747421d02d11795576bbb15bb007c5419a334 100644 --- a/internal/gitaly/service/repository/config_test.go +++ b/internal/gitaly/service/repository/config_test.go @@ -9,13 +9,13 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/repository/create_bundle.go b/internal/gitaly/service/repository/create_bundle.go index d3d89a597024356927d69c00c47191fc11f8d870..071ca159b364927e2bcba6159803dc93dfdfde6d 100644 --- a/internal/gitaly/service/repository/create_bundle.go +++ b/internal/gitaly/service/repository/create_bundle.go @@ -1,10 +1,10 @@ package repository import ( - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) func (s *server) CreateBundle(req *gitalypb.CreateBundleRequest, stream gitalypb.RepositoryService_CreateBundleServer) error { diff --git a/internal/gitaly/service/repository/create_bundle_from_ref_list.go b/internal/gitaly/service/repository/create_bundle_from_ref_list.go index f5b13b6a1aa24199beaeec808aaa0ab5284ea624..b192b4f52d716d9821ad70aac0115b423371c9fb 100644 --- a/internal/gitaly/service/repository/create_bundle_from_ref_list.go +++ b/internal/gitaly/service/repository/create_bundle_from_ref_list.go @@ -4,11 +4,11 @@ import ( "bytes" "errors" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) func (s *server) CreateBundleFromRefList(stream gitalypb.RepositoryService_CreateBundleFromRefListServer) error { diff --git a/internal/gitaly/service/repository/create_bundle_from_ref_list_test.go b/internal/gitaly/service/repository/create_bundle_from_ref_list_test.go index cccded0f9d1310de154c8ca23f73125f24861771..1e1475f3f6b65aa200791f6302230ce9bb1e9661 100644 --- a/internal/gitaly/service/repository/create_bundle_from_ref_list_test.go +++ b/internal/gitaly/service/repository/create_bundle_from_ref_list_test.go @@ -9,14 +9,14 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/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 ae00d685b7cca816cf5273b73c6cbe2e7819ff6b..1137f0b4d080404cead120f8e88e7fd45cbee587 100644 --- a/internal/gitaly/service/repository/create_bundle_test.go +++ b/internal/gitaly/service/repository/create_bundle_test.go @@ -8,15 +8,15 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) func TestCreateBundle_successful(t *testing.T) { diff --git a/internal/gitaly/service/repository/create_fork.go b/internal/gitaly/service/repository/create_fork.go index 779455278b9e9b418e84af545ab129c025b0e918..85cba53675cec87736b2121ff38f9a2310e67678 100644 --- a/internal/gitaly/service/repository/create_fork.go +++ b/internal/gitaly/service/repository/create_fork.go @@ -5,13 +5,13 @@ import ( "fmt" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/repoutil" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/repoutil" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) CreateFork(ctx context.Context, req *gitalypb.CreateForkRequest) (*gitalypb.CreateForkResponse, error) { diff --git a/internal/gitaly/service/repository/create_fork_test.go b/internal/gitaly/service/repository/create_fork_test.go index 2b58184f8dc130f18c5995e7ad412e99ac73f03a..b90c5e01f155dbc343c34c14694b58576a531109 100644 --- a/internal/gitaly/service/repository/create_fork_test.go +++ b/internal/gitaly/service/repository/create_fork_test.go @@ -7,16 +7,16 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - gitalyx509 "gitlab.com/gitlab-org/gitaly/v16/internal/x509" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + gitalyx509 "gitlab.com/gitlab-org/gitaly/v17/internal/x509" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestCreateFork_successful(t *testing.T) { diff --git a/internal/gitaly/service/repository/create_repository.go b/internal/gitaly/service/repository/create_repository.go index 896dfed0773537f6c5310602e68f00ca69b24fce..17e174e68138c1169c64d1411af01a5cb1bb1ec1 100644 --- a/internal/gitaly/service/repository/create_repository.go +++ b/internal/gitaly/service/repository/create_repository.go @@ -3,11 +3,11 @@ package repository import ( "context" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/repoutil" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/repoutil" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) CreateRepository(ctx context.Context, req *gitalypb.CreateRepositoryRequest) (*gitalypb.CreateRepositoryResponse, error) { diff --git a/internal/gitaly/service/repository/create_repository_from_bundle.go b/internal/gitaly/service/repository/create_repository_from_bundle.go index 0306d13d6c77f039f8dd93605fc05c0d219889f6..6c529c10f85a52f13890bd5f76e1b8d33ee0fe57 100644 --- a/internal/gitaly/service/repository/create_repository_from_bundle.go +++ b/internal/gitaly/service/repository/create_repository_from_bundle.go @@ -1,11 +1,11 @@ package repository import ( - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/repoutil" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/repoutil" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) // CreateRepositoryFromBundle creates a Git repository at the specified storage and path, if it does diff --git a/internal/gitaly/service/repository/create_repository_from_bundle_test.go b/internal/gitaly/service/repository/create_repository_from_bundle_test.go index 9aac6b5e331bf4b8b40309b19d8828d77558f3b6..7e1ab5b3721e1bfba49141adf8dc02e3002ff77b 100644 --- a/internal/gitaly/service/repository/create_repository_from_bundle_test.go +++ b/internal/gitaly/service/repository/create_repository_from_bundle_test.go @@ -8,20 +8,20 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/repository/create_repository_from_snapshot.go b/internal/gitaly/service/repository/create_repository_from_snapshot.go index ae6f56a2409670b082be704a5bd5c28ec79edf74..1664a4361acf06f406ece6a2f63f89e0b6a1583b 100644 --- a/internal/gitaly/service/repository/create_repository_from_snapshot.go +++ b/internal/gitaly/service/repository/create_repository_from_snapshot.go @@ -8,11 +8,11 @@ import ( "net/url" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/repoutil" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/repoutil" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "gitlab.com/gitlab-org/labkit/correlation" "gitlab.com/gitlab-org/labkit/tracing" ) diff --git a/internal/gitaly/service/repository/create_repository_from_snapshot_test.go b/internal/gitaly/service/repository/create_repository_from_snapshot_test.go index 08bb062c18f229cb16c61cd1ddb3aae9d584ff81..2cef76e89df2492ebcc6fad34be3a72120233440 100644 --- a/internal/gitaly/service/repository/create_repository_from_snapshot_test.go +++ b/internal/gitaly/service/repository/create_repository_from_snapshot_test.go @@ -14,14 +14,14 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/archive" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/archive" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/repository/create_repository_from_url.go b/internal/gitaly/service/repository/create_repository_from_url.go index 38f261849184aca593ba7f746ad8cf9e88d48940..d6db1e318553ddf00938ebff3f922e35e4a99b00 100644 --- a/internal/gitaly/service/repository/create_repository_from_url.go +++ b/internal/gitaly/service/repository/create_repository_from_url.go @@ -8,14 +8,14 @@ import ( "net/url" "regexp" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/repoutil" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/repoutil" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) var remoteNotFoundRegex = regexp.MustCompile(`fatal: repository '.*' not found`) diff --git a/internal/gitaly/service/repository/create_repository_from_url_test.go b/internal/gitaly/service/repository/create_repository_from_url_test.go index d15bfac473ebf3678fad31b366634be544a6ceb8..c1d82db688421c6565ddb279d3edee5ca90860ca 100644 --- a/internal/gitaly/service/repository/create_repository_from_url_test.go +++ b/internal/gitaly/service/repository/create_repository_from_url_test.go @@ -11,16 +11,16 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/repository/create_repository_test.go b/internal/gitaly/service/repository/create_repository_test.go index 0ec992b531065c5e42ce5c1ad8668a8359ff7666..36af2563006060c6435cc34de0dbe400e86d00a9 100644 --- a/internal/gitaly/service/repository/create_repository_test.go +++ b/internal/gitaly/service/repository/create_repository_test.go @@ -7,19 +7,19 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "golang.org/x/sys/unix" ) diff --git a/internal/gitaly/service/repository/fast_export.go b/internal/gitaly/service/repository/fast_export.go index 4997cb2657defc73e78ce99f2adb656ea313453e..920d729cfba6434232461e7fcc5f502f5eabcef6 100644 --- a/internal/gitaly/service/repository/fast_export.go +++ b/internal/gitaly/service/repository/fast_export.go @@ -5,11 +5,11 @@ import ( "errors" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) func (s *server) FastExport( diff --git a/internal/gitaly/service/repository/fast_export_test.go b/internal/gitaly/service/repository/fast_export_test.go index f430116f7a3a43cedf0db5a8a29d62f8686134c9..8b2efb5fe318c277b8af73113803af285cfb6be5 100644 --- a/internal/gitaly/service/repository/fast_export_test.go +++ b/internal/gitaly/service/repository/fast_export_test.go @@ -6,9 +6,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestFastExport(t *testing.T) { diff --git a/internal/gitaly/service/repository/fetch.go b/internal/gitaly/service/repository/fetch.go index 56a5d663dfd50178438ef24db92890a7460afd41..b33aae89ea8c2cb56a644499b074bc21ad1082d7 100644 --- a/internal/gitaly/service/repository/fetch.go +++ b/internal/gitaly/service/repository/fetch.go @@ -4,12 +4,12 @@ import ( "context" "errors" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/remoterepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/remoterepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func validateFetchSourceBranchRequest(ctx context.Context, locator storage.Locator, in *gitalypb.FetchSourceBranchRequest) error { diff --git a/internal/gitaly/service/repository/fetch_bundle.go b/internal/gitaly/service/repository/fetch_bundle.go index fbe60eadc1feb075afb176567cc715912ac35c6a..430f618d6ab00020954efde0d5b3c67905f16c85 100644 --- a/internal/gitaly/service/repository/fetch_bundle.go +++ b/internal/gitaly/service/repository/fetch_bundle.go @@ -1,10 +1,10 @@ package repository import ( - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) func (s *server) FetchBundle(stream gitalypb.RepositoryService_FetchBundleServer) error { diff --git a/internal/gitaly/service/repository/fetch_bundle_test.go b/internal/gitaly/service/repository/fetch_bundle_test.go index c39f37b919c20cece7f8516b479920b3a1365275..3c748da8b7c578394668799bcabde4585da41236 100644 --- a/internal/gitaly/service/repository/fetch_bundle_test.go +++ b/internal/gitaly/service/repository/fetch_bundle_test.go @@ -9,17 +9,17 @@ import ( "github.com/google/go-cmp/cmp" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) func TestServer_FetchBundle_success(t *testing.T) { diff --git a/internal/gitaly/service/repository/fetch_remote.go b/internal/gitaly/service/repository/fetch_remote.go index bf50ffd893d45794e4f15e0a284fc027c6604c4e..a0af3d84ec30d887578b85c7c21f9616e0bab4dc 100644 --- a/internal/gitaly/service/repository/fetch_remote.go +++ b/internal/gitaly/service/repository/fetch_remote.go @@ -7,13 +7,13 @@ import ( "strings" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/quarantine" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/quarantine" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) var changeTypes = map[gitcmd.RefUpdateType]bool{ diff --git a/internal/gitaly/service/repository/fetch_remote_test.go b/internal/gitaly/service/repository/fetch_remote_test.go index d38d3968da41b1a9d0efa63e705124fa68b39969..4f719dba4b31be88839ef96cc8595c6c39e44d3e 100644 --- a/internal/gitaly/service/repository/fetch_remote_test.go +++ b/internal/gitaly/service/repository/fetch_remote_test.go @@ -10,20 +10,20 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) const ( diff --git a/internal/gitaly/service/repository/fetch_test.go b/internal/gitaly/service/repository/fetch_test.go index b7106154f303ba976ee0280510831fdbebd178bc..23535e21dbfcd68c10ad870544c3116db2adaef5 100644 --- a/internal/gitaly/service/repository/fetch_test.go +++ b/internal/gitaly/service/repository/fetch_test.go @@ -5,17 +5,17 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestFetchSourceBranch(t *testing.T) { diff --git a/internal/gitaly/service/repository/file_attributes.go b/internal/gitaly/service/repository/file_attributes.go index 27ab187cdfe8b113ed39a7e7a00a6ef9429901cc..5e96223d5b466f864813d13e2ecde57630cd7689 100644 --- a/internal/gitaly/service/repository/file_attributes.go +++ b/internal/gitaly/service/repository/file_attributes.go @@ -4,11 +4,11 @@ import ( "context" "errors" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitattributes" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitattributes" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) GetFileAttributes(ctx context.Context, in *gitalypb.GetFileAttributesRequest) (*gitalypb.GetFileAttributesResponse, error) { diff --git a/internal/gitaly/service/repository/file_attributes_test.go b/internal/gitaly/service/repository/file_attributes_test.go index f553bb43d4fdc0783049e3e65686625b6742f151..997aa0c8da4811a3e529aa9390f9c632c508cd5b 100644 --- a/internal/gitaly/service/repository/file_attributes_test.go +++ b/internal/gitaly/service/repository/file_attributes_test.go @@ -3,10 +3,10 @@ package repository import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestGetFileAttributes(t *testing.T) { diff --git a/internal/gitaly/service/repository/fsck.go b/internal/gitaly/service/repository/fsck.go index a1ca0ba2a4d7d3647aeef4054f190172ff34e1cf..4355fe0df16648711e57aa826036980356714f03 100644 --- a/internal/gitaly/service/repository/fsck.go +++ b/internal/gitaly/service/repository/fsck.go @@ -4,9 +4,9 @@ import ( "context" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/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 712fafe215ff16a7003f89c28589a40d97dae0cd..a84137d956b66cad81a9880d72851e1b2f1e1a33 100644 --- a/internal/gitaly/service/repository/fsck_test.go +++ b/internal/gitaly/service/repository/fsck_test.go @@ -7,12 +7,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestFsck(t *testing.T) { diff --git a/internal/gitaly/service/repository/get_custom_hooks.go b/internal/gitaly/service/repository/get_custom_hooks.go index 6ee490ed482e62c059cf45fb1689fbcaec96b092..5d25e134e2297b5d7ceb23af84a2aaf5737b3155 100644 --- a/internal/gitaly/service/repository/get_custom_hooks.go +++ b/internal/gitaly/service/repository/get_custom_hooks.go @@ -3,10 +3,10 @@ package repository import ( "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/repoutil" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/repoutil" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) // GetCustomHooks fetches the git hooks for a repository. The hooks are sent in diff --git a/internal/gitaly/service/repository/get_custom_hooks_test.go b/internal/gitaly/service/repository/get_custom_hooks_test.go index e14a040d98da0967b76056b81a1ebdcea3e55206..df198cb3e549856135e162f8790b549a12d4d769 100644 --- a/internal/gitaly/service/repository/get_custom_hooks_test.go +++ b/internal/gitaly/service/repository/get_custom_hooks_test.go @@ -11,15 +11,15 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/archive" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/repoutil" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/archive" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/repoutil" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) func TestGetCustomHooks_successful(t *testing.T) { diff --git a/internal/gitaly/service/repository/has_local_branches.go b/internal/gitaly/service/repository/has_local_branches.go index e43f43015e10d7b87650026d7f005d9b57f65721..256ea2d0bbdf4b6c41895b87a13fe826dcbfe32b 100644 --- a/internal/gitaly/service/repository/has_local_branches.go +++ b/internal/gitaly/service/repository/has_local_branches.go @@ -3,8 +3,8 @@ package repository import ( "context" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) HasLocalBranches(ctx context.Context, in *gitalypb.HasLocalBranchesRequest) (*gitalypb.HasLocalBranchesResponse, error) { diff --git a/internal/gitaly/service/repository/has_local_branches_test.go b/internal/gitaly/service/repository/has_local_branches_test.go index b9eb49db6c580b2c8a644ddd489fd93c11f9a827..888ddb56dd7f5004b509be23410c4759a9048eb9 100644 --- a/internal/gitaly/service/repository/has_local_branches_test.go +++ b/internal/gitaly/service/repository/has_local_branches_test.go @@ -4,11 +4,11 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestHasLocalBranches_successful(t *testing.T) { diff --git a/internal/gitaly/service/repository/info_attributes.go b/internal/gitaly/service/repository/info_attributes.go index 31a85409beb918a523c8889c6b863f51f662457b..e51cbe6d11e1d4ebb36b19f9b178348e1b33ab9a 100644 --- a/internal/gitaly/service/repository/info_attributes.go +++ b/internal/gitaly/service/repository/info_attributes.go @@ -6,10 +6,10 @@ import ( "io" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) func (s *server) GetInfoAttributes(in *gitalypb.GetInfoAttributesRequest, stream gitalypb.RepositoryService_GetInfoAttributesServer) (returnedErr error) { diff --git a/internal/gitaly/service/repository/info_attributes_test.go b/internal/gitaly/service/repository/info_attributes_test.go index 7ad21dd1fbb0a098407d4f0b28d23740c9708bc3..84bcf527ee09c6c0ab096ad49195a7dd8c232b01 100644 --- a/internal/gitaly/service/repository/info_attributes_test.go +++ b/internal/gitaly/service/repository/info_attributes_test.go @@ -5,12 +5,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) func TestGetInfoAttributesExisting(t *testing.T) { diff --git a/internal/gitaly/service/repository/license.go b/internal/gitaly/service/repository/license.go index efff64ea691af0692f6f57e719ffd7f34443ef7c..85a1f69a4731101d89d0a4d05848d6423162d5f9 100644 --- a/internal/gitaly/service/repository/license.go +++ b/internal/gitaly/service/repository/license.go @@ -13,13 +13,13 @@ import ( "github.com/go-enry/go-license-detector/v4/licensedb" "github.com/go-enry/go-license-detector/v4/licensedb/api" "github.com/go-enry/go-license-detector/v4/licensedb/filer" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/tracing" - "gitlab.com/gitlab-org/gitaly/v16/internal/unarycache" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/tracing" + "gitlab.com/gitlab-org/gitaly/v17/internal/unarycache" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // The `github.com/go-enry/go-license-detector` package uses https://spdx.org/licenses/ diff --git a/internal/gitaly/service/repository/license_test.go b/internal/gitaly/service/repository/license_test.go index bc9138a4eb2584baa6b4693811d7cbcb43daf5a4..bb45f28faadd966e240fd57265e9c918025ea076 100644 --- a/internal/gitaly/service/repository/license_test.go +++ b/internal/gitaly/service/repository/license_test.go @@ -5,13 +5,13 @@ import ( "github.com/go-enry/go-license-detector/v4/licensedb" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) const ( diff --git a/internal/gitaly/service/repository/merge_base.go b/internal/gitaly/service/repository/merge_base.go index 570383d9dc03870cba09a7969b0412ee59173b77..02a93cbc67defcb9345e5d82bb22d430640e3ace 100644 --- a/internal/gitaly/service/repository/merge_base.go +++ b/internal/gitaly/service/repository/merge_base.go @@ -4,10 +4,10 @@ import ( "context" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) FindMergeBase(ctx context.Context, req *gitalypb.FindMergeBaseRequest) (*gitalypb.FindMergeBaseResponse, error) { diff --git a/internal/gitaly/service/repository/merge_base_test.go b/internal/gitaly/service/repository/merge_base_test.go index 9d436c9dd6f7f4d00813f996c3f1a53dbdda4263..1b26832ef4956e32a9b1e6b1ee722b39bdf15a34 100644 --- a/internal/gitaly/service/repository/merge_base_test.go +++ b/internal/gitaly/service/repository/merge_base_test.go @@ -3,11 +3,11 @@ package repository import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestFindMergeBase(t *testing.T) { diff --git a/internal/gitaly/service/repository/object_format.go b/internal/gitaly/service/repository/object_format.go index cb6b8bcc6570e2aa122bc83bd5428fd6c592869e..ced2d31fcf10db17d461668d554c3792aca78216 100644 --- a/internal/gitaly/service/repository/object_format.go +++ b/internal/gitaly/service/repository/object_format.go @@ -3,8 +3,8 @@ package repository import ( "context" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // ObjectFormat determines the object format of the Git repository. diff --git a/internal/gitaly/service/repository/object_format_test.go b/internal/gitaly/service/repository/object_format_test.go index 27308a8b33e8fd788ec4a7261072f84dd1c74344..8713799a6a62f6bd4e8fb8ef8e358736dec22d8b 100644 --- a/internal/gitaly/service/repository/object_format_test.go +++ b/internal/gitaly/service/repository/object_format_test.go @@ -7,12 +7,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestObjectFormat(t *testing.T) { diff --git a/internal/gitaly/service/repository/objects_size.go b/internal/gitaly/service/repository/objects_size.go index e636172abb6e42a961e3af1bba37a93c24556b35..b83ab9344325b9e94d2e38986c6f2a020bcd8419 100644 --- a/internal/gitaly/service/repository/objects_size.go +++ b/internal/gitaly/service/repository/objects_size.go @@ -9,10 +9,10 @@ import ( "strconv" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // revisionNotFoundRegexp is used to parse the standard error of git-rev-list(1) in order to figure out whether the diff --git a/internal/gitaly/service/repository/objects_size_test.go b/internal/gitaly/service/repository/objects_size_test.go index 9ddeb1c19a74175b61d8aa07b2ee942b94d69a18..0c0da8236e515fa8c6f1aa98fffcf9fd12f2538e 100644 --- a/internal/gitaly/service/repository/objects_size_test.go +++ b/internal/gitaly/service/repository/objects_size_test.go @@ -7,13 +7,13 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestObjectsSize(t *testing.T) { diff --git a/internal/gitaly/service/repository/optimize.go b/internal/gitaly/service/repository/optimize.go index 8424e2be8947e53090bb70e89c8491f10da41e9e..49c53bd618f439ccad451549d5a7d6dcfcaf34a1 100644 --- a/internal/gitaly/service/repository/optimize.go +++ b/internal/gitaly/service/repository/optimize.go @@ -3,11 +3,11 @@ package repository import ( "context" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping" - housekeepingmgr "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping/manager" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping" + housekeepingmgr "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping/manager" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) OptimizeRepository(ctx context.Context, in *gitalypb.OptimizeRepositoryRequest) (*gitalypb.OptimizeRepositoryResponse, error) { diff --git a/internal/gitaly/service/repository/optimize_test.go b/internal/gitaly/service/repository/optimize_test.go index 74a3e296edf4aa26613584e7ef42a0494b6e0b96..6fc3cb95fa97d4fbcaaa6601b6cf06baa5444e24 100644 --- a/internal/gitaly/service/repository/optimize_test.go +++ b/internal/gitaly/service/repository/optimize_test.go @@ -11,19 +11,19 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping" - housekeepingmgr "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping/manager" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/transactiontest" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping" + housekeepingmgr "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping/manager" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/transactiontest" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestOptimizeRepository(t *testing.T) { diff --git a/internal/gitaly/service/repository/prune_unreachable_objects.go b/internal/gitaly/service/repository/prune_unreachable_objects.go index 5937c39f72719532476d9c30e5a79def800fed0f..4cf8fd73276bb41e67af5c4ef80080c32798ff59 100644 --- a/internal/gitaly/service/repository/prune_unreachable_objects.go +++ b/internal/gitaly/service/repository/prune_unreachable_objects.go @@ -5,12 +5,12 @@ import ( "fmt" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping" - housekeepingcfg "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping" + housekeepingcfg "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // PruneUnreachableObjects prunes objects which aren't reachable from any of its references. To diff --git a/internal/gitaly/service/repository/prune_unreachable_objects_test.go b/internal/gitaly/service/repository/prune_unreachable_objects_test.go index aee53f7043b9f847ac1f81ac3450aac4ba8a9433..16cd5459b863a5a78974c71fe28c5aaba6f95a94 100644 --- a/internal/gitaly/service/repository/prune_unreachable_objects_test.go +++ b/internal/gitaly/service/repository/prune_unreachable_objects_test.go @@ -7,14 +7,14 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestPruneUnreachableObjects(t *testing.T) { diff --git a/internal/gitaly/service/repository/raw_changes.go b/internal/gitaly/service/repository/raw_changes.go index 353999b3d3710526488fbcf02e1dbf375562d42f..20956925a7a59f7e018f156408c7071ecfdfbe53 100644 --- a/internal/gitaly/service/repository/raw_changes.go +++ b/internal/gitaly/service/repository/raw_changes.go @@ -8,13 +8,13 @@ import ( "regexp" "strconv" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/rawdiff" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/rawdiff" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/proto" ) diff --git a/internal/gitaly/service/repository/raw_changes_test.go b/internal/gitaly/service/repository/raw_changes_test.go index 0bcae3e9b99ce7cb974532000eb656300cd49b73..6ac9cdc5517cb046b153524f02688d7fff7e9696 100644 --- a/internal/gitaly/service/repository/raw_changes_test.go +++ b/internal/gitaly/service/repository/raw_changes_test.go @@ -8,11 +8,11 @@ import ( "unicode/utf8" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestGetRawChanges(t *testing.T) { diff --git a/internal/gitaly/service/repository/redirecting_test_server_test.go b/internal/gitaly/service/repository/redirecting_test_server_test.go index dd01e6a12e2543e26dba2488fa956c0bc4c5484d..9eb079bd545f8cb64eba84856825403241586142 100644 --- a/internal/gitaly/service/repository/redirecting_test_server_test.go +++ b/internal/gitaly/service/repository/redirecting_test_server_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) const redirectURL = "/redirect_url" diff --git a/internal/gitaly/service/repository/remove.go b/internal/gitaly/service/repository/remove.go index 89fa1081cd7a999a7a43a5c46c6a8a6a49add978..39b90dfb98c7e71c09a24b36a07b04f9eb8536c0 100644 --- a/internal/gitaly/service/repository/remove.go +++ b/internal/gitaly/service/repository/remove.go @@ -3,10 +3,10 @@ package repository import ( "context" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/repoutil" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/repoutil" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/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 23cedbc97ed27283fad5a2e985b63ae52762da9c..4699ea63dd5ee58c3ca9bba2f44286ebdf8fb6bf 100644 --- a/internal/gitaly/service/repository/remove_test.go +++ b/internal/gitaly/service/repository/remove_test.go @@ -5,13 +5,13 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestRemoveRepository(t *testing.T) { diff --git a/internal/gitaly/service/repository/replicate.go b/internal/gitaly/service/repository/replicate.go index 3fd7484dfbd1b28db28bb5007f374ca0a19a48ba..b248533f0c0888ce5c44dc3c34302165d00d33b2 100644 --- a/internal/gitaly/service/repository/replicate.go +++ b/internal/gitaly/service/repository/replicate.go @@ -10,22 +10,22 @@ import ( "path/filepath" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/remoterepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/repoutil" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/safe" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/tempdir" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/remoterepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/repoutil" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/safe" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/tempdir" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/repository/replicate_test.go b/internal/gitaly/service/repository/replicate_test.go index 3f601d0b7a4637c03ac3ee10c56040ba10547b89..c394acc886c5a5db35cb22167882ff3173fbf1ab 100644 --- a/internal/gitaly/service/repository/replicate_test.go +++ b/internal/gitaly/service/repository/replicate_test.go @@ -14,26 +14,26 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - gitalyhook "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/repoutil" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + gitalyhook "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/repoutil" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/status" "google.golang.org/protobuf/proto" diff --git a/internal/gitaly/service/repository/repository_exists.go b/internal/gitaly/service/repository/repository_exists.go index 284e2eed74a6fdde54dad4c68291c58bea7c77a1..a682a62f9eb11045dcf3459add133562e3379df3 100644 --- a/internal/gitaly/service/repository/repository_exists.go +++ b/internal/gitaly/service/repository/repository_exists.go @@ -4,8 +4,8 @@ import ( "context" "errors" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) RepositoryExists(ctx context.Context, in *gitalypb.RepositoryExistsRequest) (*gitalypb.RepositoryExistsResponse, error) { diff --git a/internal/gitaly/service/repository/repository_exists_test.go b/internal/gitaly/service/repository/repository_exists_test.go index d7cf08204326cf57fc07947389d24048dcc2cd1c..86a1de96295b9b1511372d7e1135548ad2d89920 100644 --- a/internal/gitaly/service/repository/repository_exists_test.go +++ b/internal/gitaly/service/repository/repository_exists_test.go @@ -5,12 +5,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestRepositoryExists(t *testing.T) { diff --git a/internal/gitaly/service/repository/repository_info.go b/internal/gitaly/service/repository/repository_info.go index ed9484aace33b5c556efc6c6807162b9f704dbf3..7ae791602692523f70a38204715a31b00a80a17d 100644 --- a/internal/gitaly/service/repository/repository_info.go +++ b/internal/gitaly/service/repository/repository_info.go @@ -4,10 +4,10 @@ import ( "context" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) RepositoryInfo( diff --git a/internal/gitaly/service/repository/repository_info_test.go b/internal/gitaly/service/repository/repository_info_test.go index 82d2a5f5cbe3434d6e8cb5aac5d178413d66a61b..a895545f22163f4fd420a5b54fab38947581e6d7 100644 --- a/internal/gitaly/service/repository/repository_info_test.go +++ b/internal/gitaly/service/repository/repository_info_test.go @@ -10,13 +10,13 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestRepositoryInfo(t *testing.T) { diff --git a/internal/gitaly/service/repository/restore_repository.go b/internal/gitaly/service/repository/restore_repository.go index 1ff63471024cec00dbc8f1c298a7a6a4e102d12a..e24fd9fdd68fda0bf8fd351f987ffdc20ea48568 100644 --- a/internal/gitaly/service/repository/restore_repository.go +++ b/internal/gitaly/service/repository/restore_repository.go @@ -5,10 +5,10 @@ import ( "errors" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/backup" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/backup" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) RestoreRepository(ctx context.Context, in *gitalypb.RestoreRepositoryRequest) (*gitalypb.RestoreRepositoryResponse, error) { diff --git a/internal/gitaly/service/repository/restore_repository_test.go b/internal/gitaly/service/repository/restore_repository_test.go index 90faef013ab7bb427f27bbf4858e7d42e0ad86d5..2b311099bb6efecad961e3af348d1e95099a4786 100644 --- a/internal/gitaly/service/repository/restore_repository_test.go +++ b/internal/gitaly/service/repository/restore_repository_test.go @@ -5,14 +5,14 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/backup" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/backup" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestRestoreRepository(t *testing.T) { diff --git a/internal/gitaly/service/repository/search_files.go b/internal/gitaly/service/repository/search_files.go index 76b29b8d8e176a5c81cefa624c08d21c8a550ed9..53bcbc13b43ae855df7072bff42327d8d47b9371 100644 --- a/internal/gitaly/service/repository/search_files.go +++ b/internal/gitaly/service/repository/search_files.go @@ -9,14 +9,14 @@ import ( "io" "regexp" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) const ( diff --git a/internal/gitaly/service/repository/search_files_test.go b/internal/gitaly/service/repository/search_files_test.go index 21998acb83c28f1db6c87e1e209d3fd2d3480324..e0332d01fa79f9cf220ee2e43f1eaa5bc17e6e97 100644 --- a/internal/gitaly/service/repository/search_files_test.go +++ b/internal/gitaly/service/repository/search_files_test.go @@ -8,11 +8,11 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestSearchFilesByContent(t *testing.T) { diff --git a/internal/gitaly/service/repository/server.go b/internal/gitaly/service/repository/server.go index b26e3fb8148a0acca065104dca71f812b27b2994..113995a42485191ae3c6ea3c7c0109af5d53bbbb 100644 --- a/internal/gitaly/service/repository/server.go +++ b/internal/gitaly/service/repository/server.go @@ -3,25 +3,25 @@ package repository import ( "context" - "gitlab.com/gitlab-org/gitaly/v16/internal/backup" - "gitlab.com/gitlab-org/gitaly/v16/internal/bundleuri" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - housekeepingmgr "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping/manager" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/quarantine" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/counter" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/migration" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/unarycache" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/backup" + "gitlab.com/gitlab-org/gitaly/v17/internal/bundleuri" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + housekeepingmgr "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping/manager" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/quarantine" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/counter" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/migration" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/unarycache" + "gitlab.com/gitlab-org/gitaly/v17/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 8cbcb1296c6db143893f214fd29276244e1f2afb..56412382c7c5fdcf439431f6c928d6e78f2971be 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/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" "google.golang.org/grpc/metadata" ) diff --git a/internal/gitaly/service/repository/set_custom_hooks.go b/internal/gitaly/service/repository/set_custom_hooks.go index e96fa210eb9c9a9c6d4142bdaa6758fd75baa8de..c39654c8c6f47b7a7341c828fdc11afe121ad85a 100644 --- a/internal/gitaly/service/repository/set_custom_hooks.go +++ b/internal/gitaly/service/repository/set_custom_hooks.go @@ -1,10 +1,10 @@ package repository import ( - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/repoutil" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/repoutil" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) // SetCustomHooks sets the git hooks for a repository. The hooks are sent in a diff --git a/internal/gitaly/service/repository/set_custom_hooks_test.go b/internal/gitaly/service/repository/set_custom_hooks_test.go index 4295ccf23fa1b9c4b69fcc7d380a100890c7b752..bbf65ebf063aa877f6dfaabe2ead69e4dde297df 100644 --- a/internal/gitaly/service/repository/set_custom_hooks_test.go +++ b/internal/gitaly/service/repository/set_custom_hooks_test.go @@ -11,21 +11,21 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/archive" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/repoutil" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/archive" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/repoutil" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/repository/size.go b/internal/gitaly/service/repository/size.go index 94a2c01865796a1afbd7bae78c31bd9c12c459c0..633d0e62e1a233225cadbe377d9c9012e7fccdc3 100644 --- a/internal/gitaly/service/repository/size.go +++ b/internal/gitaly/service/repository/size.go @@ -8,8 +8,8 @@ import ( "os" "path/filepath" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // RepositorySize returns the size of the specified repository in kibibytes. By default, this diff --git a/internal/gitaly/service/repository/size_test.go b/internal/gitaly/service/repository/size_test.go index 4ae283c167b3c23d9ee35e3d9a70ef5aaecf3957..e557cbd8118090254e2a1809b4d68fe094d36b0d 100644 --- a/internal/gitaly/service/repository/size_test.go +++ b/internal/gitaly/service/repository/size_test.go @@ -8,16 +8,16 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/quarantine" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/quarantine" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/metadata" "google.golang.org/protobuf/proto" ) diff --git a/internal/gitaly/service/repository/snapshot.go b/internal/gitaly/service/repository/snapshot.go index 5b4a118e5fc10dc114f95a6fa798d5ce57b2f36f..44e5c45eea8dfa37a1ce7368d042e7526ded9f00 100644 --- a/internal/gitaly/service/repository/snapshot.go +++ b/internal/gitaly/service/repository/snapshot.go @@ -3,10 +3,10 @@ package repository import ( "errors" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) func (s *server) GetSnapshot(in *gitalypb.GetSnapshotRequest, stream gitalypb.RepositoryService_GetSnapshotServer) error { diff --git a/internal/gitaly/service/repository/snapshot_test.go b/internal/gitaly/service/repository/snapshot_test.go index 4c4c226f8c7957ebe8730871914d57af47373d18..2230f90377d1eadb78fee19bbcaa69404affa131 100644 --- a/internal/gitaly/service/repository/snapshot_test.go +++ b/internal/gitaly/service/repository/snapshot_test.go @@ -13,15 +13,15 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/archive" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/archive" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) func TestGetSnapshot(t *testing.T) { diff --git a/internal/gitaly/service/repository/testhelper_test.go b/internal/gitaly/service/repository/testhelper_test.go index 39b618ce59a5a86e06ac1026154d22ec1ffbbfb0..66acd05f69303d1919a000734d272bdc74119590 100644 --- a/internal/gitaly/service/repository/testhelper_test.go +++ b/internal/gitaly/service/repository/testhelper_test.go @@ -6,21 +6,21 @@ import ( "github.com/sirupsen/logrus" "github.com/stretchr/testify/require" - gitalyauth "gitlab.com/gitlab-org/gitaly/v16/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/commit" - hookservice "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/objectpool" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/ref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/remote" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/ssh" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + gitalyauth "gitlab.com/gitlab-org/gitaly/v17/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/commit" + hookservice "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/objectpool" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/ref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/remote" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/ssh" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" ) diff --git a/internal/gitaly/service/repository/util.go b/internal/gitaly/service/repository/util.go index 916e06beeb6bf17fba042d052798b8a71012f1aa..b4d68f8c4c6c727031d5fc98ff79d173905ae1c0 100644 --- a/internal/gitaly/service/repository/util.go +++ b/internal/gitaly/service/repository/util.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" ) func (s *server) removeOriginInRepo(ctx context.Context, repository gitcmd.RepositoryExecutor) error { diff --git a/internal/gitaly/service/repository/write_ref.go b/internal/gitaly/service/repository/write_ref.go index 73362d25eb54d965eb125a2030018b12a51a1a58..82db15f6b0388826f8d63fc0e2eef00af3a4fc90 100644 --- a/internal/gitaly/service/repository/write_ref.go +++ b/internal/gitaly/service/repository/write_ref.go @@ -6,12 +6,12 @@ import ( "errors" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/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 08c5f417687314d3f408931775ae7f4a7906168d..bf270d8d0b21ad9218f7f0091f9cb563797c683e 100644 --- a/internal/gitaly/service/repository/write_ref_test.go +++ b/internal/gitaly/service/repository/write_ref_test.go @@ -6,18 +6,18 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestWriteRef(t *testing.T) { diff --git a/internal/gitaly/service/server/disk_stats.go b/internal/gitaly/service/server/disk_stats.go index 7efc0db37583d1d0f2363b03177fe1f27972da32..8d5892cf7c2ef1b2b0d50ab7cdce203b6ceb47f6 100644 --- a/internal/gitaly/service/server/disk_stats.go +++ b/internal/gitaly/service/server/disk_stats.go @@ -3,7 +3,7 @@ package server import ( "context" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/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 0e0668b1f566026f2f72f3f7d24bde900f1b278c..a6f05eacab5247ea27a9ca85a14c7935dea5b011 100644 --- a/internal/gitaly/service/server/disk_stats_test.go +++ b/internal/gitaly/service/server/disk_stats_test.go @@ -6,9 +6,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/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 4df03409bfd4b5765782eb234ae95b6cf2593d83..6f02f7e312c99216d97fcfc18c5b333533fbcfdb 100644 --- a/internal/gitaly/service/server/info.go +++ b/internal/gitaly/service/server/info.go @@ -4,12 +4,12 @@ import ( "context" "os" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mdfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode/permission" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/fstype" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/version" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mdfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode/permission" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/fstype" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/version" + "gitlab.com/gitlab-org/gitaly/v17/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 1f215b2e2a584ac45d374004e19e5bbe2557b88c..40f1ba40af5172f1065dcccdc742b7489768316a 100644 --- a/internal/gitaly/service/server/info_test.go +++ b/internal/gitaly/service/server/info_test.go @@ -5,17 +5,17 @@ import ( "testing" "github.com/stretchr/testify/require" - gitalyauth "gitlab.com/gitlab-org/gitaly/v16/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mdfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/internal/version" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + gitalyauth "gitlab.com/gitlab-org/gitaly/v17/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mdfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/version" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/credentials/insecure" diff --git a/internal/gitaly/service/server/readiness.go b/internal/gitaly/service/server/readiness.go index 60cb12bdb7eec4df42fd3ea72cdaef1c3198a55c..a532244d382b0e6bc156c6b4de372ddfd1a32d6f 100644 --- a/internal/gitaly/service/server/readiness.go +++ b/internal/gitaly/service/server/readiness.go @@ -3,7 +3,7 @@ package server import ( "context" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // ReadinessCheck is a stub that does nothing but exists to support single interface for gitaly diff --git a/internal/gitaly/service/server/server.go b/internal/gitaly/service/server/server.go index 0400a6c4e76d7b6bab6c46c486396642a4a51f4f..a4ea9f908bc7f323e19fe670d61efb5ae37557e2 100644 --- a/internal/gitaly/service/server/server.go +++ b/internal/gitaly/service/server/server.go @@ -1,11 +1,11 @@ package server import ( - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) type server struct { diff --git a/internal/gitaly/service/server/signature.go b/internal/gitaly/service/server/signature.go index dc38cb8f47d4dc2721e5ae7cc1862a306f9a9fe9..efddb764c3e9404f0537fafa298d7dad0c78b0da 100644 --- a/internal/gitaly/service/server/signature.go +++ b/internal/gitaly/service/server/signature.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/signature" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/signature" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // ServerSignature reponds with PublicKey used by Gitaly for commit signature diff --git a/internal/gitaly/service/server/signature_test.go b/internal/gitaly/service/server/signature_test.go index 01947762ec3513a0be2b89772f0213b6210f5979..7c4b0c5f6a5b10790952a073181f88d6ee5db16c 100644 --- a/internal/gitaly/service/server/signature_test.go +++ b/internal/gitaly/service/server/signature_test.go @@ -6,10 +6,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestServerSignature(t *testing.T) { diff --git a/internal/gitaly/service/server/storage_status_openbsd.go b/internal/gitaly/service/server/storage_status_openbsd.go index e7ff40a6a4650b8b24b6f81a103a28d54e7dccc4..15363ee9008c9ac3a3084a7613ad8c3943e28cb8 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/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/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 7f33adec8076dc528ecb6d99836f5b84d71072d0..1bfbe6e5a53b22e30fdd9250fba0f740959399a1 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/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "golang.org/x/sys/unix" ) diff --git a/internal/gitaly/service/server/testhelper_test.go b/internal/gitaly/service/server/testhelper_test.go index 7846a01f9d704d556661308a1a068606bb9a2243..ced620b38323d1b818fc0c9b8572c120e6829a09 100644 --- a/internal/gitaly/service/server/testhelper_test.go +++ b/internal/gitaly/service/server/testhelper_test.go @@ -3,7 +3,7 @@ package server import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/service/setup/register.go b/internal/gitaly/service/setup/register.go index 732cb31d8bb6dd5c23730ef0dba47bb43bd0c5da..af54f10cba3d7dbd22dfa1061a93ea07e3313cc3 100644 --- a/internal/gitaly/service/setup/register.go +++ b/internal/gitaly/service/setup/register.go @@ -4,27 +4,27 @@ import ( grpcprometheus "github.com/grpc-ecosystem/go-grpc-prometheus" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/server/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/analysis" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/blob" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/cleanup" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/commit" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/conflicts" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/diff" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/internalgitaly" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/objectpool" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/operations" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/partition" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/raft" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/ref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/remote" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/repository" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/server" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/smarthttp" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/ssh" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/server/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/analysis" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/blob" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/cleanup" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/commit" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/conflicts" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/diff" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/internalgitaly" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/objectpool" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/operations" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/partition" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/raft" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/ref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/remote" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/repository" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/server" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/smarthttp" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/ssh" + "gitlab.com/gitlab-org/gitaly/v17/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/smarthttp/cache.go b/internal/gitaly/service/smarthttp/cache.go index 154261bbc4dc0e0896f4d0767be268a3986eb92b..7efba27075e1226ded422d2662e22f427653d5b7 100644 --- a/internal/gitaly/service/smarthttp/cache.go +++ b/internal/gitaly/service/smarthttp/cache.go @@ -8,11 +8,11 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "gitlab.com/gitlab-org/gitaly/v16/internal/cache" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/cache" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/proto" ) diff --git a/internal/gitaly/service/smarthttp/inforefs.go b/internal/gitaly/service/smarthttp/inforefs.go index fb49ae14f6a39cc02859fe5614e37d15cd06bf4f..8a7f0ef8599072cd10d47bb16f8363a827bb45ec 100644 --- a/internal/gitaly/service/smarthttp/inforefs.go +++ b/internal/gitaly/service/smarthttp/inforefs.go @@ -5,14 +5,14 @@ import ( "fmt" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/bundleuri" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/pktline" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/bundleuri" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) const ( diff --git a/internal/gitaly/service/smarthttp/inforefs_test.go b/internal/gitaly/service/smarthttp/inforefs_test.go index aa8f54c195dca7768363aa60f098791879aa6514..2158a5996cfb53fdc92f20387dfbd161209b2fcc 100644 --- a/internal/gitaly/service/smarthttp/inforefs_test.go +++ b/internal/gitaly/service/smarthttp/inforefs_test.go @@ -14,22 +14,22 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/bundleuri" - "gitlab.com/gitlab-org/gitaly/v16/internal/cache" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/bundleuri" + "gitlab.com/gitlab-org/gitaly/v17/internal/cache" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" "google.golang.org/grpc/codes" "google.golang.org/protobuf/proto" ) diff --git a/internal/gitaly/service/smarthttp/receive_pack.go b/internal/gitaly/service/smarthttp/receive_pack.go index c6a2e9b406b5af0398488985d3ecd2a46e241945..1702cd020a13020d63170e051b87668e4be5c168 100644 --- a/internal/gitaly/service/smarthttp/receive_pack.go +++ b/internal/gitaly/service/smarthttp/receive_pack.go @@ -5,16 +5,16 @@ import ( "errors" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook/receivepack" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook/receivepack" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) func (s *server) PostReceivePack(stream gitalypb.SmartHTTPService_PostReceivePackServer) error { diff --git a/internal/gitaly/service/smarthttp/receive_pack_test.go b/internal/gitaly/service/smarthttp/receive_pack_test.go index 0a7824394fd7ca87a840dbbafdbbe8206b19a193..d13913fe7902c8966d26339dda341c731210a82c 100644 --- a/internal/gitaly/service/smarthttp/receive_pack_test.go +++ b/internal/gitaly/service/smarthttp/receive_pack_test.go @@ -12,27 +12,27 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/pktline" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - gitalyhook "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitlab" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + gitalyhook "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitlab" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" "google.golang.org/grpc" ) diff --git a/internal/gitaly/service/smarthttp/server.go b/internal/gitaly/service/smarthttp/server.go index d68e548f5eca27b798ad89412b2d85584415e0b1..a608da8cf985d5d131834d6d6b9a63f9ea7dcb32 100644 --- a/internal/gitaly/service/smarthttp/server.go +++ b/internal/gitaly/service/smarthttp/server.go @@ -2,18 +2,18 @@ package smarthttp import ( "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/backup" - "gitlab.com/gitlab-org/gitaly/v16/internal/bundleuri" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/backup" + "gitlab.com/gitlab-org/gitaly/v17/internal/bundleuri" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/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 251fdacb81a3c063e370de43964b701e110e8ba7..93dbcaa8064c8d910bbe4d65f2b6941ca8d48de9 100644 --- a/internal/gitaly/service/smarthttp/testhelper_test.go +++ b/internal/gitaly/service/smarthttp/testhelper_test.go @@ -5,18 +5,18 @@ import ( "testing" "github.com/stretchr/testify/require" - gitalyauth "gitlab.com/gitlab-org/gitaly/v16/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/commit" - hookservice "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/objectpool" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/repository" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + gitalyauth "gitlab.com/gitlab-org/gitaly/v17/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/commit" + hookservice "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/objectpool" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/repository" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) diff --git a/internal/gitaly/service/smarthttp/upload_pack.go b/internal/gitaly/service/smarthttp/upload_pack.go index b10527cb5a3fbae8fc69bbca4c2a8c6183700ce4..670d1cb88d8be7a0d6a397c54cd01a299d59d96c 100644 --- a/internal/gitaly/service/smarthttp/upload_pack.go +++ b/internal/gitaly/service/smarthttp/upload_pack.go @@ -7,13 +7,13 @@ import ( "fmt" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/bundleuri" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/sidechannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/bundleuri" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/sidechannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) PostUploadPackWithSidechannel(ctx context.Context, req *gitalypb.PostUploadPackWithSidechannelRequest) (*gitalypb.PostUploadPackWithSidechannelResponse, error) { diff --git a/internal/gitaly/service/smarthttp/upload_pack_test.go b/internal/gitaly/service/smarthttp/upload_pack_test.go index 8fab391132a98f8ac558ce66e332a5d9ec98dc43..5e437dbe51188884578c16263d6c08fe5db0392d 100644 --- a/internal/gitaly/service/smarthttp/upload_pack_test.go +++ b/internal/gitaly/service/smarthttp/upload_pack_test.go @@ -17,23 +17,23 @@ import ( promtest "github.com/prometheus/client_golang/prometheus/testutil" "github.com/sirupsen/logrus" "github.com/stretchr/testify/require" - gitalyauth "gitlab.com/gitlab-org/gitaly/v16/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/bundleuri" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/pktline" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/sidechannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/streamcache" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + gitalyauth "gitlab.com/gitlab-org/gitaly/v17/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/bundleuri" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/sidechannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/streamcache" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) diff --git a/internal/gitaly/service/ssh/receive_pack.go b/internal/gitaly/service/ssh/receive_pack.go index 7386a75d6d8dba0839303d4adbb321a237554787..91977790e0afb8ca4e73827ce9b46821ffda96f2 100644 --- a/internal/gitaly/service/ssh/receive_pack.go +++ b/internal/gitaly/service/ssh/receive_pack.go @@ -9,17 +9,17 @@ import ( "strings" "sync" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook/receivepack" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook/receivepack" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/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 5f2a309f2898535375e61a44284a159fe5172a0b..3023688c4801bcff11c3912747728a26011891cd 100644 --- a/internal/gitaly/service/ssh/receive_pack_test.go +++ b/internal/gitaly/service/ssh/receive_pack_test.go @@ -13,27 +13,27 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitlab" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitlab" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" "google.golang.org/protobuf/encoding/protojson" ) diff --git a/internal/gitaly/service/ssh/server.go b/internal/gitaly/service/ssh/server.go index a420a83e49095c61b10b555ab790a743a1bee76e..04f0ae71e3bc2d7b0f87ef6e286128b69504c3a1 100644 --- a/internal/gitaly/service/ssh/server.go +++ b/internal/gitaly/service/ssh/server.go @@ -2,19 +2,19 @@ package ssh import ( "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/backup" - "gitlab.com/gitlab-org/gitaly/v16/internal/bundleuri" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/backup" + "gitlab.com/gitlab-org/gitaly/v17/internal/bundleuri" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) type server struct { diff --git a/internal/gitaly/service/ssh/testhelper_test.go b/internal/gitaly/service/ssh/testhelper_test.go index b513377e15e365a51d4f3d95fad29699cb9581fd..6c6c27b3e728c39d2b152be45ecd4ad40d0c3494 100644 --- a/internal/gitaly/service/ssh/testhelper_test.go +++ b/internal/gitaly/service/ssh/testhelper_test.go @@ -5,15 +5,15 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - hookservice "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/objectpool" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/repository" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/sidechannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + hookservice "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/objectpool" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/repository" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/sidechannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) diff --git a/internal/gitaly/service/ssh/upload_archive.go b/internal/gitaly/service/ssh/upload_archive.go index 6f352b5b69c900467368167492c4a012a5fe0eb3..704bdfcc8d431cc31c59d2618fbaa152505deefe 100644 --- a/internal/gitaly/service/ssh/upload_archive.go +++ b/internal/gitaly/service/ssh/upload_archive.go @@ -6,13 +6,13 @@ import ( "fmt" "sync" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/pktline" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/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 d60d30d3215e60e5db1ed96af4abddb6e2c14916..58b7de2d51da992322121e607f418c5c0c40f843 100644 --- a/internal/gitaly/service/ssh/upload_archive_test.go +++ b/internal/gitaly/service/ssh/upload_archive_test.go @@ -6,14 +6,14 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/encoding/protojson" ) diff --git a/internal/gitaly/service/ssh/upload_command.go b/internal/gitaly/service/ssh/upload_command.go index 68d2af2ca22bc2d03850da158cc6e96da4494608..a171782a12761e671a81488727d624a51306665f 100644 --- a/internal/gitaly/service/ssh/upload_command.go +++ b/internal/gitaly/service/ssh/upload_command.go @@ -6,11 +6,11 @@ import ( "io" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/pktline" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" ) // runUploadCommand runs an uploading command like git-upload-pack(1) or git-upload-archive(1). It serves multiple diff --git a/internal/gitaly/service/ssh/upload_pack.go b/internal/gitaly/service/ssh/upload_pack.go index ace512ce453078c197ea45def1bcad1ed0d3ec9d..ffeeab6f8dccfe503168c2f9196d48e40cd5374c 100644 --- a/internal/gitaly/service/ssh/upload_pack.go +++ b/internal/gitaly/service/ssh/upload_pack.go @@ -6,15 +6,15 @@ import ( "io" "sync" - "gitlab.com/gitlab-org/gitaly/v16/internal/bundleuri" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/pktline" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/sidechannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/stream" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/bundleuri" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/sidechannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/stream" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) sshUploadPack(ctx context.Context, req *gitalypb.SSHUploadPackWithSidechannelRequest, stdin io.Reader, stdout, stderr io.Writer) (negotiation *stats.PackfileNegotiation, _ int, _ error) { diff --git a/internal/gitaly/service/ssh/upload_pack_test.go b/internal/gitaly/service/ssh/upload_pack_test.go index db750f5d653394009a816c5201c5f3c84bf6930a..fd824a118a8759a621fcc2e5d150ba3a65040ca5 100644 --- a/internal/gitaly/service/ssh/upload_pack_test.go +++ b/internal/gitaly/service/ssh/upload_pack_test.go @@ -15,24 +15,24 @@ import ( "github.com/prometheus/client_golang/prometheus" promtest "github.com/prometheus/client_golang/prometheus/testutil" "github.com/stretchr/testify/require" - gitalyauth "gitlab.com/gitlab-org/gitaly/v16/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/sidechannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/streamcache" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + gitalyauth "gitlab.com/gitlab-org/gitaly/v17/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/sidechannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/streamcache" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" "google.golang.org/protobuf/encoding/protojson" diff --git a/internal/gitaly/storage/context_test.go b/internal/gitaly/storage/context_test.go index 8c2be7e44a0ae29a7b68166e20664f6678c3744b..7c07bdd0e246e80224eadaa1b342bde2aa7bb364 100644 --- a/internal/gitaly/storage/context_test.go +++ b/internal/gitaly/storage/context_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" "google.golang.org/grpc/metadata" ) diff --git a/internal/gitaly/storage/counter/counter.go b/internal/gitaly/storage/counter/counter.go index 75d4406038cb3d7abe13f2919492f1d8f29916a2..55510e3576efc4ef3045843e0b535f539c052dba 100644 --- a/internal/gitaly/storage/counter/counter.go +++ b/internal/gitaly/storage/counter/counter.go @@ -10,11 +10,11 @@ import ( "time" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/dontpanic" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/walk" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/dontpanic" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/walk" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) // RepositoryCounter provides metrics with a count of repositories present diff --git a/internal/gitaly/storage/counter/counter_test.go b/internal/gitaly/storage/counter/counter_test.go index b66839957f74c89a17c64ce2df22439eb678b185..f9b7434081afe7d1e0404596e007a0f6222e346d 100644 --- a/internal/gitaly/storage/counter/counter_test.go +++ b/internal/gitaly/storage/counter/counter_test.go @@ -6,12 +6,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) type metric struct { diff --git a/internal/gitaly/storage/counter/testhelper_test.go b/internal/gitaly/storage/counter/testhelper_test.go index ba7d60cbea47c8eefcad20ccbc82b366f9664fee..0bd98074ac742922879ebc970ee8418eb14f33b0 100644 --- a/internal/gitaly/storage/counter/testhelper_test.go +++ b/internal/gitaly/storage/counter/testhelper_test.go @@ -3,7 +3,7 @@ package counter import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/storage/fs.go b/internal/gitaly/storage/fs.go index 53656522c0535cae35ad25a00567eab174c41779..4ce42356aa3efcf376c6d43bd558fb0a46c81684 100644 --- a/internal/gitaly/storage/fs.go +++ b/internal/gitaly/storage/fs.go @@ -8,8 +8,8 @@ import ( "path/filepath" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" ) type noopFS struct { diff --git a/internal/gitaly/storage/fs_test.go b/internal/gitaly/storage/fs_test.go index be259b34da0093c14b6b798e0e06e4f90dcc4d96..df2e590640d6dfe46ad3e4064a871f1e3331d299 100644 --- a/internal/gitaly/storage/fs_test.go +++ b/internal/gitaly/storage/fs_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) type operations []any diff --git a/internal/gitaly/storage/gitstorage/alternates.go b/internal/gitaly/storage/gitstorage/alternates.go index 3d9d9668832a2b4fe7ba9ecfce6d77b30fd311cd..f87989c1c461faf6452af01c853eea0ade8f8802 100644 --- a/internal/gitaly/storage/gitstorage/alternates.go +++ b/internal/gitaly/storage/gitstorage/alternates.go @@ -5,7 +5,7 @@ import ( "fmt" "io/fs" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" ) var ( diff --git a/internal/gitaly/storage/keyvalue/badger.go b/internal/gitaly/storage/keyvalue/badger.go index 4ea127c4235533345babde399de900952fce8074..ee9164072c5ae1041cdedbcec0e7cc975c82f5b9 100644 --- a/internal/gitaly/storage/keyvalue/badger.go +++ b/internal/gitaly/storage/keyvalue/badger.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/dgraph-io/badger/v4" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) // NewBadgerStore returns a new Store backed by a Badger database at the given path. diff --git a/internal/gitaly/storage/keyvalue/databasemgr/db.go b/internal/gitaly/storage/keyvalue/databasemgr/db.go index 783383b9ab6aee147f75c9e1d1f8ff495f609e31..77d4d716bff1be0a6d7d9d41dfef1d2142af147a 100644 --- a/internal/gitaly/storage/keyvalue/databasemgr/db.go +++ b/internal/gitaly/storage/keyvalue/databasemgr/db.go @@ -9,12 +9,12 @@ import ( "path/filepath" "github.com/dgraph-io/badger/v4" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/safe" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/safe" ) // Configure the garbage collection discard ratio at 0.5. This means the value log is garbage diff --git a/internal/gitaly/storage/keyvalue/databasemgr/db_test.go b/internal/gitaly/storage/keyvalue/databasemgr/db_test.go index 1d1f779af164c44dca38805ff9fba811e584ce38..aada24c6570a82428e81aca8acaa05586ba89682 100644 --- a/internal/gitaly/storage/keyvalue/databasemgr/db_test.go +++ b/internal/gitaly/storage/keyvalue/databasemgr/db_test.go @@ -9,11 +9,11 @@ import ( "github.com/dgraph-io/badger/v4" "github.com/sirupsen/logrus" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) type dbWrapper struct { diff --git a/internal/gitaly/storage/keyvalue/databasemgr/testhelper_test.go b/internal/gitaly/storage/keyvalue/databasemgr/testhelper_test.go index 2aa3b12c6c8614abbba00817b560db98f7bb84ff..de0f58bd8696f2894dfd732d6b57d7b18411017d 100644 --- a/internal/gitaly/storage/keyvalue/databasemgr/testhelper_test.go +++ b/internal/gitaly/storage/keyvalue/databasemgr/testhelper_test.go @@ -3,7 +3,7 @@ package databasemgr import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/storage/keyvalue/prefixed_test.go b/internal/gitaly/storage/keyvalue/prefixed_test.go index 7065cd276204428e27d5e95cc179753d1dcb9ee7..583f5f5052dd7f3b81a3fd7ec48c684ed85c3351 100644 --- a/internal/gitaly/storage/keyvalue/prefixed_test.go +++ b/internal/gitaly/storage/keyvalue/prefixed_test.go @@ -6,7 +6,7 @@ import ( "github.com/dgraph-io/badger/v4" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestPrefixedTransactioner(t *testing.T) { diff --git a/internal/gitaly/storage/keyvalue/recorder_test.go b/internal/gitaly/storage/keyvalue/recorder_test.go index c4e017a1dfed3056957d5db19aeb72758c87dbe1..c7aa1ea30cc59a89f475bec40683821754187edf 100644 --- a/internal/gitaly/storage/keyvalue/recorder_test.go +++ b/internal/gitaly/storage/keyvalue/recorder_test.go @@ -5,7 +5,7 @@ import ( "github.com/dgraph-io/badger/v4" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestRecordingReadWriter(t *testing.T) { diff --git a/internal/gitaly/storage/keyvalue/testhelper_test.go b/internal/gitaly/storage/keyvalue/testhelper_test.go index 05ebcb8ac981a556999c03be8e74b820fbd962e0..f7058ef81fe89ecfbf0df6be7120e84eb79e8ecd 100644 --- a/internal/gitaly/storage/keyvalue/testhelper_test.go +++ b/internal/gitaly/storage/keyvalue/testhelper_test.go @@ -3,7 +3,7 @@ package keyvalue import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/storage/locator.go b/internal/gitaly/storage/locator.go index 20dbe54db867959952d5c554728ad07c5a27debd..80bfb296a09ff91d6dc2dc6a874cd20b58b6d224 100644 --- a/internal/gitaly/storage/locator.go +++ b/internal/gitaly/storage/locator.go @@ -10,7 +10,7 @@ import ( "path/filepath" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" ) // NewStorageNotFoundError returns a new error wrapping ErrStorageNotFound with an InvalidArgument diff --git a/internal/gitaly/storage/locator_test.go b/internal/gitaly/storage/locator_test.go index ccc0bce481c55aba99e2e05129430d06fbd840d8..a4e8dd58e6d5a9426db5701dc680e1877a8d80fd 100644 --- a/internal/gitaly/storage/locator_test.go +++ b/internal/gitaly/storage/locator_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestRepoPathEqual(t *testing.T) { diff --git a/internal/gitaly/storage/lsn.go b/internal/gitaly/storage/lsn.go index 8a350a08cada85cc542d5c9646a79d496979fd37..0829098c3bd9f2bf6cc30b0e81bea5028ae7f42b 100644 --- a/internal/gitaly/storage/lsn.go +++ b/internal/gitaly/storage/lsn.go @@ -5,7 +5,7 @@ import ( "math" "strconv" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // lsnFormatBase is the base used when formatting an LSN as a string. diff --git a/internal/gitaly/storage/mdfile/metadata.go b/internal/gitaly/storage/mdfile/metadata.go index 0da46518f4602a9e4eb658a16482ee3928cf14a1..fe9019c24ef108b83e13847d9184dcd5a895a6d4 100644 --- a/internal/gitaly/storage/mdfile/metadata.go +++ b/internal/gitaly/storage/mdfile/metadata.go @@ -8,7 +8,7 @@ import ( "path/filepath" "github.com/google/uuid" - "gitlab.com/gitlab-org/gitaly/v16/internal/safe" + "gitlab.com/gitlab-org/gitaly/v17/internal/safe" ) const ( diff --git a/internal/gitaly/storage/mdfile/metadata_test.go b/internal/gitaly/storage/mdfile/metadata_test.go index e2d8951cfdbcfd292424eb2e322243110729d683..cf9f2aca8819c25638e708840debde0900163bd1 100644 --- a/internal/gitaly/storage/mdfile/metadata_test.go +++ b/internal/gitaly/storage/mdfile/metadata_test.go @@ -8,7 +8,7 @@ import ( "github.com/google/uuid" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func readFilesystemID(t *testing.T, path string) string { diff --git a/internal/gitaly/storage/mdfile/testhelper_test.go b/internal/gitaly/storage/mdfile/testhelper_test.go index 161daea9ee59bea84d8c2af9f5f20b1358682566..971508cc1a67b2211bb985fe66de23649b4c9199 100644 --- a/internal/gitaly/storage/mdfile/testhelper_test.go +++ b/internal/gitaly/storage/mdfile/testhelper_test.go @@ -3,7 +3,7 @@ package mdfile import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/storage/mode/mode.go b/internal/gitaly/storage/mode/mode.go index a220622db5911036366ecc48d1b0cb8cba16ac97..a52b38b603d43379f9847d48fc09c6bfb84831ca 100644 --- a/internal/gitaly/storage/mode/mode.go +++ b/internal/gitaly/storage/mode/mode.go @@ -5,7 +5,7 @@ package mode import ( "io/fs" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode/permission" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode/permission" ) const ( diff --git a/internal/gitaly/storage/mode/mode_test.go b/internal/gitaly/storage/mode/mode_test.go index 8e1962021abebe5006999c5158334cdf7a92412e..3078755a4f1ee7b02e3f8753690b738e1614e948 100644 --- a/internal/gitaly/storage/mode/mode_test.go +++ b/internal/gitaly/storage/mode/mode_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" ) func TestDirectory(t *testing.T) { diff --git a/internal/gitaly/storage/mode/permission/permission_test.go b/internal/gitaly/storage/mode/permission/permission_test.go index c666d7fce6a73db5a167ab83537ccb2f1775df19..29c30c4cc6d7e7f965a41225c2a35a063d170620 100644 --- a/internal/gitaly/storage/mode/permission/permission_test.go +++ b/internal/gitaly/storage/mode/permission/permission_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode/permission" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode/permission" ) func TestOwnerRead(t *testing.T) { diff --git a/internal/gitaly/storage/mode/permission/testhelper_test.go b/internal/gitaly/storage/mode/permission/testhelper_test.go index a84b083c0bbab9ef15752aaf03ad659282c13aa9..c420b984126a5fbc6a70accd67e93ec371a410ab 100644 --- a/internal/gitaly/storage/mode/permission/testhelper_test.go +++ b/internal/gitaly/storage/mode/permission/testhelper_test.go @@ -3,7 +3,7 @@ package permission_test import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/storage/mode/testhelper_test.go b/internal/gitaly/storage/mode/testhelper_test.go index 1465ac3fee1e9ccf3d55c21c68bfea3e9fec1554..3eb5890bd14e6929c6e207ea6e65eeac17c46121 100644 --- a/internal/gitaly/storage/mode/testhelper_test.go +++ b/internal/gitaly/storage/mode/testhelper_test.go @@ -3,7 +3,7 @@ package mode_test import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/storage/node/manager.go b/internal/gitaly/storage/node/manager.go index 892789b9f2c300ee4c9b5b898941c58f45b052e4..c45e85a12e167ca224a6ff55689cf3cb42c5562b 100644 --- a/internal/gitaly/storage/node/manager.go +++ b/internal/gitaly/storage/node/manager.go @@ -4,8 +4,8 @@ import ( "fmt" "sync" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" ) // StorageFactory is responsible for instantiating a Storage. diff --git a/internal/gitaly/storage/node/manager_test.go b/internal/gitaly/storage/node/manager_test.go index 2cd8d34341f944149bfd76ca6436b03bb0bc7088..6b607207364d24f910c4114d3b5e224bdcccc757 100644 --- a/internal/gitaly/storage/node/manager_test.go +++ b/internal/gitaly/storage/node/manager_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) type StorageFactoryFunc func(storageName, storagePath string) (Storage, error) diff --git a/internal/gitaly/storage/node/testhelper_test.go b/internal/gitaly/storage/node/testhelper_test.go index 1a4c2d190334ee91b5983c96a2242e3ad7d3ec02..38e40f84b335c1290217d3b62e894c1a7dcf3181 100644 --- a/internal/gitaly/storage/node/testhelper_test.go +++ b/internal/gitaly/storage/node/testhelper_test.go @@ -3,7 +3,7 @@ package node import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/storage/raftmgr/entry_recorder.go b/internal/gitaly/storage/raftmgr/entry_recorder.go index 570e2aacbecaa034e99c0fb833a3bd08c49acb6e..497648f60e01dbeed10e453f19f667372b4dcc0d 100644 --- a/internal/gitaly/storage/raftmgr/entry_recorder.go +++ b/internal/gitaly/storage/raftmgr/entry_recorder.go @@ -4,8 +4,8 @@ import ( "slices" "sync" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/proto" ) diff --git a/internal/gitaly/storage/raftmgr/entry_recorder_test.go b/internal/gitaly/storage/raftmgr/entry_recorder_test.go index 6e1d35c60a7c6527c25f3c3e090f0d7c2f2e406b..0dea0e6209b8dc99c254587108fd9361be424cd6 100644 --- a/internal/gitaly/storage/raftmgr/entry_recorder_test.go +++ b/internal/gitaly/storage/raftmgr/entry_recorder_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestLogEntryRecorder(t *testing.T) { diff --git a/internal/gitaly/storage/raftmgr/event_registry.go b/internal/gitaly/storage/raftmgr/event_registry.go index 468a95dc70930b2691e0574d5fbc4a14a2874082..46dd97b205f7afda871eb8a981422e4d3c0af2cf 100644 --- a/internal/gitaly/storage/raftmgr/event_registry.go +++ b/internal/gitaly/storage/raftmgr/event_registry.go @@ -4,7 +4,7 @@ import ( "fmt" "sync" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" ) // ErrObsoleted is returned when an event associated with a LSN is shadowed by another one with higher term. That event diff --git a/internal/gitaly/storage/raftmgr/event_registry_test.go b/internal/gitaly/storage/raftmgr/event_registry_test.go index 8c55f65a5787951f20c11512072c086ee35665af..1bca9cf37ffe62d75633a78c8cf52faefeef6abf 100644 --- a/internal/gitaly/storage/raftmgr/event_registry_test.go +++ b/internal/gitaly/storage/raftmgr/event_registry_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" ) func TestRegistry_Untrack(t *testing.T) { diff --git a/internal/gitaly/storage/raftmgr/grpc_transport.go b/internal/gitaly/storage/raftmgr/grpc_transport.go index 1ef949464a55706f38cefdaec8882d9975937939..57e5fa465b6f9207eb45fc33a0f9eda29467306f 100644 --- a/internal/gitaly/storage/raftmgr/grpc_transport.go +++ b/internal/gitaly/storage/raftmgr/grpc_transport.go @@ -11,13 +11,13 @@ import ( "path/filepath" "sync" - "gitlab.com/gitlab-org/gitaly/v16/internal/archive" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/archive" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "go.etcd.io/etcd/raft/v3/raftpb" "golang.org/x/sync/errgroup" "google.golang.org/grpc/codes" diff --git a/internal/gitaly/storage/raftmgr/grpc_transport_test.go b/internal/gitaly/storage/raftmgr/grpc_transport_test.go index c78c727c7d3d32019cc5a2e815eabc04b697c780..f5eec89b9646f3a196458a6d2b18727ca5d76801 100644 --- a/internal/gitaly/storage/raftmgr/grpc_transport_test.go +++ b/internal/gitaly/storage/raftmgr/grpc_transport_test.go @@ -10,15 +10,15 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - logger "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + logger "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "go.etcd.io/etcd/raft/v3/raftpb" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/internal/gitaly/storage/raftmgr/logger.go b/internal/gitaly/storage/raftmgr/logger.go index 710721981e2aabe6c821438353051f6724b76c8f..a8f2b303669846d1a4677c850febcd7e0cd3f20b 100644 --- a/internal/gitaly/storage/raftmgr/logger.go +++ b/internal/gitaly/storage/raftmgr/logger.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) // raftLogger is a wrapper around the log.Logger interface to diff --git a/internal/gitaly/storage/raftmgr/logger_test.go b/internal/gitaly/storage/raftmgr/logger_test.go index 0bac85f3707e3bf67b43fdda562085f70ec6595c..989f2de9369e515b2ade3bab8f97d16ba3878162 100644 --- a/internal/gitaly/storage/raftmgr/logger_test.go +++ b/internal/gitaly/storage/raftmgr/logger_test.go @@ -5,7 +5,7 @@ import ( "github.com/sirupsen/logrus" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestRaftLogger(t *testing.T) { diff --git a/internal/gitaly/storage/raftmgr/manager.go b/internal/gitaly/storage/raftmgr/manager.go index 64769fdb9a3d74ef78051347a6ab1ab865708214..0f691c2f558b4b4aa67e419d520339b20cad575c 100644 --- a/internal/gitaly/storage/raftmgr/manager.go +++ b/internal/gitaly/storage/raftmgr/manager.go @@ -3,7 +3,7 @@ package raftmgr import ( "context" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" "go.etcd.io/etcd/raft/v3/raftpb" ) diff --git a/internal/gitaly/storage/raftmgr/storage.go b/internal/gitaly/storage/raftmgr/storage.go index f7772dd45299fa1b179526e5a08c0cfa639535e9..611759ad07984f4296c4900df3b4b2b2f49515a0 100644 --- a/internal/gitaly/storage/raftmgr/storage.go +++ b/internal/gitaly/storage/raftmgr/storage.go @@ -9,13 +9,13 @@ import ( "sync" "github.com/dgraph-io/badger/v4" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/wal" - "gitlab.com/gitlab-org/gitaly/v16/internal/safe" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/wal" + "gitlab.com/gitlab-org/gitaly/v17/internal/safe" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "go.etcd.io/etcd/raft/v3" "go.etcd.io/etcd/raft/v3/raftpb" ) diff --git a/internal/gitaly/storage/raftmgr/storage_test.go b/internal/gitaly/storage/raftmgr/storage_test.go index 9322bfa0986e35844030a1ba2d1201f0b4501dfd..9f4ed6c859688c8dc9caeafc712dc4304b0c4eae 100644 --- a/internal/gitaly/storage/raftmgr/storage_test.go +++ b/internal/gitaly/storage/raftmgr/storage_test.go @@ -7,16 +7,16 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue/databasemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/wal" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue/databasemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/wal" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "go.etcd.io/etcd/raft/v3" "go.etcd.io/etcd/raft/v3/raftpb" ) diff --git a/internal/gitaly/storage/raftmgr/testhelper_test.go b/internal/gitaly/storage/raftmgr/testhelper_test.go index c6c4a4694c30ebb56c1fa7cfbbf447b96e34b06a..eb78f30d9912880cb25550dffeb8eef9f84002e2 100644 --- a/internal/gitaly/storage/raftmgr/testhelper_test.go +++ b/internal/gitaly/storage/raftmgr/testhelper_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - logger "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + logger "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" "go.etcd.io/etcd/raft/v3/raftpb" ) diff --git a/internal/gitaly/storage/repository_path_test.go b/internal/gitaly/storage/repository_path_test.go index aa9b4de8083ef8d87230b1dbd71882cd83e7e78c..785590d823f3d0f5c13381586eb8e8e8aa5a9cc8 100644 --- a/internal/gitaly/storage/repository_path_test.go +++ b/internal/gitaly/storage/repository_path_test.go @@ -4,9 +4,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestDeriveReplicaPath(t *testing.T) { diff --git a/internal/gitaly/storage/servers.go b/internal/gitaly/storage/servers.go index cee5278c767e9bc5e0cf289fc43cca3c2ab34ef2..b7526344bf405ede00d9b5f92a3e4390819aa660 100644 --- a/internal/gitaly/storage/servers.go +++ b/internal/gitaly/storage/servers.go @@ -7,7 +7,7 @@ import ( "errors" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/env" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/env" "google.golang.org/grpc/metadata" ) diff --git a/internal/gitaly/storage/servers_test.go b/internal/gitaly/storage/servers_test.go index bb737e0fbf4cdbea8800c660c0a8ed1789865993..50719904aa67b73d255d707bee7e03129cf0ad68 100644 --- a/internal/gitaly/storage/servers_test.go +++ b/internal/gitaly/storage/servers_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" "google.golang.org/grpc/metadata" ) diff --git a/internal/gitaly/storage/set_directory_mode_test.go b/internal/gitaly/storage/set_directory_mode_test.go index 66b2acbdcebde2dd4af94902a1fc2a307db63b73..a2ca96858b9277c1fcc33beb611142320194a4f4 100644 --- a/internal/gitaly/storage/set_directory_mode_test.go +++ b/internal/gitaly/storage/set_directory_mode_test.go @@ -7,9 +7,9 @@ import ( "testing/fstest" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode/permission" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode/permission" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestSetDirectoryMode(t *testing.T) { diff --git a/internal/gitaly/storage/storage.go b/internal/gitaly/storage/storage.go index aa8b5d628e05a04f80d0da45021a6ff8d62817c9..3c9e22909e102f81d6b194ea20366e1277b0d954 100644 --- a/internal/gitaly/storage/storage.go +++ b/internal/gitaly/storage/storage.go @@ -13,10 +13,10 @@ import ( "context" "errors" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - housekeepingcfg "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + housekeepingcfg "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) var ( diff --git a/internal/gitaly/storage/storagemgr/factory.go b/internal/gitaly/storage/storagemgr/factory.go index b6f2f9c66d3d45ae1e8e085246ebb3af5ea2b739..1630bcae127ce8a9161981a261350889c8ddc7e8 100644 --- a/internal/gitaly/storage/storagemgr/factory.go +++ b/internal/gitaly/storage/storagemgr/factory.go @@ -1,9 +1,9 @@ package storagemgr import ( - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue/databasemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/node" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue/databasemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/node" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) // Factory is a factory type that can instantiate new storages. diff --git a/internal/gitaly/storage/storagemgr/metrics.go b/internal/gitaly/storage/storagemgr/metrics.go index bfae82085173357993af4dbc06802b45867fd826..0f4a073f71c7c1a5261655632aeb5dab9ef9754c 100644 --- a/internal/gitaly/storage/storagemgr/metrics.go +++ b/internal/gitaly/storage/storagemgr/metrics.go @@ -2,7 +2,7 @@ package storagemgr import ( "github.com/prometheus/client_golang/prometheus" - gitalycfgprom "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/prometheus" + gitalycfgprom "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/prometheus" ) // Metrics contains the unscoped collected by StorageManager. diff --git a/internal/gitaly/storage/storagemgr/middleware.go b/internal/gitaly/storage/storagemgr/middleware.go index 5b41895807f50a4fddc55b81485361f832feb204..5de61f7417e1f97d463c13b12cc182856d640b3c 100644 --- a/internal/gitaly/storage/storagemgr/middleware.go +++ b/internal/gitaly/storage/storagemgr/middleware.go @@ -5,13 +5,13 @@ import ( "errors" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/tracing" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/tracing" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/health/grpc_health_v1" "google.golang.org/protobuf/proto" diff --git a/internal/gitaly/storage/storagemgr/middleware_ext_test.go b/internal/gitaly/storage/storagemgr/middleware_ext_test.go index 86467d0d7fa10db9a3e80b0f87c74470a75b23bb..70c5047c7f1a6c236460bccfe1f8668297af70fe 100644 --- a/internal/gitaly/storage/storagemgr/middleware_ext_test.go +++ b/internal/gitaly/storage/storagemgr/middleware_ext_test.go @@ -5,17 +5,17 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/setup" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/setup" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestMiddleware_partitioning_hint(t *testing.T) { diff --git a/internal/gitaly/storage/storagemgr/middleware_recovery.go b/internal/gitaly/storage/storagemgr/middleware_recovery.go index b9275a17405a9e5cfdd68d0aa775f5471bef3e7f..00c9180d1717292d7399f235e968ab6418a6ee8a 100644 --- a/internal/gitaly/storage/storagemgr/middleware_recovery.go +++ b/internal/gitaly/storage/storagemgr/middleware_recovery.go @@ -8,9 +8,9 @@ import ( "os" "sync" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue/databasemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue/databasemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" "google.golang.org/grpc" "google.golang.org/protobuf/proto" ) diff --git a/internal/gitaly/storage/storagemgr/middleware_recovery_test.go b/internal/gitaly/storage/storagemgr/middleware_recovery_test.go index 1e1888b7e37d8eba165abb748273eed43ff7da76..5f68acdb040dd8c2432ae6ed2717b73eeb17f167 100644 --- a/internal/gitaly/storage/storagemgr/middleware_recovery_test.go +++ b/internal/gitaly/storage/storagemgr/middleware_recovery_test.go @@ -9,17 +9,17 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue/databasemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/node" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue/databasemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/node" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/health/grpc_health_v1" "google.golang.org/protobuf/proto" diff --git a/internal/gitaly/storage/storagemgr/middleware_test.go b/internal/gitaly/storage/storagemgr/middleware_test.go index 39a6843a027f6a585c82b470573c953d87bc62ef..af1e8f6148acf186328309e757062112f84533a3 100644 --- a/internal/gitaly/storage/storagemgr/middleware_test.go +++ b/internal/gitaly/storage/storagemgr/middleware_test.go @@ -10,17 +10,17 @@ import ( "github.com/sirupsen/logrus/hooks/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/health/grpc_health_v1" diff --git a/internal/gitaly/storage/storagemgr/partition/apply_operations.go b/internal/gitaly/storage/storagemgr/partition/apply_operations.go index a531f804c51e554f781e2750efdd7adf6144efb0..d63f55836651dab9213b14055d9f19a0ea6249f3 100644 --- a/internal/gitaly/storage/storagemgr/partition/apply_operations.go +++ b/internal/gitaly/storage/storagemgr/partition/apply_operations.go @@ -8,8 +8,8 @@ import ( "os" "path/filepath" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // applyOperations applies the operations from the log entry to the storage. diff --git a/internal/gitaly/storage/storagemgr/partition/apply_operations_test.go b/internal/gitaly/storage/storagemgr/partition/apply_operations_test.go index 434b7cae6c21fc9fc4c897bf4a59de317fec8654..4cd3c29a722f79e26d5cb7a4468e4e50001f0a4a 100644 --- a/internal/gitaly/storage/storagemgr/partition/apply_operations_test.go +++ b/internal/gitaly/storage/storagemgr/partition/apply_operations_test.go @@ -8,12 +8,12 @@ import ( "testing/fstest" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/fsrecorder" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/wal" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/fsrecorder" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/wal" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestApplyOperations(t *testing.T) { diff --git a/internal/gitaly/storage/storagemgr/partition/check_objects.go b/internal/gitaly/storage/storagemgr/partition/check_objects.go index 0b8ec729b0fdb5b7832d05d62cf66d608d63f582..25dea65d8feeb1dac9b4a807c30575ffd07d7202 100644 --- a/internal/gitaly/storage/storagemgr/partition/check_objects.go +++ b/internal/gitaly/storage/storagemgr/partition/check_objects.go @@ -9,10 +9,10 @@ import ( "runtime/trace" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" ) func checkObjects(ctx context.Context, repository *localrepo.Repo, revisions []git.Revision, callback func(revision git.Revision, objectID git.ObjectID) error) (returnedErr error) { diff --git a/internal/gitaly/storage/storagemgr/partition/conflict/fshistory/errors.go b/internal/gitaly/storage/storagemgr/partition/conflict/fshistory/errors.go index 45255f45baffc50160062bedea0a0aa9873e3b39..75923cc966c1e9683619c9b1445521647ede51b6 100644 --- a/internal/gitaly/storage/storagemgr/partition/conflict/fshistory/errors.go +++ b/internal/gitaly/storage/storagemgr/partition/conflict/fshistory/errors.go @@ -1,8 +1,8 @@ package fshistory import ( - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" ) // ReadWriteConflictError is returned when transaction performed a read on an diff --git a/internal/gitaly/storage/storagemgr/partition/conflict/fshistory/history.go b/internal/gitaly/storage/storagemgr/partition/conflict/fshistory/history.go index 87e1ddbf6b1e7bc6af862fe92a2b909f51593c16..6941ff86e14c49cfe8fc39f019e4b2d79ee457f0 100644 --- a/internal/gitaly/storage/storagemgr/partition/conflict/fshistory/history.go +++ b/internal/gitaly/storage/storagemgr/partition/conflict/fshistory/history.go @@ -1,7 +1,7 @@ package fshistory import ( - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" ) // Transaction collects changes against a History. diff --git a/internal/gitaly/storage/storagemgr/partition/conflict/fshistory/history_test.go b/internal/gitaly/storage/storagemgr/partition/conflict/fshistory/history_test.go index c58a667a39add78077c43118d8df768a82041b9e..3e5839a3aeb9b38f460bf0b8abf970cff9eb4cdf 100644 --- a/internal/gitaly/storage/storagemgr/partition/conflict/fshistory/history_test.go +++ b/internal/gitaly/storage/storagemgr/partition/conflict/fshistory/history_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" ) func TestHistory(t *testing.T) { diff --git a/internal/gitaly/storage/storagemgr/partition/conflict/fshistory/testhelper_test.go b/internal/gitaly/storage/storagemgr/partition/conflict/fshistory/testhelper_test.go index 13fcf535f5b651e3587bbc5e45d0383fb2b4f35f..6ab937aac17ec94c8e9e1c129c52414924e1e3be 100644 --- a/internal/gitaly/storage/storagemgr/partition/conflict/fshistory/testhelper_test.go +++ b/internal/gitaly/storage/storagemgr/partition/conflict/fshistory/testhelper_test.go @@ -3,7 +3,7 @@ package fshistory import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/storage/storagemgr/partition/conflict/fshistory/tree.go b/internal/gitaly/storage/storagemgr/partition/conflict/fshistory/tree.go index b4e8d01e836a9848190ae830153ecbf2ecc690fd..35e3a1d38c4097990741efab7553e958a0c032c4 100644 --- a/internal/gitaly/storage/storagemgr/partition/conflict/fshistory/tree.go +++ b/internal/gitaly/storage/storagemgr/partition/conflict/fshistory/tree.go @@ -5,7 +5,7 @@ import ( "path/filepath" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" ) // children contains child nodes of a node keyed by their diff --git a/internal/gitaly/storage/storagemgr/partition/conflict/manager.go b/internal/gitaly/storage/storagemgr/partition/conflict/manager.go index b5981aa67293d7e1297be5037574aa30b97a4d96..1cfb4ac9e2c03886957a15a84c74c6afbb25c9aa 100644 --- a/internal/gitaly/storage/storagemgr/partition/conflict/manager.go +++ b/internal/gitaly/storage/storagemgr/partition/conflict/manager.go @@ -4,10 +4,10 @@ import ( "context" "runtime/trace" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/conflict/refdb/historymgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/conflict/refdb/historymgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" ) // ErrRepositoryConcurrentlyDeleted is returned when the repository was concurrently deleted by diff --git a/internal/gitaly/storage/storagemgr/partition/conflict/manager_test.go b/internal/gitaly/storage/storagemgr/partition/conflict/manager_test.go index a5760db8da406513c6be324560ea7e36193277d4..09a18d434b288caff7acd32b821ce7f9ac18dc2d 100644 --- a/internal/gitaly/storage/storagemgr/partition/conflict/manager_test.go +++ b/internal/gitaly/storage/storagemgr/partition/conflict/manager_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestManager(t *testing.T) { diff --git a/internal/gitaly/storage/storagemgr/partition/conflict/refdb/errors.go b/internal/gitaly/storage/storagemgr/partition/conflict/refdb/errors.go index f21c4a4c0a0c5d6255467b7fe7b2b76a0c5d55c5..280af8a0e91faf730a2433b3cf6f7fbefc153996 100644 --- a/internal/gitaly/storage/storagemgr/partition/conflict/refdb/errors.go +++ b/internal/gitaly/storage/storagemgr/partition/conflict/refdb/errors.go @@ -1,8 +1,8 @@ package refdb import ( - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" ) // ChildReferencesExistError is raised when attempting to create a reference diff --git a/internal/gitaly/storage/storagemgr/partition/conflict/refdb/history.go b/internal/gitaly/storage/storagemgr/partition/conflict/refdb/history.go index 3980e6ef883689652c5afe5a37da56f356a3c1d0..8ca8670da5d9ac72d791e64f6ea97f5e3cfb3c40 100644 --- a/internal/gitaly/storage/storagemgr/partition/conflict/refdb/history.go +++ b/internal/gitaly/storage/storagemgr/partition/conflict/refdb/history.go @@ -1,8 +1,8 @@ package refdb import ( - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" ) // Transaction appends updates to a History. The updates are only applied if diff --git a/internal/gitaly/storage/storagemgr/partition/conflict/refdb/history_test.go b/internal/gitaly/storage/storagemgr/partition/conflict/refdb/history_test.go index 27b46fda53c6963b47b3779835da29cc2ff9f96b..c8e5d280d633259078d3025d855e0b0bd3f10946 100644 --- a/internal/gitaly/storage/storagemgr/partition/conflict/refdb/history_test.go +++ b/internal/gitaly/storage/storagemgr/partition/conflict/refdb/history_test.go @@ -4,9 +4,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" ) func TestTree(t *testing.T) { diff --git a/internal/gitaly/storage/storagemgr/partition/conflict/refdb/historymgr/manager.go b/internal/gitaly/storage/storagemgr/partition/conflict/refdb/historymgr/manager.go index 024c91248de6448595de8fa69c9c34b87f01f062..9321fb16a0461d5b728a977b144b2f002e9ac00b 100644 --- a/internal/gitaly/storage/storagemgr/partition/conflict/refdb/historymgr/manager.go +++ b/internal/gitaly/storage/storagemgr/partition/conflict/refdb/historymgr/manager.go @@ -4,9 +4,9 @@ import ( "context" "runtime/trace" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/conflict/refdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/conflict/refdb" ) // Transaction performs an atomic update against a repository's history under a single LSN. diff --git a/internal/gitaly/storage/storagemgr/partition/conflict/refdb/historymgr/manager_test.go b/internal/gitaly/storage/storagemgr/partition/conflict/refdb/historymgr/manager_test.go index d670af70f8a19d40aaf77207fc986d259f7118c1..5396ae0aa292e21798e37c62b7483d20dc53f649 100644 --- a/internal/gitaly/storage/storagemgr/partition/conflict/refdb/historymgr/manager_test.go +++ b/internal/gitaly/storage/storagemgr/partition/conflict/refdb/historymgr/manager_test.go @@ -4,9 +4,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" ) func TestManager(t *testing.T) { diff --git a/internal/gitaly/storage/storagemgr/partition/conflict/refdb/historymgr/testhelper_test.go b/internal/gitaly/storage/storagemgr/partition/conflict/refdb/historymgr/testhelper_test.go index 481f8cac3504ecc8247c3333abdd1d6537087d11..6027d2f245a5bf24053b5a9c8a98e5968b5ede10 100644 --- a/internal/gitaly/storage/storagemgr/partition/conflict/refdb/historymgr/testhelper_test.go +++ b/internal/gitaly/storage/storagemgr/partition/conflict/refdb/historymgr/testhelper_test.go @@ -3,7 +3,7 @@ package historymgr import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/storage/storagemgr/partition/conflict/refdb/testhelper_test.go b/internal/gitaly/storage/storagemgr/partition/conflict/refdb/testhelper_test.go index 12e7104f014c923e96b56da8e18e5b5ba8145a29..43e2e68d6d2b5188ef05cad283a8022dbb0bc07c 100644 --- a/internal/gitaly/storage/storagemgr/partition/conflict/refdb/testhelper_test.go +++ b/internal/gitaly/storage/storagemgr/partition/conflict/refdb/testhelper_test.go @@ -3,7 +3,7 @@ package refdb import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/storage/storagemgr/partition/conflict/refdb/tree.go b/internal/gitaly/storage/storagemgr/partition/conflict/refdb/tree.go index 61a155fdfc061b4abc7a8124d88322ea11906ac7..7507911a4ec1963c3ce25a5d499ff79bb19ceeb1 100644 --- a/internal/gitaly/storage/storagemgr/partition/conflict/refdb/tree.go +++ b/internal/gitaly/storage/storagemgr/partition/conflict/refdb/tree.go @@ -4,7 +4,7 @@ import ( "path/filepath" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" ) // children contains child nodes of a node keyed by their diff --git a/internal/gitaly/storage/storagemgr/partition/conflict/testhelper_test.go b/internal/gitaly/storage/storagemgr/partition/conflict/testhelper_test.go index 2de131e4b1a8768b23983042fbff3630261b0bf6..24a105ee810badf9195d66f97e4184ec63abfe4f 100644 --- a/internal/gitaly/storage/storagemgr/partition/conflict/testhelper_test.go +++ b/internal/gitaly/storage/storagemgr/partition/conflict/testhelper_test.go @@ -3,7 +3,7 @@ package conflict import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/storage/storagemgr/partition/factory.go b/internal/gitaly/storage/storagemgr/partition/factory.go index 82a92808977862e08d07372444c31970d2665176..db45c51cbb31ee00fe245e2a15c617a469a676a5 100644 --- a/internal/gitaly/storage/storagemgr/partition/factory.go +++ b/internal/gitaly/storage/storagemgr/partition/factory.go @@ -4,13 +4,13 @@ import ( "context" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/log" - logger "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/log" + logger "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) // Factory is factory type that can create new partitions. diff --git a/internal/gitaly/storage/storagemgr/partition/fsrecorder/fs.go b/internal/gitaly/storage/storagemgr/partition/fsrecorder/fs.go index 38c650dcdc6be47e09be930b7a0abff75e0d3c3f..49d5cbc7808657ef3833ab0a8e3512b8d5db5b05 100644 --- a/internal/gitaly/storage/storagemgr/partition/fsrecorder/fs.go +++ b/internal/gitaly/storage/storagemgr/partition/fsrecorder/fs.go @@ -5,7 +5,7 @@ import ( "path/filepath" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" ) func newPathEscapesRootError(path string) error { diff --git a/internal/gitaly/storage/storagemgr/partition/fsrecorder/testhelper_test.go b/internal/gitaly/storage/storagemgr/partition/fsrecorder/testhelper_test.go index 6428b047e934fd18915bff201394aa203f988230..0b276b08b3d33659271f12a6841541a88bfd0164 100644 --- a/internal/gitaly/storage/storagemgr/partition/fsrecorder/testhelper_test.go +++ b/internal/gitaly/storage/storagemgr/partition/fsrecorder/testhelper_test.go @@ -3,7 +3,7 @@ package fsrecorder import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/storage/storagemgr/partition/log/log_manager.go b/internal/gitaly/storage/storagemgr/partition/log/log_manager.go index ceda60647abfa3c20051b7de1edb39fd971afdf5..fd6a42d5666d2c5ab496e3e2576d832376fb35a7 100644 --- a/internal/gitaly/storage/storagemgr/partition/log/log_manager.go +++ b/internal/gitaly/storage/storagemgr/partition/log/log_manager.go @@ -10,9 +10,9 @@ import ( "runtime/trace" "sync" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/safe" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/safe" ) // ErrLogEntryNotAppended is returned by CompareAndAppendLogEntry if the expected LSN diff --git a/internal/gitaly/storage/storagemgr/partition/log/log_manager_test.go b/internal/gitaly/storage/storagemgr/partition/log/log_manager_test.go index aae61b65b0b4eb0ddfd2e3a6256e32f73de264ff..32b3335401d421f49d822631661dc0fb110fc6d8 100644 --- a/internal/gitaly/storage/storagemgr/partition/log/log_manager_test.go +++ b/internal/gitaly/storage/storagemgr/partition/log/log_manager_test.go @@ -9,9 +9,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func setupEntryFiles(t *testing.T, files map[string][]byte) string { diff --git a/internal/gitaly/storage/storagemgr/partition/log/positions.go b/internal/gitaly/storage/storagemgr/partition/log/positions.go index 842f80188d0aa3154cfb121c97e6f9531208f095..3d16528e835c0d3cf551b2863d98f5d4a03cf31c 100644 --- a/internal/gitaly/storage/storagemgr/partition/log/positions.go +++ b/internal/gitaly/storage/storagemgr/partition/log/positions.go @@ -5,7 +5,7 @@ import ( "fmt" "sync/atomic" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" ) var ( diff --git a/internal/gitaly/storage/storagemgr/partition/log/positions_test.go b/internal/gitaly/storage/storagemgr/partition/log/positions_test.go index e26457779afcd22fc67397a4dfee138bcd842ccc..85d8eeafe9fcdba0c883b1660178ce9e48d4e676 100644 --- a/internal/gitaly/storage/storagemgr/partition/log/positions_test.go +++ b/internal/gitaly/storage/storagemgr/partition/log/positions_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" ) func TestPositionTracker(t *testing.T) { diff --git a/internal/gitaly/storage/storagemgr/partition/log/testhelper_test.go b/internal/gitaly/storage/storagemgr/partition/log/testhelper_test.go index 62ab82a853622a44d518f803be31a1238c0520a5..3ad871786a642b577b40493074d13d621c629c1d 100644 --- a/internal/gitaly/storage/storagemgr/partition/log/testhelper_test.go +++ b/internal/gitaly/storage/storagemgr/partition/log/testhelper_test.go @@ -3,7 +3,7 @@ package log import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/storage/storagemgr/partition/metrics.go b/internal/gitaly/storage/storagemgr/partition/metrics.go index 738221b1a4a69078f56dac359536b52247f60ebe..c088be38edcdcb4fc68ab70e6ad619958fb4b173 100644 --- a/internal/gitaly/storage/storagemgr/partition/metrics.go +++ b/internal/gitaly/storage/storagemgr/partition/metrics.go @@ -2,8 +2,8 @@ package partition import ( "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/snapshot" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/snapshot" ) // Metrics contains the metrics collected across all TransactionManagers. diff --git a/internal/gitaly/storage/storagemgr/partition/migration/dryrun.go b/internal/gitaly/storage/storagemgr/partition/migration/dryrun.go index 6ecc23ff7dbf15d41e3773d1102f93c3e11f459d..c4faa49fb0d918c30b41e1d19b973fd5505a78b7 100644 --- a/internal/gitaly/storage/storagemgr/partition/migration/dryrun.go +++ b/internal/gitaly/storage/storagemgr/partition/migration/dryrun.go @@ -4,10 +4,10 @@ import ( "context" "sync" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) // dryRunTransaction stubs the actual transaction to ensure that the `Commit()` diff --git a/internal/gitaly/storage/storagemgr/partition/migration/dryrun_test.go b/internal/gitaly/storage/storagemgr/partition/migration/dryrun_test.go index 2485065d4548eb436625ad8681e2af0a86bc2015..1d29d6f73861442d6f187e213c37c4d48c210c40 100644 --- a/internal/gitaly/storage/storagemgr/partition/migration/dryrun_test.go +++ b/internal/gitaly/storage/storagemgr/partition/migration/dryrun_test.go @@ -8,19 +8,19 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestDryRunPartition(t *testing.T) { diff --git a/internal/gitaly/storage/storagemgr/partition/migration/factory.go b/internal/gitaly/storage/storagemgr/partition/migration/factory.go index 5e1381334b93c2fceb028f5e6117dc62687d1b97..c38cf290c9df9f28dc5c2fd786600e522c5c81c5 100644 --- a/internal/gitaly/storage/storagemgr/partition/migration/factory.go +++ b/internal/gitaly/storage/storagemgr/partition/migration/factory.go @@ -1,10 +1,10 @@ package migration import ( - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) // migrationFactory defines a partition factory that wraps another partition factory. diff --git a/internal/gitaly/storage/storagemgr/partition/migration/manager.go b/internal/gitaly/storage/storagemgr/partition/migration/manager.go index 59e543eab251a82b2ca9c951674dc72d9354fe60..e70640870a1b3522c6c2593ebad6f4ac581a6fa1 100644 --- a/internal/gitaly/storage/storagemgr/partition/migration/manager.go +++ b/internal/gitaly/storage/storagemgr/partition/migration/manager.go @@ -12,10 +12,10 @@ import ( "github.com/dgraph-io/badger/v4" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" "google.golang.org/grpc/metadata" ) diff --git a/internal/gitaly/storage/storagemgr/partition/migration/manager_test.go b/internal/gitaly/storage/storagemgr/partition/migration/manager_test.go index 92429d21f9a84d8c442764b49055565e772676fd..2f81d169637af7bb0415a41270b145346635880d 100644 --- a/internal/gitaly/storage/storagemgr/partition/migration/manager_test.go +++ b/internal/gitaly/storage/storagemgr/partition/migration/manager_test.go @@ -11,18 +11,18 @@ import ( "github.com/dgraph-io/badger/v4" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" "google.golang.org/grpc/metadata" ) diff --git a/internal/gitaly/storage/storagemgr/partition/migration/migration.go b/internal/gitaly/storage/storagemgr/partition/migration/migration.go index 4bac6e39c02841d3914f04e678929f52cb95e2da..b7040dd6d34df83109ce7731e02c2c6bd8f6f15c 100644 --- a/internal/gitaly/storage/storagemgr/partition/migration/migration.go +++ b/internal/gitaly/storage/storagemgr/partition/migration/migration.go @@ -6,7 +6,7 @@ import ( "errors" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" ) // errInvalidMigration is returned if a migration being run is improperly configured. diff --git a/internal/gitaly/storage/storagemgr/partition/migration/migration_test.go b/internal/gitaly/storage/storagemgr/partition/migration/migration_test.go index 191ff6f79cbc16948b513ca0ebaa282c5fd18693..c24d1667b796e19074a02a9e6e5b048b99fb1cb3 100644 --- a/internal/gitaly/storage/storagemgr/partition/migration/migration_test.go +++ b/internal/gitaly/storage/storagemgr/partition/migration/migration_test.go @@ -7,10 +7,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestMigration_Run(t *testing.T) { diff --git a/internal/gitaly/storage/storagemgr/partition/migration/state.go b/internal/gitaly/storage/storagemgr/partition/migration/state.go index 9d3baaa16ecf207b07752f46b6b92dec2e7cad1d..a3e5b87a25587e17e96bf563397a4380c7f54f84 100644 --- a/internal/gitaly/storage/storagemgr/partition/migration/state.go +++ b/internal/gitaly/storage/storagemgr/partition/migration/state.go @@ -3,7 +3,7 @@ package migration import ( "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" ) // StateManager is used to manipulate the stored state of migrations. diff --git a/internal/gitaly/storage/storagemgr/partition/migration/testhelper_test.go b/internal/gitaly/storage/storagemgr/partition/migration/testhelper_test.go index 7dc4e175bb18b01bc6bcab6ed21d8dc7ceb77a56..30146625b47f8bd77260de8f8d34f7e1b2735e8d 100644 --- a/internal/gitaly/storage/storagemgr/partition/migration/testhelper_test.go +++ b/internal/gitaly/storage/storagemgr/partition/migration/testhelper_test.go @@ -3,7 +3,7 @@ package migration import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/storage/storagemgr/partition/migration/xxxx_reftable_migration.go b/internal/gitaly/storage/storagemgr/partition/migration/xxxx_reftable_migration.go index f189b774fec4818a310d3023748bad82d23c9328..f15674b0961392ef052e764a7e5e53e551dcb04c 100644 --- a/internal/gitaly/storage/storagemgr/partition/migration/xxxx_reftable_migration.go +++ b/internal/gitaly/storage/storagemgr/partition/migration/xxxx_reftable_migration.go @@ -8,12 +8,12 @@ import ( "fmt" "path/filepath" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // NewReftableMigration provides a new reftable migration. diff --git a/internal/gitaly/storage/storagemgr/partition/migration/xxxx_reftable_migration_test.go b/internal/gitaly/storage/storagemgr/partition/migration/xxxx_reftable_migration_test.go index ca15cbc64755e956c3ea18e084e74a5360f8a03a..947c5b6b777d3febc8bccd95fd2f78e4d2e637cc 100644 --- a/internal/gitaly/storage/storagemgr/partition/migration/xxxx_reftable_migration_test.go +++ b/internal/gitaly/storage/storagemgr/partition/migration/xxxx_reftable_migration_test.go @@ -8,20 +8,20 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestReftableMigration(t *testing.T) { diff --git a/internal/gitaly/storage/storagemgr/partition/snapshot/manager.go b/internal/gitaly/storage/storagemgr/partition/snapshot/manager.go index 33cddf4aff4ce7c78991b8c920d2fa57ec4c6cef..3183314442c0d2276010128b9676d2913350270b 100644 --- a/internal/gitaly/storage/storagemgr/partition/snapshot/manager.go +++ b/internal/gitaly/storage/storagemgr/partition/snapshot/manager.go @@ -14,8 +14,8 @@ import ( "time" lru "github.com/hashicorp/golang-lru/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" "golang.org/x/sync/errgroup" ) diff --git a/internal/gitaly/storage/storagemgr/partition/snapshot/manager_test.go b/internal/gitaly/storage/storagemgr/partition/snapshot/manager_test.go index 8d1d9ca8fab4f0a7c10b0890fef27447712dadf0..6e6c1d03692f3b37307fedee0a0d8c3817069e39 100644 --- a/internal/gitaly/storage/storagemgr/partition/snapshot/manager_test.go +++ b/internal/gitaly/storage/storagemgr/partition/snapshot/manager_test.go @@ -9,8 +9,8 @@ import ( "testing/fstest" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" "golang.org/x/sync/errgroup" ) diff --git a/internal/gitaly/storage/storagemgr/partition/snapshot/snapshot.go b/internal/gitaly/storage/storagemgr/partition/snapshot/snapshot.go index 132c50ee11a7f84ddb78fc8d92c4fcc220826f7b..e0162f9918c798f87f1a31fd0ffb81debe13e0a2 100644 --- a/internal/gitaly/storage/storagemgr/partition/snapshot/snapshot.go +++ b/internal/gitaly/storage/storagemgr/partition/snapshot/snapshot.go @@ -10,11 +10,11 @@ import ( "strings" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/gitstorage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode/permission" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/gitstorage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode/permission" ) // ModeReadOnlyDirectory is the mode given to directories in read-only snapshots. diff --git a/internal/gitaly/storage/storagemgr/partition/snapshot/testhelper_test.go b/internal/gitaly/storage/storagemgr/partition/snapshot/testhelper_test.go index ea9059a8200a5150f2cce3cdfd4fac90b5cc5f0d..1bd334cb504818913c593cec9cd701f2fbd10f76 100644 --- a/internal/gitaly/storage/storagemgr/partition/snapshot/testhelper_test.go +++ b/internal/gitaly/storage/storagemgr/partition/snapshot/testhelper_test.go @@ -3,7 +3,7 @@ package snapshot import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/storage/storagemgr/partition/testhelper_test.go b/internal/gitaly/storage/storagemgr/partition/testhelper_test.go index 24671dad1fc9afb5f7b420cb00569adc1f73c9c9..7ea5062d7d6bfce17a7a6b54e361423da1795e09 100644 --- a/internal/gitaly/storage/storagemgr/partition/testhelper_test.go +++ b/internal/gitaly/storage/storagemgr/partition/testhelper_test.go @@ -19,26 +19,26 @@ import ( io_prometheus_client "github.com/prometheus/client_model/go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping" - housekeepingcfg "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/objectpool" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/packfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/repoutil" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/counter" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping" + housekeepingcfg "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/objectpool" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/packfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/repoutil" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/counter" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/proto" ) diff --git a/internal/gitaly/storage/storagemgr/partition/transaction_manager.go b/internal/gitaly/storage/storagemgr/partition/transaction_manager.go index 8095d363d73f958e22f8ca32910442a66d4764d1..9f6a833660129b40791cbf871aee999e47ae96a8 100644 --- a/internal/gitaly/storage/storagemgr/partition/transaction_manager.go +++ b/internal/gitaly/storage/storagemgr/partition/transaction_manager.go @@ -22,28 +22,28 @@ import ( "github.com/dgraph-io/badger/v4" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping" - housekeepingcfg "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/conflict" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/conflict/fshistory" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/fsrecorder" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/snapshot" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/wal" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/wal/reftree" - logging "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/safe" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/tracing" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping" + housekeepingcfg "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/conflict" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/conflict/fshistory" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/fsrecorder" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/snapshot" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/wal" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/wal/reftree" + logging "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/safe" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/tracing" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "gitlab.com/gitlab-org/labkit/correlation" "golang.org/x/sync/errgroup" "google.golang.org/protobuf/proto" diff --git a/internal/gitaly/storage/storagemgr/partition/transaction_manager_alternate_test.go b/internal/gitaly/storage/storagemgr/partition/transaction_manager_alternate_test.go index 26d8c1d3339e6dfee2d546d07e000af354012a28..41fb8b3ac2727e644dfc9e4230d00add403f0d47 100644 --- a/internal/gitaly/storage/storagemgr/partition/transaction_manager_alternate_test.go +++ b/internal/gitaly/storage/storagemgr/partition/transaction_manager_alternate_test.go @@ -5,14 +5,14 @@ import ( "path/filepath" "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - housekeepingcfg "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/conflict/fshistory" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + housekeepingcfg "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/conflict/fshistory" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func generateAlternateTests(t *testing.T, setup testTransactionSetup) []transactionTestCase { diff --git a/internal/gitaly/storage/storagemgr/partition/transaction_manager_consumer_test.go b/internal/gitaly/storage/storagemgr/partition/transaction_manager_consumer_test.go index e29c0d51cf4c9d286a71f36b84641560a3b68f32..0288e51585b43763d3837193f843d3a06060cd83 100644 --- a/internal/gitaly/storage/storagemgr/partition/transaction_manager_consumer_test.go +++ b/internal/gitaly/storage/storagemgr/partition/transaction_manager_consumer_test.go @@ -4,11 +4,11 @@ import ( "context" "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func generateConsumerTests(t *testing.T, setup testTransactionSetup) []transactionTestCase { diff --git a/internal/gitaly/storage/storagemgr/partition/transaction_manager_default_branch_test.go b/internal/gitaly/storage/storagemgr/partition/transaction_manager_default_branch_test.go index 9b1ac217cacf770014f834487a41b578ddab960d..ae8e474a529fd4550755c3f1771384ef430c5a26 100644 --- a/internal/gitaly/storage/storagemgr/partition/transaction_manager_default_branch_test.go +++ b/internal/gitaly/storage/storagemgr/partition/transaction_manager_default_branch_test.go @@ -3,9 +3,9 @@ package partition import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" ) func generateDefaultBranchTests(t *testing.T, setup testTransactionSetup) []transactionTestCase { diff --git a/internal/gitaly/storage/storagemgr/partition/transaction_manager_hook_test.go b/internal/gitaly/storage/storagemgr/partition/transaction_manager_hook_test.go index 529afda61dc1cb4d430bf70d8e8ffb390333a7ac..034ab54cd7c2a55e5b54f5bca40421d0bd1e1afe 100644 --- a/internal/gitaly/storage/storagemgr/partition/transaction_manager_hook_test.go +++ b/internal/gitaly/storage/storagemgr/partition/transaction_manager_hook_test.go @@ -4,12 +4,12 @@ import ( "sync" "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/conflict/refdb" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/conflict/refdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) // hookFunc is a function that is executed at a specific point. It gets a hookContext that allows it to diff --git a/internal/gitaly/storage/storagemgr/partition/transaction_manager_housekeeping_test.go b/internal/gitaly/storage/storagemgr/partition/transaction_manager_housekeeping_test.go index 42f413f69cdccebc346edbc78130af5d229dee5b..4599b883b6c64689daf42299887e6f84f30e491a 100644 --- a/internal/gitaly/storage/storagemgr/partition/transaction_manager_housekeeping_test.go +++ b/internal/gitaly/storage/storagemgr/partition/transaction_manager_housekeeping_test.go @@ -8,15 +8,15 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - housekeepingcfg "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/conflict/fshistory" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + housekeepingcfg "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/conflict/fshistory" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func generateHousekeepingPackRefsTests(t *testing.T, ctx context.Context, testPartitionID storage.PartitionID, relativePath string) []transactionTestCase { diff --git a/internal/gitaly/storage/storagemgr/partition/transaction_manager_key_value_test.go b/internal/gitaly/storage/storagemgr/partition/transaction_manager_key_value_test.go index d798d5ef109e69f525cc26810a535e52b256de7c..2775b3704d22e343d42c1e719ab4eacc5ed42415 100644 --- a/internal/gitaly/storage/storagemgr/partition/transaction_manager_key_value_test.go +++ b/internal/gitaly/storage/storagemgr/partition/transaction_manager_key_value_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/dgraph-io/badger/v4" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" ) func generateKeyValueTests(t *testing.T, setup testTransactionSetup) []transactionTestCase { diff --git a/internal/gitaly/storage/storagemgr/partition/transaction_manager_refs_test.go b/internal/gitaly/storage/storagemgr/partition/transaction_manager_refs_test.go index a2b35437a158b89014f03bcd2426cb5b14039fdb..b1b0364118dcaef5e131f33cce17da2ecbc2129f 100644 --- a/internal/gitaly/storage/storagemgr/partition/transaction_manager_refs_test.go +++ b/internal/gitaly/storage/storagemgr/partition/transaction_manager_refs_test.go @@ -4,16 +4,16 @@ import ( "path/filepath" "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - housekeepingcfg "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/conflict/fshistory" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/conflict/refdb" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + housekeepingcfg "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/conflict/fshistory" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/conflict/refdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func generateModifyReferencesTests(t *testing.T, setup testTransactionSetup) []transactionTestCase { diff --git a/internal/gitaly/storage/storagemgr/partition/transaction_manager_repo_test.go b/internal/gitaly/storage/storagemgr/partition/transaction_manager_repo_test.go index ee1c32cd974ae450b896511a5e0cc30154196722..a3b94520c260a4399fed3b5965056f6b69d7d551 100644 --- a/internal/gitaly/storage/storagemgr/partition/transaction_manager_repo_test.go +++ b/internal/gitaly/storage/storagemgr/partition/transaction_manager_repo_test.go @@ -4,14 +4,14 @@ import ( "path/filepath" "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/conflict" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/conflict/fshistory" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/snapshot" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/conflict" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/conflict/fshistory" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/snapshot" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func generateCreateRepositoryTests(t *testing.T, setup testTransactionSetup) []transactionTestCase { diff --git a/internal/gitaly/storage/storagemgr/partition/transaction_manager_test.go b/internal/gitaly/storage/storagemgr/partition/transaction_manager_test.go index 7f2c97bb10e80eb2df6a2d209cd9287bd90643b4..747a1b01f109219a6b2c483f1fa716a11125af7d 100644 --- a/internal/gitaly/storage/storagemgr/partition/transaction_manager_test.go +++ b/internal/gitaly/storage/storagemgr/partition/transaction_manager_test.go @@ -19,21 +19,21 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/conflict/refdb" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/wal" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/conflict/refdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/wal" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/proto" ) diff --git a/internal/gitaly/storage/storagemgr/partition_assigner.go b/internal/gitaly/storage/storagemgr/partition_assigner.go index 3075aa7bd77fe9781c40d85ec42c195a9cee644b..76dd4241f4f6d0c1f7520d8e1811724bd9863a70 100644 --- a/internal/gitaly/storage/storagemgr/partition_assigner.go +++ b/internal/gitaly/storage/storagemgr/partition_assigner.go @@ -9,9 +9,9 @@ import ( "sync" "github.com/dgraph-io/badger/v4" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/gitstorage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/gitstorage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue" ) // ErrRepositoriesAreInDifferentPartitions is returned when attempting to begin a transaction spanning diff --git a/internal/gitaly/storage/storagemgr/partition_assigner_test.go b/internal/gitaly/storage/storagemgr/partition_assigner_test.go index 1aa9a3e44972c854d4b533204f0b89ab3a691d5d..efca68f638f46a14ab3e6421bdaceaa2874042cc 100644 --- a/internal/gitaly/storage/storagemgr/partition_assigner_test.go +++ b/internal/gitaly/storage/storagemgr/partition_assigner_test.go @@ -11,14 +11,14 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/gitstorage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/gitstorage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) type partitionAssignments map[string]storage.PartitionID diff --git a/internal/gitaly/storage/storagemgr/partition_manager.go b/internal/gitaly/storage/storagemgr/partition_manager.go index 0bae0b40d555d2ed150af9b4d0bfc27914660920..ebbaca234a9b016f593ddb413a554ee6a0614dad 100644 --- a/internal/gitaly/storage/storagemgr/partition_manager.go +++ b/internal/gitaly/storage/storagemgr/partition_manager.go @@ -16,14 +16,14 @@ import ( "github.com/dgraph-io/badger/v4" lru "github.com/hashicorp/golang-lru/v2" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue/databasemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/safe" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue/databasemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/safe" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" ) // DefaultMaxInactivePartitions is the default number of inactive partitions to keep on standby. diff --git a/internal/gitaly/storage/storagemgr/partition_manager_test.go b/internal/gitaly/storage/storagemgr/partition_manager_test.go index a7cba96ab9f3749817c325df4e2f28d3d0c57ce8..23f2bf7a8fbab46d1e4e129af94b3dcde8d52e25 100644 --- a/internal/gitaly/storage/storagemgr/partition_manager_test.go +++ b/internal/gitaly/storage/storagemgr/partition_manager_test.go @@ -14,18 +14,18 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue/databasemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/snapshot" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue/databasemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/snapshot" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) type mockPartitionFactory struct { diff --git a/internal/gitaly/storage/storagemgr/testhelper_test.go b/internal/gitaly/storage/storagemgr/testhelper_test.go index 27945408e824cc743658a950d727c47a1f9287c3..465fa1388c63ab935aa848b7da6615bfc93b3871 100644 --- a/internal/gitaly/storage/storagemgr/testhelper_test.go +++ b/internal/gitaly/storage/storagemgr/testhelper_test.go @@ -3,7 +3,7 @@ package storagemgr import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/storage/storagemgr/transaction_registry.go b/internal/gitaly/storage/storagemgr/transaction_registry.go index d46ff6875e59217c07b20f7beb865c28bf056648..464aa53ba0f073260cdd4eab093c220f8a12f5e0 100644 --- a/internal/gitaly/storage/storagemgr/transaction_registry.go +++ b/internal/gitaly/storage/storagemgr/transaction_registry.go @@ -4,7 +4,7 @@ import ( "errors" "sync" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" ) var errTransactionNotFound = errors.New("transaction not found") diff --git a/internal/gitaly/storage/storagemgr/transaction_registry_test.go b/internal/gitaly/storage/storagemgr/transaction_registry_test.go index 9996e745b2b38fdfa569356b2c9020b4b9e6b0d1..b4fbf8fc8154bced700ad9dee9e5c31b8b57911f 100644 --- a/internal/gitaly/storage/storagemgr/transaction_registry_test.go +++ b/internal/gitaly/storage/storagemgr/transaction_registry_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" ) func TestTransactionRegistry(t *testing.T) { diff --git a/internal/gitaly/storage/sync_test.go b/internal/gitaly/storage/sync_test.go index ce312686ae7b748eab66b290d241d63cdb18823f..7ef99e99bf91e1ac9cec7f1e4ac704af2f55bec4 100644 --- a/internal/gitaly/storage/sync_test.go +++ b/internal/gitaly/storage/sync_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestNeedsSync(t *testing.T) { diff --git a/internal/gitaly/storage/testhelper_test.go b/internal/gitaly/storage/testhelper_test.go index 54497d21e920bd12bef0fd39fe67e33c339b26b4..6cc71382b5652f5eddd35924cbc0b3d04e1e74ca 100644 --- a/internal/gitaly/storage/testhelper_test.go +++ b/internal/gitaly/storage/testhelper_test.go @@ -3,7 +3,7 @@ package storage import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/storage/wal/entry.go b/internal/gitaly/storage/wal/entry.go index addd72b03ff10018ab081f0ac56479fcca39b761..1fe55954d605e742004a9d8ffaef560c53f67448 100644 --- a/internal/gitaly/storage/wal/entry.go +++ b/internal/gitaly/storage/wal/entry.go @@ -7,9 +7,9 @@ import ( "path/filepath" "strconv" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // Entry represents a write-ahead log entry. diff --git a/internal/gitaly/storage/wal/entry_test.go b/internal/gitaly/storage/wal/entry_test.go index f5b4d1080e67b459f88a0accfde8bd6a26643c05..fcab6697fe3751fe86c2354c1558afa181d48f36 100644 --- a/internal/gitaly/storage/wal/entry_test.go +++ b/internal/gitaly/storage/wal/entry_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func setupTestDirectory(t *testing.T, path string) { diff --git a/internal/gitaly/storage/wal/get_inode_test.go b/internal/gitaly/storage/wal/get_inode_test.go index b2f4cc77609bead273e614d1de8d8b98d002b843..d6bc63b3c1aea4b858bee7c67890e5dd113c8c8b 100644 --- a/internal/gitaly/storage/wal/get_inode_test.go +++ b/internal/gitaly/storage/wal/get_inode_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" ) func TestGetInode(t *testing.T) { diff --git a/internal/gitaly/storage/wal/manifest.go b/internal/gitaly/storage/wal/manifest.go index 4a5592d0c737fe7cde9c0c5106f554f13bbd8c19..e83af88af47956c6f09e3d7f62a96dcccbe31af3 100644 --- a/internal/gitaly/storage/wal/manifest.go +++ b/internal/gitaly/storage/wal/manifest.go @@ -6,8 +6,8 @@ import ( "os" "path/filepath" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/proto" ) diff --git a/internal/gitaly/storage/wal/manifest_test.go b/internal/gitaly/storage/wal/manifest_test.go index f9e0f52fd93f87edcafb624f233592ea88ccb04f..b405036d0b37ba6b438774d089fe8429fc42259d 100644 --- a/internal/gitaly/storage/wal/manifest_test.go +++ b/internal/gitaly/storage/wal/manifest_test.go @@ -6,9 +6,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestManifest(t *testing.T) { diff --git a/internal/gitaly/storage/wal/operations.go b/internal/gitaly/storage/wal/operations.go index 233809cfa524a6d1e27c694346723928601baad4..6c430942f09c62b21d80ee45953283cac6b5c8f2 100644 --- a/internal/gitaly/storage/wal/operations.go +++ b/internal/gitaly/storage/wal/operations.go @@ -1,8 +1,8 @@ package wal import ( - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // operations is a helper type around []*gitalypb.LogEntry_Operation. diff --git a/internal/gitaly/storage/wal/operations_test.go b/internal/gitaly/storage/wal/operations_test.go index fbcd839829a19ceea4f3b3b1a48105f135ded353..d25666a228db9992f91a2d9fd57f69d606b812f0 100644 --- a/internal/gitaly/storage/wal/operations_test.go +++ b/internal/gitaly/storage/wal/operations_test.go @@ -3,9 +3,9 @@ package wal import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestOperations(t *testing.T) { diff --git a/internal/gitaly/storage/wal/reference_recorder.go b/internal/gitaly/storage/wal/reference_recorder.go index 1d1a0fa057404255abcd628c62f303d15e8e1af6..b9bc92abb9099687b0a456fc6c72dda13cdbf641 100644 --- a/internal/gitaly/storage/wal/reference_recorder.go +++ b/internal/gitaly/storage/wal/reference_recorder.go @@ -9,8 +9,8 @@ import ( "path/filepath" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/wal/reftree" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/wal/reftree" ) // ReferenceRecorder records the file system operations performed by reference transactions. diff --git a/internal/gitaly/storage/wal/reference_recorder_test.go b/internal/gitaly/storage/wal/reference_recorder_test.go index 5fdb1fb4386d99efff13d04960a19aac630851d8..4b8ab5f17418f7d5fc491ada94f961cfec73a7de 100644 --- a/internal/gitaly/storage/wal/reference_recorder_test.go +++ b/internal/gitaly/storage/wal/reference_recorder_test.go @@ -8,12 +8,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestRecorderRecordReferenceUpdates(t *testing.T) { diff --git a/internal/gitaly/storage/wal/reftree/testhelper_test.go b/internal/gitaly/storage/wal/reftree/testhelper_test.go index 57da0580298bbef6c652c581cde8ddecfbee1cc1..1e2b708cc8fce0a1697fe644f842d221f0e8ee80 100644 --- a/internal/gitaly/storage/wal/reftree/testhelper_test.go +++ b/internal/gitaly/storage/wal/reftree/testhelper_test.go @@ -3,7 +3,7 @@ package reftree import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/storage/wal/testhelper_test.go b/internal/gitaly/storage/wal/testhelper_test.go index 9197f21ba7140bbd9fa911a8665e2f4b9c91a63c..b4cc462ca8f3796d1d83e6bc6f8d5d8dd3df88a2 100644 --- a/internal/gitaly/storage/wal/testhelper_test.go +++ b/internal/gitaly/storage/wal/testhelper_test.go @@ -3,7 +3,7 @@ package wal import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/storage/walk/testhelper_test.go b/internal/gitaly/storage/walk/testhelper_test.go index d5ac33bf57d6d9c009c19567628589ab3deeb3a8..55326173e7dfd37811de428fbda97ed4eaaa467d 100644 --- a/internal/gitaly/storage/walk/testhelper_test.go +++ b/internal/gitaly/storage/walk/testhelper_test.go @@ -3,7 +3,7 @@ package walk import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/storage/walk/walk.go b/internal/gitaly/storage/walk/walk.go index c85e89338795bf1430e89f9341025fde03a68202..7243f0f24bed45649d2ff4688c74974c84c8755f 100644 --- a/internal/gitaly/storage/walk/walk.go +++ b/internal/gitaly/storage/walk/walk.go @@ -6,10 +6,10 @@ import ( "os" "path/filepath" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // FindRepositories finds all repositories in a storage and provides their information to the caller-provided action. diff --git a/internal/gitaly/storage/walk/walk_test.go b/internal/gitaly/storage/walk/walk_test.go index 5d7139da80fb9747e48aa22bafe2be887d0ce742..77a0042ca8bd37b4bd7d58642e3e88aa684701f1 100644 --- a/internal/gitaly/storage/walk/walk_test.go +++ b/internal/gitaly/storage/walk/walk_test.go @@ -7,11 +7,11 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestWalkStorage(t *testing.T) { diff --git a/internal/gitaly/transaction/manager.go b/internal/gitaly/transaction/manager.go index e25d5cb54631a79c182765801a87a39d8283cf9e..aed6b69790710e2ec53fd65cb84c519a9b60c07a 100644 --- a/internal/gitaly/transaction/manager.go +++ b/internal/gitaly/transaction/manager.go @@ -7,13 +7,13 @@ import ( "time" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) const ( diff --git a/internal/gitaly/transaction/manager_test.go b/internal/gitaly/transaction/manager_test.go index c37257ee5e2f1b3a3ac492de60ba13a3f5d03a8b..980fc8b9cefbb4af75c0310a3adaac19314ef74e 100644 --- a/internal/gitaly/transaction/manager_test.go +++ b/internal/gitaly/transaction/manager_test.go @@ -7,14 +7,14 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/internal/gitaly/transaction/mock.go b/internal/gitaly/transaction/mock.go index 18e16edde6a4d9c7788fa99c125bd2483718d1f7..19ebd04a86b9b8e5ae9a242962d8492caed59727 100644 --- a/internal/gitaly/transaction/mock.go +++ b/internal/gitaly/transaction/mock.go @@ -5,8 +5,8 @@ import ( "errors" "sync" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" ) // MockManager is a mock Manager for use in tests. diff --git a/internal/gitaly/transaction/testhelper_test.go b/internal/gitaly/transaction/testhelper_test.go index 12a16c0e92399544e13633ffecedaee446c443f0..165d4dbb89390ffa5bf33782a1ceed099112d2c0 100644 --- a/internal/gitaly/transaction/testhelper_test.go +++ b/internal/gitaly/transaction/testhelper_test.go @@ -3,7 +3,7 @@ package transaction import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/transaction/voting.go b/internal/gitaly/transaction/voting.go index d515afe90acf2daafd3cc21dadc351888de0f0fa..b018bd32f05520a8af4a68aba69c19fa0582d38c 100644 --- a/internal/gitaly/transaction/voting.go +++ b/internal/gitaly/transaction/voting.go @@ -7,9 +7,9 @@ import ( "io" "os" - "gitlab.com/gitlab-org/gitaly/v16/internal/safe" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/internal/safe" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" ) // RunOnContext runs the given function if the context identifies a transaction. diff --git a/internal/gitaly/transaction/voting_test.go b/internal/gitaly/transaction/voting_test.go index e06c7a61e624b1a3c43e73067f37672b29e47b1a..c0a64bd6bf28ad9383bc926ce639481aa5821aeb 100644 --- a/internal/gitaly/transaction/voting_test.go +++ b/internal/gitaly/transaction/voting_test.go @@ -8,12 +8,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/safe" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/safe" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" "google.golang.org/grpc/peer" ) diff --git a/internal/gitlab/client/gitlabnet.go b/internal/gitlab/client/gitlabnet.go index 085eee7f9ef47481c69ba720c702ffefced203cc..383b9bfaedce2b3ed1d41d352c9b57f7d76a26e3 100644 --- a/internal/gitlab/client/gitlabnet.go +++ b/internal/gitlab/client/gitlabnet.go @@ -11,7 +11,7 @@ import ( "time" "github.com/golang-jwt/jwt/v5" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" "gitlab.com/gitlab-org/labkit/correlation" ) diff --git a/internal/gitlab/client/gitlabnet_test.go b/internal/gitlab/client/gitlabnet_test.go index 8a61a3931b4c79f3b31a69619fe2720f3bb5fe64..c73fd2ea4e8503ae3207b4b2aafd079be9c09a35 100644 --- a/internal/gitlab/client/gitlabnet_test.go +++ b/internal/gitlab/client/gitlabnet_test.go @@ -10,7 +10,7 @@ import ( "github.com/golang-jwt/jwt/v5" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" "gitlab.com/gitlab-org/labkit/correlation" ) diff --git a/internal/gitlab/client/testhelper_test.go b/internal/gitlab/client/testhelper_test.go index 137104d4d83555d8a67b3d1147855a4b4c807fc6..cacb27732a2746fa8d0d209b5b0e990da10a839b 100644 --- a/internal/gitlab/client/testhelper_test.go +++ b/internal/gitlab/client/testhelper_test.go @@ -3,7 +3,7 @@ package client import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitlab/http_client.go b/internal/gitlab/http_client.go index a574705861272926ddf9144b2069e4ca0dee6316..ebbdd0010ab76cae0d07f5cdac2717b32a87cf35 100644 --- a/internal/gitlab/http_client.go +++ b/internal/gitlab/http_client.go @@ -13,12 +13,12 @@ import ( "strings" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - gitalycfgprom "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitlab/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/prometheus/metrics" - "gitlab.com/gitlab-org/gitaly/v16/internal/version" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + gitalycfgprom "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/prometheus" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitlab/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/prometheus/metrics" + "gitlab.com/gitlab-org/gitaly/v17/internal/version" ) var glIDRegex = regexp.MustCompile(`\A[0-9]+\z`) diff --git a/internal/gitlab/http_client_test.go b/internal/gitlab/http_client_test.go index 7d3d6bf157088bd33f97c3e280fa971850479d32..611ded8359e93c156af20f66ca2b8f13fa0e90cb 100644 --- a/internal/gitlab/http_client_test.go +++ b/internal/gitlab/http_client_test.go @@ -9,13 +9,13 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/promtest" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/prometheus" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/promtest" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/proto" ) diff --git a/internal/gitlab/test_server.go b/internal/gitlab/test_server.go index 81845ccf0eef6de709e2001d1aa381f9f8336451..fb42f7c9e2587c6823df039549b19d79df5a8530 100644 --- a/internal/gitlab/test_server.go +++ b/internal/gitlab/test_server.go @@ -16,8 +16,8 @@ import ( "github.com/golang-jwt/jwt/v5" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) var changeLineRegex = regexp.MustCompile("^[a-f0-9]{40} [a-f0-9]{40} refs/[^ ]+$") diff --git a/internal/gitlab/testhelper_test.go b/internal/gitlab/testhelper_test.go index ef9a1141dcb7cc755e167f7817626f69b0c2e494..ce2c26084418aba763912467d4171eb946e9ff10 100644 --- a/internal/gitlab/testhelper_test.go +++ b/internal/gitlab/testhelper_test.go @@ -3,7 +3,7 @@ package gitlab import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/grpc/backchannel/backchannel.go b/internal/grpc/backchannel/backchannel.go index fc5ad9269e5344d802fbf7519997563bac9acc80..d75fb2ba3e32da89cffe2bc6311eaf1f720ff8f5 100644 --- a/internal/grpc/backchannel/backchannel.go +++ b/internal/grpc/backchannel/backchannel.go @@ -34,7 +34,7 @@ import ( "sync" "github.com/hashicorp/yamux" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) type yamuxLogWrapper struct { diff --git a/internal/grpc/backchannel/backchannel_example_test.go b/internal/grpc/backchannel/backchannel_example_test.go index b28bb68cf13f3181f4bc868c0dcdfb019dce0c3d..daecd3cc475491b8d1f691e20cdded3193aeba25 100644 --- a/internal/grpc/backchannel/backchannel_example_test.go +++ b/internal/grpc/backchannel/backchannel_example_test.go @@ -7,10 +7,10 @@ import ( "net" "os" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/listenmux" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/listenmux" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) diff --git a/internal/grpc/backchannel/backchannel_test.go b/internal/grpc/backchannel/backchannel_test.go index 28d4ab71e8566e8d6407636c2c40b72f023e3f8f..77d81df433d4caa10c274722fa1b4b9ba814d0f8 100644 --- a/internal/grpc/backchannel/backchannel_test.go +++ b/internal/grpc/backchannel/backchannel_test.go @@ -12,9 +12,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/listenmux" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/listenmux" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/credentials/insecure" diff --git a/internal/grpc/backchannel/client.go b/internal/grpc/backchannel/client.go index d3c5c7fc2c9ab394fa73f7d4ae81c2e4a6975f23..60dda1529765698f097e55303556063fe7f374dd 100644 --- a/internal/grpc/backchannel/client.go +++ b/internal/grpc/backchannel/client.go @@ -7,7 +7,7 @@ import ( "time" "github.com/hashicorp/yamux" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" "google.golang.org/grpc/credentials" ) diff --git a/internal/grpc/backchannel/server.go b/internal/grpc/backchannel/server.go index 4eeb99701f221c384b0953a3f8eefd5bb828ad70..a9586fadb48bce25434a10671d141a73c03914b7 100644 --- a/internal/grpc/backchannel/server.go +++ b/internal/grpc/backchannel/server.go @@ -8,7 +8,7 @@ import ( "net" "github.com/hashicorp/yamux" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" "google.golang.org/grpc" "google.golang.org/grpc/credentials" "google.golang.org/grpc/credentials/insecure" diff --git a/internal/grpc/backchannel/testhelper_test.go b/internal/grpc/backchannel/testhelper_test.go index c2ba27cbb2cf259115fdf0bed3f90fa65d48174c..f658051829590d14909b85a9b05409b591ebf1bf 100644 --- a/internal/grpc/backchannel/testhelper_test.go +++ b/internal/grpc/backchannel/testhelper_test.go @@ -3,7 +3,7 @@ package backchannel import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/grpc/client/dial.go b/internal/grpc/client/dial.go index 4aad0e23cc75ca0930898e15711adce8b80088e1..c8291c8cad0af3c1cde1ae0c323ccab1f452af77 100644 --- a/internal/grpc/client/dial.go +++ b/internal/grpc/client/dial.go @@ -8,10 +8,10 @@ import ( "net/url" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/dnsresolver" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - gitalyx509 "gitlab.com/gitlab-org/gitaly/v16/internal/x509" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/dnsresolver" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + gitalyx509 "gitlab.com/gitlab-org/gitaly/v17/internal/x509" + "gitlab.com/gitlab-org/gitaly/v17/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/grpc/client/dial_ext_test.go b/internal/grpc/client/dial_ext_test.go index 2be6d3e01f409dc4bad8669c1d032f743a3d547a..fca4f4ee4a945e95046364c05fe728af1fc96207 100644 --- a/internal/grpc/client/dial_ext_test.go +++ b/internal/grpc/client/dial_ext_test.go @@ -7,14 +7,14 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/repository" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/repository" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/internal/grpc/client/dial_test.go b/internal/grpc/client/dial_test.go index 39636f213bb990692e770b83d283626e6a9f89d5..790a5743abe8063c6300619142c89e064fbe7458 100644 --- a/internal/grpc/client/dial_test.go +++ b/internal/grpc/client/dial_test.go @@ -7,10 +7,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/listenmux" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/listenmux" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/credentials/insecure" diff --git a/internal/grpc/client/pool.go b/internal/grpc/client/pool.go index a79112dc8c8006b31218cfe5502d18a5f2243340..2389cf386a2364f93a497529fa25d08dbeb6f525 100644 --- a/internal/grpc/client/pool.go +++ b/internal/grpc/client/pool.go @@ -6,7 +6,7 @@ import ( "fmt" "sync" - gitalyauth "gitlab.com/gitlab-org/gitaly/v16/auth" + gitalyauth "gitlab.com/gitlab-org/gitaly/v17/auth" "google.golang.org/grpc" ) diff --git a/internal/grpc/client/testhelper_test.go b/internal/grpc/client/testhelper_test.go index 137104d4d83555d8a67b3d1147855a4b4c807fc6..cacb27732a2746fa8d0d209b5b0e990da10a839b 100644 --- a/internal/grpc/client/testhelper_test.go +++ b/internal/grpc/client/testhelper_test.go @@ -3,7 +3,7 @@ package client import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/grpc/dnsresolver/builder.go b/internal/grpc/dnsresolver/builder.go index 69a7d2346e48a5c38b72eaee942d4d5dffd6cbeb..69d40349d3839feed84e514de28cae64adef958b 100644 --- a/internal/grpc/dnsresolver/builder.go +++ b/internal/grpc/dnsresolver/builder.go @@ -5,9 +5,9 @@ import ( "strings" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/backoff" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/backoff" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" "google.golang.org/grpc/resolver" ) diff --git a/internal/grpc/dnsresolver/builder_test.go b/internal/grpc/dnsresolver/builder_test.go index 0d283cb64f31c0a1665c9ada7cb10b964cb63f46..2b696a99db1ce00352e52ca7fa62762039885ad3 100644 --- a/internal/grpc/dnsresolver/builder_test.go +++ b/internal/grpc/dnsresolver/builder_test.go @@ -8,7 +8,7 @@ import ( "github.com/miekg/dns" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" "google.golang.org/grpc/resolver" ) diff --git a/internal/grpc/dnsresolver/resolver.go b/internal/grpc/dnsresolver/resolver.go index df21fb198088fa5503f7abcaff31928c4466e005..fb6372f8df0d62abb21c409d35d044ac8f7a3b43 100644 --- a/internal/grpc/dnsresolver/resolver.go +++ b/internal/grpc/dnsresolver/resolver.go @@ -7,9 +7,9 @@ import ( "sync" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/backoff" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/backoff" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" "google.golang.org/grpc/resolver" ) diff --git a/internal/grpc/dnsresolver/resolver_test.go b/internal/grpc/dnsresolver/resolver_test.go index 1cbef27d9bfbb4b223226124d28ae30face4294b..505b8ca9cfadf968be96856dc2a807f3c12127a5 100644 --- a/internal/grpc/dnsresolver/resolver_test.go +++ b/internal/grpc/dnsresolver/resolver_test.go @@ -10,9 +10,9 @@ import ( "github.com/miekg/dns" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/backoff" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/backoff" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" grpccorrelation "gitlab.com/gitlab-org/labkit/correlation/grpc" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" diff --git a/internal/grpc/dnsresolver/target.go b/internal/grpc/dnsresolver/target.go index 0e1ac3f8ac96dc6a64f7c381efa7f7b2db202e73..73a40d7248ce740f7290d997c0d0299002fea4dd 100644 --- a/internal/grpc/dnsresolver/target.go +++ b/internal/grpc/dnsresolver/target.go @@ -6,7 +6,7 @@ import ( "net/url" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" ) // ValidateURL validates Gitaly address URL having dns scheme. The URL follows three forms: diff --git a/internal/grpc/dnsresolver/target_test.go b/internal/grpc/dnsresolver/target_test.go index 36ad9bf493350048f21b11635197647c8928e76e..dba1d08fd3c1f8c89c75aaedf3ff4228d2cd5663 100644 --- a/internal/grpc/dnsresolver/target_test.go +++ b/internal/grpc/dnsresolver/target_test.go @@ -7,8 +7,8 @@ import ( "github.com/miekg/dns" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestFindDNSLookup_default(t *testing.T) { diff --git a/internal/grpc/dnsresolver/testhelper_test.go b/internal/grpc/dnsresolver/testhelper_test.go index 3abd3d645306d4fc4dc1e403ad8d06924118ea97..cf0615333d36ff990d2581f7b11ffa02ec5b52d1 100644 --- a/internal/grpc/dnsresolver/testhelper_test.go +++ b/internal/grpc/dnsresolver/testhelper_test.go @@ -9,7 +9,7 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" "google.golang.org/grpc/resolver" "google.golang.org/grpc/serviceconfig" ) diff --git a/internal/grpc/grpcstats/stats.go b/internal/grpc/grpcstats/stats.go index 09fed704f3ca137c4e813ede165d9837b10f53d1..d41fb18418851a42af64b692cb8f51d052e4ca54 100644 --- a/internal/grpc/grpcstats/stats.go +++ b/internal/grpc/grpcstats/stats.go @@ -3,7 +3,7 @@ package grpcstats import ( "context" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" "google.golang.org/grpc/stats" ) diff --git a/internal/grpc/grpcstats/stats_test.go b/internal/grpc/grpcstats/stats_test.go index 04a393737d1655b5dab744298cf000926d5485d3..73747fd75f549cdf66bd3ec301dad039bfc189c6 100644 --- a/internal/grpc/grpcstats/stats_test.go +++ b/internal/grpc/grpcstats/stats_test.go @@ -12,10 +12,10 @@ import ( grpcmwlogrus "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/loghandler" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/middleware/loghandler" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" "google.golang.org/grpc" "google.golang.org/grpc/interop/grpc_testing" "google.golang.org/grpc/stats" diff --git a/internal/grpc/grpcstats/testhelper_test.go b/internal/grpc/grpcstats/testhelper_test.go index d0b298d5f8df5539dd4a0231b01753d51432a326..b571e579b8ee7997a4ce53b80bd376b5a1202b63 100644 --- a/internal/grpc/grpcstats/testhelper_test.go +++ b/internal/grpc/grpcstats/testhelper_test.go @@ -3,7 +3,7 @@ package grpcstats import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/grpc/listenmux/mux_test.go b/internal/grpc/listenmux/mux_test.go index 66a855d47d4e29c0a2429591de35ae761e80e9ec..9c5e9b8615ec7b266de39593b4db42021b4f8fa4 100644 --- a/internal/grpc/listenmux/mux_test.go +++ b/internal/grpc/listenmux/mux_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" "google.golang.org/grpc" "google.golang.org/grpc/credentials" "google.golang.org/grpc/credentials/insecure" diff --git a/internal/grpc/listenmux/testhelper_test.go b/internal/grpc/listenmux/testhelper_test.go index 3cd68209c1e168cb9dfc5529d4194b924f1e264b..30edc056938e13929ffb29ca74cd1ded12aac71f 100644 --- a/internal/grpc/listenmux/testhelper_test.go +++ b/internal/grpc/listenmux/testhelper_test.go @@ -3,7 +3,7 @@ package listenmux import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/grpc/metadata/metadata_test.go b/internal/grpc/metadata/metadata_test.go index ca079929d3e6fda371b3c83ca09caacf283374c8..70786434ff395e073811ad1956fb6cd2f7a6838e 100644 --- a/internal/grpc/metadata/metadata_test.go +++ b/internal/grpc/metadata/metadata_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestOutgoingToIncoming(t *testing.T) { diff --git a/internal/grpc/metadata/testhelper_test.go b/internal/grpc/metadata/testhelper_test.go index bfb3939032784d680b90cfc7555c8541478be8ba..89cc339cad845583b16a6b4275d3ab7be3c77b30 100644 --- a/internal/grpc/metadata/testhelper_test.go +++ b/internal/grpc/metadata/testhelper_test.go @@ -3,7 +3,7 @@ package metadata import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/grpc/middleware/cache/cache.go b/internal/grpc/middleware/cache/cache.go index 10c51a79fdff9b9e764127422becd91ae2b819ed..7c049cbacf11720247fed8b3fbcc0c66f057bd39 100644 --- a/internal/grpc/middleware/cache/cache.go +++ b/internal/grpc/middleware/cache/cache.go @@ -6,9 +6,9 @@ import ( "strings" "sync" - diskcache "gitlab.com/gitlab-org/gitaly/v16/internal/cache" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + diskcache "gitlab.com/gitlab-org/gitaly/v17/internal/cache" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" "google.golang.org/grpc" "google.golang.org/protobuf/proto" ) diff --git a/internal/grpc/middleware/cache/cache_test.go b/internal/grpc/middleware/cache/cache_test.go index e911fd85d80476ef82bfc0b867307538793f9e57..022e8a657c89ef97862eec74374f23d1d59583a4 100644 --- a/internal/grpc/middleware/cache/cache_test.go +++ b/internal/grpc/middleware/cache/cache_test.go @@ -8,10 +8,10 @@ import ( "testing" "github.com/stretchr/testify/require" - diskcache "gitlab.com/gitlab-org/gitaly/v16/internal/cache" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + diskcache "gitlab.com/gitlab-org/gitaly/v17/internal/cache" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/health/grpc_health_v1" diff --git a/internal/grpc/middleware/cache/prometheus.go b/internal/grpc/middleware/cache/prometheus.go index 261e460459b229e8ec8964c4b4a805ca9698aa01..40f0ceb8ecc52ab87f07854ceafcf2e358b52ada 100644 --- a/internal/grpc/middleware/cache/prometheus.go +++ b/internal/grpc/middleware/cache/prometheus.go @@ -3,7 +3,7 @@ package cache import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" ) var ( diff --git a/internal/grpc/middleware/cache/testhelper_test.go b/internal/grpc/middleware/cache/testhelper_test.go index 6c55da37a068a62f2b55197fdf75c3403cf2b942..dced38bf5641e8e96f4f8d88c0d461a07d02f8f7 100644 --- a/internal/grpc/middleware/cache/testhelper_test.go +++ b/internal/grpc/middleware/cache/testhelper_test.go @@ -3,7 +3,7 @@ package cache import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/grpc/middleware/customfieldshandler/customfields_handler.go b/internal/grpc/middleware/customfieldshandler/customfields_handler.go index fafb09ba2d1e570bd84fc09c93a88aef5f1af953..ad64cd9296aaccd4d521c6a702c9fbdb094a7dca 100644 --- a/internal/grpc/middleware/customfieldshandler/customfields_handler.go +++ b/internal/grpc/middleware/customfieldshandler/customfields_handler.go @@ -4,7 +4,7 @@ import ( "context" grpcmw "github.com/grpc-ecosystem/go-grpc-middleware" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" "google.golang.org/grpc" ) diff --git a/internal/grpc/middleware/customfieldshandler/customfields_handler_test.go b/internal/grpc/middleware/customfieldshandler/customfields_handler_test.go index 1ad7cdc319cb174e72ec5a7bab10546a6618bbf7..7ffcac551b01bda7732f6b52b487a77bed07af80 100644 --- a/internal/grpc/middleware/customfieldshandler/customfields_handler_test.go +++ b/internal/grpc/middleware/customfieldshandler/customfields_handler_test.go @@ -9,19 +9,19 @@ import ( grpcmwlogrus "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/ref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/loghandler" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/ref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/middleware/loghandler" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/test/bufconn" diff --git a/internal/grpc/middleware/customfieldshandler/testhelper_test.go b/internal/grpc/middleware/customfieldshandler/testhelper_test.go index 16e038e4ebac7394d4d3789eae331177eeadcc08..247060934ea1d8be11a1485ef9b15d7b9cb60783 100644 --- a/internal/grpc/middleware/customfieldshandler/testhelper_test.go +++ b/internal/grpc/middleware/customfieldshandler/testhelper_test.go @@ -3,7 +3,7 @@ package customfieldshandler import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/grpc/middleware/featureflag/featureflag_handler.go b/internal/grpc/middleware/featureflag/featureflag_handler.go index 893cb79ce7949ab4146a42d41ee6b0dc14214fe7..501ea092467d205eaf2f213d0669a2414e9550b3 100644 --- a/internal/grpc/middleware/featureflag/featureflag_handler.go +++ b/internal/grpc/middleware/featureflag/featureflag_handler.go @@ -5,8 +5,8 @@ import ( "sort" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) // FieldsProducer adds feature_flags logging fields to gRPC logs. Only enabled flags are available. diff --git a/internal/grpc/middleware/featureflag/featureflag_handler_test.go b/internal/grpc/middleware/featureflag/featureflag_handler_test.go index 29cbc02e25ea823464d669d12adcb38ebd6e086d..a4f6ae62794e0586dc136fd760f3fca30893e754 100644 --- a/internal/grpc/middleware/featureflag/featureflag_handler_test.go +++ b/internal/grpc/middleware/featureflag/featureflag_handler_test.go @@ -7,10 +7,10 @@ import ( grpcmwlogrus "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/loghandler" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/middleware/loghandler" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/interop/grpc_testing" diff --git a/internal/grpc/middleware/featureflag/testhelper_test.go b/internal/grpc/middleware/featureflag/testhelper_test.go index 3b7d116384074c0070a51b1f0b9c5df35067a19b..064f394a695a68e25bc208ac3bfc54b37b9b4714 100644 --- a/internal/grpc/middleware/featureflag/testhelper_test.go +++ b/internal/grpc/middleware/featureflag/testhelper_test.go @@ -3,7 +3,7 @@ package featureflag import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/grpc/middleware/limithandler/middleware.go b/internal/grpc/middleware/limithandler/middleware.go index 64d36ffe3b1a3b3fa000349c7a133d9404a1f079..41783002310fe4a15ad9221a80438844a206fd7d 100644 --- a/internal/grpc/middleware/limithandler/middleware.go +++ b/internal/grpc/middleware/limithandler/middleware.go @@ -7,10 +7,10 @@ import ( "time" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/requestinfohandler" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/limiter" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/middleware/requestinfohandler" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/limiter" "google.golang.org/grpc" ) diff --git a/internal/grpc/middleware/limithandler/middleware_test.go b/internal/grpc/middleware/limithandler/middleware_test.go index e26e21e957de07691be748d63b4c4c2e88bf5fbb..b8853927d06a2699397b36b77cf4fe2b0eaf37af 100644 --- a/internal/grpc/middleware/limithandler/middleware_test.go +++ b/internal/grpc/middleware/limithandler/middleware_test.go @@ -11,13 +11,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/limithandler" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/duration" - "gitlab.com/gitlab-org/gitaly/v16/internal/limiter" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/middleware/limithandler" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/duration" + "gitlab.com/gitlab-org/gitaly/v17/internal/limiter" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/credentials/insecure" diff --git a/internal/grpc/middleware/limithandler/testhelper_test.go b/internal/grpc/middleware/limithandler/testhelper_test.go index a217688fd54af5eb66e98c702df995613afae166..77e4abd9fa5f68b5f66fda581ff5602a387f6da3 100644 --- a/internal/grpc/middleware/limithandler/testhelper_test.go +++ b/internal/grpc/middleware/limithandler/testhelper_test.go @@ -10,7 +10,7 @@ import ( "github.com/prometheus/client_golang/prometheus" dto "github.com/prometheus/client_model/go" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" "google.golang.org/grpc/interop/grpc_testing" ) diff --git a/internal/grpc/middleware/loghandler/loghandler.go b/internal/grpc/middleware/loghandler/loghandler.go index f1d66ad19d024b4902a3ce028a7c8014f70ba31d..e0e08f1aab5f702473c1bc9472a13570b478e030 100644 --- a/internal/grpc/middleware/loghandler/loghandler.go +++ b/internal/grpc/middleware/loghandler/loghandler.go @@ -5,7 +5,7 @@ import ( grpcmwlogrus "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/stats" diff --git a/internal/grpc/middleware/loghandler/loghandler_test.go b/internal/grpc/middleware/loghandler/loghandler_test.go index 8ce7a1251d629e964fcc0e5bd4c582ae6f681457..276267ce62d4b78ef21048ba7ef3f2833befd8b2 100644 --- a/internal/grpc/middleware/loghandler/loghandler_test.go +++ b/internal/grpc/middleware/loghandler/loghandler_test.go @@ -10,7 +10,7 @@ import ( "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/stats" diff --git a/internal/grpc/middleware/loghandler/testhelper_test.go b/internal/grpc/middleware/loghandler/testhelper_test.go index 6776efe8d214972d6c831e3faa713d91b33e722e..33cc37acbc4ad0d45ae3485c4a6e57e27f9c600b 100644 --- a/internal/grpc/middleware/loghandler/testhelper_test.go +++ b/internal/grpc/middleware/loghandler/testhelper_test.go @@ -3,7 +3,7 @@ package loghandler import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/grpc/middleware/panichandler/panic_handler.go b/internal/grpc/middleware/panichandler/panic_handler.go index 92d4627643b520659d9736e047ab9d6926de75f2..110fdc8ff66b2425f061c6011eb90cbf5ee5ad23 100644 --- a/internal/grpc/middleware/panichandler/panic_handler.go +++ b/internal/grpc/middleware/panichandler/panic_handler.go @@ -4,7 +4,7 @@ import ( "context" "runtime/debug" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/internal/grpc/middleware/requestinfohandler/requestinfohandler.go b/internal/grpc/middleware/requestinfohandler/requestinfohandler.go index d560ca1cd6d4e98d37cd34c205cccc09b3ebeb1d..0d1dc9b1fad323cd86978becff95528a5c54ebaf 100644 --- a/internal/grpc/middleware/requestinfohandler/requestinfohandler.go +++ b/internal/grpc/middleware/requestinfohandler/requestinfohandler.go @@ -9,10 +9,10 @@ import ( grpcprometheus "github.com/grpc-ecosystem/go-grpc-prometheus" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - gitalyauth "gitlab.com/gitlab-org/gitaly/v16/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + gitalyauth "gitlab.com/gitlab-org/gitaly/v17/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "gitlab.com/gitlab-org/labkit/correlation" "google.golang.org/grpc" "google.golang.org/grpc/metadata" diff --git a/internal/grpc/middleware/requestinfohandler/requestinfohandler_test.go b/internal/grpc/middleware/requestinfohandler/requestinfohandler_test.go index 2b72eb4c0e7fdb0515ddada8f9c916b4c8d6b765..8ce94d66720a5b6799c9bf263203b8214b9f1c6e 100644 --- a/internal/grpc/middleware/requestinfohandler/requestinfohandler_test.go +++ b/internal/grpc/middleware/requestinfohandler/requestinfohandler_test.go @@ -12,10 +12,10 @@ import ( grpcmwtags "github.com/grpc-ecosystem/go-grpc-middleware/tags" "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/logging" "github.com/stretchr/testify/require" - gitalylog "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + gitalylog "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "gitlab.com/gitlab-org/labkit/correlation" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" diff --git a/internal/grpc/middleware/requestinfohandler/testhelper_test.go b/internal/grpc/middleware/requestinfohandler/testhelper_test.go index 464eca43dce82ac6a041d791aedca3a7b0148daa..5d53befef4dca08bb2d3f475699c2b74d7dd081a 100644 --- a/internal/grpc/middleware/requestinfohandler/testhelper_test.go +++ b/internal/grpc/middleware/requestinfohandler/testhelper_test.go @@ -3,7 +3,7 @@ package requestinfohandler import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/grpc/middleware/sentryhandler/sentryhandler.go b/internal/grpc/middleware/sentryhandler/sentryhandler.go index 2ac1ef2cfe55acf2f727b4d77d3a9b66cd7877bf..d578a7e36bb22af6de33687c731c74b22cee4c3a 100644 --- a/internal/grpc/middleware/sentryhandler/sentryhandler.go +++ b/internal/grpc/middleware/sentryhandler/sentryhandler.go @@ -10,8 +10,8 @@ import ( sentry "github.com/getsentry/sentry-go" grpcmw "github.com/grpc-ecosystem/go-grpc-middleware/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/requestinfohandler" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/middleware/requestinfohandler" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" "google.golang.org/grpc" "google.golang.org/grpc/codes" ) diff --git a/internal/grpc/middleware/sentryhandler/sentryhandler_test.go b/internal/grpc/middleware/sentryhandler/sentryhandler_test.go index 61d67ed1066b5dbc95a07557cbd8ea4181df30cd..5f920f7e8f4802048caeb3df7394c52a6fd2deba 100644 --- a/internal/grpc/middleware/sentryhandler/sentryhandler_test.go +++ b/internal/grpc/middleware/sentryhandler/sentryhandler_test.go @@ -9,8 +9,8 @@ import ( sentry "github.com/getsentry/sentry-go" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/credentials/insecure" diff --git a/internal/grpc/middleware/sentryhandler/testhelper_test.go b/internal/grpc/middleware/sentryhandler/testhelper_test.go index d9287d14e2130e264a32ccea16ed03ac00066287..50f65121a66fe2bcff12092c0285ed3a6764fa0c 100644 --- a/internal/grpc/middleware/sentryhandler/testhelper_test.go +++ b/internal/grpc/middleware/sentryhandler/testhelper_test.go @@ -3,7 +3,7 @@ package sentryhandler import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/grpc/middleware/statushandler/statushandler.go b/internal/grpc/middleware/statushandler/statushandler.go index 339d849e706d966b6cab6eb808e50acacdf730ee..fe19ba5c8866daa368328f91e0073227d40baad9 100644 --- a/internal/grpc/middleware/statushandler/statushandler.go +++ b/internal/grpc/middleware/statushandler/statushandler.go @@ -4,7 +4,7 @@ import ( "context" "errors" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" "google.golang.org/grpc" "google.golang.org/grpc/codes" ) diff --git a/internal/grpc/middleware/statushandler/statushandler_test.go b/internal/grpc/middleware/statushandler/statushandler_test.go index 8ea38d2d351c5cd108234e5deff84514e1c58792..ddc913278dcf78b4b98ac3225b15d6812f2566bc 100644 --- a/internal/grpc/middleware/statushandler/statushandler_test.go +++ b/internal/grpc/middleware/statushandler/statushandler_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/interop/stress/grpc_testing" diff --git a/internal/grpc/middleware/statushandler/testhelper_test.go b/internal/grpc/middleware/statushandler/testhelper_test.go index 3437d6df2a41697d1878f0a9babfae7b6ce00b9b..4e82ca2801c9831f9316186e5f80c5fbdc362c67 100644 --- a/internal/grpc/middleware/statushandler/testhelper_test.go +++ b/internal/grpc/middleware/statushandler/testhelper_test.go @@ -3,7 +3,7 @@ package statushandler import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/grpc/protoregistry/method_info.go b/internal/grpc/protoregistry/method_info.go index 837b826b8b45621be0ba7623684291121200c949..14c4954aa4f760576e550afbf539498fbaba4d23 100644 --- a/internal/grpc/protoregistry/method_info.go +++ b/internal/grpc/protoregistry/method_info.go @@ -6,9 +6,9 @@ import ( "strconv" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/protoutil" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/protoutil" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/reflect/protopath" "google.golang.org/protobuf/reflect/protorange" diff --git a/internal/grpc/protoregistry/method_info_test.go b/internal/grpc/protoregistry/method_info_test.go index 8619c4248a5fd13a101c97f1086d7ca25a03d8c3..f588a40342705b2571efa159a451db37d2ac7ab0 100644 --- a/internal/grpc/protoregistry/method_info_test.go +++ b/internal/grpc/protoregistry/method_info_test.go @@ -6,9 +6,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/reflect/protoreflect" ) diff --git a/internal/grpc/protoregistry/registry.go b/internal/grpc/protoregistry/registry.go index 0f205a891d9ebb069fd8c205702586596db6629a..1963958815dc1954735c300811bb2997d42d8550 100644 --- a/internal/grpc/protoregistry/registry.go +++ b/internal/grpc/protoregistry/registry.go @@ -3,8 +3,8 @@ package protoregistry import ( "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/protoutil" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/protoutil" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/reflect/protodesc" protoreg "google.golang.org/protobuf/reflect/protoregistry" "google.golang.org/protobuf/types/descriptorpb" diff --git a/internal/grpc/protoregistry/testhelper_test.go b/internal/grpc/protoregistry/testhelper_test.go index 07f146a30d633df59eee86ca9a029dc91ee791a9..59c5cb201985954f2a8d0d737e02b27f6730914f 100644 --- a/internal/grpc/protoregistry/testhelper_test.go +++ b/internal/grpc/protoregistry/testhelper_test.go @@ -3,7 +3,7 @@ package protoregistry import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/grpc/proxy/handler.go b/internal/grpc/proxy/handler.go index 1a67d3c0f2f14fa3d79b0e04668c902d407a853e..2725c6d9ea1fca5af4fed0008af5e242543d1b54 100644 --- a/internal/grpc/proxy/handler.go +++ b/internal/grpc/proxy/handler.go @@ -9,7 +9,7 @@ import ( "fmt" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/sentryhandler" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/middleware/sentryhandler" "golang.org/x/sync/errgroup" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/internal/grpc/proxy/handler_ext_test.go b/internal/grpc/proxy/handler_ext_test.go index ed99af19a0f890f3163882e12df51b39150b6c82..79c7d87ba9049a4f93386827f4ec2e9e44b8820c 100644 --- a/internal/grpc/proxy/handler_ext_test.go +++ b/internal/grpc/proxy/handler_ext_test.go @@ -18,11 +18,11 @@ import ( "github.com/getsentry/sentry-go" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/proxy" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/proxy" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/credentials/insecure" diff --git a/internal/grpc/proxy/peeker_test.go b/internal/grpc/proxy/peeker_test.go index aea17bba219e822623afca7515ee6672fbc8619b..45e3f326a05a97b0f613a540a37f5ccfb69cc821 100644 --- a/internal/grpc/proxy/peeker_test.go +++ b/internal/grpc/proxy/peeker_test.go @@ -6,9 +6,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/proxy" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/proxy" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" "google.golang.org/grpc/interop/grpc_testing" "google.golang.org/protobuf/proto" ) diff --git a/internal/grpc/proxy/proxy_test_testhelper_test.go b/internal/grpc/proxy/proxy_test_testhelper_test.go index 3fef99bda1291e7ddf7eeaa3cf12b03797e03817..1d164991ba6ff753f6c00aac1274a8c2b9c98de1 100644 --- a/internal/grpc/proxy/proxy_test_testhelper_test.go +++ b/internal/grpc/proxy/proxy_test_testhelper_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/sentryhandler" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/proxy" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/middleware/sentryhandler" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/proxy" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/interop/grpc_testing" diff --git a/internal/grpc/proxy/testhelper_test.go b/internal/grpc/proxy/testhelper_test.go index 458219da2cad46879b817aff870a32735f45d807..9bd10ed95fd7cc29f4ca0dfe7448d634ca2935c8 100644 --- a/internal/grpc/proxy/testhelper_test.go +++ b/internal/grpc/proxy/testhelper_test.go @@ -3,7 +3,7 @@ package proxy import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/grpc/sidechannel/conn.go b/internal/grpc/sidechannel/conn.go index 7e8830bd8e5b367b29ffd623b304c7b73eb56fc0..658c9d9f702c81c8d17d683af25cae26164a5156 100644 --- a/internal/grpc/sidechannel/conn.go +++ b/internal/grpc/sidechannel/conn.go @@ -6,10 +6,10 @@ import ( "io" "net" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/pktline" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/streamio" "google.golang.org/grpc" ) diff --git a/internal/grpc/sidechannel/proxy.go b/internal/grpc/sidechannel/proxy.go index 06e0b38ffa46c2a797212c304a4a13516709cab1..b7cea3cb29f861c8feae169d65ac065353852b3e 100644 --- a/internal/grpc/sidechannel/proxy.go +++ b/internal/grpc/sidechannel/proxy.go @@ -6,8 +6,8 @@ import ( "fmt" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" "google.golang.org/grpc" grpcMetadata "google.golang.org/grpc/metadata" ) diff --git a/internal/grpc/sidechannel/proxy_test.go b/internal/grpc/sidechannel/proxy_test.go index 38fdf2dbbd7c1c921d2a8798e5ebb9be1be59ed4..d0fd6a9442b314b4b6beeb6b0c6cdc01baf2c612 100644 --- a/internal/grpc/sidechannel/proxy_test.go +++ b/internal/grpc/sidechannel/proxy_test.go @@ -10,12 +10,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/listenmux" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/listenmux" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" healthpb "google.golang.org/grpc/health/grpc_health_v1" diff --git a/internal/grpc/sidechannel/registry_test.go b/internal/grpc/sidechannel/registry_test.go index a0b55c2ac038692a898d02455301d9293419350c..892b7e0beb6f94f65212e523a2d8cd6f70feb619 100644 --- a/internal/grpc/sidechannel/registry_test.go +++ b/internal/grpc/sidechannel/registry_test.go @@ -11,7 +11,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestRegistry(t *testing.T) { diff --git a/internal/grpc/sidechannel/sidechannel.go b/internal/grpc/sidechannel/sidechannel.go index 083bc9304d91394747270ebd66362b0f8c9d07c5..871af513d581a28f6b73da29aa746984e90bdadc 100644 --- a/internal/grpc/sidechannel/sidechannel.go +++ b/internal/grpc/sidechannel/sidechannel.go @@ -9,11 +9,11 @@ import ( "strconv" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/listenmux" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/tracing" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/listenmux" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/tracing" "google.golang.org/grpc" "google.golang.org/grpc/credentials" "google.golang.org/grpc/credentials/insecure" diff --git a/internal/grpc/sidechannel/sidechannel_test.go b/internal/grpc/sidechannel/sidechannel_test.go index ea096f9da680d0a51abe209ebfdcfdb5745c1b47..398a3837a3c2c0acb7d8b7fedb6bf1737b4aba22 100644 --- a/internal/grpc/sidechannel/sidechannel_test.go +++ b/internal/grpc/sidechannel/sidechannel_test.go @@ -10,9 +10,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/listenmux" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/listenmux" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" healthpb "google.golang.org/grpc/health/grpc_health_v1" diff --git a/internal/grpc/sidechannel/testhelper_test.go b/internal/grpc/sidechannel/testhelper_test.go index 746f17eba10958b592bd4815655a4ee71ff30917..da020b1c47fec3d9951f26eb08f22dbc82cbe5af 100644 --- a/internal/grpc/sidechannel/testhelper_test.go +++ b/internal/grpc/sidechannel/testhelper_test.go @@ -3,7 +3,7 @@ package sidechannel import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/helper/chunk/chunker_test.go b/internal/helper/chunk/chunker_test.go index 75e2883497eb89eaee0d7071f07eeb421df8b9fc..df84c8e8bd412889d1195ad2e3122cd66040ac2a 100644 --- a/internal/helper/chunk/chunker_test.go +++ b/internal/helper/chunk/chunker_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/interop/grpc_testing" diff --git a/internal/helper/chunk/testhelper_test.go b/internal/helper/chunk/testhelper_test.go index e81d92db68a4f2652d78a92f2ac687cfc6489ac0..1f83340a1fe116a84cf6271fe73ede7add2b7d8e 100644 --- a/internal/helper/chunk/testhelper_test.go +++ b/internal/helper/chunk/testhelper_test.go @@ -3,7 +3,7 @@ package chunk import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/helper/duration/testhelper_test.go b/internal/helper/duration/testhelper_test.go index a0d9e8f7f8aa067b473328d40babbebfa4a95b16..e6b694dd12af7e2ecc117d383022f4fe3eafbc08 100644 --- a/internal/helper/duration/testhelper_test.go +++ b/internal/helper/duration/testhelper_test.go @@ -3,7 +3,7 @@ package duration import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/helper/env/env_test.go b/internal/helper/env/env_test.go index 9984cf38f0801c71315ae94dca74eadff1a7f691..ff123eee3411df74a538e2497e3d85b6bdf8083a 100644 --- a/internal/helper/env/env_test.go +++ b/internal/helper/env/env_test.go @@ -7,8 +7,8 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/env" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/env" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestGetBool(t *testing.T) { diff --git a/internal/helper/env/testhelper_test.go b/internal/helper/env/testhelper_test.go index 5fb46d8dc9e76e69ade874c236c280c33e6a8833..ee523566b7ead5ba418b5aabbec5e9e7750aba45 100644 --- a/internal/helper/env/testhelper_test.go +++ b/internal/helper/env/testhelper_test.go @@ -3,7 +3,7 @@ package env_test import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/helper/fstype/testhelper_test.go b/internal/helper/fstype/testhelper_test.go index 10ba5c1a8c526f7e7df28050477506c85262c93a..8f555f9b0cec31891a9ab15a9a08a50dd49327b6 100644 --- a/internal/helper/fstype/testhelper_test.go +++ b/internal/helper/fstype/testhelper_test.go @@ -3,7 +3,7 @@ package fstype import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/helper/lines/testhelper_test.go b/internal/helper/lines/testhelper_test.go index c1230a7615a55e1173879841189a36e84284bf1e..49cbc44ac961155d2833bf59485c54c5e4fe33cd 100644 --- a/internal/helper/lines/testhelper_test.go +++ b/internal/helper/lines/testhelper_test.go @@ -3,7 +3,7 @@ package lines import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/helper/perm/fix_permissions.go b/internal/helper/perm/fix_permissions.go index f949b95e4748509be909ec304c4c57430294eab7..7cfa09bf97bb98e9bc08ae332ccddf7eaa32583e 100644 --- a/internal/helper/perm/fix_permissions.go +++ b/internal/helper/perm/fix_permissions.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" ) // FixDirectoryPermissions does a recursive directory walk to look for diff --git a/internal/helper/perm/perm_test.go b/internal/helper/perm/perm_test.go index 283d768ff28f02408f77d44386df1b17c01a305c..34e0ddaf726ed603fd6cd655065c8bbcf5a570e0 100644 --- a/internal/helper/perm/perm_test.go +++ b/internal/helper/perm/perm_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/perm" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/perm" ) func TestUmaskMask(t *testing.T) { diff --git a/internal/helper/perm/testhelper_test.go b/internal/helper/perm/testhelper_test.go index 011814ee8cde68b0ad6ce13ef8f1467ec6e5d25e..f239279b37c0e844802b3cb71508bd6f07708401 100644 --- a/internal/helper/perm/testhelper_test.go +++ b/internal/helper/perm/testhelper_test.go @@ -3,7 +3,7 @@ package perm_test import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/helper/testhelper_test.go b/internal/helper/testhelper_test.go index c57af0dad2d948bb5c6d9c00ca497d80e16e8fb8..7322f0550178d1df642ead6000736b1696fec62e 100644 --- a/internal/helper/testhelper_test.go +++ b/internal/helper/testhelper_test.go @@ -3,7 +3,7 @@ package helper import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/helper/text/chomp_test.go b/internal/helper/text/chomp_test.go index 5d707bbeb702ec11f92119f301bb5ffad89c852e..c67193c9f00843f1a289b17b40b78a63c38d449d 100644 --- a/internal/helper/text/chomp_test.go +++ b/internal/helper/text/chomp_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" ) func TestChompBytes(t *testing.T) { diff --git a/internal/helper/text/testhelper_test.go b/internal/helper/text/testhelper_test.go index 6483830f208c41836008148fcc401a9e6646a0db..426606d64f967aa33b20fff5e6b43992e8879958 100644 --- a/internal/helper/text/testhelper_test.go +++ b/internal/helper/text/testhelper_test.go @@ -3,7 +3,7 @@ package text_test import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/kernel/testhelper_test.go b/internal/kernel/testhelper_test.go index 25357f06fa6c369133ec79429208f35b250f83d9..f8e6ea35db8700fad39374916dd553ec6e3963ba 100644 --- a/internal/kernel/testhelper_test.go +++ b/internal/kernel/testhelper_test.go @@ -3,7 +3,7 @@ package kernel import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/kernel/version.go b/internal/kernel/version.go index 9617cadffbe6081e1bce722873e8d200da734e57..53330c30de788a1d27c5b6ebf97ad50816e72bd1 100644 --- a/internal/kernel/version.go +++ b/internal/kernel/version.go @@ -6,7 +6,7 @@ import ( "strconv" "sync" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" ) // Version models a kernel version. diff --git a/internal/kernel/version_test.go b/internal/kernel/version_test.go index 7c3da043ac2bc7d41ba5c8bfbd7fd1fb6c8e1071..e2c9e19ef343d36e2da3b59997dc724e3dd89f57 100644 --- a/internal/kernel/version_test.go +++ b/internal/kernel/version_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" ) func TestIsAtLeast(t *testing.T) { diff --git a/internal/limiter/adaptive_calculator.go b/internal/limiter/adaptive_calculator.go index 38d3e0ba856c0a915290de971c9ee3d3f279db2c..3351b8a737a95d5cfcb1525cc6c18b7be61066cd 100644 --- a/internal/limiter/adaptive_calculator.go +++ b/internal/limiter/adaptive_calculator.go @@ -10,8 +10,8 @@ import ( "time" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) const ( diff --git a/internal/limiter/adaptive_calculator_test.go b/internal/limiter/adaptive_calculator_test.go index 97b81d3a49837acc149eb913756d342811a2257c..ca66ca07644db3d3140366b37432c7778ea52bbd 100644 --- a/internal/limiter/adaptive_calculator_test.go +++ b/internal/limiter/adaptive_calculator_test.go @@ -10,8 +10,8 @@ import ( "github.com/sirupsen/logrus" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestAdaptiveCalculator_alreadyStarted(t *testing.T) { diff --git a/internal/limiter/concurrency_limiter.go b/internal/limiter/concurrency_limiter.go index 38110d05a774737ffa31cc9ae72da810e495579a..fdff8a497f4929c43f4276e2e18426c84f836968 100644 --- a/internal/limiter/concurrency_limiter.go +++ b/internal/limiter/concurrency_limiter.go @@ -7,10 +7,10 @@ import ( "sync" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/tracing" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/tracing" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/types/known/durationpb" ) diff --git a/internal/limiter/concurrency_limiter_test.go b/internal/limiter/concurrency_limiter_test.go index aa11adbdd0995a497eea05cd126fb637baed19d8..14cec2460d903cdee3fe21f81732e8e36767399f 100644 --- a/internal/limiter/concurrency_limiter_test.go +++ b/internal/limiter/concurrency_limiter_test.go @@ -11,9 +11,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/protobuf/types/known/durationpb" ) diff --git a/internal/limiter/monitor.go b/internal/limiter/monitor.go index 9230525d86545f20a52a0fb8dc61c15e803da56c..8ec1793e1cb39144790962f7f0cb9d81b62f0ed0 100644 --- a/internal/limiter/monitor.go +++ b/internal/limiter/monitor.go @@ -6,7 +6,7 @@ import ( "time" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) // ConcurrencyMonitor allows the concurrency monitor to be observed. diff --git a/internal/limiter/monitor_test.go b/internal/limiter/monitor_test.go index deff19caced1cc39f7735acf13a2eaa64e9fb6f7..14b3f12e3e383505909bc1a0c67fb8872e90d0ca 100644 --- a/internal/limiter/monitor_test.go +++ b/internal/limiter/monitor_test.go @@ -6,9 +6,9 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/require" - promconfig "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + promconfig "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/prometheus" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestNewPerRPCPromMonitor(t *testing.T) { diff --git a/internal/limiter/rate_limiter.go b/internal/limiter/rate_limiter.go index 73e0e5b6a212519b26f6a1e139ebf890b19b1485..9a0f547bc8b8e9ab350913cf1b35d74e44c1f21f 100644 --- a/internal/limiter/rate_limiter.go +++ b/internal/limiter/rate_limiter.go @@ -7,10 +7,10 @@ import ( "time" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/tracing" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/tracing" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "golang.org/x/time/rate" "google.golang.org/protobuf/types/known/durationpb" ) diff --git a/internal/limiter/rate_limiter_test.go b/internal/limiter/rate_limiter_test.go index 5a39a694ce54a9be0c83756a6b70dfec114bbc96..a229845d6d40b267873d27bf8dee2ccb7c2ac871 100644 --- a/internal/limiter/rate_limiter_test.go +++ b/internal/limiter/rate_limiter_test.go @@ -5,8 +5,8 @@ import ( "time" "github.com/stretchr/testify/assert" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestRateLimiter_pruneUnusedLimiters(t *testing.T) { diff --git a/internal/limiter/resizable_semaphore_test.go b/internal/limiter/resizable_semaphore_test.go index f7593012e0bcb78b89b859723e7681b6a15c54c9..b0fcebb008c56e1eb7f5f4067a0e3fe783b65a2d 100644 --- a/internal/limiter/resizable_semaphore_test.go +++ b/internal/limiter/resizable_semaphore_test.go @@ -9,7 +9,7 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestResizableSemaphore_New(t *testing.T) { diff --git a/internal/limiter/testhelper_test.go b/internal/limiter/testhelper_test.go index 419ba21582f2f4206f8f6ef4f63158025017fc34..205d37640c06a44323bbea859b2cb1e3c4ceadc4 100644 --- a/internal/limiter/testhelper_test.go +++ b/internal/limiter/testhelper_test.go @@ -3,7 +3,7 @@ package limiter import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/limiter/watchers/cgroup_cpu_watcher.go b/internal/limiter/watchers/cgroup_cpu_watcher.go index 30f5c8454196ec0cd33d5797b3003119fad3850a..de63951bbab15d554c55cb97875299fec3233058 100644 --- a/internal/limiter/watchers/cgroup_cpu_watcher.go +++ b/internal/limiter/watchers/cgroup_cpu_watcher.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/cgroups" - "gitlab.com/gitlab-org/gitaly/v16/internal/limiter" + "gitlab.com/gitlab-org/gitaly/v17/internal/cgroups" + "gitlab.com/gitlab-org/gitaly/v17/internal/limiter" ) const ( diff --git a/internal/limiter/watchers/cgroup_cpu_watcher_test.go b/internal/limiter/watchers/cgroup_cpu_watcher_test.go index 8b007b399ebc5d13f73e66bdd9625e3fbff37cbd..5e9c29a43a03dfe5c2e5142eeff6abf7e28c49c1 100644 --- a/internal/limiter/watchers/cgroup_cpu_watcher_test.go +++ b/internal/limiter/watchers/cgroup_cpu_watcher_test.go @@ -6,9 +6,9 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/cgroups" - "gitlab.com/gitlab-org/gitaly/v16/internal/limiter" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/cgroups" + "gitlab.com/gitlab-org/gitaly/v17/internal/limiter" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestCgroupCPUWatcher_Name(t *testing.T) { diff --git a/internal/limiter/watchers/cgroup_memory_watcher.go b/internal/limiter/watchers/cgroup_memory_watcher.go index ab686ba120d62e8f054c55d4e2c271e3ce078a1c..d30d8b6293241f21b1ef39d2ae52932abe4a9dba 100644 --- a/internal/limiter/watchers/cgroup_memory_watcher.go +++ b/internal/limiter/watchers/cgroup_memory_watcher.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/cgroups" - "gitlab.com/gitlab-org/gitaly/v16/internal/limiter" + "gitlab.com/gitlab-org/gitaly/v17/internal/cgroups" + "gitlab.com/gitlab-org/gitaly/v17/internal/limiter" ) const ( diff --git a/internal/limiter/watchers/cgroup_memory_watcher_test.go b/internal/limiter/watchers/cgroup_memory_watcher_test.go index ccc2df3a0c91523ac0792a9a5dc040fefc00cc8e..54841b71d9d5550f0b04113a27f8e890adddeec1 100644 --- a/internal/limiter/watchers/cgroup_memory_watcher_test.go +++ b/internal/limiter/watchers/cgroup_memory_watcher_test.go @@ -5,9 +5,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/cgroups" - "gitlab.com/gitlab-org/gitaly/v16/internal/limiter" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/cgroups" + "gitlab.com/gitlab-org/gitaly/v17/internal/limiter" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestCgroupMemoryWatcher_Name(t *testing.T) { diff --git a/internal/limiter/watchers/testhelper_test.go b/internal/limiter/watchers/testhelper_test.go index bb4613acc978849e681b3c0e5ef3eb2b60b73d46..075a0967579a40e72d5155160bab611b9166316f 100644 --- a/internal/limiter/watchers/testhelper_test.go +++ b/internal/limiter/watchers/testhelper_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/cgroups" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/cgroups" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) type testCgroupManager struct { diff --git a/internal/log/customfields_test.go b/internal/log/customfields_test.go index 8d14a38eb0ebf99dfac03b86221a2f60e8e72bc1..2b49af93cc0afbe54bfc040714acf40bfabfa5e0 100644 --- a/internal/log/customfields_test.go +++ b/internal/log/customfields_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestStatsFromContext_BackgroundContext(t *testing.T) { diff --git a/internal/log/matcher.go b/internal/log/matcher.go index 2a46196e6ca86aa19ee6a519f1176169c8c1de1c..c58ef0ded0797ecd1c685d1c3c2590ef0c12c903 100644 --- a/internal/log/matcher.go +++ b/internal/log/matcher.go @@ -5,7 +5,7 @@ import ( "regexp" "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/env" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/env" ) const ( diff --git a/internal/log/testhelper_test.go b/internal/log/testhelper_test.go index b4c6298c664e69598cab42bdbe7a8f632680e405..31d8e505b5a065e7760bf287194e16efafe049ac 100644 --- a/internal/log/testhelper_test.go +++ b/internal/log/testhelper_test.go @@ -3,7 +3,7 @@ package log_test import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/offloading/options.go b/internal/offloading/options.go index 6398fd28437136541e97bcf2b67bedc8d2946649..ff931aadba868e325d64e430666cf00fc2a1806b 100644 --- a/internal/offloading/options.go +++ b/internal/offloading/options.go @@ -4,7 +4,7 @@ import ( "math/rand" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/backoff" + "gitlab.com/gitlab-org/gitaly/v17/internal/backoff" ) var ( diff --git a/internal/offloading/sink.go b/internal/offloading/sink.go index 8ea3a17407ccdd287ba0b174a48bb959fc424260..9aa185ae8f52d188eaad9e71306f2e346a58f2d7 100644 --- a/internal/offloading/sink.go +++ b/internal/offloading/sink.go @@ -9,7 +9,7 @@ import ( "path/filepath" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/backoff" + "gitlab.com/gitlab-org/gitaly/v17/internal/backoff" "gocloud.dev/blob" "golang.org/x/sync/errgroup" diff --git a/internal/offloading/sink_test.go b/internal/offloading/sink_test.go index 4593c26c5c9facc46f31dca6ad7c5b4eace2da31..7993a29c1a6f08cc15c0633f67f88cbb16c51e1d 100644 --- a/internal/offloading/sink_test.go +++ b/internal/offloading/sink_test.go @@ -10,9 +10,9 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/backoff" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/backoff" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" "gocloud.dev/blob" "gocloud.dev/gcerrors" ) diff --git a/internal/offloading/testhelper_test.go b/internal/offloading/testhelper_test.go index 911b7f1184fe02b28817fcdd57a8196549ee58f8..66421c06eea347760b478754ba7ae2560fdba98d 100644 --- a/internal/offloading/testhelper_test.go +++ b/internal/offloading/testhelper_test.go @@ -3,7 +3,7 @@ package offloading import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/praefect/auth_test.go b/internal/praefect/auth_test.go index ed9e2e74105586ddb15c1154956a8c72b381a434..8365d50a05efc3598bdcf2f40b7390e5e652405e 100644 --- a/internal/praefect/auth_test.go +++ b/internal/praefect/auth_test.go @@ -7,17 +7,17 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - gitalyauth "gitlab.com/gitlab-org/gitaly/v16/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/transactions" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/promtest" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + gitalyauth "gitlab.com/gitlab-org/gitaly/v17/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/transactions" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/promtest" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/credentials/insecure" diff --git a/internal/praefect/config/config.go b/internal/praefect/config/config.go index 3a4621d40b9d1c53f131acc8891ca39a47b18816..742bc0cf836cff77a365c738837696eaf3f1a372 100644 --- a/internal/praefect/config/config.go +++ b/internal/praefect/config/config.go @@ -14,13 +14,13 @@ import ( "github.com/hashicorp/yamux" "github.com/pelletier/go-toml/v2" promclient "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/errors/cfgerror" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/sentry" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/duration" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/errors/cfgerror" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/prometheus" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/sentry" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/duration" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) // ElectionStrategy is a Praefect primary election strategy. diff --git a/internal/praefect/config/config_test.go b/internal/praefect/config/config_test.go index 6a16fb8fd8e22fa9b13b716059668b97acb44c22..f9bdcab52d23350d269bbe109fe6f3f21c465e33 100644 --- a/internal/praefect/config/config_test.go +++ b/internal/praefect/config/config_test.go @@ -12,14 +12,14 @@ import ( "github.com/pelletier/go-toml/v2" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/errors/cfgerror" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/sentry" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/duration" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/errors/cfgerror" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/prometheus" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/sentry" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/duration" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestConfigValidation(t *testing.T) { diff --git a/internal/praefect/config/node.go b/internal/praefect/config/node.go index 9f99055d32c3d990918d0a1bd534c7c9a51650f2..e902ed122535da4c3efc377f36c49c3e10ca9c00 100644 --- a/internal/praefect/config/node.go +++ b/internal/praefect/config/node.go @@ -4,7 +4,7 @@ import ( "encoding/json" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/errors/cfgerror" + "gitlab.com/gitlab-org/gitaly/v17/internal/errors/cfgerror" ) // Node describes an address that serves a storage diff --git a/internal/praefect/config/node_test.go b/internal/praefect/config/node_test.go index c472e60c5cbb20a34648c8aea52ec40a3a16796f..e385be12c087a9023aba1434b679a77b53a11101 100644 --- a/internal/praefect/config/node_test.go +++ b/internal/praefect/config/node_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/errors/cfgerror" + "gitlab.com/gitlab-org/gitaly/v17/internal/errors/cfgerror" ) func TestNode_MarshalJSON(t *testing.T) { diff --git a/internal/praefect/config/testhelper_test.go b/internal/praefect/config/testhelper_test.go index fba4fa2c61e341c8754e646b2031d10b859e15b4..a4f7d39e588c427b279c03e5d1b86b91b2a51d98 100644 --- a/internal/praefect/config/testhelper_test.go +++ b/internal/praefect/config/testhelper_test.go @@ -3,7 +3,7 @@ package config import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/praefect/coordinator.go b/internal/praefect/coordinator.go index f5868e4e33e169098d08eaefabe91d394c6da315..a9979fe7bfceb49386df43555dc6de1178afeabc 100644 --- a/internal/praefect/coordinator.go +++ b/internal/praefect/coordinator.go @@ -8,20 +8,20 @@ import ( "time" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/proxy" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/metrics" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/transactions" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/proxy" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/metrics" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/transactions" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "gitlab.com/gitlab-org/labkit/correlation" "golang.org/x/sync/errgroup" grpc_metadata "google.golang.org/grpc/metadata" diff --git a/internal/praefect/coordinator_pg_test.go b/internal/praefect/coordinator_pg_test.go index 6b2294e33d1eff24529c806f6dcc189e5ce8bf35..fa4ed30014ffeebce50dc151e00e166dab76d321 100644 --- a/internal/praefect/coordinator_pg_test.go +++ b/internal/praefect/coordinator_pg_test.go @@ -10,16 +10,16 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/transactions" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/transactions" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/peer" "google.golang.org/protobuf/proto" ) diff --git a/internal/praefect/coordinator_test.go b/internal/praefect/coordinator_test.go index 88ab9dbad5e61fc54fc51dec32c2d058b1489e24..a00353e9035efe990f5e70e11aefeb583e32cc8e 100644 --- a/internal/praefect/coordinator_test.go +++ b/internal/praefect/coordinator_test.go @@ -14,31 +14,31 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/cache" - "gitlab.com/gitlab-org/gitaly/v16/internal/datastructure" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - gconfig "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/repository" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - gitaly_metadata "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/proxy" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/transactions" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/promtest" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/cache" + "gitlab.com/gitlab-org/gitaly/v17/internal/datastructure" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + gconfig "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/repository" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + gitaly_metadata "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/proxy" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/transactions" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/promtest" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "gitlab.com/gitlab-org/labkit/correlation" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/internal/praefect/datastore/assignment.go b/internal/praefect/datastore/assignment.go index 6d1aecd536784c5ceb5cc6e50ae82b072df96cae..6467ece6ed208fbbda4966ebce07e564b2886159 100644 --- a/internal/praefect/datastore/assignment.go +++ b/internal/praefect/datastore/assignment.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/glsql" ) // InvalidArgumentError tags the error as being caused by an invalid argument. diff --git a/internal/praefect/datastore/assignment_test.go b/internal/praefect/datastore/assignment_test.go index 22da8f5821f40675f55114ea5ea1c2c3edc16a4a..1e39a4d08aba0f62a29aeedf6534441e6d41cd49 100644 --- a/internal/praefect/datastore/assignment_test.go +++ b/internal/praefect/datastore/assignment_test.go @@ -6,9 +6,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/glsql" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" ) func TestAssignmentStore_GetHostAssignments(t *testing.T) { diff --git a/internal/praefect/datastore/collector.go b/internal/praefect/datastore/collector.go index 328ce8960d5ad093a4eb40f9458267eaf021e1f0..f905d18207dde44eda1ae531e542628b1acaac73 100644 --- a/internal/praefect/datastore/collector.go +++ b/internal/praefect/datastore/collector.go @@ -6,8 +6,8 @@ import ( "time" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/glsql" ) var ( diff --git a/internal/praefect/datastore/collector_test.go b/internal/praefect/datastore/collector_test.go index 47f84f07606eedfea8f0f0a5352b251e20b893b7..52eb2e058193d732c83fb22c97de1c3657a57f84 100644 --- a/internal/praefect/datastore/collector_test.go +++ b/internal/praefect/datastore/collector_test.go @@ -11,9 +11,9 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" ) func TestRepositoryStoreCollector(t *testing.T) { diff --git a/internal/praefect/datastore/glsql/postgres.go b/internal/praefect/datastore/glsql/postgres.go index 06e69c4af81698f3ea0c0a418ac063493fe28455..57678be46e922f98278e0eacf23a167f14becbd3 100644 --- a/internal/praefect/datastore/glsql/postgres.go +++ b/internal/praefect/datastore/glsql/postgres.go @@ -13,8 +13,8 @@ import ( "github.com/jackc/pgx/v5/pgtype" "github.com/jackc/pgx/v5/stdlib" migrate "github.com/rubenv/sql-migrate" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/migrations" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/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 37db4f04b004b72ce2547c0a69a098a99b2566d1..53035a4d5465a3fe6b85da441f5d3780f57d3226 100644 --- a/internal/praefect/datastore/glsql/postgres_test.go +++ b/internal/praefect/datastore/glsql/postgres_test.go @@ -11,11 +11,11 @@ import ( migrate "github.com/rubenv/sql-migrate" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/glsql" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/migrations" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/migrations" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" ) func TestOpenDB(t *testing.T) { diff --git a/internal/praefect/datastore/glsql/testhelper_test.go b/internal/praefect/datastore/glsql/testhelper_test.go index cf0831c63ce638ec6bb502ac99204a5d0a33950d..87f6a065595d00910cce2c1abb9a9f3110167721 100644 --- a/internal/praefect/datastore/glsql/testhelper_test.go +++ b/internal/praefect/datastore/glsql/testhelper_test.go @@ -3,7 +3,7 @@ package glsql import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/praefect/datastore/listener.go b/internal/praefect/datastore/listener.go index b6face6b9defdd998e69773c3c1893d223248684..3d467f36dd2906dc15afff3615e306121ae12b29 100644 --- a/internal/praefect/datastore/listener.go +++ b/internal/praefect/datastore/listener.go @@ -9,10 +9,10 @@ import ( "github.com/jackc/pgx/v5" promclient "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/glsql" ) const ( diff --git a/internal/praefect/datastore/listener_test.go b/internal/praefect/datastore/listener_test.go index 20d1c6518dc5c46ecb357a273bc60a984f3d5b6f..da763ed41341973ebdcb0ead67fdf9f250aee8f9 100644 --- a/internal/praefect/datastore/listener_test.go +++ b/internal/praefect/datastore/listener_test.go @@ -13,11 +13,11 @@ import ( "github.com/jackc/pgx/v5/pgconn" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/glsql" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" ) func TestNewListener(t *testing.T) { diff --git a/internal/praefect/datastore/memory.go b/internal/praefect/datastore/memory.go index 45a84da7215f9a5defc0110fc90f19b917e80ad7..ab1df822589ebfa4c7fe97f60d20aa9c1249102a 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/v16/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" ) var errDeadAckedAsFailed = errors.New("job acknowledged as failed with no attempts left, should be 'dead'") diff --git a/internal/praefect/datastore/memory_test.go b/internal/praefect/datastore/memory_test.go index 426b89d273c85ee8f11600f4b02993f1a503cf1c..7075cf29785f9855ba52d2a7382264cdf153ae33 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/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMemoryReplicationEventQueue(t *testing.T) { diff --git a/internal/praefect/datastore/postgres.go b/internal/praefect/datastore/postgres.go index a5cdcea2baecdde4bcd8a2d825d62f5b43ebdec4..10f8c357b7e5f120c277e946a3dd60fa4ebcdf18 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/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/glsql" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/migrations" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v17/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 9032b29420e576e40f8ac0090f7a7dbf306336b2..f150a9dee0f5c1b41411b636f4476528771c66d1 100644 --- a/internal/praefect/datastore/postgres_test.go +++ b/internal/praefect/datastore/postgres_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" ) func TestMigrateStatus(t *testing.T) { diff --git a/internal/praefect/datastore/queue.go b/internal/praefect/datastore/queue.go index 9865ea744fb6cd6acd695affde034eded05c5d9e..473fbf0832889a822c8e0d8d970a166e6b0d05a8 100644 --- a/internal/praefect/datastore/queue.go +++ b/internal/praefect/datastore/queue.go @@ -9,7 +9,7 @@ import ( "fmt" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/glsql" ) // CorrelationIDKey is the key that is used to store the correlation ID for a specific replication job as part of the diff --git a/internal/praefect/datastore/queue_bm_test.go b/internal/praefect/datastore/queue_bm_test.go index 6785434eb04dbcf3eb40d4c13d25c4af8a5e1ad9..54b4c9678daac3cb8225076387b770b2acd03c7c 100644 --- a/internal/praefect/datastore/queue_bm_test.go +++ b/internal/praefect/datastore/queue_bm_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" ) func BenchmarkPostgresReplicationEventQueue_Acknowledge(b *testing.B) { diff --git a/internal/praefect/datastore/queue_test.go b/internal/praefect/datastore/queue_test.go index 7c07cf72e96c36178f9c2a91135c3eaf850b9311..db9e898af3283fe25de5b264c212617d0e0c28d7 100644 --- a/internal/praefect/datastore/queue_test.go +++ b/internal/praefect/datastore/queue_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" ) func TestPostgresReplicationEventQueue_DeleteReplicaUniqueIndex(t *testing.T) { diff --git a/internal/praefect/datastore/repository_store.go b/internal/praefect/datastore/repository_store.go index 5925bece40e5d9293dc71114649a8198e04a167e..94542d5e506aadba78b9c65ccfbf275679241018 100644 --- a/internal/praefect/datastore/repository_store.go +++ b/internal/praefect/datastore/repository_store.go @@ -9,8 +9,8 @@ import ( "strings" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/datastructure" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v17/internal/datastructure" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/glsql" ) type storages map[string][]string diff --git a/internal/praefect/datastore/repository_store_bm_test.go b/internal/praefect/datastore/repository_store_bm_test.go index f53be74d64aedd1fa19e28a62df47b56505764e3..b7461ddc115cb211d8cf77594882528caa65c5f2 100644 --- a/internal/praefect/datastore/repository_store_bm_test.go +++ b/internal/praefect/datastore/repository_store_bm_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" ) // 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/datastore/repository_store_mock.go b/internal/praefect/datastore/repository_store_mock.go index 4a43505988e2864ee57a335ce9c52dae59b2094b..19a613cc9fe9e897e0262fe9ae11c85074b2bba4 100644 --- a/internal/praefect/datastore/repository_store_mock.go +++ b/internal/praefect/datastore/repository_store_mock.go @@ -3,7 +3,7 @@ package datastore import ( "context" - "gitlab.com/gitlab-org/gitaly/v16/internal/datastructure" + "gitlab.com/gitlab-org/gitaly/v17/internal/datastructure" ) // MockRepositoryStore allows for mocking a RepositoryStore by parametrizing its behavior. All methods diff --git a/internal/praefect/datastore/repository_store_test.go b/internal/praefect/datastore/repository_store_test.go index 577ffc0e7e91db1305803b445d3e70e13359f769..f018055c21cf2bad917e3efa9c13b0a2d3b12ad0 100644 --- a/internal/praefect/datastore/repository_store_test.go +++ b/internal/praefect/datastore/repository_store_test.go @@ -8,9 +8,9 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/glsql" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" ) // repositoryRecord represents Praefect's records related to a repository. diff --git a/internal/praefect/datastore/storage_cleanup.go b/internal/praefect/datastore/storage_cleanup.go index bd5e2f64d5a47ab0428b9094fe35b59fae2770b1..a7f6207462119b01d029ed2cf9192b9758d8c1c8 100644 --- a/internal/praefect/datastore/storage_cleanup.go +++ b/internal/praefect/datastore/storage_cleanup.go @@ -7,7 +7,7 @@ import ( "fmt" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" ) // ClusterPath represents path on the cluster to the storage. diff --git a/internal/praefect/datastore/storage_cleanup_test.go b/internal/praefect/datastore/storage_cleanup_test.go index 2b0b52381bb0b686b24ff09eed06cb5485c75c9e..691cb02b3e52bb0e74c5c6bbb007157146c61993 100644 --- a/internal/praefect/datastore/storage_cleanup_test.go +++ b/internal/praefect/datastore/storage_cleanup_test.go @@ -6,8 +6,8 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" ) func TestStorageCleanup_Populate(t *testing.T) { diff --git a/internal/praefect/datastore/storage_provider.go b/internal/praefect/datastore/storage_provider.go index 18eeed537700d1911000cde562a22c5fe218dd2f..a9f1933030fc17aa9387261a8e97201fccefd7bd 100644 --- a/internal/praefect/datastore/storage_provider.go +++ b/internal/praefect/datastore/storage_provider.go @@ -10,9 +10,9 @@ import ( lru "github.com/hashicorp/golang-lru/v2" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/datastructure" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v17/internal/datastructure" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/glsql" ) // ConsistentStoragesGetter returns storages which contain the latest generation of a repository. diff --git a/internal/praefect/datastore/storage_provider_test.go b/internal/praefect/datastore/storage_provider_test.go index 92be00ca6e083497e1e00fd69d7b9eb7933d44ae..fa5c8513c316ce80fca75809674ab25721021eb7 100644 --- a/internal/praefect/datastore/storage_provider_test.go +++ b/internal/praefect/datastore/storage_provider_test.go @@ -11,11 +11,11 @@ import ( "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/datastructure" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/glsql" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/datastructure" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" ) func TestCachingStorageProvider_GetSyncedNodes(t *testing.T) { diff --git a/internal/praefect/datastore/testhelper_test.go b/internal/praefect/datastore/testhelper_test.go index 1a47b041a7f13a13afe5c72dd05fba6c40c6ae73..f57b74ba94b61925ded2f7fa7a112a3d640b0acf 100644 --- a/internal/praefect/datastore/testhelper_test.go +++ b/internal/praefect/datastore/testhelper_test.go @@ -3,7 +3,7 @@ package datastore import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/praefect/delete_object_pool.go b/internal/praefect/delete_object_pool.go index a1ff485f2cc2c871bc7224dc1f4e8f421273fe88..666f39a29c756e2ceb72cdf1f69ab79df7178bdb 100644 --- a/internal/praefect/delete_object_pool.go +++ b/internal/praefect/delete_object_pool.go @@ -4,13 +4,13 @@ import ( "context" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/objectpool" - objectpoolsvc "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/objectpool" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/objectpool" + objectpoolsvc "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/objectpool" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/protobuf/proto" ) diff --git a/internal/praefect/delete_object_pool_test.go b/internal/praefect/delete_object_pool_test.go index b38b6792ad14d26ff9ea722995cbfe4e17ecbc3a..e10728e4818ac0409fe174edc561a75c04ce15a0 100644 --- a/internal/praefect/delete_object_pool_test.go +++ b/internal/praefect/delete_object_pool_test.go @@ -6,12 +6,12 @@ import ( grpcmwlogrus "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) diff --git a/internal/praefect/dependencies.go b/internal/praefect/dependencies.go index 4dd0091bc8cb36dd77f46001230bd7531099bb7c..a07eb39cccb60df3c6c84fba7f2282509c8e15d0 100644 --- a/internal/praefect/dependencies.go +++ b/internal/praefect/dependencies.go @@ -1,14 +1,14 @@ package praefect import ( - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/proxy" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/transactions" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/proxy" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/transactions" ) // Dependencies consolidates Praefect service dependencies for injection. diff --git a/internal/praefect/get_object_pool.go b/internal/praefect/get_object_pool.go index 64df9857fccf8966f5d578fa5309c0b5a707c9ba..0c3b783d82ccec64dfd8160568b7e7d973255086 100644 --- a/internal/praefect/get_object_pool.go +++ b/internal/praefect/get_object_pool.go @@ -6,11 +6,11 @@ import ( "path/filepath" "strconv" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" ) diff --git a/internal/praefect/get_object_pool_test.go b/internal/praefect/get_object_pool_test.go index 989f96e0cba2c5d325c83cbe78b32392b20a978c..e1560220fc7d28083729a3f73878b2e994273659 100644 --- a/internal/praefect/get_object_pool_test.go +++ b/internal/praefect/get_object_pool_test.go @@ -8,20 +8,20 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/setup" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/proxy" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/setup" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/proxy" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) diff --git a/internal/praefect/helper_test.go b/internal/praefect/helper_test.go index ca797ec67f88f2fe977bab121ccf588adf551a9e..72cf2351ced7b24de35506dcde8c292ddaeffb68 100644 --- a/internal/praefect/helper_test.go +++ b/internal/praefect/helper_test.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/nodes" ) // generates a praefect configuration with the specified number of backend diff --git a/internal/praefect/info_service_test.go b/internal/praefect/info_service_test.go index 04676a691f6b1310285b1abcbe6e954b367d453b..8989f0d0d77492fec2e42c49f7e2a24562099b25 100644 --- a/internal/praefect/info_service_test.go +++ b/internal/praefect/info_service_test.go @@ -5,23 +5,23 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - gconfig "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/repository" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/sidechannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/service/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/transactions" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + gconfig "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/repository" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/sidechannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/service/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/transactions" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" ) diff --git a/internal/praefect/metrics/prometheus.go b/internal/praefect/metrics/prometheus.go index a411babd88b01fb3147503d71a79e6d875d56277..fe18d6660992e29ddca8d04f698d1c34e90ea7da 100644 --- a/internal/praefect/metrics/prometheus.go +++ b/internal/praefect/metrics/prometheus.go @@ -5,9 +5,9 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - gitalycfgprom "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/prometheus/metrics" + gitalycfgprom "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/prometheus" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/prometheus/metrics" ) // RegisterReplicationDelay creates and registers a prometheus histogram diff --git a/internal/praefect/metrics/prometheus_test.go b/internal/praefect/metrics/prometheus_test.go index 99250c6ff4a65a9dfa18280586ce494228288a33..47c250d0822412ce966dabcb68a978067cb09470 100644 --- a/internal/praefect/metrics/prometheus_test.go +++ b/internal/praefect/metrics/prometheus_test.go @@ -5,8 +5,8 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/require" - gitalycfgprom "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" + gitalycfgprom "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/prometheus" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" ) func TestRegisterReplicationDelay(t *testing.T) { diff --git a/internal/praefect/metrics/testhelper_test.go b/internal/praefect/metrics/testhelper_test.go index 843d467d474218d76f01f5a0366da2c6bdbd6044..f97357bfe1e07f90e065676f15e6c592437a8f6a 100644 --- a/internal/praefect/metrics/testhelper_test.go +++ b/internal/praefect/metrics/testhelper_test.go @@ -3,7 +3,7 @@ package metrics import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/praefect/middleware/errorhandler.go b/internal/praefect/middleware/errorhandler.go index 738f9c1edd49c1f3192aac4bc227318e3af22acf..9eb0bdfba2dfde7c31763cfef63145d571a9af35 100644 --- a/internal/praefect/middleware/errorhandler.go +++ b/internal/praefect/middleware/errorhandler.go @@ -6,8 +6,8 @@ import ( "fmt" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes/tracker" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/nodes/tracker" "google.golang.org/grpc" ) diff --git a/internal/praefect/middleware/errorhandler_test.go b/internal/praefect/middleware/errorhandler_test.go index 1cc7ab7c9338de674e4d9d215198b5affe39d58c..83bf39bbe1b0e3ad556fbece81cb809ffed16281 100644 --- a/internal/praefect/middleware/errorhandler_test.go +++ b/internal/praefect/middleware/errorhandler_test.go @@ -8,14 +8,14 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/proxy" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes/tracker" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/proxy" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/nodes/tracker" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) diff --git a/internal/praefect/middleware/methodtype.go b/internal/praefect/middleware/methodtype.go index 78c9637b7fa8f1992162726ec5b72157a75b82da..5b0e7c7d5d22ecfbdd7defe20f04524ca9ff73bd 100644 --- a/internal/praefect/middleware/methodtype.go +++ b/internal/praefect/middleware/methodtype.go @@ -3,9 +3,9 @@ package middleware import ( "context" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/metrics" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/metrics" "google.golang.org/grpc" ) diff --git a/internal/praefect/middleware/testhelper_test.go b/internal/praefect/middleware/testhelper_test.go index 06fab764ad93b323bfe7ab23c2be6f5ebb20ff17..a90bc017c171a548fea338a6f6c6e2f1e997735b 100644 --- a/internal/praefect/middleware/testhelper_test.go +++ b/internal/praefect/middleware/testhelper_test.go @@ -3,7 +3,7 @@ package middleware import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/praefect/node.go b/internal/praefect/node.go index 6a91b4aa734022f4b2de21efae5d7b5555f188c2..bffee98d8355d9caf7878532a185a7a1643fbb2e 100644 --- a/internal/praefect/node.go +++ b/internal/praefect/node.go @@ -4,13 +4,13 @@ import ( "context" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/sidechannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes/tracker" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/sidechannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/nodes/tracker" "google.golang.org/grpc" "google.golang.org/grpc/health/grpc_health_v1" ) diff --git a/internal/praefect/node_test.go b/internal/praefect/node_test.go index 364318f026809ea14ad33be82e23b1f5bfc77eed..e9bc94897b86a72093e3186cfd16f1d7cafe5e05 100644 --- a/internal/praefect/node_test.go +++ b/internal/praefect/node_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/health" diff --git a/internal/praefect/nodes/disabled_elector.go b/internal/praefect/nodes/disabled_elector.go index 1e01864ede24fc71d5437758339dd089f6d0cd6e..97dafe60ff3916ba9e871101841f8dcafd969393 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/v16/internal/praefect/metrics" + "gitlab.com/gitlab-org/gitaly/v17/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 f0a4fc221d233317f29fe4e6d06fcb909c6f9fb4..454de48c1bc9fb51e4629173b9959f1ebce0ca04 100644 --- a/internal/praefect/nodes/health_manager.go +++ b/internal/praefect/nodes/health_manager.go @@ -7,9 +7,9 @@ import ( "sync/atomic" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/glsql" "gitlab.com/gitlab-org/labkit/correlation" "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 813aae8d682c38cf3ef7735e2252f83cf8d4858b..07c70e9ffe61e3e04c86848e9a1ea1085a0b0dad 100644 --- a/internal/praefect/nodes/health_manager_test.go +++ b/internal/praefect/nodes/health_manager_test.go @@ -7,10 +7,10 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/glsql" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" "google.golang.org/grpc" "google.golang.org/grpc/health/grpc_health_v1" ) diff --git a/internal/praefect/nodes/local_elector.go b/internal/praefect/nodes/local_elector.go index ca8636e1002e044a520fc5976695fea62f5fc918..4458afe0fb79ea103fad4e2f6473f138393db2b5 100644 --- a/internal/praefect/nodes/local_elector.go +++ b/internal/praefect/nodes/local_elector.go @@ -5,8 +5,8 @@ import ( "sync" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/metrics" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/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 db3ebb80be2a6455a50663d49045c6e862d5a905..a1a0c66b1c0bfbb97be54b2204c778c74aebd99c 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/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/promtest" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/promtest" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) diff --git a/internal/praefect/nodes/manager.go b/internal/praefect/nodes/manager.go index 9c7e9086371d73d97506202e6664e458812bc90f..4d3f878dd0e6896bb183ee8b7f02ff385c08af93 100644 --- a/internal/praefect/nodes/manager.go +++ b/internal/praefect/nodes/manager.go @@ -10,19 +10,19 @@ import ( "time" grpcprometheus "github.com/grpc-ecosystem/go-grpc-prometheus" - gitalyauth "gitlab.com/gitlab-org/gitaly/v16/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/datastructure" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/proxy" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/sidechannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/metrics" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/middleware" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes/tracker" - prommetrics "gitlab.com/gitlab-org/gitaly/v16/internal/prometheus/metrics" + gitalyauth "gitlab.com/gitlab-org/gitaly/v17/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/datastructure" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/proxy" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/sidechannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/metrics" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/middleware" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/nodes/tracker" + prommetrics "gitlab.com/gitlab-org/gitaly/v17/internal/prometheus/metrics" "google.golang.org/grpc" "google.golang.org/grpc/backoff" 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 0d29c752c89030f131da11866583aefabe9fe175..de1256339cb678f29839d63ea8a7e8f1fb9c44ca 100644 --- a/internal/praefect/nodes/manager_test.go +++ b/internal/praefect/nodes/manager_test.go @@ -9,13 +9,13 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/datastructure" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/promtest" + "gitlab.com/gitlab-org/gitaly/v17/internal/datastructure" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/promtest" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/health" diff --git a/internal/praefect/nodes/per_repository.go b/internal/praefect/nodes/per_repository.go index a0794630369446b833075382f44d38819e64ae98..15ba470ddda3897bc1d3593d74a44db37212ff99 100644 --- a/internal/praefect/nodes/per_repository.go +++ b/internal/praefect/nodes/per_repository.go @@ -6,9 +6,9 @@ import ( "errors" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/glsql" ) // ErrNoPrimary is returned if the repository does not have a primary. diff --git a/internal/praefect/nodes/per_repository_test.go b/internal/praefect/nodes/per_repository_test.go index de21adfe0011f460c0d5b0bfecaa691a0e5fdb93..21eb9782ae459429c47337f10e563f19f8b0d8e8 100644 --- a/internal/praefect/nodes/per_repository_test.go +++ b/internal/praefect/nodes/per_repository_test.go @@ -6,10 +6,10 @@ import ( "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" ) func TestPerRepositoryElector(t *testing.T) { diff --git a/internal/praefect/nodes/ping.go b/internal/praefect/nodes/ping.go index e6e56180f05309f53c550f5429806799b6153b78..f4cc2c64c6322c32c4c04789576568141d3fa1d5 100644 --- a/internal/praefect/nodes/ping.go +++ b/internal/praefect/nodes/ping.go @@ -8,10 +8,10 @@ import ( "strings" "sync" - gitalyauth "gitlab.com/gitlab-org/gitaly/v16/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + gitalyauth "gitlab.com/gitlab-org/gitaly/v17/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/health/grpc_health_v1" ) diff --git a/internal/praefect/nodes/ping_test.go b/internal/praefect/nodes/ping_test.go index 6498ea8db2f5a0ef3d7baa1dca49b8690192074a..43aec07e623e6d3569fc94e35c9d54f7864bde0a 100644 --- a/internal/praefect/nodes/ping_test.go +++ b/internal/praefect/nodes/ping_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" ) func TestNewPingSet(t *testing.T) { diff --git a/internal/praefect/nodes/sql_elector.go b/internal/praefect/nodes/sql_elector.go index 8df4ed0eba5ef5dec48a7d91bca10a861a1be391..662226861b661ee54399954ad74b40d54263968c 100644 --- a/internal/praefect/nodes/sql_elector.go +++ b/internal/praefect/nodes/sql_elector.go @@ -11,10 +11,10 @@ import ( "time" "github.com/google/uuid" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/glsql" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/metrics" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/metrics" ) const ( diff --git a/internal/praefect/nodes/sql_elector_test.go b/internal/praefect/nodes/sql_elector_test.go index 135c03b84a4c77360d9cc98cce60e8ef84efdd10..3777d040d9459faae26bb45b3d62867a65489ef8 100644 --- a/internal/praefect/nodes/sql_elector_test.go +++ b/internal/praefect/nodes/sql_elector_test.go @@ -9,15 +9,15 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/listenmux" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/glsql" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/promtest" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/listenmux" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/promtest" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/credentials/insecure" diff --git a/internal/praefect/nodes/testhelper_test.go b/internal/praefect/nodes/testhelper_test.go index 74decdf8563961a2899e405e55a1fa28cf7add63..d89161aaaacdf8fbe9e08a4328783b9ee293a66d 100644 --- a/internal/praefect/nodes/testhelper_test.go +++ b/internal/praefect/nodes/testhelper_test.go @@ -3,7 +3,7 @@ package nodes import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/praefect/nodes/tracker/errors.go b/internal/praefect/nodes/tracker/errors.go index 2b816274966f5a3a82a58acb42ad3b980df5022c..2a7f4be6ae7d4a6e14fe90abc4bd330075f9c2e4 100644 --- a/internal/praefect/nodes/tracker/errors.go +++ b/internal/praefect/nodes/tracker/errors.go @@ -6,7 +6,7 @@ import ( "sync" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" ) // ErrorTracker allows tracking how many read/write errors have occurred, and whether or not it has diff --git a/internal/praefect/nodes/tracker/errors_test.go b/internal/praefect/nodes/tracker/errors_test.go index d276e6da65d7349877464046347119a6451c9936..b90cce1296724d17d16a5a2946eb6f9f3d8faece 100644 --- a/internal/praefect/nodes/tracker/errors_test.go +++ b/internal/praefect/nodes/tracker/errors_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) var ( diff --git a/internal/praefect/nodes/tracker/testhelper_test.go b/internal/praefect/nodes/tracker/testhelper_test.go index aabde655390d4148d2f64bca5ac13b3ae64dcf0f..0a6e8b78f2d0a3e647ed83967b96388e833b9d9f 100644 --- a/internal/praefect/nodes/tracker/testhelper_test.go +++ b/internal/praefect/nodes/tracker/testhelper_test.go @@ -3,7 +3,7 @@ package tracker import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/praefect/reconciler/reconciler.go b/internal/praefect/reconciler/reconciler.go index b91cc2c9852ea8a7fc27827c8f749e18c21c0355..51ea64b252f8a63c1befd11ec3c2b07d5d43b364 100644 --- a/internal/praefect/reconciler/reconciler.go +++ b/internal/praefect/reconciler/reconciler.go @@ -5,11 +5,11 @@ import ( "fmt" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/advisorylock" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/advisorylock" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/glsql" ) const logBatchSize = 25 diff --git a/internal/praefect/reconciler/reconciler_benchmark_test.go b/internal/praefect/reconciler/reconciler_benchmark_test.go index 9372a647405c3e85048277bc44ecfd8ddd1b9d37..71cfdbf32ad1f8a29340778f4294d6b046478fef 100644 --- a/internal/praefect/reconciler/reconciler_benchmark_test.go +++ b/internal/praefect/reconciler/reconciler_benchmark_test.go @@ -6,9 +6,9 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" ) func BenchmarkReconcile(b *testing.B) { diff --git a/internal/praefect/reconciler/reconciler_test.go b/internal/praefect/reconciler/reconciler_test.go index 10b06b70935a5351efd45c3d403882f14446f278..9bbb91c42168883b16b7034ed86cc1f859d92133 100644 --- a/internal/praefect/reconciler/reconciler_test.go +++ b/internal/praefect/reconciler/reconciler_test.go @@ -9,12 +9,12 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" ) func TestReconciler(t *testing.T) { diff --git a/internal/praefect/reconciler/testhelper_test.go b/internal/praefect/reconciler/testhelper_test.go index d489e2e02ce586b077ac67973b2663f588150939..7ae25d8b9abf2ce92c4b671e01c28c155c12410f 100644 --- a/internal/praefect/reconciler/testhelper_test.go +++ b/internal/praefect/reconciler/testhelper_test.go @@ -3,7 +3,7 @@ package reconciler import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/praefect/remove_repository.go b/internal/praefect/remove_repository.go index a681a39c0dcd6973ef35cb43475147f8400e85ce..c199bafb1b7584f2f173e219bf69fa796c773178 100644 --- a/internal/praefect/remove_repository.go +++ b/internal/praefect/remove_repository.go @@ -7,11 +7,11 @@ import ( "sync" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/protobuf/proto" ) diff --git a/internal/praefect/remove_repository_test.go b/internal/praefect/remove_repository_test.go index 50792ddbc522989e330511cc1fd9f1ba463375c5..1036a6462e7d20f4746e2f789438dc9a74c03d22 100644 --- a/internal/praefect/remove_repository_test.go +++ b/internal/praefect/remove_repository_test.go @@ -7,20 +7,20 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/setup" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/proxy" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/setup" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/proxy" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) diff --git a/internal/praefect/replicator.go b/internal/praefect/replicator.go index 46ffca5cf33950b0f8ca7e12bc1c30cd45bafda1..d5efd9f51514cba668b5ecbf2b4a597ba9e1e290 100644 --- a/internal/praefect/replicator.go +++ b/internal/praefect/replicator.go @@ -9,15 +9,15 @@ import ( "time" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/repository" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - prommetrics "gitlab.com/gitlab-org/gitaly/v16/internal/prometheus/metrics" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/repository" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + prommetrics "gitlab.com/gitlab-org/gitaly/v17/internal/prometheus/metrics" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "gitlab.com/gitlab-org/labkit/correlation" "google.golang.org/grpc" "google.golang.org/protobuf/proto" diff --git a/internal/praefect/replicator_pg_test.go b/internal/praefect/replicator_pg_test.go index 02f59bf6ab981790dd5ec80a21e11e57d8150612..38dae6fb987017901b5ce078d70b942ced94f1f7 100644 --- a/internal/praefect/replicator_pg_test.go +++ b/internal/praefect/replicator_pg_test.go @@ -7,12 +7,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/repository" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/repository" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) diff --git a/internal/praefect/replicator_test.go b/internal/praefect/replicator_test.go index d6a551b9564202bb4abe827f5f3f47e5ccaab6de..b556d8a19f56ee718da29c9dc915238ee23ee180 100644 --- a/internal/praefect/replicator_test.go +++ b/internal/praefect/replicator_test.go @@ -11,23 +11,23 @@ import ( "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - gitalyauth "gitlab.com/gitlab-org/gitaly/v16/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - gitalycfg "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/setup" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/promtest" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + gitalyauth "gitlab.com/gitlab-org/gitaly/v17/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + gitalycfg "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/setup" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/promtest" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "gitlab.com/gitlab-org/labkit/correlation" "golang.org/x/sync/errgroup" "google.golang.org/grpc" diff --git a/internal/praefect/repocleaner/action_log.go b/internal/praefect/repocleaner/action_log.go index 91c155da8a2cce2fe02424850f0c39a7fcf8e67e..4e007a5e04a97824a7c6fc583670ed0eea888e20 100644 --- a/internal/praefect/repocleaner/action_log.go +++ b/internal/praefect/repocleaner/action_log.go @@ -3,7 +3,7 @@ package repocleaner import ( "context" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) // LogWarnAction is an implementation of the Action interface that allows to log a warning message diff --git a/internal/praefect/repocleaner/action_log_test.go b/internal/praefect/repocleaner/action_log_test.go index c1e456e24fab281c3733fce3a672e473d00acd71..78fc71840d3a4cb3fca17caa1a74870314686944 100644 --- a/internal/praefect/repocleaner/action_log_test.go +++ b/internal/praefect/repocleaner/action_log_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestLogWarnAction_Perform(t *testing.T) { diff --git a/internal/praefect/repocleaner/repository.go b/internal/praefect/repocleaner/repository.go index 8a270b32927c265ebe2f49461dccf35dd608b3d3..e33e60f07ff827fad669d454fb55e3c96a0f3d1c 100644 --- a/internal/praefect/repocleaner/repository.go +++ b/internal/praefect/repocleaner/repository.go @@ -7,11 +7,11 @@ import ( "io" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // StateOwner performs check for the existence of the repositories. diff --git a/internal/praefect/repocleaner/repository_test.go b/internal/praefect/repocleaner/repository_test.go index 3d45a27c341844298a5f1283596792b56744921a..90370e674bea099b9887c33f7d3616b089e769d7 100644 --- a/internal/praefect/repocleaner/repository_test.go +++ b/internal/praefect/repocleaner/repository_test.go @@ -10,20 +10,20 @@ import ( "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/setup" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/service/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/setup" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/service/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" ) func TestRunner_Run(t *testing.T) { diff --git a/internal/praefect/repocleaner/testhelper_test.go b/internal/praefect/repocleaner/testhelper_test.go index ce013255100eaf3a5661111f57696a6993ea5378..4d9b309e78d57b6dbddbc4bce7f929840a5b432b 100644 --- a/internal/praefect/repocleaner/testhelper_test.go +++ b/internal/praefect/repocleaner/testhelper_test.go @@ -3,7 +3,7 @@ package repocleaner import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/praefect/repository_exists.go b/internal/praefect/repository_exists.go index 3c649f9d8556625bd49dc17c35fcf9e35cca504d..8d00bb5d6691e97e82ddce15efb3ceed53fd4be0 100644 --- a/internal/praefect/repository_exists.go +++ b/internal/praefect/repository_exists.go @@ -3,10 +3,10 @@ package praefect import ( "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" ) diff --git a/internal/praefect/repository_exists_test.go b/internal/praefect/repository_exists_test.go index 6c4ed1f92c835f517c019ba13df351557a7098e1..9b2068d72315635e4efb4b4382ae3067e9e277c8 100644 --- a/internal/praefect/repository_exists_test.go +++ b/internal/praefect/repository_exists_test.go @@ -7,15 +7,15 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/proxy" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/proxy" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) diff --git a/internal/praefect/router.go b/internal/praefect/router.go index 4fbbdc3c81fd98563aa07805204f17ec073922a1..4e6c5995447fdcbe94d904161d0c0ebf981c0caa 100644 --- a/internal/praefect/router.go +++ b/internal/praefect/router.go @@ -3,7 +3,7 @@ package praefect import ( "context" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" "google.golang.org/grpc" ) diff --git a/internal/praefect/router_node_manager.go b/internal/praefect/router_node_manager.go index a65ebd023cf46a03469807191c05577e556e55e3..c86d7b4914ee8a25cc53440486aa3db564067fa7 100644 --- a/internal/praefect/router_node_manager.go +++ b/internal/praefect/router_node_manager.go @@ -5,9 +5,9 @@ import ( "errors" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/datastructure" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v17/internal/datastructure" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/nodes" ) type nodeManagerRouter struct { diff --git a/internal/praefect/router_per_repository.go b/internal/praefect/router_per_repository.go index 8d54b579f525ac639fa0f006dcfbb22808d5aae2..eb86d63401c993c8174b1aea2f3708ce540632d4 100644 --- a/internal/praefect/router_per_repository.go +++ b/internal/praefect/router_per_repository.go @@ -5,10 +5,10 @@ import ( "errors" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" ) diff --git a/internal/praefect/router_per_repository_test.go b/internal/praefect/router_per_repository_test.go index aeace6d02781260f62847609ffda2ed71f801aae..c2330b633fc56fbe8d1279fc6ee4f23c3d480fa1 100644 --- a/internal/praefect/router_per_repository_test.go +++ b/internal/praefect/router_per_repository_test.go @@ -7,12 +7,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" "google.golang.org/grpc" "google.golang.org/grpc/metadata" ) diff --git a/internal/praefect/server.go b/internal/praefect/server.go index 766efebd706a6666816b1541d018c05cb0f6c708..6fe4706848062b74271e2ea26134d17a7c57cfb7 100644 --- a/internal/praefect/server.go +++ b/internal/praefect/server.go @@ -10,28 +10,28 @@ import ( grpcmwlogrus "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/selector" grpcprometheus "github.com/grpc-ecosystem/go-grpc-prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/server/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/grpcstats" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/listenmux" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/loghandler" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/panichandler" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/requestinfohandler" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/sentryhandler" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/statushandler" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/proxy" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/sidechannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/middleware" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/service/info" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/service/server" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/service/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/transactions" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/server/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/grpcstats" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/listenmux" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/middleware/loghandler" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/middleware/panichandler" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/middleware/requestinfohandler" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/middleware/sentryhandler" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/middleware/statushandler" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/proxy" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/sidechannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/middleware" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/service/info" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/service/server" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/service/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/transactions" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/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_test.go b/internal/praefect/server_factory_test.go index 5910de7c7aa8727c0afe61f80bc9e0503ace7159..2bb2ec9cd6fddd2f8878bc90923450631796ed9e 100644 --- a/internal/praefect/server_factory_test.go +++ b/internal/praefect/server_factory_test.go @@ -10,27 +10,27 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/bootstrap/starter" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - gconfig "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/setup" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/listenmux" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/sidechannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/service/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/transactions" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/promtest" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/bootstrap/starter" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + gconfig "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/setup" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/listenmux" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/sidechannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/service/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/transactions" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/promtest" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/credentials" "google.golang.org/grpc/credentials/insecure" diff --git a/internal/praefect/server_test.go b/internal/praefect/server_test.go index 70916f0dc5a41e33110f38f0c7f31d8efd27f843..d0453a6e882d941d271217551b5e56e9745348e1 100644 --- a/internal/praefect/server_test.go +++ b/internal/praefect/server_test.go @@ -16,35 +16,35 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/datastructure" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - gconfig "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/setup" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mdfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/listenmux" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/proxy" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes/tracker" - serversvc "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/service/server" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/service/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/transactions" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/promtest" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" - "gitlab.com/gitlab-org/gitaly/v16/internal/version" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/datastructure" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + gconfig "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/setup" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mdfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/listenmux" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/proxy" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/nodes/tracker" + serversvc "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/service/server" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/service/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/transactions" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/promtest" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/internal/version" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/credentials/insecure" diff --git a/internal/praefect/service/checks.go b/internal/praefect/service/checks.go index 63b7f58dcf0d390fbf8a6f3097a1982242023bf6..f8ab24e10e92bff2b1d94ef95fcd23b58845111f 100644 --- a/internal/praefect/service/checks.go +++ b/internal/praefect/service/checks.go @@ -9,11 +9,11 @@ import ( "time" migrate "github.com/rubenv/sql-migrate" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/glsql" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/migrations" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/migrations" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/nodes" ) // Severity is a type that indicates the severity of a check diff --git a/internal/praefect/service/checks_test.go b/internal/praefect/service/checks_test.go index 15b94bee090ee9ae70caeffea5d653a6affe0d2a..2911e74f6fa28c9840d301afcfd68e6ae2b4e1c7 100644 --- a/internal/praefect/service/checks_test.go +++ b/internal/praefect/service/checks_test.go @@ -14,13 +14,13 @@ import ( "github.com/google/uuid" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/migrations" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/migrations" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/health" "google.golang.org/grpc/health/grpc_health_v1" diff --git a/internal/praefect/service/info/dataloss.go b/internal/praefect/service/info/dataloss.go index b428fbaca838aa154589905f80dcf777995edd83..001f91d4611d62c6253a7c150541c0ad823b52a1 100644 --- a/internal/praefect/service/info/dataloss.go +++ b/internal/praefect/service/info/dataloss.go @@ -1,9 +1,9 @@ package info import ( - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/proto" ) diff --git a/internal/praefect/service/info/metadata.go b/internal/praefect/service/info/metadata.go index 5db5ccdb0fb8f5ced7a77d78648852520d64ba21..cf4be4b9aabaf79d05b1630fa83fa48227c608f5 100644 --- a/internal/praefect/service/info/metadata.go +++ b/internal/praefect/service/info/metadata.go @@ -4,9 +4,9 @@ import ( "context" "errors" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/internal/praefect/service/info/replication_factor.go b/internal/praefect/service/info/replication_factor.go index d83a87b343502a7908fd0f6ef98607228af195f5..5de70681d6053ca64245df065b8e568ebb1655b2 100644 --- a/internal/praefect/service/info/replication_factor.go +++ b/internal/praefect/service/info/replication_factor.go @@ -5,9 +5,9 @@ import ( "errors" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) //nolint:revive // This is unintentionally missing documentation. diff --git a/internal/praefect/service/info/repositories.go b/internal/praefect/service/info/repositories.go index 7226e63920176c1003432f0407db45ec73719e2d..9e48dc7ee3b1cce4dddb82f5a334d73bff4939ff 100644 --- a/internal/praefect/service/info/repositories.go +++ b/internal/praefect/service/info/repositories.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "golang.org/x/sync/errgroup" ) diff --git a/internal/praefect/service/info/server.go b/internal/praefect/service/info/server.go index d3f0de40234f39a39cfef74998684f1c03849681..b236826cacef7e513e0eb2902748ceb99c4f9656 100644 --- a/internal/praefect/service/info/server.go +++ b/internal/praefect/service/info/server.go @@ -4,12 +4,12 @@ import ( "context" "errors" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // AssignmentStore is an interface for getting repository host node assignments. diff --git a/internal/praefect/service/info/verification.go b/internal/praefect/service/info/verification.go index dfa2ebead204a0e0e158e0ad88c08f032e8282ad..b6e49dd73fa16e9702b4c36804a28a068f2b47dc 100644 --- a/internal/praefect/service/info/verification.go +++ b/internal/praefect/service/info/verification.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // MarkUnverified marks replicas as unverified. See the protobuf declarations for details. diff --git a/internal/praefect/service/server/disk_stats.go b/internal/praefect/service/server/disk_stats.go index b734cbec8d6a46295382d3d3b157a4c3bd422ffa..73222321b6baae9933aa4a0617c5f185539cd70e 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/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/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 b99d2b8b303d13a9b282e2dd53ccde56156748d0..aa21537722ff2f63c6bf9eba5f768a9148f0b078 100644 --- a/internal/praefect/service/server/info.go +++ b/internal/praefect/service/server/info.go @@ -5,8 +5,8 @@ import ( "sync" "github.com/google/uuid" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" ) diff --git a/internal/praefect/service/server/readiness.go b/internal/praefect/service/server/readiness.go index 16ac30b189b75af2f714107324840a4a8ac89e37..367e161d92fe65ed97fe3c6d74cf98c932068586 100644 --- a/internal/praefect/service/server/readiness.go +++ b/internal/praefect/service/server/readiness.go @@ -5,7 +5,7 @@ import ( "io" "sort" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // ReadinessCheck runs the set of the checks to make sure service is in operational state. diff --git a/internal/praefect/service/server/readiness_test.go b/internal/praefect/service/server/readiness_test.go index 9435fe687b5cfb1b3a5b32af598a143cfc522387..70d4eb089ab8b77d2a6ce9be17e84d1616990ebb 100644 --- a/internal/praefect/service/server/readiness_test.go +++ b/internal/praefect/service/server/readiness_test.go @@ -8,14 +8,14 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/setup" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/setup" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/types/known/durationpb" ) diff --git a/internal/praefect/service/server/server.go b/internal/praefect/service/server/server.go index a1bbca3730d4885a72bc347e43944d2c4a2182dd..f696d3569db8359fa06ba5440800d3f878e8d50c 100644 --- a/internal/praefect/service/server/server.go +++ b/internal/praefect/service/server/server.go @@ -1,10 +1,10 @@ package server import ( - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/service" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/service" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // Server is a ServerService server diff --git a/internal/praefect/service/server/signature.go b/internal/praefect/service/server/signature.go index b664275e60e79e8c72fe1190bef50a4590c33fd7..f2f68758506a755885c96228094a797a4bfdea7b 100644 --- a/internal/praefect/service/server/signature.go +++ b/internal/praefect/service/server/signature.go @@ -5,7 +5,7 @@ import ( "context" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // ServerSignature obtains the public key from all storage nodes and diff --git a/internal/praefect/service/server/testhelper_test.go b/internal/praefect/service/server/testhelper_test.go index 282f28bc0a04aedf8cd15b09661536f1da2b8e6f..89c536e36d2909ddc7081ab29771e52ce7c1c364 100644 --- a/internal/praefect/service/server/testhelper_test.go +++ b/internal/praefect/service/server/testhelper_test.go @@ -3,7 +3,7 @@ package server_test import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/praefect/service/testhelper_test.go b/internal/praefect/service/testhelper_test.go index 084c50d6cd52a28fd0d20ed026057bce9e00480e..07b0f7758e2404354f334ece5729e70448ec39fd 100644 --- a/internal/praefect/service/testhelper_test.go +++ b/internal/praefect/service/testhelper_test.go @@ -3,7 +3,7 @@ package service import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/praefect/service/transaction/server.go b/internal/praefect/service/transaction/server.go index d6e219befb1949d270ebfb0ea9ab314fcd52a326..7e29592a2d6fca7a6186ce2742af1c9db2c1288c 100644 --- a/internal/praefect/service/transaction/server.go +++ b/internal/praefect/service/transaction/server.go @@ -4,10 +4,10 @@ import ( "context" "errors" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/transactions" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/transactions" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) //nolint:revive // This is unintentionally missing documentation. diff --git a/internal/praefect/testhelper_test.go b/internal/praefect/testhelper_test.go index 21330d0f3c8652f6501def1c6f30fac52edf7fae..07a4579ca695eda945e2a9e5ba63a9447199c186 100644 --- a/internal/praefect/testhelper_test.go +++ b/internal/praefect/testhelper_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestMain(m *testing.M) { diff --git a/internal/praefect/testserver.go b/internal/praefect/testserver.go index 15bc462246153713d689f063e62fc8245f0964b2..5df225450bc09e2b6bab9a2d124f85e1cbd56385 100644 --- a/internal/praefect/testserver.go +++ b/internal/praefect/testserver.go @@ -9,21 +9,21 @@ import ( "time" "github.com/stretchr/testify/require" - gitalycfgauth "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/server/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/proxy" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/transactions" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/promtest" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" + gitalycfgauth "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/server/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/proxy" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/transactions" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/promtest" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" correlation "gitlab.com/gitlab-org/labkit/correlation/grpc" "google.golang.org/grpc" "google.golang.org/grpc/health" diff --git a/internal/praefect/transaction_test.go b/internal/praefect/transaction_test.go index 2fd6e1dc4d8553f6abd664af4e6c72e9b27d902f..63d985fbb83d324af4b60c0f0877e3f05ae23d3c 100644 --- a/internal/praefect/transaction_test.go +++ b/internal/praefect/transaction_test.go @@ -10,10 +10,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/transactions" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/transactions" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/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 f3fa0c94ce188348c74d56b856af8e8bfa2629db..7c61e61f992e4b567eb06b35f0b85324d2b6e23b 100644 --- a/internal/praefect/transactions/manager.go +++ b/internal/praefect/transactions/manager.go @@ -9,9 +9,9 @@ import ( "time" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" ) //nolint:revive // This is unintentionally missing documentation. diff --git a/internal/praefect/transactions/manager_test.go b/internal/praefect/transactions/manager_test.go index 75a00b6a48057d2f29a97edaf6d48dba1db1f196..a195fc88b789ec97a872e396ea1ed4b56eb4e44f 100644 --- a/internal/praefect/transactions/manager_test.go +++ b/internal/praefect/transactions/manager_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestManager_CancelTransactionNodeVoter(t *testing.T) { diff --git a/internal/praefect/transactions/subtransaction.go b/internal/praefect/transactions/subtransaction.go index 42328c7c64913e3be09f0fe2bfae5e996b33ad48..e5083826976273f3fb25cf3e685435722d13ba88 100644 --- a/internal/praefect/transactions/subtransaction.go +++ b/internal/praefect/transactions/subtransaction.go @@ -6,7 +6,7 @@ import ( "fmt" "sync" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" ) // VoteResult represents the outcome of a transaction for a single voter. diff --git a/internal/praefect/transactions/subtransaction_test.go b/internal/praefect/transactions/subtransaction_test.go index 0a076aee8abb7b90c3d27e48c82c12fb60373f68..7b53e3519865aa467ece007099afa94c2b128826 100644 --- a/internal/praefect/transactions/subtransaction_test.go +++ b/internal/praefect/transactions/subtransaction_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" ) func TestSubtransaction_cancel(t *testing.T) { diff --git a/internal/praefect/transactions/testhelper_test.go b/internal/praefect/transactions/testhelper_test.go index cdc7934b9823a5c854f353280e8bd56f97369e6f..6b293f81fe4cdb6de4296bbb90ce1e2247a26648 100644 --- a/internal/praefect/transactions/testhelper_test.go +++ b/internal/praefect/transactions/testhelper_test.go @@ -3,7 +3,7 @@ package transactions import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/praefect/transactions/transaction.go b/internal/praefect/transactions/transaction.go index 4248723ec0ad26f8e1dfec530ea6645af5abe30b..f5ae7d02b703ad6c4d863f0a0ef1f1b56b65fdcb 100644 --- a/internal/praefect/transactions/transaction.go +++ b/internal/praefect/transactions/transaction.go @@ -5,7 +5,7 @@ import ( "errors" "sync" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" ) var ( diff --git a/internal/praefect/transactions/transaction_test.go b/internal/praefect/transactions/transaction_test.go index 9d71d3fc2b78f6b17a5f9e1da32e71ea6b0c1fb2..93c43f44b02bf07693acfa3bb982d3aea45ed313 100644 --- a/internal/praefect/transactions/transaction_test.go +++ b/internal/praefect/transactions/transaction_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" ) func TestTransactionCancellationWithEmptyTransaction(t *testing.T) { diff --git a/internal/praefect/verifier.go b/internal/praefect/verifier.go index 2962e5722ad3d5655ade60e3037b92a6d44d31dc..c4b254c8685badfe38d2ccf9a03320a22e0bd3b6 100644 --- a/internal/praefect/verifier.go +++ b/internal/praefect/verifier.go @@ -8,10 +8,10 @@ import ( "time" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/glsql" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // MetadataVerifier verifies the repository metadata against the actual replicas on the diff --git a/internal/praefect/verifier_test.go b/internal/praefect/verifier_test.go index 8ee36b1caea010154d9b36f0013cdd93d05698de..4734367fd22b42ff03aeb2abebc1d0c6cbe8c887 100644 --- a/internal/praefect/verifier_test.go +++ b/internal/praefect/verifier_test.go @@ -9,26 +9,26 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - gitalyconfig "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/repository" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/setup" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/sidechannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/glsql" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/service/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/transactions" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + gitalyconfig "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/repository" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/setup" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/sidechannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/service/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/transactions" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" ) diff --git a/internal/praefect/walkrepos.go b/internal/praefect/walkrepos.go index c33ae1f0674cf9e41496bd3479c560793d2c1757..4004fba9a9acda1b9529bbbbcf01bfbf94b0e619 100644 --- a/internal/praefect/walkrepos.go +++ b/internal/praefect/walkrepos.go @@ -3,10 +3,10 @@ package praefect import ( "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" ) diff --git a/internal/praefect/walkrepos_test.go b/internal/praefect/walkrepos_test.go index 63301caf587fe0dce0b8d82a80a030e3a2060420..5ec56ed8b552742d12ed817d083f9267e97b4b5e 100644 --- a/internal/praefect/walkrepos_test.go +++ b/internal/praefect/walkrepos_test.go @@ -6,14 +6,14 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) diff --git a/internal/protoutil/extension.go b/internal/protoutil/extension.go index e56d5ec7841a53fda767830158438951a188eaeb..e25679ca00c66604af4d3ba9b288767d5c31a95a 100644 --- a/internal/protoutil/extension.go +++ b/internal/protoutil/extension.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/reflect/protoregistry" "google.golang.org/protobuf/runtime/protoimpl" diff --git a/internal/ps/testhelper_test.go b/internal/ps/testhelper_test.go index 86cb86e6d0603717001cd393c7e86938d1ef5a85..e5c068927f1adbde89bea5c3cd96554803f0b5a0 100644 --- a/internal/ps/testhelper_test.go +++ b/internal/ps/testhelper_test.go @@ -3,7 +3,7 @@ package ps import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/safe/file_writer.go b/internal/safe/file_writer.go index ec1fb751829df2fe062e25ae31bc85ab857c244e..7afb3f3d46fb700c9f0cf61c4247162976df904f 100644 --- a/internal/safe/file_writer.go +++ b/internal/safe/file_writer.go @@ -8,7 +8,7 @@ import ( "path/filepath" "sync" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" ) // ErrAlreadyDone is returned when the safe file has already been closed diff --git a/internal/safe/file_writer_test.go b/internal/safe/file_writer_test.go index 9379c9b80416638b2cc905ff6691bd8634825847..460412aaa66fb55074f0fa2a4f1ef3d3871c0bad 100644 --- a/internal/safe/file_writer_test.go +++ b/internal/safe/file_writer_test.go @@ -10,9 +10,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/safe" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/safe" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestFileWriter_successful(t *testing.T) { diff --git a/internal/safe/locking_directory.go b/internal/safe/locking_directory.go index 1a9252dd2ed59c74093835b4b3ec265d29af6839..aa0c5eeaac353f941df3d00398ea9482aa8ef897 100644 --- a/internal/safe/locking_directory.go +++ b/internal/safe/locking_directory.go @@ -7,7 +7,7 @@ import ( "os" "path/filepath" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" ) type lockingDirectoryState int diff --git a/internal/safe/locking_directory_test.go b/internal/safe/locking_directory_test.go index 36f172ece555300f3ea015689a14c60a138e5ad7..b58c1b8f421da3a41c9a866748738cf185121b14 100644 --- a/internal/safe/locking_directory_test.go +++ b/internal/safe/locking_directory_test.go @@ -9,9 +9,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/safe" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/safe" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestLockingDirectory(t *testing.T) { diff --git a/internal/safe/locking_file_writer.go b/internal/safe/locking_file_writer.go index 194fcd123b36fd6d310b9026ba4c8ca9d763e375..348f30a472bd9bb8d6cde17d3c6f5428b900402f 100644 --- a/internal/safe/locking_file_writer.go +++ b/internal/safe/locking_file_writer.go @@ -7,7 +7,7 @@ import ( "io" "os" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" ) type lockingFileWriterState int diff --git a/internal/safe/locking_file_writer_test.go b/internal/safe/locking_file_writer_test.go index bfb4c8bc20fdd0187dbc76310ab3899708d1a584..94d37cc402fd0dda339e444251d8da523ce0153d 100644 --- a/internal/safe/locking_file_writer_test.go +++ b/internal/safe/locking_file_writer_test.go @@ -7,11 +7,11 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/safe" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/safe" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestLockingFileWriter_lifecycle(t *testing.T) { diff --git a/internal/safe/sync_test.go b/internal/safe/sync_test.go index 734f77b835607273ed843922a0003517e50dac48..e51c37b5afbc855dd0e814596c98c435798dfecd 100644 --- a/internal/safe/sync_test.go +++ b/internal/safe/sync_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) type call struct { diff --git a/internal/safe/testhelper_test.go b/internal/safe/testhelper_test.go index 56f4b40026bdedb2f6ac02ecd5d289d6906f49bb..d6995300af822b3d589355c7e781f7dc46264cc2 100644 --- a/internal/safe/testhelper_test.go +++ b/internal/safe/testhelper_test.go @@ -3,7 +3,7 @@ package safe import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/signature/testhelper_test.go b/internal/signature/testhelper_test.go index 52b02e6daa2ed6b90658d1fd0635a3f0eb8399f8..c014a9a1d1a5386c8b79d273cfcf5e22044dea83 100644 --- a/internal/signature/testhelper_test.go +++ b/internal/signature/testhelper_test.go @@ -3,7 +3,7 @@ package signature import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/stream/pktline.go b/internal/stream/pktline.go index 31d9d32c11987fc002703cdb4e484042a2340b89..7850abf695e2d140ad48b9b21f6ee36a897b3928 100644 --- a/internal/stream/pktline.go +++ b/internal/stream/pktline.go @@ -4,7 +4,7 @@ import ( "fmt" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/pktline" ) // Conn represents a bi-directional client side connection. diff --git a/internal/stream/std_stream.go b/internal/stream/std_stream.go index 8afa2c8d6dc2111f396e69b108557acd0b481d44..34ab4281688b8cab4d11870edce601539409c5f4 100644 --- a/internal/stream/std_stream.go +++ b/internal/stream/std_stream.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // StdoutStderrResponse is an interface for RPC responses that need to stream stderr and stdout diff --git a/internal/streamcache/cache.go b/internal/streamcache/cache.go index 094dfec93c0434e4dc1271596f9714b0c0cf6a6a..6caa9ceb82dd1295a9880716b65cc2f2940007fb 100644 --- a/internal/streamcache/cache.go +++ b/internal/streamcache/cache.go @@ -35,10 +35,10 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "gitlab.com/gitlab-org/gitaly/v16/internal/dontpanic" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/dontpanic" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) var ( diff --git a/internal/streamcache/cache_test.go b/internal/streamcache/cache_test.go index 7a97ed5ba47a767573fde7aa9dc9f279414f1647..b2c94505c97175cd03269765ad9118b824797314 100644 --- a/internal/streamcache/cache_test.go +++ b/internal/streamcache/cache_test.go @@ -16,10 +16,10 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/duration" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/duration" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func newCache(tb testing.TB, dir string) Cache { diff --git a/internal/streamcache/filestore.go b/internal/streamcache/filestore.go index 800a98a617152efe6fba4dc852cdb1022eb23e51..0a6cf0fdd09ddbd87394379b24592ab9317b3339 100644 --- a/internal/streamcache/filestore.go +++ b/internal/streamcache/filestore.go @@ -12,10 +12,10 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "gitlab.com/gitlab-org/gitaly/v16/internal/dontpanic" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/perm" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/dontpanic" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/perm" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) var ( diff --git a/internal/streamcache/filestore_test.go b/internal/streamcache/filestore_test.go index 2e55bb7a6d02350df9d40eedc71842a15571c5d5..c2ba675eddd2c725178b0c7349bc8db5961c421c 100644 --- a/internal/streamcache/filestore_test.go +++ b/internal/streamcache/filestore_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestFilestoreCreate(t *testing.T) { diff --git a/internal/streamcache/min_occurrences_test.go b/internal/streamcache/min_occurrences_test.go index 00bb2fcc341ae5b283b5a31f2fc9852cf792af6c..7f1913c95e32878c7ed563176ff669dce752b171 100644 --- a/internal/streamcache/min_occurrences_test.go +++ b/internal/streamcache/min_occurrences_test.go @@ -8,7 +8,7 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func testNullCache() *TestLoggingCache { return &TestLoggingCache{Cache: NullCache{}} } diff --git a/internal/streamcache/pipe_test.go b/internal/streamcache/pipe_test.go index e4cff80857401ce94fc062703139011762025c9c..73ff7a32e2742b9aacd183267ca04bebe9fc1392 100644 --- a/internal/streamcache/pipe_test.go +++ b/internal/streamcache/pipe_test.go @@ -12,7 +12,7 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func createPipe(t *testing.T) (*pipeReader, *pipe) { diff --git a/internal/streamcache/sendfile_test.go b/internal/streamcache/sendfile_test.go index 94b9d163a16d4457c2e3a226f8320fb365741695..5c19fcf3a637235806223f4ede1bc0a5a457e6f6 100644 --- a/internal/streamcache/sendfile_test.go +++ b/internal/streamcache/sendfile_test.go @@ -12,7 +12,7 @@ import ( "testing/iotest" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) type wrappedFile struct{ f *os.File } diff --git a/internal/streamcache/testhelper_test.go b/internal/streamcache/testhelper_test.go index 79d1622b4c7c5d4b35b4b7b6fd85ae0808c2b3b9..7b0a0aa62377fae968333e904ed45b868bf557a0 100644 --- a/internal/streamcache/testhelper_test.go +++ b/internal/streamcache/testhelper_test.go @@ -3,7 +3,7 @@ package streamcache import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/structerr/grpc_server.go b/internal/structerr/grpc_server.go index 52887ba26b517f4db4300b925c54be0c4fbc1503..de7fd54e121c94760447cb08735073eb42ac69f7 100644 --- a/internal/structerr/grpc_server.go +++ b/internal/structerr/grpc_server.go @@ -3,7 +3,7 @@ package structerr import ( "context" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) // FieldsProducer extracts metadata from err if it contains a `structerr.Error` and exposes it as diff --git a/internal/tempdir/clean.go b/internal/tempdir/clean.go index cdd957fdf351092a8f1f9472bd817b7f9a9ce654..ee222bcf720b61d4c1755c81b200d0389334d6e8 100644 --- a/internal/tempdir/clean.go +++ b/internal/tempdir/clean.go @@ -11,11 +11,11 @@ import ( "strings" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/dontpanic" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/perm" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/dontpanic" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/perm" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) const ( diff --git a/internal/tempdir/clean_test.go b/internal/tempdir/clean_test.go index a608ad8fe00caece0ccceb2908064169123f8c53..5a3be1841adc3c756c8e186a58961d1e6b442aa5 100644 --- a/internal/tempdir/clean_test.go +++ b/internal/tempdir/clean_test.go @@ -7,12 +7,12 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestCleanSuccess(t *testing.T) { diff --git a/internal/tempdir/tempdir.go b/internal/tempdir/tempdir.go index f70c1216ce0aa83c362b12318ebb1aa166530d8c..32a3726ad6725a13c6779a7acc3c36b038411a38 100644 --- a/internal/tempdir/tempdir.go +++ b/internal/tempdir/tempdir.go @@ -7,10 +7,10 @@ import ( "path/filepath" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // Dir is a storage-scoped temporary directory. diff --git a/internal/tempdir/tempdir_test.go b/internal/tempdir/tempdir_test.go index bbfc1916826828cd5bdedc32f629ee63cb521562..d10ff400475c2c93fd1c5476ed32b3282ee096d2 100644 --- a/internal/tempdir/tempdir_test.go +++ b/internal/tempdir/tempdir_test.go @@ -7,11 +7,11 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestNewRepositorySuccess(t *testing.T) { diff --git a/internal/tempdir/testhelper_test.go b/internal/tempdir/testhelper_test.go index 6023ee6ec51d2ab30ec4be5622c4604b8ec4d112..edabbf2eaf62cb62cf322b111821a55f8b2cff5e 100644 --- a/internal/tempdir/testhelper_test.go +++ b/internal/tempdir/testhelper_test.go @@ -3,7 +3,7 @@ package tempdir import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/testhelper/configure.go b/internal/testhelper/configure.go index 184adf784809fab3c806f190df773aa8e0f264ae..344a648c18bd1631791225bdac3426c92b645631 100644 --- a/internal/testhelper/configure.go +++ b/internal/testhelper/configure.go @@ -8,8 +8,8 @@ import ( "runtime" "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) var testDirectory string diff --git a/internal/testhelper/directory.go b/internal/testhelper/directory.go index 2b20cbf3f812f53103f490b9a2b0bb2cbf835389..92422d6a5ef09d27bc8f781e3a4a4459d8e47508 100644 --- a/internal/testhelper/directory.go +++ b/internal/testhelper/directory.go @@ -12,7 +12,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" ) // DirectoryEntry models an entry in a directory. diff --git a/internal/testhelper/directory_test.go b/internal/testhelper/directory_test.go index 2fa13f0f6060f970de7dbd8d2d0977e62ffa9d1d..28ca1f9984159a464ff8e473e68d5f36146e679c 100644 --- a/internal/testhelper/directory_test.go +++ b/internal/testhelper/directory_test.go @@ -14,8 +14,8 @@ import ( "testing/fstest" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/archive" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/archive" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" ) type tbRecorder struct { diff --git a/internal/testhelper/featureset.go b/internal/testhelper/featureset.go index 54ad33ba7bb989d42dcc60b4a2fd015b582daba3..c5d2187644cad657ad5f9c51841a7719cc7cde59 100644 --- a/internal/testhelper/featureset.go +++ b/internal/testhelper/featureset.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" ) // FeatureSet is a representation of a set of features that should be disabled. diff --git a/internal/testhelper/featureset_test.go b/internal/testhelper/featureset_test.go index 956345adc2754251eb249afdab69c72c206637aa..a98f6fb0f3feed9f789158ceddc2493e2e1b4087 100644 --- a/internal/testhelper/featureset_test.go +++ b/internal/testhelper/featureset_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/stretchr/testify/require" - ff "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" + ff "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" "google.golang.org/grpc/metadata" ) diff --git a/internal/testhelper/gitlabtest.go b/internal/testhelper/gitlabtest.go index 1cf948ea8468f3c1bfe4d6cb2b933321edc2947b..9c6f4a923657cda14e4e13e60876e17682ca8b65 100644 --- a/internal/testhelper/gitlabtest.go +++ b/internal/testhelper/gitlabtest.go @@ -1,7 +1,7 @@ package testhelper import ( - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/internal/testhelper/grpc.go b/internal/testhelper/grpc.go index 924feeb51bccd83b10251397fe6dce2f39f4a174..c1aa6cff8353453ef455b53ef2ff883c180e5028 100644 --- a/internal/testhelper/grpc.go +++ b/internal/testhelper/grpc.go @@ -11,8 +11,8 @@ import ( "github.com/google/go-cmp/cmp/cmpopts" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb/testproto" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb/testproto" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" diff --git a/internal/testhelper/grpc_test.go b/internal/testhelper/grpc_test.go index 086ab1712cd910563cb19158081d401050ba5998..a58d053f4b1397e41b7a26b4d63387fd68b2394d 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/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" "google.golang.org/grpc" ) diff --git a/internal/testhelper/leakage.go b/internal/testhelper/leakage.go index 88c4806c5c2103c87aa5ac584175bcaf477228cd..237a2c5acbe3c2f7e82e968f7cc61a08ad1bf19c 100644 --- a/internal/testhelper/leakage.go +++ b/internal/testhelper/leakage.go @@ -10,8 +10,8 @@ import ( "syscall" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/command/commandcounter" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/command/commandcounter" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" "go.uber.org/goleak" ) diff --git a/internal/testhelper/logger.go b/internal/testhelper/logger.go index 6fdced6c75806ea82e71df3e881b59dfde9874ad..45db325db8e849422e21f999065a2228d354e5ee 100644 --- a/internal/testhelper/logger.go +++ b/internal/testhelper/logger.go @@ -7,7 +7,7 @@ import ( "github.com/sirupsen/logrus" "github.com/sirupsen/logrus/hooks/test" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) var ( diff --git a/internal/testhelper/testcfg/binaries.go b/internal/testhelper/testcfg/binaries.go index f9a7ebe69f93b5d4896dbd41fb22c007d1c80380..3823481d7a44ca4c5a3c7165900465a8229c1334 100644 --- a/internal/testhelper/testcfg/binaries.go +++ b/internal/testhelper/testcfg/binaries.go @@ -10,10 +10,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/version" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/version" ) var buildOnceByName sync.Map diff --git a/internal/testhelper/testcfg/gitaly.go b/internal/testhelper/testcfg/gitaly.go index 726092838afe7827659953c276b92f5ad8fd214c..b12e374a19cb8589d0f5f540e1889d68cb196ecc 100644 --- a/internal/testhelper/testcfg/gitaly.go +++ b/internal/testhelper/testcfg/gitaly.go @@ -8,10 +8,10 @@ import ( "github.com/pelletier/go-toml/v2" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/duration" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/duration" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) // UnconfiguredSocketPath is used to bypass config validation errors diff --git a/internal/testhelper/testcfg/metadata.go b/internal/testhelper/testcfg/metadata.go index a37a53548477aa0b58652c65f8aa7f3b548a31f3..c9e12bf78e8948e4be64d1593d6248747fe00b3b 100644 --- a/internal/testhelper/testcfg/metadata.go +++ b/internal/testhelper/testcfg/metadata.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" "google.golang.org/grpc/metadata" ) diff --git a/internal/testhelper/testdb/db.go b/internal/testhelper/testdb/db.go index d0f8b74dd265e49d0377b08e3da790bf8ad2f1c5..537ed9f0c6a5b4fb1f1c688d6f3323faa745058e 100644 --- a/internal/testhelper/testdb/db.go +++ b/internal/testhelper/testdb/db.go @@ -17,10 +17,10 @@ import ( migrate "github.com/rubenv/sql-migrate" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/glsql" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/migrations" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/migrations" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) // TxWrapper is a simple wrapper around *sql.Tx. diff --git a/internal/testhelper/testdb/health.go b/internal/testhelper/testdb/health.go index fde8d847d8523aae970cb0194d2190eed93f090a..f66950682be16107eff7ebd3f7a386991105936c 100644 --- a/internal/testhelper/testdb/health.go +++ b/internal/testhelper/testdb/health.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/glsql" ) // SetHealthyNodes sets the healthy nodes in the database as determined by the passed in map. The healthyNodes map is keyed by diff --git a/internal/testhelper/testdb/testhelper_test.go b/internal/testhelper/testdb/testhelper_test.go index 124932072153eb9dac4cd3ff008d71f838003961..30c8a53a964898f272409d84de22727885534a68 100644 --- a/internal/testhelper/testdb/testhelper_test.go +++ b/internal/testhelper/testdb/testhelper_test.go @@ -3,7 +3,7 @@ package testdb import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/testhelper/testhelper.go b/internal/testhelper/testhelper.go index 20f27fbc4339cba66b33636809e00094560ed179..5bbda5b9feff82813384e5bc002604764a5e27cd 100644 --- a/internal/testhelper/testhelper.go +++ b/internal/testhelper/testhelper.go @@ -23,10 +23,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/env" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/perm" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/env" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/perm" ) const ( diff --git a/internal/testhelper/testserver/gitaly.go b/internal/testhelper/testserver/gitaly.go index 88054eb6022f7f90d316a96a8ed9270cb1f91f63..10bbd2e9d97ae09ce2e1278565ce261d094ff56b 100644 --- a/internal/testhelper/testserver/gitaly.go +++ b/internal/testhelper/testserver/gitaly.go @@ -8,44 +8,44 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - gitalyauth "gitlab.com/gitlab-org/gitaly/v16/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/backup" - "gitlab.com/gitlab-org/gitaly/v16/internal/bundleuri" - "gitlab.com/gitlab-org/gitaly/v16/internal/cache" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping" - housekeepingmgr "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping/manager" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/server" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/counter" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue/databasemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - nodeimpl "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/node" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/migration" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitlab" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/limithandler" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/limiter" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - praefectconfig "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/streamcache" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" + gitalyauth "gitlab.com/gitlab-org/gitaly/v17/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/backup" + "gitlab.com/gitlab-org/gitaly/v17/internal/bundleuri" + "gitlab.com/gitlab-org/gitaly/v17/internal/cache" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping" + housekeepingmgr "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping/manager" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/server" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/counter" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue/databasemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + nodeimpl "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/node" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/migration" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitlab" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/middleware/limithandler" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/limiter" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + praefectconfig "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/streamcache" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" "google.golang.org/grpc" "google.golang.org/grpc/health" healthpb "google.golang.org/grpc/health/grpc_health_v1" diff --git a/internal/testhelper/testserver/praefect.go b/internal/testhelper/testserver/praefect.go index 45d1e1a8c52af757b432b3f6fb9220cae31f7956..c1f395edf280ea1d270bc791c06fd603d3c46acc 100644 --- a/internal/testhelper/testserver/praefect.go +++ b/internal/testhelper/testserver/praefect.go @@ -15,10 +15,10 @@ import ( "github.com/pelletier/go-toml/v2" "github.com/stretchr/testify/require" - gitalycfg "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + gitalycfg "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) // PraefectServer encapsulates information of a running Praefect server. diff --git a/internal/testhelper/testserver/structerr_interceptors.go b/internal/testhelper/testserver/structerr_interceptors.go index 6c4ffb4b16e0eb886fb219d662e972a3f8256dfd..2f9f355f390fe7bc75fa17cd0a33a602131392df 100644 --- a/internal/testhelper/testserver/structerr_interceptors.go +++ b/internal/testhelper/testserver/structerr_interceptors.go @@ -4,8 +4,8 @@ import ( "context" "sort" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" "google.golang.org/grpc" ) diff --git a/internal/testhelper/testserver/structerr_interceptors_test.go b/internal/testhelper/testserver/structerr_interceptors_test.go index d763531145af865ae3bc0c159b3bd7c4df251557..babf6c0f2770fcdda7f2128ab8d3a75d4e2a1567 100644 --- a/internal/testhelper/testserver/structerr_interceptors_test.go +++ b/internal/testhelper/testserver/structerr_interceptors_test.go @@ -9,10 +9,10 @@ import ( grpcmwlogrus "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/loghandler" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb/testproto" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/middleware/loghandler" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb/testproto" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/credentials/insecure" diff --git a/internal/testhelper/testserver/testhelper_test.go b/internal/testhelper/testserver/testhelper_test.go index d09ca3b545d50a330071c9cf5629bd00970f476f..9cc638b2179784e66391bbc8de1936ba418fd493 100644 --- a/internal/testhelper/testserver/testhelper_test.go +++ b/internal/testhelper/testserver/testhelper_test.go @@ -3,7 +3,7 @@ package testserver import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/testhelper/transactiontest/gitaly.go b/internal/testhelper/transactiontest/gitaly.go index ee751a0ece81ee889be5177002d81ae1e75ee580..953a6115dc99aa8c578e485f08c1e65ad0aee75c 100644 --- a/internal/testhelper/transactiontest/gitaly.go +++ b/internal/testhelper/transactiontest/gitaly.go @@ -7,7 +7,7 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" ) diff --git a/internal/tracing/passthrough_test.go b/internal/tracing/passthrough_test.go index 31bd3a50fc7e8a19d31b71dce4ddd65566901b3d..162825318f6351e7358a9d83265692d96365e9f1 100644 --- a/internal/tracing/passthrough_test.go +++ b/internal/tracing/passthrough_test.go @@ -10,7 +10,7 @@ import ( "github.com/opentracing/opentracing-go" "github.com/stretchr/testify/require" "github.com/uber/jaeger-client-go" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" grpctracing "gitlab.com/gitlab-org/labkit/tracing/grpc" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" diff --git a/internal/tracing/testhelper_test.go b/internal/tracing/testhelper_test.go index f940df2d15fbd7e608b074841660a0e56aa3138f..ccee6af3ae9cdbaf23b2824b13a00940f945a306 100644 --- a/internal/tracing/testhelper_test.go +++ b/internal/tracing/testhelper_test.go @@ -3,7 +3,7 @@ package tracing import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/tracing/tracing_test.go b/internal/tracing/tracing_test.go index 06214b31cbf4d31f88327951093e5153dea6c6d9..1ad3638364f434146e217bc351da7748866f999b 100644 --- a/internal/tracing/tracing_test.go +++ b/internal/tracing/tracing_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/uber/jaeger-client-go" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestCreateSpan(t *testing.T) { diff --git a/internal/transaction/txinfo/transaction.go b/internal/transaction/txinfo/transaction.go index a198b2abe1bd58b443c0e23570c22c7d2b87bfcf..cc3b5314de35950dc659392d6d647582f29057d6 100644 --- a/internal/transaction/txinfo/transaction.go +++ b/internal/transaction/txinfo/transaction.go @@ -7,7 +7,7 @@ import ( "errors" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" "google.golang.org/grpc/metadata" ) diff --git a/internal/transaction/voting/phase.go b/internal/transaction/voting/phase.go index 80ccf0588f6939eb71baa96b5a219cf96d35cc37..05cba92e2635be7b2ba9db6740f9cc3d00dd289e 100644 --- a/internal/transaction/voting/phase.go +++ b/internal/transaction/voting/phase.go @@ -3,7 +3,7 @@ package voting import ( "fmt" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // Phase is the transactional phase a given vote can be cast on. diff --git a/internal/transaction/voting/testhelper_test.go b/internal/transaction/voting/testhelper_test.go index c2d50fd065b9b13ba7d07ffe3aa65d913889fa0f..90c6be3cea51be4db7d5fad815393000bfef3cc5 100644 --- a/internal/transaction/voting/testhelper_test.go +++ b/internal/transaction/voting/testhelper_test.go @@ -3,7 +3,7 @@ package voting import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/unarycache/cache.go b/internal/unarycache/cache.go index 18c174806e6a81b2ed56297a09daf20765bc8c3e..fc7fae9dd4e4630e7e93e160bc58b5fc4f4249e4 100644 --- a/internal/unarycache/cache.go +++ b/internal/unarycache/cache.go @@ -12,7 +12,7 @@ import ( "fmt" lru "github.com/hashicorp/golang-lru/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" ) // Generator is a function that computes a cacheable value for a repository based on the given key. diff --git a/internal/unarycache/cache_test.go b/internal/unarycache/cache_test.go index 7782a6f4a1031531b0aad898db3acf82d16e212d..d190f39ca3baa89e955b95d4c379e06bb2852993 100644 --- a/internal/unarycache/cache_test.go +++ b/internal/unarycache/cache_test.go @@ -7,10 +7,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestCache_GetOrCompute(t *testing.T) { diff --git a/internal/unarycache/testhelper_test.go b/internal/unarycache/testhelper_test.go index d213f51ad96fb4f187cbcb0cbec2de305a6b7581..d8628b21f070dd36516359a03957d08d85d89aad 100644 --- a/internal/unarycache/testhelper_test.go +++ b/internal/unarycache/testhelper_test.go @@ -3,7 +3,7 @@ package unarycache import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/packed_binaries.go b/packed_binaries.go index 1e3a30cb3b802d85bd1c5d712b6ed7facbdb19cb..84b530d604cacf77910c8d5e3c70602c99ff488f 100644 --- a/packed_binaries.go +++ b/packed_binaries.go @@ -7,7 +7,7 @@ import ( "os" "path/filepath" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" "golang.org/x/sync/errgroup" ) diff --git a/packed_binaries_test.go b/packed_binaries_test.go index ff845a0e4fc262cd842347294f8e570855e40b25..ffb54991c076cc60a668480088228e66d0ce2301 100644 --- a/packed_binaries_test.go +++ b/packed_binaries_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" ) func TestUnpackAuxiliaryBinaries_success(t *testing.T) { diff --git a/proto/analysis.proto b/proto/analysis.proto index ced5b9cb90348e8a8ea1de1719649e07a5af0fe5..fde22c54fbccd32d31025eff189cc2ae19e3e51e 100644 --- a/proto/analysis.proto +++ b/proto/analysis.proto @@ -5,7 +5,7 @@ package gitaly; import "lint.proto"; import "shared.proto"; -option go_package = "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"; +option go_package = "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb"; // AnalysisService is a gRPC service providing RPCs that analyze objects in a repository. service AnalysisService { diff --git a/proto/blob.proto b/proto/blob.proto index f81ec91c6624bfc6c91dff7dea4f60ed240ef3fe..648b3f061b94a531f761c4528c883d255a2dfd65 100644 --- a/proto/blob.proto +++ b/proto/blob.proto @@ -5,7 +5,7 @@ package gitaly; import "lint.proto"; import "shared.proto"; -option go_package = "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"; +option go_package = "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb"; // BlobService is a service which provides RPCs to retrieve Git blobs from a // specific repository. diff --git a/proto/cleanup.proto b/proto/cleanup.proto index 94fff3ae0fdfcd7e7a76030ca505035a2e21b4a0..864786c50a53c0267eaa616eef36f5088f74abfb 100644 --- a/proto/cleanup.proto +++ b/proto/cleanup.proto @@ -5,7 +5,7 @@ package gitaly; import "lint.proto"; import "shared.proto"; -option go_package = "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"; +option go_package = "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb"; // CleanupService provides RPCs to clean up a repository's contents. service CleanupService { diff --git a/proto/cluster.proto b/proto/cluster.proto index 1a6289edb04f6b534757767d7070ba424df4a8b4..aa8bd151ea9ae99cc9249215f39cc8a33e78b54f 100644 --- a/proto/cluster.proto +++ b/proto/cluster.proto @@ -5,7 +5,7 @@ package gitaly; import "lint.proto"; import "raftpb/raft.proto"; // Upstream go.etcd.io/etcd/raft/v3/raftpb/raft.proto -option go_package = "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"; +option go_package = "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb"; // RaftEntry encapsulates critical data for replication using etcd/raft library. // It has a request ID allowing the primary to track when the action is diff --git a/proto/commit.proto b/proto/commit.proto index b42478449f68048b3ae574319b281e719280a3ed..9a7e3fb5f7128d57a75d18d068db8d27000b8d3c 100644 --- a/proto/commit.proto +++ b/proto/commit.proto @@ -7,7 +7,7 @@ import "google/protobuf/timestamp.proto"; import "lint.proto"; import "shared.proto"; -option go_package = "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"; +option go_package = "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb"; // CommitService is a service which provides RPCs that interact with Git // commits. @@ -775,7 +775,7 @@ message RawBlameError { // actual_lines contains the actual number of lines that can be blamed in the file. uint64 actual_lines = 1; } - + // InvalidIgnoreRevsFormatError indicates that the file containing ignored // revisions has an invalid format. message InvalidIgnoreRevsFormatError { diff --git a/proto/conflicts.proto b/proto/conflicts.proto index 83e4905aa0fb44ee75c8b8649fa2cd956481abdb..8280c6f1872cb4d4b4f0589479f2f0e147f4fc3f 100644 --- a/proto/conflicts.proto +++ b/proto/conflicts.proto @@ -6,7 +6,7 @@ import "google/protobuf/timestamp.proto"; import "lint.proto"; import "shared.proto"; -option go_package = "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"; +option go_package = "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb"; // ConflictsService is a service which provides RPCs to interact with conflicts // resulting from a merge. diff --git a/proto/diff.proto b/proto/diff.proto index 6c5d70c285ae0347e599d52f08bc1122c8bc1a57..c7337a5617c05801ec7a06fde51651ad2f58c6e8 100644 --- a/proto/diff.proto +++ b/proto/diff.proto @@ -5,7 +5,7 @@ package gitaly; import "lint.proto"; import "shared.proto"; -option go_package = "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"; +option go_package = "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb"; // DiffService is a service which provides RPCs to inspect differences // introduced between a set of commits. diff --git a/proto/errors.proto b/proto/errors.proto index 582f1377df7c620186fdbbf58ca557441771afe7..2f587eb7079dd67ad5e6268db7187d13567d3eb6 100644 --- a/proto/errors.proto +++ b/proto/errors.proto @@ -4,7 +4,7 @@ package gitaly; import "google/protobuf/duration.proto"; -option go_package = "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"; +option go_package = "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb"; // AccessCheckError is an error returned by GitLab's `/internal/allowed` // endpoint. diff --git a/proto/go/gitalypb/analysis.pb.go b/proto/go/gitalypb/analysis.pb.go index c5f51385d77a6f26df8f6eae56c9112f979a7ef0..e2a0fa84a3ed624982f3d9db7de4dde8167b3825 100644 --- a/proto/go/gitalypb/analysis.pb.go +++ b/proto/go/gitalypb/analysis.pb.go @@ -276,7 +276,7 @@ var file_analysis_proto_rawDesc = string([]byte{ 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x06, 0xfa, 0x97, 0x28, 0x02, 0x08, 0x02, 0x28, 0x01, 0x30, 0x01, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2d, 0x6f, 0x72, 0x67, 0x2f, 0x67, 0x69, 0x74, - 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x36, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, + 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x37, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, }) diff --git a/proto/go/gitalypb/blob.pb.go b/proto/go/gitalypb/blob.pb.go index 41f56583c459af583bba37a372e009433ba7aac5..a5a46d694a5cda34f0da365f1aefcbf3c3a5d78e 100644 --- a/proto/go/gitalypb/blob.pb.go +++ b/proto/go/gitalypb/blob.pb.go @@ -1364,7 +1364,7 @@ var file_blob_proto_rawDesc = string([]byte{ 0x46, 0x53, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x06, 0xfa, 0x97, 0x28, 0x02, 0x08, 0x02, 0x30, 0x01, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, - 0x62, 0x2d, 0x6f, 0x72, 0x67, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x36, + 0x62, 0x2d, 0x6f, 0x72, 0x67, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x37, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, }) diff --git a/proto/go/gitalypb/cleanup.pb.go b/proto/go/gitalypb/cleanup.pb.go index 86a67a4e989f82be349b33adfdb2a863c8eac67d..cd919e0fefc116bd2d5de2d2c5cd3ce305741d4f 100644 --- a/proto/go/gitalypb/cleanup.pb.go +++ b/proto/go/gitalypb/cleanup.pb.go @@ -348,7 +348,7 @@ var file_cleanup_proto_rawDesc = string([]byte{ 0x74, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x06, 0xfa, 0x97, 0x28, 0x02, 0x08, 0x01, 0x28, 0x01, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2d, 0x6f, 0x72, 0x67, 0x2f, - 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x36, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x37, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, }) diff --git a/proto/go/gitalypb/cluster.pb.go b/proto/go/gitalypb/cluster.pb.go index 5d93f2697e0fe36996639be46629fa41eeee650e..242fe4449e3f6d04c6cfc222372488212c037416 100644 --- a/proto/go/gitalypb/cluster.pb.go +++ b/proto/go/gitalypb/cluster.pb.go @@ -296,7 +296,7 @@ var file_cluster_proto_rawDesc = string([]byte{ 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x08, 0xfa, 0x97, 0x28, 0x04, 0x08, 0x01, 0x10, 0x02, 0x28, 0x01, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2d, 0x6f, 0x72, 0x67, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, - 0x2f, 0x76, 0x31, 0x36, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, + 0x2f, 0x76, 0x31, 0x37, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, }) diff --git a/proto/go/gitalypb/commit.pb.go b/proto/go/gitalypb/commit.pb.go index 5536d0a3cfa8f73797695fee20c22e19f9e973c8..6aedcd92b99e7e2403e237b4106a3e5e80765695 100644 --- a/proto/go/gitalypb/commit.pb.go +++ b/proto/go/gitalypb/commit.pb.go @@ -5015,7 +5015,7 @@ var file_commit_proto_rawDesc = string([]byte{ 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x06, 0xfa, 0x97, 0x28, 0x02, 0x08, 0x02, 0x28, 0x01, 0x30, 0x01, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2d, 0x6f, 0x72, 0x67, 0x2f, 0x67, 0x69, 0x74, - 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x36, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, + 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x37, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, }) diff --git a/proto/go/gitalypb/conflicts.pb.go b/proto/go/gitalypb/conflicts.pb.go index 3b4880573f185b8421dbcb8da9987c6350a1cbb7..b8102f2b358de9410fd3f892e606ecc4b631a514 100644 --- a/proto/go/gitalypb/conflicts.pb.go +++ b/proto/go/gitalypb/conflicts.pb.go @@ -695,7 +695,7 @@ var file_conflicts_proto_rawDesc = string([]byte{ 0x66, 0x6c, 0x69, 0x63, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x06, 0xfa, 0x97, 0x28, 0x02, 0x08, 0x01, 0x28, 0x01, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2d, 0x6f, 0x72, - 0x67, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x36, 0x2f, 0x70, 0x72, 0x6f, + 0x67, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x37, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, }) diff --git a/proto/go/gitalypb/diff.pb.go b/proto/go/gitalypb/diff.pb.go index 3ff4dab06d93e6d7b314ea533d614cd260b86ec2..1e42e9d0e8631942637c424663ed86d918d379e5 100644 --- a/proto/go/gitalypb/diff.pb.go +++ b/proto/go/gitalypb/diff.pb.go @@ -3230,7 +3230,7 @@ var file_diff_proto_rawDesc = string([]byte{ 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x06, 0xfa, 0x97, 0x28, 0x02, 0x08, 0x02, 0x30, 0x01, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2d, 0x6f, 0x72, 0x67, 0x2f, 0x67, 0x69, 0x74, 0x61, - 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x36, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, + 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x37, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, }) diff --git a/proto/go/gitalypb/errors.pb.go b/proto/go/gitalypb/errors.pb.go index bcdd386e530c8cce38d4ff4bae64a635fe3f99c6..f5cbb09415ef32ec1cda008aadf96413f32a5bad 100644 --- a/proto/go/gitalypb/errors.pb.go +++ b/proto/go/gitalypb/errors.pb.go @@ -1418,7 +1418,7 @@ var file_errors_proto_rawDesc = string([]byte{ 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2d, 0x6f, 0x72, 0x67, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x76, - 0x31, 0x36, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x61, + 0x31, 0x37, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, }) diff --git a/proto/go/gitalypb/hook.pb.go b/proto/go/gitalypb/hook.pb.go index 953bff314080978268c6af04ef6bd6789dd82c77..3b164d0fe4e8fe90acb2e6a7f3061bdfa2b30b34 100644 --- a/proto/go/gitalypb/hook.pb.go +++ b/proto/go/gitalypb/hook.pb.go @@ -1074,7 +1074,7 @@ var file_hook_proto_rawDesc = string([]byte{ 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x06, 0xfa, 0x97, 0x28, 0x02, 0x08, 0x01, 0x28, 0x01, 0x30, 0x01, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2d, 0x6f, 0x72, 0x67, 0x2f, 0x67, - 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x36, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, + 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x37, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, }) diff --git a/proto/go/gitalypb/internal.pb.go b/proto/go/gitalypb/internal.pb.go index 6ba6c79aeba93141325aef4efc9e0f1b4ebb73b2..0d46f1a33138c3af7b8d15a7aae7b15b3c2a03ca 100644 --- a/proto/go/gitalypb/internal.pb.go +++ b/proto/go/gitalypb/internal.pb.go @@ -152,7 +152,7 @@ var file_internal_proto_rawDesc = string([]byte{ 0x6f, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x08, 0xfa, 0x97, 0x28, 0x04, 0x08, 0x02, 0x10, 0x02, 0x30, 0x01, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2d, 0x6f, 0x72, 0x67, 0x2f, - 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x36, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x37, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, }) diff --git a/proto/go/gitalypb/lint.pb.go b/proto/go/gitalypb/lint.pb.go index 2e26e59a8c8bc9b7582cd3dc604a15db124179a5..64e7696b5fba8a0c5a4037c7414e210e8df3304c 100644 --- a/proto/go/gitalypb/lint.pb.go +++ b/proto/go/gitalypb/lint.pb.go @@ -352,7 +352,7 @@ var file_lint_proto_rawDesc = string([]byte{ 0x6e, 0x73, 0x18, 0xe5, 0xc8, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x70, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2d, 0x6f, 0x72, 0x67, - 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x36, 0x2f, 0x70, 0x72, 0x6f, 0x74, + 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x37, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, }) diff --git a/proto/go/gitalypb/log.pb.go b/proto/go/gitalypb/log.pb.go index 137b176af5f8946321c9fd6ea1eeb4814a73c8f1..609e2900ac8e3d64f1182e217e2bbd6f303e8c1a 100644 --- a/proto/go/gitalypb/log.pb.go +++ b/proto/go/gitalypb/log.pb.go @@ -977,7 +977,7 @@ var file_log_proto_rawDesc = string([]byte{ 0x75, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2d, 0x6f, 0x72, 0x67, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2f, - 0x76, 0x31, 0x36, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, + 0x76, 0x31, 0x37, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, }) diff --git a/proto/go/gitalypb/objectpool.pb.go b/proto/go/gitalypb/objectpool.pb.go index c6369d3e2ed3d6c304e1f4a793dc4b9c032ae60d..0bce584b65258e2082dfc0f45b1b4a7e37a81d80 100644 --- a/proto/go/gitalypb/objectpool.pb.go +++ b/proto/go/gitalypb/objectpool.pb.go @@ -664,7 +664,7 @@ var file_objectpool_proto_rawDesc = string([]byte{ 0x65, 0x63, 0x74, 0x50, 0x6f, 0x6f, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x06, 0xfa, 0x97, 0x28, 0x02, 0x08, 0x02, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2d, 0x6f, 0x72, 0x67, - 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x36, 0x2f, 0x70, 0x72, 0x6f, 0x74, + 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x37, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, }) diff --git a/proto/go/gitalypb/operations.pb.go b/proto/go/gitalypb/operations.pb.go index 6ee63e7ee5c366c49cd2c0f19342c996f06f40f0..4b813048f0aa9aa2153ba11b39561a85c993631f 100644 --- a/proto/go/gitalypb/operations.pb.go +++ b/proto/go/gitalypb/operations.pb.go @@ -5169,7 +5169,7 @@ var file_operations_proto_rawDesc = string([]byte{ 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x06, 0xfa, 0x97, 0x28, 0x02, 0x08, 0x01, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2d, 0x6f, 0x72, 0x67, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2f, - 0x76, 0x31, 0x36, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, + 0x76, 0x31, 0x37, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, }) diff --git a/proto/go/gitalypb/packfile.pb.go b/proto/go/gitalypb/packfile.pb.go index 0e49fbfe5b99879fd0254971fbb802cfe20dabe5..3a6ffef5458df58d50e8c48b542d8c12c25b7e7f 100644 --- a/proto/go/gitalypb/packfile.pb.go +++ b/proto/go/gitalypb/packfile.pb.go @@ -152,7 +152,7 @@ var file_packfile_proto_rawDesc = string([]byte{ 0x69, 0x6c, 0x74, 0x65, 0x72, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2d, 0x6f, 0x72, 0x67, 0x2f, 0x67, 0x69, 0x74, - 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x36, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, + 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x37, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, }) diff --git a/proto/go/gitalypb/partition.pb.go b/proto/go/gitalypb/partition.pb.go index 3d0dce5d698e0f99c573a5b6a4d1a477ef262353..676c0aa83651b0b4da330a572f8e2cf27f39dfff 100644 --- a/proto/go/gitalypb/partition.pb.go +++ b/proto/go/gitalypb/partition.pb.go @@ -331,7 +331,7 @@ var file_partition_proto_rawDesc = string([]byte{ 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x08, 0xfa, 0x97, 0x28, 0x04, 0x08, 0x02, 0x10, 0x02, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, - 0x62, 0x2d, 0x6f, 0x72, 0x67, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x36, + 0x62, 0x2d, 0x6f, 0x72, 0x67, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x37, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, }) diff --git a/proto/go/gitalypb/praefect.pb.go b/proto/go/gitalypb/praefect.pb.go index 76e57d63b098f95cae72a8bba216ca980e174dc5..9d5be1dfb46651113c9cbaf4de5f843f3ddd5295 100644 --- a/proto/go/gitalypb/praefect.pb.go +++ b/proto/go/gitalypb/praefect.pb.go @@ -1384,7 +1384,7 @@ var file_praefect_proto_rawDesc = string([]byte{ 0x74, 0x6f, 0x72, 0x79, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x1a, 0x04, 0xf0, 0x97, 0x28, 0x01, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2d, - 0x6f, 0x72, 0x67, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x36, 0x2f, 0x70, + 0x6f, 0x72, 0x67, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x37, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, }) diff --git a/proto/go/gitalypb/ref.pb.go b/proto/go/gitalypb/ref.pb.go index be0d606a1b8ddf1c72aeeacba56c360de66d4c60..7332332d0033a016b46c192ccc43626ccda740d3 100644 --- a/proto/go/gitalypb/ref.pb.go +++ b/proto/go/gitalypb/ref.pb.go @@ -2993,7 +2993,7 @@ var file_ref_proto_rawDesc = string([]byte{ 0x44, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x06, 0xfa, 0x97, 0x28, 0x02, 0x08, 0x02, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2d, 0x6f, 0x72, 0x67, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, - 0x79, 0x2f, 0x76, 0x31, 0x36, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, + 0x79, 0x2f, 0x76, 0x31, 0x37, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, }) diff --git a/proto/go/gitalypb/remote.pb.go b/proto/go/gitalypb/remote.pb.go index e8a127effb8f44abbb2ce2baf34a82e0844140ad..816f099c183d21f8edeab904def7fc7d2268018c 100644 --- a/proto/go/gitalypb/remote.pb.go +++ b/proto/go/gitalypb/remote.pb.go @@ -563,7 +563,7 @@ var file_remote_proto_rawDesc = string([]byte{ 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x06, 0xfa, 0x97, 0x28, 0x02, 0x08, 0x02, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2d, 0x6f, 0x72, 0x67, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2f, - 0x76, 0x31, 0x36, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, + 0x76, 0x31, 0x37, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, }) diff --git a/proto/go/gitalypb/repository.pb.go b/proto/go/gitalypb/repository.pb.go index 14177d738280c40648c6b5d9cbca876b75ce4eef..9730f39b1b5cf77db155cbe25bb3c81d3efc160c 100644 --- a/proto/go/gitalypb/repository.pb.go +++ b/proto/go/gitalypb/repository.pb.go @@ -6111,7 +6111,7 @@ var file_repository_proto_rawDesc = string([]byte{ 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x06, 0xfa, 0x97, 0x28, 0x02, 0x08, 0x02, 0x30, 0x01, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2d, 0x6f, 0x72, 0x67, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, - 0x2f, 0x76, 0x31, 0x36, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, + 0x2f, 0x76, 0x31, 0x37, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, }) diff --git a/proto/go/gitalypb/server.pb.go b/proto/go/gitalypb/server.pb.go index e158bc8702bf0c4675d2cebae615a428c7aa0841..83c135da6715c354a312fab92c4524935e3c61f9 100644 --- a/proto/go/gitalypb/server.pb.go +++ b/proto/go/gitalypb/server.pb.go @@ -820,7 +820,7 @@ var file_server_proto_rawDesc = string([]byte{ 0x65, 0x72, 0x76, 0x65, 0x72, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x1a, 0x04, 0xf0, 0x97, 0x28, 0x01, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, - 0x62, 0x2d, 0x6f, 0x72, 0x67, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x36, + 0x62, 0x2d, 0x6f, 0x72, 0x67, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x37, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, }) diff --git a/proto/go/gitalypb/service_config.pb.go b/proto/go/gitalypb/service_config.pb.go index 9d01d10cbed69e6d8537bce014f5ef15fa405cc4..78583cf8e989021d5e4d0afe62a2ad2c521b1426 100644 --- a/proto/go/gitalypb/service_config.pb.go +++ b/proto/go/gitalypb/service_config.pb.go @@ -560,7 +560,7 @@ var file_service_config_proto_rawDesc = string([]byte{ 0x79, 0x61, 0x62, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x43, 0x6f, 0x64, 0x65, 0x73, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2d, 0x6f, 0x72, 0x67, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, - 0x2f, 0x76, 0x31, 0x36, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, + 0x2f, 0x76, 0x31, 0x37, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, }) diff --git a/proto/go/gitalypb/shared.pb.go b/proto/go/gitalypb/shared.pb.go index 730e14f6991f153585c740019c6eb33f19242c7e..e4351838dacbc42f0090c24a653cc8334d04a69d 100644 --- a/proto/go/gitalypb/shared.pb.go +++ b/proto/go/gitalypb/shared.pb.go @@ -1383,7 +1383,7 @@ var file_shared_proto_rawDesc = string([]byte{ 0x00, 0x12, 0x0e, 0x0a, 0x0a, 0x44, 0x45, 0x53, 0x43, 0x45, 0x4e, 0x44, 0x49, 0x4e, 0x47, 0x10, 0x01, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2d, 0x6f, 0x72, 0x67, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, - 0x79, 0x2f, 0x76, 0x31, 0x36, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, + 0x79, 0x2f, 0x76, 0x31, 0x37, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, }) diff --git a/proto/go/gitalypb/smarthttp.pb.go b/proto/go/gitalypb/smarthttp.pb.go index 1d403a229eed09fa315d627543ee17af61828561..efc5895eaf81b6b5d861db371e3a970321f2d7c1 100644 --- a/proto/go/gitalypb/smarthttp.pb.go +++ b/proto/go/gitalypb/smarthttp.pb.go @@ -486,7 +486,7 @@ var file_smarthttp_proto_rawDesc = string([]byte{ 0x73, 0x65, 0x22, 0x06, 0xfa, 0x97, 0x28, 0x02, 0x08, 0x01, 0x28, 0x01, 0x30, 0x01, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2d, 0x6f, 0x72, 0x67, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x76, - 0x31, 0x36, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x61, + 0x31, 0x37, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, }) diff --git a/proto/go/gitalypb/ssh.pb.go b/proto/go/gitalypb/ssh.pb.go index ccf717ac8e0d23ec9e2a19ebc65dd620d8a4b8b1..7de3a0efb0a0b1403eee53212f5bcdd22b575c79 100644 --- a/proto/go/gitalypb/ssh.pb.go +++ b/proto/go/gitalypb/ssh.pb.go @@ -511,7 +511,7 @@ var file_ssh_proto_rawDesc = string([]byte{ 0x64, 0x41, 0x72, 0x63, 0x68, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x06, 0xfa, 0x97, 0x28, 0x02, 0x08, 0x02, 0x28, 0x01, 0x30, 0x01, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, - 0x62, 0x2d, 0x6f, 0x72, 0x67, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x36, + 0x62, 0x2d, 0x6f, 0x72, 0x67, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x37, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, }) diff --git a/proto/go/gitalypb/testproto/error_metadata.pb.go b/proto/go/gitalypb/testproto/error_metadata.pb.go index fcba312ade10245624bd89c08f4d5c02ecae8f1b..127efd7e325b14e3d21e782013fcee062e2bcf1d 100644 --- a/proto/go/gitalypb/testproto/error_metadata.pb.go +++ b/proto/go/gitalypb/testproto/error_metadata.pb.go @@ -89,7 +89,7 @@ var file_testproto_error_metadata_proto_rawDesc = string([]byte{ 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x3e, 0x5a, 0x3c, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2d, 0x6f, 0x72, 0x67, 0x2f, 0x67, 0x69, - 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x36, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, + 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x37, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x70, 0x62, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, }) diff --git a/proto/go/gitalypb/testproto/invalid.pb.go b/proto/go/gitalypb/testproto/invalid.pb.go index 3659b2c6cf4693ef8b089fb1a07e55c0f423ddd4..0236838590a96b29d81a97e3ed594deec8719106 100644 --- a/proto/go/gitalypb/testproto/invalid.pb.go +++ b/proto/go/gitalypb/testproto/invalid.pb.go @@ -7,7 +7,7 @@ package testproto import ( - gitalypb "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + gitalypb "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -1018,7 +1018,7 @@ var file_testproto_invalid_proto_rawDesc = string([]byte{ 0x64, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x08, 0xfa, 0x97, 0x28, 0x04, 0x08, 0x03, 0x10, 0x02, 0x42, 0x3e, 0x5a, 0x3c, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2d, 0x6f, - 0x72, 0x67, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x36, 0x2f, 0x70, 0x72, + 0x72, 0x67, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x37, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x70, 0x62, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, diff --git a/proto/go/gitalypb/testproto/valid.pb.go b/proto/go/gitalypb/testproto/valid.pb.go index 6c3328c7e96e3a37f74ff8f30a768a8aa1dec8cd..69a5a1d740c66f74d1d427bd8d02e2b762a6ea77 100644 --- a/proto/go/gitalypb/testproto/valid.pb.go +++ b/proto/go/gitalypb/testproto/valid.pb.go @@ -7,7 +7,7 @@ package testproto import ( - gitalypb "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + gitalypb "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -626,7 +626,7 @@ var file_testproto_valid_proto_rawDesc = string([]byte{ 0x6c, 0x69, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x06, 0xfa, 0x97, 0x28, 0x02, 0x08, 0x03, 0x42, 0x3e, 0x5a, 0x3c, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2d, 0x6f, 0x72, 0x67, 0x2f, 0x67, 0x69, 0x74, - 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x36, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, + 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x37, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x70, 0x62, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, }) diff --git a/proto/go/gitalypb/transaction.pb.go b/proto/go/gitalypb/transaction.pb.go index f1b84a1a20e9d797c307c9eb611dc8d9e1b9dad3..a677da46b4f24480570e3258e4e2bb29857cd618 100644 --- a/proto/go/gitalypb/transaction.pb.go +++ b/proto/go/gitalypb/transaction.pb.go @@ -419,7 +419,7 @@ var file_transaction_proto_rawDesc = string([]byte{ 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x1a, 0x04, 0xf0, 0x97, 0x28, 0x01, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2d, 0x6f, 0x72, 0x67, 0x2f, 0x67, 0x69, - 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x36, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, + 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x37, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, }) diff --git a/proto/hook.proto b/proto/hook.proto index 4bf963b2ffa7595e588a31e3b5605a8fbb614876..4740f39cce9bba356ef71e3a175327aefb564522 100644 --- a/proto/hook.proto +++ b/proto/hook.proto @@ -5,7 +5,7 @@ package gitaly; import "lint.proto"; import "shared.proto"; -option go_package = "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"; +option go_package = "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb"; // HookService is a service which provides the implementation of a subset of // Git hooks. These are typically invoked via the `gitaly-hooks` binary to diff --git a/proto/internal.proto b/proto/internal.proto index 47d82677794fccffd9e619b27d9204f0c7c2db13..d28019b51bb5d1d1902e88ce7d33f00c5eaa422a 100644 --- a/proto/internal.proto +++ b/proto/internal.proto @@ -5,7 +5,7 @@ package gitaly; import "google/protobuf/timestamp.proto"; import "lint.proto"; -option go_package = "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"; +option go_package = "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb"; // InternalGitaly is a gRPC service meant to be served by a Gitaly node, but // only reachable by Praefect or other Gitalies diff --git a/proto/lint.proto b/proto/lint.proto index a0a410f06b8caaf324606baf60a1b42f62959252..afec025370681d22862b6a4c978ab66d36d7040b 100644 --- a/proto/lint.proto +++ b/proto/lint.proto @@ -4,7 +4,7 @@ package gitaly; import "google/protobuf/descriptor.proto"; -option go_package = "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"; +option go_package = "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb"; // OperationMsg ... message OperationMsg { diff --git a/proto/log.proto b/proto/log.proto index dd5546b06dfdf668180aaf6ed56fdf6d65731ccf..9479b349c66f3dbbf7088a452b9adc177d4ac873 100644 --- a/proto/log.proto +++ b/proto/log.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package gitaly; -option go_package = "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"; +option go_package = "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb"; // LogEntry is a single entry in a partition's write-ahead log. // diff --git a/proto/objectpool.proto b/proto/objectpool.proto index 321b60c49cada40ada40a2a6e0c576e64573eea7..ae71b6f024000c495a2161497e544c9968cccb3a 100644 --- a/proto/objectpool.proto +++ b/proto/objectpool.proto @@ -5,7 +5,7 @@ package gitaly; import "lint.proto"; import "shared.proto"; -option go_package = "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"; +option go_package = "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb"; // ObjectPoolService is a service that manages the lifetime of object pools. // diff --git a/proto/operations.proto b/proto/operations.proto index 9730bf0c492f7c9c703876096667bc22870e5ed8..af402b56fc9c6fd9a262e3467a19702acdc54d96 100644 --- a/proto/operations.proto +++ b/proto/operations.proto @@ -7,7 +7,7 @@ import "google/protobuf/timestamp.proto"; import "lint.proto"; import "shared.proto"; -option go_package = "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"; +option go_package = "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb"; // OperationService provides an interface for performing mutating git // operations on a repository on behalf of a user. The user's operation is diff --git a/proto/packfile.proto b/proto/packfile.proto index d941705767fd30031dc0dd654586392134f0c71e..b98a8790c231b5332b2590d0555eaddca62ac7fd 100644 --- a/proto/packfile.proto +++ b/proto/packfile.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package gitaly; -option go_package = "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"; +option go_package = "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb"; // PackfileNegotiationStatistics represents the git packfile negotiation. message PackfileNegotiationStatistics { diff --git a/proto/partition.proto b/proto/partition.proto index ae1e40fbcbb25d1acf7566f1d711859ad00ec370..16d679bb55efcac6edddcdbe01e327843985d2a9 100644 --- a/proto/partition.proto +++ b/proto/partition.proto @@ -5,7 +5,7 @@ package gitaly; import "lint.proto"; import "shared.proto"; -option go_package = "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"; +option go_package = "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb"; // PartitionService is a service providing RPCs accessing partitions as a whole. service PartitionService { diff --git a/proto/praefect.proto b/proto/praefect.proto index 03aa2b22c774aa02c5c20935770d33e463973af2..96f4455e393cc2b813ac35371b4fcd48152d7620 100644 --- a/proto/praefect.proto +++ b/proto/praefect.proto @@ -6,7 +6,7 @@ import "google/protobuf/timestamp.proto"; import "lint.proto"; import "shared.proto"; -option go_package = "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"; +option go_package = "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb"; // PraefectInfoService is a service which provides RPCs to query and modify // Praefect-specific parameters. @@ -17,7 +17,7 @@ service PraefectInfoService { rpc RepositoryReplicas(RepositoryReplicasRequest) returns (RepositoryReplicasResponse); // Dataloss provides information on repositories in Praefect that are in a degraded state and - // thus susceptible to dataloss. A repository is considered degraded when its replicas are + // thus susceptible to dataloss. A repository is considered degraded when its replicas are // outdated and/or unavailable. rpc Dataloss(DatalossRequest) returns (stream DatalossResponse); diff --git a/proto/ref.proto b/proto/ref.proto index aefcb9a19efddcdef0c266c5cf74c8891a70fdbe..eccc7a2ab7414907af87581156450e9cf02c706e 100644 --- a/proto/ref.proto +++ b/proto/ref.proto @@ -6,7 +6,7 @@ import "errors.proto"; import "lint.proto"; import "shared.proto"; -option go_package = "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"; +option go_package = "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb"; // RefService is a service that provides RPCs to list and modify Git references. service RefService { diff --git a/proto/remote.proto b/proto/remote.proto index 055cac0469492e73aacb4e700779e071397ff19f..029382f5774f48f9e851147af592625825517c4d 100644 --- a/proto/remote.proto +++ b/proto/remote.proto @@ -5,7 +5,7 @@ package gitaly; import "lint.proto"; import "shared.proto"; -option go_package = "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"; +option go_package = "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb"; // RemoteService is a service providing RPCs to interact with a remote // repository that is hosted on another Git server. diff --git a/proto/repository.proto b/proto/repository.proto index c85b599dcd779314b59cc31a3cd673675881c05b..4d156a438ca7957b06134fee49c23f3101d78890 100644 --- a/proto/repository.proto +++ b/proto/repository.proto @@ -6,7 +6,7 @@ import "errors.proto"; import "lint.proto"; import "shared.proto"; -option go_package = "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"; +option go_package = "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb"; // RepositoryService is a service providing RPCs accessing repositories as a whole. service RepositoryService { diff --git a/proto/server.proto b/proto/server.proto index bac97c44d33ef71b71c5b4d0e0f9e438b09b7ae0..67436fc4ff2062de0e2fcbfd285db96b4051fd1a 100644 --- a/proto/server.proto +++ b/proto/server.proto @@ -5,7 +5,7 @@ package gitaly; import "google/protobuf/duration.proto"; import "lint.proto"; -option go_package = "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"; +option go_package = "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb"; // ServerService is a service that provides information about a Gitaly server. service ServerService { diff --git a/proto/service_config.proto b/proto/service_config.proto index f2286f7e3d452ea4e7f2c5648bd3dd991d920f1b..88358931a784de681f4020e1ea15e1f259d7ca53 100644 --- a/proto/service_config.proto +++ b/proto/service_config.proto @@ -5,7 +5,7 @@ package gitaly; import "google/protobuf/duration.proto"; import "google/protobuf/wrappers.proto"; -option go_package = "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"; +option go_package = "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb"; // ServiceConfig defines the configuration that allows service owners to publish parameters to be // automatically used by all clients of their service. gRPC doesn't export this protobuf. So, we diff --git a/proto/shared.proto b/proto/shared.proto index 0ca6c22507e86ece3ab00687b58ea18aaaff8ca0..f2e7dbe2091224c0d5478e85c07f17dd686aecea 100644 --- a/proto/shared.proto +++ b/proto/shared.proto @@ -5,7 +5,7 @@ package gitaly; import "google/protobuf/timestamp.proto"; import "lint.proto"; -option go_package = "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"; +option go_package = "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb"; // ObjectType ... enum ObjectType { @@ -245,4 +245,4 @@ enum SortDirection { message Partition { // id is the identifier of a partition within the storage string id = 1; -} \ No newline at end of file +} diff --git a/proto/smarthttp.proto b/proto/smarthttp.proto index c9f2b40ee0411b718b8c727b2fa5199e7a4c1243..7568f05064db25484e7e4fcf6e5f3bd58f214234 100644 --- a/proto/smarthttp.proto +++ b/proto/smarthttp.proto @@ -6,7 +6,7 @@ import "lint.proto"; import "packfile.proto"; import "shared.proto"; -option go_package = "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"; +option go_package = "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb"; // SmartHTTPService is a service that provides RPCs required for HTTP-based Git // clones via the smart HTTP protocol. diff --git a/proto/ssh.proto b/proto/ssh.proto index f58287c1d4be63ed6f4d9adcefa783ebd85713e6..dd06aed7b375fa15d6182969c61ea2b273acd3a8 100644 --- a/proto/ssh.proto +++ b/proto/ssh.proto @@ -6,7 +6,7 @@ import "lint.proto"; import "packfile.proto"; import "shared.proto"; -option go_package = "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"; +option go_package = "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb"; // SSHService is a service that provides RPCs required for SSH-based Git clones. service SSHService { diff --git a/proto/testproto/error_metadata.proto b/proto/testproto/error_metadata.proto index 4d4649ff2c6e8c8936c8302293be7d120135df27..49f87d213ec7c9d8a3c517aa2befa4ba74b7cff1 100644 --- a/proto/testproto/error_metadata.proto +++ b/proto/testproto/error_metadata.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package testproto; -option go_package = "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb/testproto"; +option go_package = "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb/testproto"; // errorMetadata is a key-value metadata item that may be attached to errors. We only use this // infrastructure for testing purposes to assert that we add error metadata as expected that would diff --git a/proto/testproto/invalid.proto b/proto/testproto/invalid.proto index 11cbd7dbc39ecf22518cc62f8e0ee879c90ec83a..55a9da078c38b555255a07979dd546cec9f81bc6 100644 --- a/proto/testproto/invalid.proto +++ b/proto/testproto/invalid.proto @@ -5,7 +5,7 @@ package testproto; import "lint.proto"; import "shared.proto"; -option go_package = "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb/testproto"; +option go_package = "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb/testproto"; message InvalidMethodRequest { } diff --git a/proto/testproto/valid.proto b/proto/testproto/valid.proto index cfe96f0cba9bab90f56602cfdae9e0ffd5601762..3a9b31316f8e5a18c223eaef73809fe78e88d5fb 100644 --- a/proto/testproto/valid.proto +++ b/proto/testproto/valid.proto @@ -5,7 +5,7 @@ package testproto; import "lint.proto"; import "shared.proto"; -option go_package = "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb/testproto"; +option go_package = "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb/testproto"; message ValidRequest { gitaly.Repository destination = 1 [(gitaly.target_repository)=true]; diff --git a/proto/transaction.proto b/proto/transaction.proto index ab3c30797932b07b60a4bc5dc5231cd2ea2cada0..eb8e0a826524e9733830cbb8e5077c1cc4f8631a 100644 --- a/proto/transaction.proto +++ b/proto/transaction.proto @@ -5,7 +5,7 @@ package gitaly; import "lint.proto"; import "shared.proto"; -option go_package = "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"; +option go_package = "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb"; // RefTransaction is a service which provides RPCs to interact with reference // transactions. Reference transactions are used in the context of Gitaly diff --git a/streamio/testhelper_test.go b/streamio/testhelper_test.go index 2edd01de6548a193a837a2a3377e100e630fabd3..7f5795246a4fbc17af2308af0f559b377b30869a 100644 --- a/streamio/testhelper_test.go +++ b/streamio/testhelper_test.go @@ -3,7 +3,7 @@ package streamio import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/testhelper_test.go b/testhelper_test.go index 0aa8282d5ebdf889011ac026836c96bd3b504368..276c23c79afadea7232a4a14ad974e211459a6b0 100644 --- a/testhelper_test.go +++ b/testhelper_test.go @@ -3,7 +3,7 @@ package gitaly import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/tools/protoc-gen-gitaly-lint/lint.go b/tools/protoc-gen-gitaly-lint/lint.go index 5da0ff643d5c04e11e790fe06cdff7cce9031590..db051e3dc5ea22a5ed51a1fcb4fb43831bd9fc81 100644 --- a/tools/protoc-gen-gitaly-lint/lint.go +++ b/tools/protoc-gen-gitaly-lint/lint.go @@ -4,8 +4,8 @@ import ( "errors" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/protoutil" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/protoutil" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/reflect/protoregistry" "google.golang.org/protobuf/types/descriptorpb" "google.golang.org/protobuf/types/pluginpb" diff --git a/tools/protoc-gen-gitaly-lint/lint_test.go b/tools/protoc-gen-gitaly-lint/lint_test.go index 607858112b7a757737a968b9516eb80bf23b9463..6f3ca8eb659f025adf79aeba4f8346e91f1eb1f9 100644 --- a/tools/protoc-gen-gitaly-lint/lint_test.go +++ b/tools/protoc-gen-gitaly-lint/lint_test.go @@ -10,7 +10,7 @@ import ( "google.golang.org/protobuf/types/descriptorpb" "google.golang.org/protobuf/types/pluginpb" - _ "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb/testproto" + _ "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb/testproto" ) func TestLintFile(t *testing.T) { diff --git a/tools/protoc-gen-gitaly-lint/method.go b/tools/protoc-gen-gitaly-lint/method.go index a790dae62b5e3a562e7c4162c510a864aa1a3db5..076289529145153920a01a06fa1bacdfbacdc580 100644 --- a/tools/protoc-gen-gitaly-lint/method.go +++ b/tools/protoc-gen-gitaly-lint/method.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/protoutil" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/protoutil" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/types/descriptorpb" "google.golang.org/protobuf/types/pluginpb" ) diff --git a/tools/test-boot/main.go b/tools/test-boot/main.go index a9739b00b7e7250138610af27b086747ea5b7ccc..c261f31fa2d7b5d7a0ae7250a5343301de7eed46 100644 --- a/tools/test-boot/main.go +++ b/tools/test-boot/main.go @@ -14,7 +14,7 @@ import ( "time" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" "google.golang.org/grpc" )