From 5ab7842d102c637a4a8483709fe7d90b1f70bdb9 Mon Sep 17 00:00:00 2001 From: Alessio Caiazza <376774-nolith@users.noreply.gitlab.com> Date: Fri, 2 Oct 2020 12:03:14 +0200 Subject: [PATCH 1/2] Bump go.mod module version to v13 --- Makefile | 2 +- client/dial.go | 2 +- client/dial_test.go | 6 +-- client/pool.go | 2 +- client/pool_test.go | 6 +-- client/receive_pack.go | 6 +-- client/upload_archive.go | 6 +-- client/upload_pack.go | 6 +-- cmd/gitaly-blackbox/main.go | 6 +-- cmd/gitaly-debug/analyzehttp.go | 2 +- cmd/gitaly-debug/bitmap.go | 2 +- cmd/gitaly-debug/simulatehttp.go | 4 +- cmd/gitaly-git2go/main_test.go | 2 +- cmd/gitaly-git2go/merge.go | 2 +- cmd/gitaly-git2go/merge_test.go | 6 +-- cmd/gitaly-hooks/hooks.go | 22 +++++----- cmd/gitaly-hooks/hooks_test.go | 14 +++--- cmd/gitaly-ssh/auth_test.go | 14 +++--- cmd/gitaly-ssh/main.go | 6 +-- cmd/gitaly-ssh/main_test.go | 2 +- cmd/gitaly-ssh/receive_pack.go | 4 +- cmd/gitaly-ssh/testhelper_test.go | 4 +- cmd/gitaly-ssh/upload_archive.go | 4 +- cmd/gitaly-ssh/upload_pack.go | 4 +- cmd/gitaly-ssh/upload_pack_test.go | 12 ++--- cmd/gitaly-wrapper/main.go | 4 +- cmd/gitaly-wrapper/main_test.go | 2 +- cmd/gitaly/main.go | 22 +++++----- cmd/praefect/main.go | 32 +++++++------- cmd/praefect/main_test.go | 4 +- cmd/praefect/subcmd.go | 10 ++--- cmd/praefect/subcmd_accept_dataloss.go | 4 +- cmd/praefect/subcmd_accept_dataloss_test.go | 10 ++--- cmd/praefect/subcmd_dataloss.go | 4 +- cmd/praefect/subcmd_dataloss_test.go | 10 ++--- cmd/praefect/subcmd_pingnodes.go | 4 +- cmd/praefect/subcmd_pingnodes_test.go | 4 +- cmd/praefect/subcmd_reconcile.go | 4 +- cmd/praefect/subcmd_sqldown.go | 4 +- cmd/praefect/subcmd_sqlstatus.go | 4 +- cmd/praefect/subcmd_test.go | 4 +- go.mod | 2 +- go.sum | 3 ++ internal/blackbox/blackbox.go | 4 +- internal/blackbox/config.go | 2 +- internal/bootstrap/starter/starter.go | 4 +- internal/cache/cachedb.go | 4 +- internal/cache/cachedb_test.go | 10 ++--- internal/cache/keyer.go | 14 +++--- internal/cache/walker.go | 8 ++-- internal/cache/walker_test.go | 8 ++-- internal/command/command.go | 4 +- internal/dontpanic/retry.go | 2 +- internal/dontpanic/retry_test.go | 2 +- internal/git/alternates/alternates.go | 4 +- internal/git/bitmap.go | 6 +-- internal/git/catfile/batch.go | 6 +-- internal/git/catfile/batch_cache.go | 4 +- internal/git/catfile/batchcheck.go | 6 +-- internal/git/catfile/catfile.go | 4 +- internal/git/catfile/catfile_test.go | 6 +-- internal/git/catfile/testhelper_test.go | 2 +- internal/git/command.go | 6 +-- internal/git/command_test.go | 2 +- internal/git/dirs_test.go | 2 +- internal/git/gittest/delta_islands.go | 4 +- internal/git/gittest/http_server.go | 2 +- internal/git/helper_test.go | 2 +- internal/git/hooks/hooks.go | 2 +- internal/git/hooks/hooks_test.go | 2 +- internal/git/log/commit.go | 8 ++-- internal/git/log/commit_test.go | 6 +-- internal/git/log/last_commit.go | 10 ++--- internal/git/log/log.go | 4 +- internal/git/log/tag.go | 6 +-- internal/git/log/tag_test.go | 6 +-- internal/git/objectpool/clone.go | 6 +-- internal/git/objectpool/clone_test.go | 4 +- internal/git/objectpool/fetch.go | 10 ++--- internal/git/objectpool/fetch_test.go | 8 ++-- internal/git/objectpool/link.go | 10 ++--- internal/git/objectpool/link_test.go | 4 +- internal/git/objectpool/pool.go | 8 ++-- internal/git/objectpool/pool_test.go | 4 +- internal/git/objectpool/proto.go | 4 +- internal/git/objectpool/testhelper_test.go | 4 +- internal/git/packfile/bitmap.go | 2 +- internal/git/packfile/index.go | 2 +- internal/git/packfile/packfile_test.go | 2 +- internal/git/pktline/read_monitor_test.go | 2 +- internal/git/proto.go | 4 +- internal/git/proto_test.go | 2 +- internal/git/protocol.go | 2 +- internal/git/protocol_test.go | 2 +- internal/git/receivepack.go | 12 ++--- internal/git/remote/remote.go | 4 +- internal/git/remote/remote_test.go | 4 +- internal/git/repository.go | 4 +- internal/git/repository_test.go | 2 +- internal/git/safecmd.go | 6 +-- internal/git/safecmd_test.go | 8 ++-- internal/git/stats/analyzehttp.go | 2 +- internal/git/stats/analyzehttp_test.go | 2 +- internal/git/stats/git.go | 4 +- internal/git/stats/git_test.go | 6 +-- internal/git/stats/packfile_negotiation.go | 4 +- .../git/stats/packfile_negotiation_test.go | 2 +- internal/git/stats/profile.go | 6 +-- internal/git/stats/profile_test.go | 2 +- internal/git/stats/reference_discovery.go | 4 +- .../git/stats/reference_discovery_test.go | 2 +- internal/git/stats/testhelper_test.go | 2 +- internal/git/updateref/updateref.go | 6 +-- internal/git/updateref/updateref_test.go | 6 +-- internal/git2go/merge.go | 4 +- internal/gitaly/config/concurrency.go | 2 +- internal/gitaly/config/config.go | 10 ++--- internal/gitaly/config/config_test.go | 2 +- internal/gitaly/config/locator.go | 4 +- internal/gitaly/config/logger.go | 2 +- internal/gitaly/config/prometheus/config.go | 2 +- internal/gitaly/config/sentry/sentry.go | 2 +- internal/gitaly/diff/diff.go | 2 +- internal/gitaly/hook/access.go | 6 +-- internal/gitaly/hook/access_test.go | 8 ++-- internal/gitaly/hook/custom.go | 6 +-- internal/gitaly/hook/custom_test.go | 8 ++-- internal/gitaly/hook/manager.go | 6 +-- internal/gitaly/hook/postreceive.go | 6 +-- internal/gitaly/hook/prereceive.go | 4 +- internal/gitaly/hook/referencetransaction.go | 2 +- internal/gitaly/hook/testhelper_test.go | 2 +- internal/gitaly/hook/transactions.go | 4 +- internal/gitaly/hook/update.go | 4 +- internal/gitaly/linguist/linguist.go | 4 +- internal/gitaly/linguist/linguist_test.go | 4 +- internal/gitaly/maintenance/daily.go | 4 +- internal/gitaly/maintenance/daily_test.go | 4 +- internal/gitaly/maintenance/optimize.go | 6 +-- internal/gitaly/maintenance/optimize_test.go | 8 ++-- .../gitaly/rubyserver/concurrency_test.go | 4 +- internal/gitaly/rubyserver/proxy.go | 6 +-- internal/gitaly/rubyserver/proxy_test.go | 2 +- internal/gitaly/rubyserver/rubyserver.go | 20 ++++----- internal/gitaly/rubyserver/rubyserver_test.go | 4 +- internal/gitaly/rubyserver/testhelper_test.go | 4 +- internal/gitaly/rubyserver/worker.go | 6 +-- internal/gitaly/rubyserver/worker_test.go | 4 +- internal/gitaly/server/auth/auth.go | 4 +- internal/gitaly/server/auth_test.go | 14 +++--- internal/gitaly/server/server.go | 34 +++++++------- internal/gitaly/server/server_factory.go | 14 +++--- internal/gitaly/server/server_factory_test.go | 8 ++-- internal/gitaly/service/blob/get_blob.go | 8 ++-- internal/gitaly/service/blob/get_blob_test.go | 6 +-- internal/gitaly/service/blob/get_blobs.go | 10 ++--- .../gitaly/service/blob/get_blobs_test.go | 4 +- internal/gitaly/service/blob/lfs_pointers.go | 10 ++--- .../gitaly/service/blob/lfs_pointers_test.go | 6 +-- internal/gitaly/service/blob/server.go | 4 +- .../gitaly/service/blob/testhelper_test.go | 6 +-- .../cleanup/apply_bfg_object_map_stream.go | 12 ++--- .../apply_bfg_object_map_stream_test.go | 8 ++-- .../service/cleanup/internalrefs/cleaner.go | 6 +-- .../service/cleanup/notifier/notifier.go | 6 +-- internal/gitaly/service/cleanup/server.go | 2 +- .../gitaly/service/cleanup/testhelper_test.go | 4 +- internal/gitaly/service/commit/between.go | 6 +-- .../gitaly/service/commit/between_test.go | 4 +- .../gitaly/service/commit/commit_messages.go | 10 ++--- .../service/commit/commit_messages_test.go | 6 +-- .../service/commit/commit_signatures.go | 10 ++--- .../service/commit/commit_signatures_test.go | 6 +-- .../service/commit/commits_by_message.go | 6 +-- .../service/commit/commits_by_message_test.go | 4 +- .../gitaly/service/commit/commits_helper.go | 8 ++-- .../gitaly/service/commit/count_commits.go | 4 +- .../service/commit/count_commits_test.go | 4 +- .../service/commit/count_diverging_commits.go | 6 +-- .../commit/count_diverging_commits_test.go | 4 +- .../commit/filter_shas_with_signatures.go | 8 ++-- .../filter_shas_with_signatures_test.go | 4 +- .../gitaly/service/commit/find_all_commits.go | 8 ++-- .../service/commit/find_all_commits_test.go | 6 +-- internal/gitaly/service/commit/find_commit.go | 8 ++-- .../gitaly/service/commit/find_commit_test.go | 12 ++--- .../gitaly/service/commit/find_commits.go | 14 +++--- .../service/commit/find_commits_test.go | 6 +-- internal/gitaly/service/commit/isancestor.go | 4 +- .../gitaly/service/commit/isancestor_test.go | 8 ++-- internal/gitaly/service/commit/languages.go | 14 +++--- .../gitaly/service/commit/languages_test.go | 4 +- .../service/commit/last_commit_for_path.go | 10 ++--- .../commit/last_commit_for_path_test.go | 4 +- .../service/commit/list_commits_by_oid.go | 8 ++-- .../commit/list_commits_by_oid_test.go | 4 +- .../commit/list_commits_by_ref_name.go | 10 ++--- .../commit/list_commits_by_ref_name_test.go | 4 +- internal/gitaly/service/commit/list_files.go | 10 ++--- .../gitaly/service/commit/list_files_test.go | 6 +-- .../commit/list_last_commits_for_tree.go | 14 +++--- .../commit/list_last_commits_for_tree_test.go | 6 +-- internal/gitaly/service/commit/raw_blame.go | 6 +-- .../gitaly/service/commit/raw_blame_test.go | 6 +-- internal/gitaly/service/commit/server.go | 6 +-- internal/gitaly/service/commit/stats.go | 8 ++-- internal/gitaly/service/commit/stats_test.go | 4 +- .../gitaly/service/commit/testhelper_test.go | 6 +-- .../gitaly/service/commit/tree_entries.go | 8 ++-- .../service/commit/tree_entries_helper.go | 4 +- .../service/commit/tree_entries_test.go | 6 +-- internal/gitaly/service/commit/tree_entry.go | 10 ++--- .../gitaly/service/commit/tree_entry_test.go | 4 +- internal/gitaly/service/commit/util.go | 2 +- .../service/conflicts/list_conflict_files.go | 4 +- .../conflicts/list_conflict_files_test.go | 4 +- .../service/conflicts/resolve_conflicts.go | 4 +- .../conflicts/resolve_conflicts_test.go | 12 ++--- internal/gitaly/service/conflicts/server.go | 4 +- .../service/conflicts/testhelper_test.go | 10 ++--- internal/gitaly/service/diff/commit.go | 6 +-- internal/gitaly/service/diff/commit_test.go | 6 +-- internal/gitaly/service/diff/numstat.go | 6 +-- internal/gitaly/service/diff/numstat_test.go | 6 +-- internal/gitaly/service/diff/raw.go | 6 +-- internal/gitaly/service/diff/raw_test.go | 6 +-- internal/gitaly/service/diff/server.go | 4 +- .../gitaly/service/diff/testhelper_test.go | 6 +-- internal/gitaly/service/hook/post_receive.go | 6 +-- .../gitaly/service/hook/post_receive_test.go | 14 +++--- internal/gitaly/service/hook/pre_receive.go | 10 ++--- .../gitaly/service/hook/pre_receive_test.go | 14 +++--- .../service/hook/reference_transaction.go | 6 +-- .../hook/reference_transaction_test.go | 10 ++--- internal/gitaly/service/hook/server.go | 4 +- .../gitaly/service/hook/testhelper_test.go | 10 ++--- internal/gitaly/service/hook/update.go | 6 +-- internal/gitaly/service/hook/update_test.go | 8 ++-- internal/gitaly/service/inspect/inspector.go | 4 +- .../gitaly/service/inspect/inspector_test.go | 2 +- .../gitaly/service/internalgitaly/server.go | 4 +- .../service/internalgitaly/testhelper_test.go | 4 +- .../service/internalgitaly/walkrepos.go | 4 +- .../service/internalgitaly/walkrepos_test.go | 6 +-- .../gitaly/service/namespace/namespace.go | 4 +- .../service/namespace/namespace_test.go | 8 ++-- internal/gitaly/service/namespace/server.go | 2 +- .../service/namespace/testhelper_test.go | 4 +- .../gitaly/service/objectpool/alternates.go | 8 ++-- .../service/objectpool/alternates_test.go | 10 ++--- internal/gitaly/service/objectpool/create.go | 6 +-- .../gitaly/service/objectpool/create_test.go | 8 ++-- .../objectpool/fetch_into_object_pool.go | 8 ++-- .../objectpool/fetch_into_object_pool_test.go | 8 ++-- internal/gitaly/service/objectpool/get.go | 6 +-- .../gitaly/service/objectpool/get_test.go | 8 ++-- internal/gitaly/service/objectpool/link.go | 4 +- .../gitaly/service/objectpool/link_test.go | 12 ++--- .../gitaly/service/objectpool/reduplicate.go | 4 +- .../service/objectpool/reduplicate_test.go | 10 ++--- internal/gitaly/service/objectpool/server.go | 4 +- .../service/objectpool/testhelper_test.go | 6 +-- .../gitaly/service/operations/apply_patch.go | 4 +- .../service/operations/apply_patch_test.go | 8 ++-- .../gitaly/service/operations/branches.go | 10 ++--- .../service/operations/branches_test.go | 20 ++++----- .../gitaly/service/operations/cherry_pick.go | 4 +- .../service/operations/cherry_pick_test.go | 6 +-- .../gitaly/service/operations/commit_files.go | 6 +-- .../service/operations/commit_files_test.go | 8 ++-- internal/gitaly/service/operations/merge.go | 22 +++++----- .../gitaly/service/operations/merge_test.go | 12 ++--- internal/gitaly/service/operations/rebase.go | 8 ++-- .../gitaly/service/operations/rebase_test.go | 10 ++--- internal/gitaly/service/operations/revert.go | 4 +- .../gitaly/service/operations/revert_test.go | 6 +-- internal/gitaly/service/operations/server.go | 10 ++--- internal/gitaly/service/operations/squash.go | 4 +- .../gitaly/service/operations/squash_test.go | 8 ++-- .../gitaly/service/operations/submodules.go | 4 +- .../service/operations/submodules_test.go | 8 ++-- internal/gitaly/service/operations/tags.go | 4 +- .../gitaly/service/operations/tags_test.go | 12 ++--- .../service/operations/testhelper_test.go | 24 +++++----- .../operations/update_branches_test.go | 8 ++-- internal/gitaly/service/operations/utils.go | 2 +- internal/gitaly/service/ref/branches.go | 6 +-- internal/gitaly/service/ref/branches_test.go | 6 +-- internal/gitaly/service/ref/delete_refs.go | 8 ++-- .../gitaly/service/ref/delete_refs_test.go | 4 +- internal/gitaly/service/ref/list_new_blobs.go | 8 ++-- .../gitaly/service/ref/list_new_blobs_test.go | 4 +- .../gitaly/service/ref/list_new_commits.go | 10 ++--- .../service/ref/list_new_commits_test.go | 4 +- internal/gitaly/service/ref/pack_refs.go | 8 ++-- internal/gitaly/service/ref/pack_refs_test.go | 4 +- internal/gitaly/service/ref/refexists.go | 8 ++-- internal/gitaly/service/ref/refexists_test.go | 6 +-- internal/gitaly/service/ref/refname.go | 6 +-- internal/gitaly/service/ref/refname_test.go | 8 ++-- internal/gitaly/service/ref/refnames.go | 6 +-- .../gitaly/service/ref/refnames_containing.go | 8 ++-- internal/gitaly/service/ref/refs.go | 14 +++--- internal/gitaly/service/ref/refs_test.go | 14 +++--- .../gitaly/service/ref/remote_branches.go | 8 ++-- .../service/ref/remote_branches_test.go | 6 +-- internal/gitaly/service/ref/server.go | 4 +- internal/gitaly/service/ref/tag_messages.go | 10 ++--- .../gitaly/service/ref/tag_messages_test.go | 6 +-- .../gitaly/service/ref/testhelper_test.go | 8 ++-- internal/gitaly/service/ref/util.go | 8 ++-- internal/gitaly/service/ref/util_test.go | 2 +- internal/gitaly/service/register.go | 44 +++++++++---------- .../service/remote/fetch_internal_remote.go | 10 ++--- .../remote/fetch_internal_remote_test.go | 16 +++---- .../service/remote/find_remote_root_ref.go | 4 +- .../remote/find_remote_root_ref_test.go | 4 +- internal/gitaly/service/remote/remotes.go | 10 ++--- .../gitaly/service/remote/remotes_test.go | 4 +- internal/gitaly/service/remote/server.go | 8 ++-- .../gitaly/service/remote/testhelper_test.go | 8 ++-- .../service/remote/update_remote_mirror.go | 6 +-- .../remote/update_remote_mirror_test.go | 4 +- .../service/repository/apply_gitattributes.go | 6 +-- .../repository/apply_gitattributes_test.go | 4 +- internal/gitaly/service/repository/archive.go | 16 +++---- .../gitaly/service/repository/archive_test.go | 8 ++-- .../service/repository/backup_custom_hooks.go | 6 +-- .../repository/backup_custom_hooks_test.go | 8 ++-- .../service/repository/calculate_checksum.go | 6 +-- .../repository/calculate_checksum_test.go | 6 +-- internal/gitaly/service/repository/cleanup.go | 4 +- .../gitaly/service/repository/cleanup_test.go | 8 ++-- .../service/repository/clone_from_pool.go | 6 +-- .../repository/clone_from_pool_internal.go | 10 ++--- .../clone_from_pool_internal_test.go | 12 ++--- .../repository/clone_from_pool_test.go | 8 ++-- .../gitaly/service/repository/commit_graph.go | 6 +-- .../service/repository/commit_graph_test.go | 4 +- internal/gitaly/service/repository/config.go | 8 ++-- .../gitaly/service/repository/config_test.go | 4 +- internal/gitaly/service/repository/create.go | 6 +-- .../service/repository/create_bundle.go | 8 ++-- .../service/repository/create_bundle_test.go | 8 ++-- .../service/repository/create_from_bundle.go | 10 ++--- .../repository/create_from_bundle_test.go | 12 ++--- .../repository/create_from_snapshot.go | 6 +-- .../repository/create_from_snapshot_test.go | 6 +-- .../service/repository/create_from_url.go | 8 ++-- .../repository/create_from_url_test.go | 6 +-- .../gitaly/service/repository/create_test.go | 6 +-- internal/gitaly/service/repository/fetch.go | 12 ++--- .../gitaly/service/repository/fetch_remote.go | 4 +- .../service/repository/fetch_remote_test.go | 8 ++-- .../gitaly/service/repository/fetch_test.go | 16 +++---- internal/gitaly/service/repository/fork.go | 6 +-- .../gitaly/service/repository/fork_test.go | 12 ++--- internal/gitaly/service/repository/fsck.go | 6 +-- .../gitaly/service/repository/fsck_test.go | 4 +- internal/gitaly/service/repository/gc.go | 12 ++--- internal/gitaly/service/repository/gc_test.go | 8 ++-- .../service/repository/info_attributes.go | 4 +- .../repository/info_attributes_test.go | 6 +-- internal/gitaly/service/repository/license.go | 4 +- .../gitaly/service/repository/license_test.go | 6 +-- .../gitaly/service/repository/merge_base.go | 6 +-- .../service/repository/merge_base_test.go | 4 +- internal/gitaly/service/repository/midx.go | 10 ++--- .../gitaly/service/repository/midx_test.go | 6 +-- .../gitaly/service/repository/optimize.go | 8 ++-- .../service/repository/optimize_test.go | 8 ++-- .../gitaly/service/repository/raw_changes.go | 12 ++--- .../service/repository/raw_changes_test.go | 4 +- .../service/repository/rebase_in_progress.go | 4 +- .../repository/rebase_in_progress_test.go | 4 +- .../redirecting_test_server_test.go | 4 +- internal/gitaly/service/repository/remove.go | 8 ++-- .../gitaly/service/repository/remove_test.go | 4 +- internal/gitaly/service/repository/rename.go | 4 +- .../gitaly/service/repository/rename_test.go | 8 ++-- internal/gitaly/service/repository/repack.go | 8 ++-- .../gitaly/service/repository/repack_test.go | 8 ++-- .../gitaly/service/repository/replicate.go | 14 +++--- .../service/repository/replicate_test.go | 12 ++--- .../gitaly/service/repository/repository.go | 8 ++-- .../service/repository/repository_test.go | 8 ++-- .../repository/restore_custom_hooks.go | 6 +-- .../repository/restore_custom_hooks_test.go | 8 ++-- .../gitaly/service/repository/search_files.go | 12 ++--- .../service/repository/search_files_test.go | 6 +-- internal/gitaly/service/repository/server.go | 10 ++--- .../gitaly/service/repository/server_test.go | 6 +-- internal/gitaly/service/repository/size.go | 4 +- .../gitaly/service/repository/size_test.go | 4 +- .../gitaly/service/repository/snapshot.go | 10 ++--- .../service/repository/snapshot_test.go | 16 +++---- .../service/repository/squash_in_progress.go | 2 +- .../repository/squash_in_progress_test.go | 4 +- .../service/repository/testhelper_test.go | 18 ++++---- internal/gitaly/service/repository/util.go | 4 +- .../gitaly/service/repository/write_ref.go | 8 ++-- .../service/repository/write_ref_test.go | 4 +- internal/gitaly/service/server/disk_stats.go | 4 +- .../gitaly/service/server/disk_stats_test.go | 6 +-- internal/gitaly/service/server/info.go | 12 ++--- internal/gitaly/service/server/info_test.go | 18 ++++---- internal/gitaly/service/server/server.go | 4 +- .../service/server/storage_status_openbsd.go | 4 +- .../service/server/storage_status_unix.go | 4 +- internal/gitaly/service/smarthttp/cache.go | 4 +- internal/gitaly/service/smarthttp/inforefs.go | 10 ++--- .../gitaly/service/smarthttp/inforefs_test.go | 20 ++++----- .../gitaly/service/smarthttp/receive_pack.go | 10 ++--- .../service/smarthttp/receive_pack_test.go | 26 +++++------ internal/gitaly/service/smarthttp/server.go | 2 +- .../service/smarthttp/testhelper_test.go | 16 +++---- .../gitaly/service/smarthttp/upload_pack.go | 14 +++--- .../service/smarthttp/upload_pack_test.go | 12 ++--- .../service/ssh/monitor_stdin_command.go | 6 +-- internal/gitaly/service/ssh/receive_pack.go | 10 ++--- .../gitaly/service/ssh/receive_pack_test.go | 16 +++---- internal/gitaly/service/ssh/server.go | 2 +- .../gitaly/service/ssh/testhelper_test.go | 6 +-- internal/gitaly/service/ssh/upload_archive.go | 12 ++--- .../gitaly/service/ssh/upload_archive_test.go | 6 +-- internal/gitaly/service/ssh/upload_pack.go | 16 +++---- .../gitaly/service/ssh/upload_pack_test.go | 10 ++--- internal/gitaly/service/wiki/delete_page.go | 4 +- .../gitaly/service/wiki/delete_page_test.go | 6 +-- internal/gitaly/service/wiki/find_file.go | 6 +-- .../gitaly/service/wiki/find_file_test.go | 4 +- internal/gitaly/service/wiki/find_page.go | 6 +-- .../gitaly/service/wiki/find_page_test.go | 4 +- internal/gitaly/service/wiki/get_all_pages.go | 4 +- .../gitaly/service/wiki/get_all_pages_test.go | 4 +- .../gitaly/service/wiki/get_page_versions.go | 4 +- .../service/wiki/get_page_versions_test.go | 6 +-- internal/gitaly/service/wiki/list_pages.go | 4 +- .../gitaly/service/wiki/list_pages_test.go | 4 +- internal/gitaly/service/wiki/server.go | 4 +- .../gitaly/service/wiki/testhelper_test.go | 14 +++--- internal/gitaly/service/wiki/update_page.go | 4 +- .../gitaly/service/wiki/update_page_test.go | 6 +-- internal/gitaly/service/wiki/util.go | 2 +- internal/gitaly/service/wiki/write_page.go | 4 +- .../gitaly/service/wiki/write_page_test.go | 6 +-- internal/gitalyssh/gitalyssh.go | 10 ++--- internal/gitalyssh/gitalyssh_test.go | 6 +-- internal/gitalyssh/testhelper_test.go | 2 +- internal/gitlabshell/env.go | 2 +- internal/gitlabshell/env_test.go | 6 +-- internal/helper/chunk/chunker_test.go | 4 +- .../helper/fieldextractors/fieldextractor.go | 2 +- .../helper/housekeeping/housekeeping_test.go | 2 +- internal/helper/repo.go | 6 +-- internal/helper/repo_test.go | 6 +-- internal/helper/storage.go | 2 +- internal/helper/storage_test.go | 4 +- internal/middleware/cache/cache.go | 6 +-- internal/middleware/cache/cache_test.go | 12 ++--- internal/middleware/cache/prometheus.go | 2 +- .../middleware/cache/testdata/stream.pb.go | 2 +- .../commandstatshandler.go | 2 +- .../commandstatshandler_test.go | 10 ++--- .../limithandler/limithandler_test.go | 6 +-- .../limithandler/testhelper_test.go | 2 +- .../metadatahandler/metadatahandler.go | 4 +- .../metadatahandler/metadatahandler_test.go | 2 +- .../middleware/sentryhandler/sentryhandler.go | 2 +- .../sentryhandler/sentryhandler_test.go | 2 +- internal/praefect/auth_test.go | 22 +++++----- internal/praefect/config/config.go | 10 ++--- internal/praefect/config/config_test.go | 8 ++-- internal/praefect/config/log.go | 2 +- internal/praefect/consistencycheck_test.go | 8 ++-- internal/praefect/coordinator.go | 24 +++++----- internal/praefect/coordinator_test.go | 24 +++++----- internal/praefect/correlation.go | 2 +- internal/praefect/datastore/collector_test.go | 2 +- internal/praefect/datastore/glsql/postgres.go | 4 +- .../praefect/datastore/glsql/postgres_test.go | 4 +- internal/praefect/datastore/glsql/testing.go | 2 +- internal/praefect/datastore/init_test.go | 4 +- internal/praefect/datastore/memory.go | 2 +- internal/praefect/datastore/memory_test.go | 4 +- internal/praefect/datastore/postgres.go | 6 +-- internal/praefect/datastore/postgres_test.go | 2 +- internal/praefect/datastore/queue.go | 2 +- internal/praefect/datastore/queue_bm_test.go | 2 +- internal/praefect/datastore/queue_test.go | 4 +- .../datastore/repository_memory_test.go | 2 +- .../praefect/datastore/repository_postgres.go | 2 +- .../datastore/repository_postgres_bm_test.go | 2 +- .../grpc-proxy/proxy/examples_test.go | 4 +- internal/praefect/grpc-proxy/proxy/handler.go | 2 +- .../praefect/grpc-proxy/proxy/handler_test.go | 14 +++--- .../praefect/grpc-proxy/proxy/helper_test.go | 4 +- .../praefect/grpc-proxy/proxy/peeker_test.go | 8 ++-- internal/praefect/helper_test.go | 36 +++++++-------- internal/praefect/info_service_test.go | 8 ++-- internal/praefect/metadata/server.go | 4 +- internal/praefect/metadata/server_test.go | 4 +- internal/praefect/metrics/prometheus.go | 4 +- internal/praefect/middleware/errorhandler.go | 4 +- .../praefect/middleware/errorhandler_test.go | 12 ++--- internal/praefect/middleware/methodtype.go | 4 +- internal/praefect/mock/mock.pb.go | 2 +- internal/praefect/mocksvc_test.go | 2 +- internal/praefect/nodes/disabled_elector.go | 2 +- internal/praefect/nodes/health_manager.go | 4 +- .../praefect/nodes/health_manager_test.go | 6 +-- internal/praefect/nodes/init_test.go | 2 +- internal/praefect/nodes/local_elector.go | 2 +- internal/praefect/nodes/local_elector_test.go | 6 +-- internal/praefect/nodes/manager.go | 22 +++++----- internal/praefect/nodes/manager_test.go | 12 ++--- internal/praefect/nodes/sql_elector.go | 4 +- internal/praefect/nodes/sql_elector_test.go | 8 ++-- .../praefect/nodes/tracker/errors_test.go | 2 +- internal/praefect/protoregistry/find_oid.go | 2 +- .../praefect/protoregistry/find_oid_test.go | 4 +- .../praefect/protoregistry/protoregistry.go | 4 +- .../protoregistry/protoregistry_test.go | 6 +-- internal/praefect/reconciler/reconciler.go | 6 +-- .../reconciler/reconciler_benchmark_test.go | 4 +- .../praefect/reconciler/reconciler_test.go | 12 ++--- internal/praefect/replicator.go | 16 +++---- internal/praefect/replicator_test.go | 42 +++++++++--------- internal/praefect/router.go | 4 +- internal/praefect/server.go | 34 +++++++------- internal/praefect/server_factory.go | 12 ++--- internal/praefect/server_factory_test.go | 26 +++++------ internal/praefect/server_test.go | 34 +++++++------- .../praefect/service/info/consistencycheck.go | 8 ++-- internal/praefect/service/info/dataloss.go | 2 +- .../praefect/service/info/repositories.go | 6 +-- internal/praefect/service/info/server.go | 10 ++--- .../praefect/service/server/disk_stats.go | 2 +- internal/praefect/service/server/info.go | 2 +- internal/praefect/service/server/server.go | 6 +-- .../praefect/service/transaction/server.go | 6 +-- internal/praefect/transaction_test.go | 8 ++-- internal/praefect/transactions/manager.go | 2 +- .../praefect/transactions/transaction_test.go | 2 +- internal/praefect/version.go | 2 +- internal/protoutil/extension.go | 2 +- internal/safe/file_writer_test.go | 4 +- internal/storage/locator.go | 2 +- internal/storage/metadata.go | 2 +- internal/stream/std_stream.go | 2 +- internal/supervisor/monitor.go | 2 +- internal/supervisor/supervisor_test.go | 2 +- internal/tempdir/tempdir.go | 8 ++-- internal/tempdir/tempdir_test.go | 8 ++-- internal/tempdir/testhelper_test.go | 2 +- internal/testhelper/commit.go | 4 +- internal/testhelper/config_test.go | 2 +- internal/testhelper/git_protocol.go | 4 +- internal/testhelper/githttp.go | 2 +- internal/testhelper/grpc_test.go | 2 +- internal/testhelper/hook_env.go | 6 +-- internal/testhelper/tag.go | 2 +- internal/testhelper/testhelper.go | 20 ++++----- internal/testhelper/testserver.go | 18 ++++---- .../go/internal/cmd/protoc-gen-gitaly/main.go | 2 +- proto/go/internal/linter/lint.go | 4 +- proto/go/internal/linter/lint_test.go | 4 +- proto/go/internal/linter/method.go | 4 +- .../go/internal/linter/testdata/invalid.pb.go | 2 +- proto/go/internal/linter/testdata/valid.pb.go | 2 +- 570 files changed, 1915 insertions(+), 1912 deletions(-) diff --git a/Makefile b/Makefile index db8225bbc2..de47dd8222 100644 --- a/Makefile +++ b/Makefile @@ -47,7 +47,7 @@ GOCOVER_COBERTURA := ${BUILD_DIR}/bin/gocover-cobertura # Build information BUNDLE_FLAGS ?= $(shell test -f ${SOURCE_DIR}/../.gdk-install-root && echo --no-deployment || echo --deployment) -GITALY_PACKAGE := gitlab.com/gitlab-org/gitaly +GITALY_PACKAGE := gitlab.com/gitlab-org/gitaly/v13 BUILD_TIME := $(shell date +"%Y%m%d.%H%M%S") GITALY_VERSION := $(shell git describe --match v* 2>/dev/null | sed 's/^v//' || cat ${SOURCE_DIR}/VERSION 2>/dev/null || echo unknown) GO_LDFLAGS := -ldflags '-X ${GITALY_PACKAGE}/internal/version.version=${GITALY_VERSION} -X ${GITALY_PACKAGE}/internal/version.buildtime=${BUILD_TIME}' diff --git a/client/dial.go b/client/dial.go index d601382681..8592dbe43c 100644 --- a/client/dial.go +++ b/client/dial.go @@ -7,7 +7,7 @@ import ( "net/url" "time" - gitaly_x509 "gitlab.com/gitlab-org/gitaly/internal/x509" + gitaly_x509 "gitlab.com/gitlab-org/gitaly/v13/internal/x509" grpccorrelation "gitlab.com/gitlab-org/labkit/correlation/grpc" grpctracing "gitlab.com/gitlab-org/labkit/tracing/grpc" "google.golang.org/grpc" diff --git a/client/dial_test.go b/client/dial_test.go index 29091fc3b5..1c1395227e 100644 --- a/client/dial_test.go +++ b/client/dial_test.go @@ -13,9 +13,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/uber/jaeger-client-go" - proxytestdata "gitlab.com/gitlab-org/gitaly/internal/praefect/grpc-proxy/testdata" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - gitaly_x509 "gitlab.com/gitlab-org/gitaly/internal/x509" + proxytestdata "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/grpc-proxy/testdata" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + gitaly_x509 "gitlab.com/gitlab-org/gitaly/v13/internal/x509" "gitlab.com/gitlab-org/labkit/correlation" grpccorrelation "gitlab.com/gitlab-org/labkit/correlation/grpc" grpctracing "gitlab.com/gitlab-org/labkit/tracing/grpc" diff --git a/client/pool.go b/client/pool.go index 00e6ed05f0..630f094bd8 100644 --- a/client/pool.go +++ b/client/pool.go @@ -6,7 +6,7 @@ import ( "fmt" "sync" - gitalyauth "gitlab.com/gitlab-org/gitaly/auth" + gitalyauth "gitlab.com/gitlab-org/gitaly/v13/auth" "google.golang.org/grpc" ) diff --git a/client/pool_test.go b/client/pool_test.go index 5a58e2793d..21a7264318 100644 --- a/client/pool_test.go +++ b/client/pool_test.go @@ -9,9 +9,9 @@ import ( grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware" "github.com/stretchr/testify/require" - gitaly_auth "gitlab.com/gitlab-org/gitaly/internal/gitaly/config/auth" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/server/auth" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + gitaly_auth "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config/auth" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/server/auth" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/health" diff --git a/client/receive_pack.go b/client/receive_pack.go index b3ca8d8d56..34f18a156e 100644 --- a/client/receive_pack.go +++ b/client/receive_pack.go @@ -4,9 +4,9 @@ import ( "context" "io" - "gitlab.com/gitlab-org/gitaly/internal/stream" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/stream" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc" ) diff --git a/client/upload_archive.go b/client/upload_archive.go index 118ef47870..52435b61b2 100644 --- a/client/upload_archive.go +++ b/client/upload_archive.go @@ -4,9 +4,9 @@ import ( "context" "io" - "gitlab.com/gitlab-org/gitaly/internal/stream" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/stream" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc" ) diff --git a/client/upload_pack.go b/client/upload_pack.go index b7c004576f..c8d9de937c 100644 --- a/client/upload_pack.go +++ b/client/upload_pack.go @@ -4,9 +4,9 @@ import ( "context" "io" - "gitlab.com/gitlab-org/gitaly/internal/stream" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/stream" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc" ) diff --git a/cmd/gitaly-blackbox/main.go b/cmd/gitaly-blackbox/main.go index 7210d5d5f7..7fda9bd598 100644 --- a/cmd/gitaly-blackbox/main.go +++ b/cmd/gitaly-blackbox/main.go @@ -7,9 +7,9 @@ import ( "os" "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/blackbox" - "gitlab.com/gitlab-org/gitaly/internal/log" - "gitlab.com/gitlab-org/gitaly/internal/version" + "gitlab.com/gitlab-org/gitaly/v13/internal/blackbox" + "gitlab.com/gitlab-org/gitaly/v13/internal/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/version" ) var ( diff --git a/cmd/gitaly-debug/analyzehttp.go b/cmd/gitaly-debug/analyzehttp.go index 2088acdc5a..3930959a85 100644 --- a/cmd/gitaly-debug/analyzehttp.go +++ b/cmd/gitaly-debug/analyzehttp.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "gitlab.com/gitlab-org/gitaly/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/stats" ) func analyzeHTTPClone(cloneURL string) { diff --git a/cmd/gitaly-debug/bitmap.go b/cmd/gitaly-debug/bitmap.go index a8d768df1e..b372dbd937 100644 --- a/cmd/gitaly-debug/bitmap.go +++ b/cmd/gitaly-debug/bitmap.go @@ -5,7 +5,7 @@ import ( "fmt" "os" - "gitlab.com/gitlab-org/gitaly/internal/git/packfile" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/packfile" ) func listBitmapPack(idxFile string) { diff --git a/cmd/gitaly-debug/simulatehttp.go b/cmd/gitaly-debug/simulatehttp.go index ac9a63fe31..aa1daa878a 100644 --- a/cmd/gitaly-debug/simulatehttp.go +++ b/cmd/gitaly-debug/simulatehttp.go @@ -9,8 +9,8 @@ import ( "regexp" "time" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/pktline" ) func simulateHTTPClone(gitDir string) { diff --git a/cmd/gitaly-git2go/main_test.go b/cmd/gitaly-git2go/main_test.go index e9552633b0..5248a648ca 100644 --- a/cmd/gitaly-git2go/main_test.go +++ b/cmd/gitaly-git2go/main_test.go @@ -6,7 +6,7 @@ import ( "os" "testing" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/cmd/gitaly-git2go/merge.go b/cmd/gitaly-git2go/merge.go index 3f07a51ab9..c79dadd26f 100644 --- a/cmd/gitaly-git2go/merge.go +++ b/cmd/gitaly-git2go/merge.go @@ -10,7 +10,7 @@ import ( "time" git "github.com/libgit2/git2go/v30" - "gitlab.com/gitlab-org/gitaly/internal/git2go" + "gitlab.com/gitlab-org/gitaly/v13/internal/git2go" ) type mergeSubcommand struct { diff --git a/cmd/gitaly-git2go/merge_test.go b/cmd/gitaly-git2go/merge_test.go index c5ae2a5d9c..5d5ab9d7bb 100644 --- a/cmd/gitaly-git2go/merge_test.go +++ b/cmd/gitaly-git2go/merge_test.go @@ -9,9 +9,9 @@ import ( git "github.com/libgit2/git2go/v30" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git2go" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/git2go" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestMergeFailsWithMissingArguments(t *testing.T) { diff --git a/cmd/gitaly-hooks/hooks.go b/cmd/gitaly-hooks/hooks.go index dda50710c1..10bd8038ea 100644 --- a/cmd/gitaly-hooks/hooks.go +++ b/cmd/gitaly-hooks/hooks.go @@ -14,17 +14,17 @@ import ( "github.com/BurntSushi/toml" "github.com/golang/protobuf/jsonpb" - gitalyauth "gitlab.com/gitlab-org/gitaly/auth" - "gitlab.com/gitlab-org/gitaly/client" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/gitlabshell" - gitalylog "gitlab.com/gitlab-org/gitaly/internal/log" - "gitlab.com/gitlab-org/gitaly/internal/metadata/featureflag" - "gitlab.com/gitlab-org/gitaly/internal/praefect/metadata" - "gitlab.com/gitlab-org/gitaly/internal/stream" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + gitalyauth "gitlab.com/gitlab-org/gitaly/v13/auth" + "gitlab.com/gitlab-org/gitaly/v13/client" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitlabshell" + gitalylog "gitlab.com/gitlab-org/gitaly/v13/internal/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/metadata/featureflag" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/metadata" + "gitlab.com/gitlab-org/gitaly/v13/internal/stream" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "gitlab.com/gitlab-org/labkit/tracing" "google.golang.org/grpc" ) diff --git a/cmd/gitaly-hooks/hooks_test.go b/cmd/gitaly-hooks/hooks_test.go index 5e219e9838..f3ab6bd68f 100644 --- a/cmd/gitaly-hooks/hooks_test.go +++ b/cmd/gitaly-hooks/hooks_test.go @@ -14,13 +14,13 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - gitalyhook "gitlab.com/gitlab-org/gitaly/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/hook" - "gitlab.com/gitlab-org/gitaly/internal/praefect/metadata" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + gitalyhook "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/hook" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/metadata" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/reflection" ) diff --git a/cmd/gitaly-ssh/auth_test.go b/cmd/gitaly-ssh/auth_test.go index 30d7e41a7f..c8d434ecdf 100644 --- a/cmd/gitaly-ssh/auth_test.go +++ b/cmd/gitaly-ssh/auth_test.go @@ -12,13 +12,13 @@ import ( "github.com/golang/protobuf/jsonpb" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/server" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/server" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" ) diff --git a/cmd/gitaly-ssh/main.go b/cmd/gitaly-ssh/main.go index 1a99ae8490..e52c581129 100644 --- a/cmd/gitaly-ssh/main.go +++ b/cmd/gitaly-ssh/main.go @@ -7,9 +7,9 @@ import ( "os" "strings" - gitalyauth "gitlab.com/gitlab-org/gitaly/auth" - "gitlab.com/gitlab-org/gitaly/client" - "gitlab.com/gitlab-org/gitaly/internal/metadata/featureflag" + gitalyauth "gitlab.com/gitlab-org/gitaly/v13/auth" + "gitlab.com/gitlab-org/gitaly/v13/client" + "gitlab.com/gitlab-org/gitaly/v13/internal/metadata/featureflag" "gitlab.com/gitlab-org/labkit/tracing" "google.golang.org/grpc" ) diff --git a/cmd/gitaly-ssh/main_test.go b/cmd/gitaly-ssh/main_test.go index 7256a7e023..db4c75ecee 100644 --- a/cmd/gitaly-ssh/main_test.go +++ b/cmd/gitaly-ssh/main_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" "google.golang.org/grpc" ) diff --git a/cmd/gitaly-ssh/receive_pack.go b/cmd/gitaly-ssh/receive_pack.go index 70b2cb1b94..0de7ff34a9 100644 --- a/cmd/gitaly-ssh/receive_pack.go +++ b/cmd/gitaly-ssh/receive_pack.go @@ -6,8 +6,8 @@ import ( "os" "github.com/golang/protobuf/jsonpb" - "gitlab.com/gitlab-org/gitaly/client" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/client" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" ) diff --git a/cmd/gitaly-ssh/testhelper_test.go b/cmd/gitaly-ssh/testhelper_test.go index 729ff1f59b..5a1b7b93c3 100644 --- a/cmd/gitaly-ssh/testhelper_test.go +++ b/cmd/gitaly-ssh/testhelper_test.go @@ -5,8 +5,8 @@ import ( "path/filepath" "testing" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) var gitalySSHPath string diff --git a/cmd/gitaly-ssh/upload_archive.go b/cmd/gitaly-ssh/upload_archive.go index dcb9eb2cf5..80dc851e24 100644 --- a/cmd/gitaly-ssh/upload_archive.go +++ b/cmd/gitaly-ssh/upload_archive.go @@ -6,8 +6,8 @@ import ( "os" "github.com/golang/protobuf/jsonpb" - "gitlab.com/gitlab-org/gitaly/client" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/client" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" ) diff --git a/cmd/gitaly-ssh/upload_pack.go b/cmd/gitaly-ssh/upload_pack.go index 25c8563250..dc11b56f44 100644 --- a/cmd/gitaly-ssh/upload_pack.go +++ b/cmd/gitaly-ssh/upload_pack.go @@ -6,8 +6,8 @@ import ( "os" "github.com/golang/protobuf/jsonpb" - "gitlab.com/gitlab-org/gitaly/client" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/client" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" ) diff --git a/cmd/gitaly-ssh/upload_pack_test.go b/cmd/gitaly-ssh/upload_pack_test.go index 8872b9a066..4d0408c93f 100644 --- a/cmd/gitaly-ssh/upload_pack_test.go +++ b/cmd/gitaly-ssh/upload_pack_test.go @@ -8,12 +8,12 @@ import ( "github.com/golang/protobuf/jsonpb" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/updateref" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/server" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/updateref" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/server" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) const keepAroundNamespace = "refs/keep-around" diff --git a/cmd/gitaly-wrapper/main.go b/cmd/gitaly-wrapper/main.go index e31c9e2e08..afb10d1975 100644 --- a/cmd/gitaly-wrapper/main.go +++ b/cmd/gitaly-wrapper/main.go @@ -12,8 +12,8 @@ import ( "time" "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/bootstrap" - "gitlab.com/gitlab-org/gitaly/internal/ps" + "gitlab.com/gitlab-org/gitaly/v13/internal/bootstrap" + "gitlab.com/gitlab-org/gitaly/v13/internal/ps" ) const ( diff --git a/cmd/gitaly-wrapper/main_test.go b/cmd/gitaly-wrapper/main_test.go index 59963da525..d5ce3a83d2 100644 --- a/cmd/gitaly-wrapper/main_test.go +++ b/cmd/gitaly-wrapper/main_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/bootstrap" + "gitlab.com/gitlab-org/gitaly/v13/internal/bootstrap" ) // TestStolenPid tests for regressions in https://gitlab.com/gitlab-org/gitaly/issues/1661 diff --git a/cmd/gitaly/main.go b/cmd/gitaly/main.go index 3df15744a0..d3d52b7271 100644 --- a/cmd/gitaly/main.go +++ b/cmd/gitaly/main.go @@ -9,17 +9,17 @@ import ( "github.com/prometheus/client_golang/prometheus" log "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/bootstrap" - "gitlab.com/gitlab-org/gitaly/internal/bootstrap/starter" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config/sentry" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/server" - glog "gitlab.com/gitlab-org/gitaly/internal/log" - "gitlab.com/gitlab-org/gitaly/internal/storage" - "gitlab.com/gitlab-org/gitaly/internal/tempdir" - "gitlab.com/gitlab-org/gitaly/internal/version" + "gitlab.com/gitlab-org/gitaly/v13/internal/bootstrap" + "gitlab.com/gitlab-org/gitaly/v13/internal/bootstrap/starter" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config/sentry" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/server" + glog "gitlab.com/gitlab-org/gitaly/v13/internal/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/storage" + "gitlab.com/gitlab-org/gitaly/v13/internal/tempdir" + "gitlab.com/gitlab-org/gitaly/v13/internal/version" "gitlab.com/gitlab-org/labkit/monitoring" "gitlab.com/gitlab-org/labkit/tracing" ) diff --git a/cmd/praefect/main.go b/cmd/praefect/main.go index f5a62f389e..b6906594a4 100644 --- a/cmd/praefect/main.go +++ b/cmd/praefect/main.go @@ -92,22 +92,22 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/bootstrap" - "gitlab.com/gitlab-org/gitaly/internal/bootstrap/starter" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config/sentry" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/log" - "gitlab.com/gitlab-org/gitaly/internal/praefect" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore/glsql" - "gitlab.com/gitlab-org/gitaly/internal/praefect/metrics" - "gitlab.com/gitlab-org/gitaly/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/internal/praefect/nodes/tracker" - "gitlab.com/gitlab-org/gitaly/internal/praefect/protoregistry" - "gitlab.com/gitlab-org/gitaly/internal/praefect/reconciler" - "gitlab.com/gitlab-org/gitaly/internal/praefect/transactions" - "gitlab.com/gitlab-org/gitaly/internal/version" + "gitlab.com/gitlab-org/gitaly/v13/internal/bootstrap" + "gitlab.com/gitlab-org/gitaly/v13/internal/bootstrap/starter" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config/sentry" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/metrics" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/nodes/tracker" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/protoregistry" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/reconciler" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/transactions" + "gitlab.com/gitlab-org/gitaly/v13/internal/version" "gitlab.com/gitlab-org/labkit/monitoring" "gitlab.com/gitlab-org/labkit/tracing" ) diff --git a/cmd/praefect/main_test.go b/cmd/praefect/main_test.go index 7604d33dd6..05ddb65ba2 100644 --- a/cmd/praefect/main_test.go +++ b/cmd/praefect/main_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/bootstrap/starter" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/bootstrap/starter" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" ) func TestNoConfigFlag(t *testing.T) { diff --git a/cmd/praefect/subcmd.go b/cmd/praefect/subcmd.go index 7b867dc548..ae86e6aa06 100644 --- a/cmd/praefect/subcmd.go +++ b/cmd/praefect/subcmd.go @@ -9,11 +9,11 @@ import ( "os/signal" "time" - gitalyauth "gitlab.com/gitlab-org/gitaly/auth" - "gitlab.com/gitlab-org/gitaly/client" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore/glsql" + gitalyauth "gitlab.com/gitlab-org/gitaly/v13/auth" + "gitlab.com/gitlab-org/gitaly/v13/client" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore/glsql" "google.golang.org/grpc" ) diff --git a/cmd/praefect/subcmd_accept_dataloss.go b/cmd/praefect/subcmd_accept_dataloss.go index cb81e1b900..399728c083 100644 --- a/cmd/praefect/subcmd_accept_dataloss.go +++ b/cmd/praefect/subcmd_accept_dataloss.go @@ -5,8 +5,8 @@ import ( "flag" "fmt" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) type requiredParameterError string diff --git a/cmd/praefect/subcmd_accept_dataloss_test.go b/cmd/praefect/subcmd_accept_dataloss_test.go index c687337f57..d4cb502760 100644 --- a/cmd/praefect/subcmd_accept_dataloss_test.go +++ b/cmd/praefect/subcmd_accept_dataloss_test.go @@ -6,11 +6,11 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/internal/praefect/service/info" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/service/info" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func TestAcceptDatalossSubcommand(t *testing.T) { diff --git a/cmd/praefect/subcmd_dataloss.go b/cmd/praefect/subcmd_dataloss.go index 460e374ba2..ebf64625a5 100644 --- a/cmd/praefect/subcmd_dataloss.go +++ b/cmd/praefect/subcmd_dataloss.go @@ -10,8 +10,8 @@ import ( "sort" "strings" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) type unexpectedPositionalArgsError struct{ Command string } diff --git a/cmd/praefect/subcmd_dataloss_test.go b/cmd/praefect/subcmd_dataloss_test.go index a7094dfe72..6c2d50031a 100644 --- a/cmd/praefect/subcmd_dataloss_test.go +++ b/cmd/praefect/subcmd_dataloss_test.go @@ -5,11 +5,11 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/internal/praefect/service/info" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/service/info" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestDatalossSubcommand(t *testing.T) { diff --git a/cmd/praefect/subcmd_pingnodes.go b/cmd/praefect/subcmd_pingnodes.go index cc2f87ff63..4685881ac1 100644 --- a/cmd/praefect/subcmd_pingnodes.go +++ b/cmd/praefect/subcmd_pingnodes.go @@ -9,8 +9,8 @@ import ( "sync" "time" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/health/grpc_health_v1" ) diff --git a/cmd/praefect/subcmd_pingnodes_test.go b/cmd/praefect/subcmd_pingnodes_test.go index 22bc90a977..beea6a4573 100644 --- a/cmd/praefect/subcmd_pingnodes_test.go +++ b/cmd/praefect/subcmd_pingnodes_test.go @@ -10,8 +10,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) type mockServerService struct { diff --git a/cmd/praefect/subcmd_reconcile.go b/cmd/praefect/subcmd_reconcile.go index d9431fe417..af67d46818 100644 --- a/cmd/praefect/subcmd_reconcile.go +++ b/cmd/praefect/subcmd_reconcile.go @@ -8,8 +8,8 @@ import ( "io" "log" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) type nodeReconciler struct { diff --git a/cmd/praefect/subcmd_sqldown.go b/cmd/praefect/subcmd_sqldown.go index 2748de0d02..277e9ca9b6 100644 --- a/cmd/praefect/subcmd_sqldown.go +++ b/cmd/praefect/subcmd_sqldown.go @@ -6,8 +6,8 @@ import ( "fmt" "strconv" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore" ) type sqlMigrateDownSubcommand struct { diff --git a/cmd/praefect/subcmd_sqlstatus.go b/cmd/praefect/subcmd_sqlstatus.go index f71d9d2006..078f071bca 100644 --- a/cmd/praefect/subcmd_sqlstatus.go +++ b/cmd/praefect/subcmd_sqlstatus.go @@ -6,8 +6,8 @@ import ( "sort" "github.com/olekukonko/tablewriter" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore" ) type sqlMigrateStatusSubcommand struct{} diff --git a/cmd/praefect/subcmd_test.go b/cmd/praefect/subcmd_test.go index adb940851e..ab9765e7a9 100644 --- a/cmd/praefect/subcmd_test.go +++ b/cmd/praefect/subcmd_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/health" "google.golang.org/grpc/health/grpc_health_v1" diff --git a/go.mod b/go.mod index 87e5732dbf..593df89df9 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module gitlab.com/gitlab-org/gitaly +module gitlab.com/gitlab-org/gitaly/v13 require ( github.com/BurntSushi/toml v0.3.1 diff --git a/go.sum b/go.sum index 5b8b468a2c..179efb12d2 100644 --- a/go.sum +++ b/go.sum @@ -77,6 +77,7 @@ github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/gavv/httpexpect v2.0.0+incompatible/go.mod h1:x+9tiU1YnrOvnB725RkpoLv1M62hOWzwo5OXotisrKc= github.com/getsentry/raven-go v0.1.0/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ= +github.com/getsentry/raven-go v0.1.2 h1:4V0z512S5mZXiBvmW2RbuZBSIY1sEdMNsPjpx2zwtSE= github.com/getsentry/raven-go v0.1.2/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ= github.com/getsentry/sentry-go v0.5.1 h1:MIPe7ScHADsrK2vznqmhksIUFxq7m0JfTh+ZIMkI+VQ= github.com/getsentry/sentry-go v0.5.1/go.mod h1:B8H7x8TYDPkeWPRzGpIiFO97LZP6rL8A3hEt8lUItMw= @@ -356,7 +357,9 @@ github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDf github.com/yudai/pp v2.0.1+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZkTdatxwunjIkc= github.com/ziutek/mymysql v1.5.4 h1:GB0qdRGsTwQSBVYuVShFBKaXSnSnYYC2d9knnE1LHFs= github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0= +gitlab.com/gitlab-org/gitaly v1.68.0 h1:VlcJs1+PrhW7lqJUU7Fh1q8FMJujmbbivdfde/cwB98= gitlab.com/gitlab-org/gitaly v1.68.0/go.mod h1:/pCsB918Zu5wFchZ9hLYin9WkJ2yQqdVNz0zlv5HbXg= +gitlab.com/gitlab-org/gitaly v1.87.0 h1:iTR1CslbK6F3vKe8yPqb5OQ+Pnrj/bl8ded5dPMU79s= gitlab.com/gitlab-org/gitlab-shell v0.0.0-20200921044701-1a2bfecd2f0e h1:kqUd95SLY+StJ14/rJdFwurKword02z9oGxEcDJH7gg= gitlab.com/gitlab-org/gitlab-shell v0.0.0-20200921044701-1a2bfecd2f0e/go.mod h1:RABblvnnhHpFU/lexlwGqpKgZsLV3RGA2D/Elp5/KEA= gitlab.com/gitlab-org/labkit v0.0.0-20190221122536-0c3fc7cdd57c/go.mod h1:rYhLgfrbEcyfinG+R3EvKu6bZSsmwQqcXzLfHWSfUKM= diff --git a/internal/blackbox/blackbox.go b/internal/blackbox/blackbox.go index d9f39dd591..79bde3ec64 100644 --- a/internal/blackbox/blackbox.go +++ b/internal/blackbox/blackbox.go @@ -7,8 +7,8 @@ import ( "github.com/prometheus/client_golang/prometheus" log "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/internal/version" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v13/internal/version" "gitlab.com/gitlab-org/labkit/monitoring" ) diff --git a/internal/blackbox/config.go b/internal/blackbox/config.go index 7d4bb9c241..d830975de1 100644 --- a/internal/blackbox/config.go +++ b/internal/blackbox/config.go @@ -6,7 +6,7 @@ import ( "time" "github.com/BurntSushi/toml" - logconfig "gitlab.com/gitlab-org/gitaly/internal/gitaly/config/log" + logconfig "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config/log" ) type Config struct { diff --git a/internal/bootstrap/starter/starter.go b/internal/bootstrap/starter/starter.go index a8b7c018c3..23cc2e832c 100644 --- a/internal/bootstrap/starter/starter.go +++ b/internal/bootstrap/starter/starter.go @@ -7,8 +7,8 @@ import ( "strings" "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/bootstrap" - "gitlab.com/gitlab-org/gitaly/internal/connectioncounter" + "gitlab.com/gitlab-org/gitaly/v13/internal/bootstrap" + "gitlab.com/gitlab-org/gitaly/v13/internal/connectioncounter" ) const ( diff --git a/internal/cache/cachedb.go b/internal/cache/cachedb.go index a70724596c..a8746a35f0 100644 --- a/internal/cache/cachedb.go +++ b/internal/cache/cachedb.go @@ -10,8 +10,8 @@ import ( "github.com/golang/protobuf/proto" "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" - "gitlab.com/gitlab-org/gitaly/internal/safe" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/safe" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) // maps a cache path to the number of active writers diff --git a/internal/cache/cachedb_test.go b/internal/cache/cachedb_test.go index 7031f62614..3a1b6bf841 100644 --- a/internal/cache/cachedb_test.go +++ b/internal/cache/cachedb_test.go @@ -12,11 +12,11 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/cache" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/metadata/featureflag" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/cache" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/metadata/featureflag" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func TestMain(m *testing.M) { diff --git a/internal/cache/keyer.go b/internal/cache/keyer.go index 41528aade2..87c0b98d89 100644 --- a/internal/cache/keyer.go +++ b/internal/cache/keyer.go @@ -16,13 +16,13 @@ import ( "github.com/golang/protobuf/proto" "github.com/google/uuid" "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/metadata/featureflag" - "gitlab.com/gitlab-org/gitaly/internal/safe" - "gitlab.com/gitlab-org/gitaly/internal/storage" - "gitlab.com/gitlab-org/gitaly/internal/tempdir" - "gitlab.com/gitlab-org/gitaly/internal/version" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/metadata/featureflag" + "gitlab.com/gitlab-org/gitaly/v13/internal/safe" + "gitlab.com/gitlab-org/gitaly/v13/internal/storage" + "gitlab.com/gitlab-org/gitaly/v13/internal/tempdir" + "gitlab.com/gitlab-org/gitaly/v13/internal/version" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" ) diff --git a/internal/cache/walker.go b/internal/cache/walker.go index 775f048967..30626b78db 100644 --- a/internal/cache/walker.go +++ b/internal/cache/walker.go @@ -12,10 +12,10 @@ import ( "time" "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/dontpanic" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/log" - "gitlab.com/gitlab-org/gitaly/internal/tempdir" + "gitlab.com/gitlab-org/gitaly/v13/internal/dontpanic" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/tempdir" ) func logWalkErr(err error, path, msg string) { diff --git a/internal/cache/walker_test.go b/internal/cache/walker_test.go index a469ffbd11..62347d382f 100644 --- a/internal/cache/walker_test.go +++ b/internal/cache/walker_test.go @@ -9,10 +9,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/cache" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/tempdir" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/cache" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/tempdir" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestDiskCacheObjectWalker(t *testing.T) { diff --git a/internal/command/command.go b/internal/command/command.go index 5ea8ab7521..6ad473b84a 100644 --- a/internal/command/command.go +++ b/internal/command/command.go @@ -16,8 +16,8 @@ import ( "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/metadata/featureflag" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/metadata/featureflag" "gitlab.com/gitlab-org/labkit/tracing" ) diff --git a/internal/dontpanic/retry.go b/internal/dontpanic/retry.go index 2f95761974..bbcbd89c5b 100644 --- a/internal/dontpanic/retry.go +++ b/internal/dontpanic/retry.go @@ -11,7 +11,7 @@ import ( "time" sentry "github.com/getsentry/sentry-go" - "gitlab.com/gitlab-org/gitaly/internal/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/log" ) // Try will wrap the provided function with a panic recovery. If a panic occurs, diff --git a/internal/dontpanic/retry_test.go b/internal/dontpanic/retry_test.go index fe5c880921..9ee4ee9979 100644 --- a/internal/dontpanic/retry_test.go +++ b/internal/dontpanic/retry_test.go @@ -5,7 +5,7 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/dontpanic" + "gitlab.com/gitlab-org/gitaly/v13/internal/dontpanic" ) func TestTry(t *testing.T) { diff --git a/internal/git/alternates/alternates.go b/internal/git/alternates/alternates.go index b17fdaff39..98b073a99f 100644 --- a/internal/git/alternates/alternates.go +++ b/internal/git/alternates/alternates.go @@ -5,8 +5,8 @@ import ( "path/filepath" "strings" - "gitlab.com/gitlab-org/gitaly/internal/git/repository" - "gitlab.com/gitlab-org/gitaly/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/repository" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" ) // PathAndEnv finds the disk path to a repository, and returns the diff --git a/internal/git/bitmap.go b/internal/git/bitmap.go index f557557f74..f64d66139a 100644 --- a/internal/git/bitmap.go +++ b/internal/git/bitmap.go @@ -9,9 +9,9 @@ import ( "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" grpc_ctxtags "github.com/grpc-ecosystem/go-grpc-middleware/tags" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/internal/git/packfile" - "gitlab.com/gitlab-org/gitaly/internal/git/repository" - "gitlab.com/gitlab-org/gitaly/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/packfile" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/repository" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" ) var badBitmapRequestCount = prometheus.NewCounterVec( diff --git a/internal/git/catfile/batch.go b/internal/git/catfile/batch.go index 759899091f..fe01901f79 100644 --- a/internal/git/catfile/batch.go +++ b/internal/git/catfile/batch.go @@ -8,9 +8,9 @@ import ( "io/ioutil" "sync" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/alternates" - "gitlab.com/gitlab-org/gitaly/internal/git/repository" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/alternates" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/repository" ) // batch encapsulates a 'git cat-file --batch' process diff --git a/internal/git/catfile/batch_cache.go b/internal/git/catfile/batch_cache.go index d20568d361..2bba3e9af8 100644 --- a/internal/git/catfile/batch_cache.go +++ b/internal/git/catfile/batch_cache.go @@ -6,8 +6,8 @@ import ( "time" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/internal/git/repository" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/repository" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" ) const ( diff --git a/internal/git/catfile/batchcheck.go b/internal/git/catfile/batchcheck.go index 00714b7a81..093578176a 100644 --- a/internal/git/catfile/batchcheck.go +++ b/internal/git/catfile/batchcheck.go @@ -7,9 +7,9 @@ import ( "io" "sync" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/alternates" - "gitlab.com/gitlab-org/gitaly/internal/git/repository" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/alternates" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/repository" ) // batchCheck encapsulates a 'git cat-file --batch-check' process diff --git a/internal/git/catfile/catfile.go b/internal/git/catfile/catfile.go index be662f45b2..08b17cca5e 100644 --- a/internal/git/catfile/catfile.go +++ b/internal/git/catfile/catfile.go @@ -5,8 +5,8 @@ import ( "sync" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/internal/git/repository" - "gitlab.com/gitlab-org/gitaly/internal/metadata" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/repository" + "gitlab.com/gitlab-org/gitaly/v13/internal/metadata" ) var catfileCacheCounter = prometheus.NewCounterVec( diff --git a/internal/git/catfile/catfile_test.go b/internal/git/catfile/catfile_test.go index da1ab80592..46febea8a8 100644 --- a/internal/git/catfile/catfile_test.go +++ b/internal/git/catfile/catfile_test.go @@ -12,9 +12,9 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" "google.golang.org/grpc/metadata" ) diff --git a/internal/git/catfile/testhelper_test.go b/internal/git/catfile/testhelper_test.go index 8cbef4ef54..048718d379 100644 --- a/internal/git/catfile/testhelper_test.go +++ b/internal/git/catfile/testhelper_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/git/command.go b/internal/git/command.go index 6fb682913e..bf8c640426 100644 --- a/internal/git/command.go +++ b/internal/git/command.go @@ -4,9 +4,9 @@ import ( "context" "os/exec" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/git/alternates" - "gitlab.com/gitlab-org/gitaly/internal/git/repository" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/alternates" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/repository" ) // unsafeCmdWithEnv creates a git.unsafeCmd with the given args, environment, and Repository diff --git a/internal/git/command_test.go b/internal/git/command_test.go index 746baf8560..524b350292 100644 --- a/internal/git/command_test.go +++ b/internal/git/command_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestGitCommandProxy(t *testing.T) { diff --git a/internal/git/dirs_test.go b/internal/git/dirs_test.go index e0bb87e0cc..b0ecc9d1b5 100644 --- a/internal/git/dirs_test.go +++ b/internal/git/dirs_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestObjectDirs(t *testing.T) { diff --git a/internal/git/gittest/delta_islands.go b/internal/git/gittest/delta_islands.go index 7640be6d3f..42417976a6 100644 --- a/internal/git/gittest/delta_islands.go +++ b/internal/git/gittest/delta_islands.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) // TestDeltaIslands is based on the tests in diff --git a/internal/git/gittest/http_server.go b/internal/git/gittest/http_server.go index 25ff78f089..bd442f599f 100644 --- a/internal/git/gittest/http_server.go +++ b/internal/git/gittest/http_server.go @@ -10,7 +10,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" ) // RemoteUploadPackServer implements two HTTP routes for git-upload-pack by copying stdin and stdout into and out of the git upload-pack command diff --git a/internal/git/helper_test.go b/internal/git/helper_test.go index f3cd415b17..f6bed1a699 100644 --- a/internal/git/helper_test.go +++ b/internal/git/helper_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/git/hooks/hooks.go b/internal/git/hooks/hooks.go index aabb2f5fa5..57c46a6962 100644 --- a/internal/git/hooks/hooks.go +++ b/internal/git/hooks/hooks.go @@ -4,7 +4,7 @@ import ( "fmt" "path/filepath" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" ) // Override allows tests to control where the hooks directory is. diff --git a/internal/git/hooks/hooks_test.go b/internal/git/hooks/hooks_test.go index 1ea9266bf2..2c7e87b021 100644 --- a/internal/git/hooks/hooks_test.go +++ b/internal/git/hooks/hooks_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" ) func TestPath(t *testing.T) { diff --git a/internal/git/log/commit.go b/internal/git/log/commit.go index 81a768be37..597f04c8a8 100644 --- a/internal/git/log/commit.go +++ b/internal/git/log/commit.go @@ -10,10 +10,10 @@ import ( "strings" "github.com/golang/protobuf/ptypes/timestamp" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) // GetCommit tries to resolve revision to a Git commit. Returns nil if diff --git a/internal/git/log/commit_test.go b/internal/git/log/commit_test.go index 891443bb14..39813278eb 100644 --- a/internal/git/log/commit_test.go +++ b/internal/git/log/commit_test.go @@ -7,9 +7,9 @@ import ( "github.com/golang/protobuf/ptypes/timestamp" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/metadata" ) diff --git a/internal/git/log/last_commit.go b/internal/git/log/last_commit.go index 6c29a64e60..448ebeab2a 100644 --- a/internal/git/log/last_commit.go +++ b/internal/git/log/last_commit.go @@ -4,11 +4,11 @@ import ( "context" "io/ioutil" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) // LastCommitForPath returns the last commit which modified path. diff --git a/internal/git/log/log.go b/internal/git/log/log.go index c591f36bf9..29529a2517 100644 --- a/internal/git/log/log.go +++ b/internal/git/log/log.go @@ -6,8 +6,8 @@ import ( "fmt" "io" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) // IsNotFound tests if an error is a "not found" error. diff --git a/internal/git/log/tag.go b/internal/git/log/tag.go index f309f9b780..fd7898e344 100644 --- a/internal/git/log/tag.go +++ b/internal/git/log/tag.go @@ -8,9 +8,9 @@ import ( "io/ioutil" "strings" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) const ( diff --git a/internal/git/log/tag_test.go b/internal/git/log/tag_test.go index 2aadb8511b..0331d96612 100644 --- a/internal/git/log/tag_test.go +++ b/internal/git/log/tag_test.go @@ -8,9 +8,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestGetTag(t *testing.T) { diff --git a/internal/git/objectpool/clone.go b/internal/git/objectpool/clone.go index e21587de85..b8f0b1e3b1 100644 --- a/internal/git/objectpool/clone.go +++ b/internal/git/objectpool/clone.go @@ -5,9 +5,9 @@ import ( "os" "path/filepath" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) // Clone a repository to a pool, without setting the alternates, is not the diff --git a/internal/git/objectpool/clone_test.go b/internal/git/objectpool/clone_test.go index cb10fd01d0..fb2f1e5943 100644 --- a/internal/git/objectpool/clone_test.go +++ b/internal/git/objectpool/clone_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestClone(t *testing.T) { diff --git a/internal/git/objectpool/fetch.go b/internal/git/objectpool/fetch.go index 2bcd3a5991..490705c219 100644 --- a/internal/git/objectpool/fetch.go +++ b/internal/git/objectpool/fetch.go @@ -13,11 +13,11 @@ import ( "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/repository" - "gitlab.com/gitlab-org/gitaly/internal/git/updateref" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/repository" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/updateref" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) const ( diff --git a/internal/git/objectpool/fetch_test.go b/internal/git/objectpool/fetch_test.go index 4998d2b3a3..d7f63f0b67 100644 --- a/internal/git/objectpool/fetch_test.go +++ b/internal/git/objectpool/fetch_test.go @@ -8,10 +8,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestFetchFromOriginDangling(t *testing.T) { diff --git a/internal/git/objectpool/link.go b/internal/git/objectpool/link.go index ac7b526f4f..8a125d81ab 100644 --- a/internal/git/objectpool/link.go +++ b/internal/git/objectpool/link.go @@ -10,11 +10,11 @@ import ( "path/filepath" "strings" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/remote" - "gitlab.com/gitlab-org/gitaly/internal/git/repository" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/remote" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/repository" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) // Link will write the relative path to the object pool from the repository that diff --git a/internal/git/objectpool/link_test.go b/internal/git/objectpool/link_test.go index c3a7318af7..3eb10b67e1 100644 --- a/internal/git/objectpool/link_test.go +++ b/internal/git/objectpool/link_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestLink(t *testing.T) { diff --git a/internal/git/objectpool/pool.go b/internal/git/objectpool/pool.go index 96ead69878..bf337bbc15 100644 --- a/internal/git/objectpool/pool.go +++ b/internal/git/objectpool/pool.go @@ -12,10 +12,10 @@ import ( "regexp" "strings" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/storage" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/storage" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) // poolDirRegexp is used to validate object pool directory structure and name. diff --git a/internal/git/objectpool/pool_test.go b/internal/git/objectpool/pool_test.go index 2a2dd2c540..f9809b64d3 100644 --- a/internal/git/objectpool/pool_test.go +++ b/internal/git/objectpool/pool_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestNewObjectPool(t *testing.T) { diff --git a/internal/git/objectpool/proto.go b/internal/git/objectpool/proto.go index 1e69f5a50c..95d4732a0b 100644 --- a/internal/git/objectpool/proto.go +++ b/internal/git/objectpool/proto.go @@ -1,8 +1,8 @@ package objectpool import ( - "gitlab.com/gitlab-org/gitaly/internal/storage" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/storage" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) // FromProto returns an object pool object from a git repository object diff --git a/internal/git/objectpool/testhelper_test.go b/internal/git/objectpool/testhelper_test.go index 21eef190a0..8bcffa71a5 100644 --- a/internal/git/objectpool/testhelper_test.go +++ b/internal/git/objectpool/testhelper_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/git/packfile/bitmap.go b/internal/git/packfile/bitmap.go index fa35ec4b64..25195a94f9 100644 --- a/internal/git/packfile/bitmap.go +++ b/internal/git/packfile/bitmap.go @@ -11,7 +11,7 @@ import ( "math/big" "os" - "gitlab.com/gitlab-org/gitaly/internal/git/gitio" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/gitio" ) // IndexBitmap is the in-memory representation of a .bitmap file. diff --git a/internal/git/packfile/index.go b/internal/git/packfile/index.go index 29640bcb12..74f15e18c7 100644 --- a/internal/git/packfile/index.go +++ b/internal/git/packfile/index.go @@ -16,7 +16,7 @@ import ( "strconv" "strings" - "gitlab.com/gitlab-org/gitaly/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" ) const sumSize = sha1.Size diff --git a/internal/git/packfile/packfile_test.go b/internal/git/packfile/packfile_test.go index d571a668b4..9d8668d11b 100644 --- a/internal/git/packfile/packfile_test.go +++ b/internal/git/packfile/packfile_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/git/pktline/read_monitor_test.go b/internal/git/pktline/read_monitor_test.go index 63f26f1db0..2aec058191 100644 --- a/internal/git/pktline/read_monitor_test.go +++ b/internal/git/pktline/read_monitor_test.go @@ -11,7 +11,7 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestReadMonitorTimeout(t *testing.T) { diff --git a/internal/git/proto.go b/internal/git/proto.go index 69a4148201..7299e91c9e 100644 --- a/internal/git/proto.go +++ b/internal/git/proto.go @@ -9,8 +9,8 @@ import ( "strings" "time" - "gitlab.com/gitlab-org/gitaly/internal/git/repository" - "gitlab.com/gitlab-org/gitaly/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/repository" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" ) // FallbackTimeValue is the value returned by `SafeTimeParse` in case it diff --git a/internal/git/proto_test.go b/internal/git/proto_test.go index 3386c41d4b..20c2fd2ee1 100644 --- a/internal/git/proto_test.go +++ b/internal/git/proto_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" ) func TestVersionComparator(t *testing.T) { diff --git a/internal/git/protocol.go b/internal/git/protocol.go index 6b0541027e..2cbb51f9bf 100644 --- a/internal/git/protocol.go +++ b/internal/git/protocol.go @@ -7,7 +7,7 @@ import ( grpc_ctxtags "github.com/grpc-ecosystem/go-grpc-middleware/tags" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/internal/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/log" ) const ( diff --git a/internal/git/protocol_test.go b/internal/git/protocol_test.go index f5ec602db0..6dd05594c0 100644 --- a/internal/git/protocol_test.go +++ b/internal/git/protocol_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) type fakeProtocolMessage struct { diff --git a/internal/git/receivepack.go b/internal/git/receivepack.go index f75afd55ab..3a04ebaa17 100644 --- a/internal/git/receivepack.go +++ b/internal/git/receivepack.go @@ -7,12 +7,12 @@ import ( "strconv" "github.com/golang/protobuf/jsonpb" - "gitlab.com/gitlab-org/gitaly/internal/git/hooks" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/gitlabshell" - "gitlab.com/gitlab-org/gitaly/internal/metadata/featureflag" - "gitlab.com/gitlab-org/gitaly/internal/praefect/metadata" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/hooks" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitlabshell" + "gitlab.com/gitlab-org/gitaly/v13/internal/metadata/featureflag" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/metadata" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) // ReceivePackRequest abstracts away the different requests that end up diff --git a/internal/git/remote/remote.go b/internal/git/remote/remote.go index 41e83b1877..125db9d1a0 100644 --- a/internal/git/remote/remote.go +++ b/internal/git/remote/remote.go @@ -4,8 +4,8 @@ import ( "bufio" "context" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/repository" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/repository" ) //Remove removes the remote from repository diff --git a/internal/git/remote/remote_test.go b/internal/git/remote/remote_test.go index 91549043a1..ac54d8eb45 100644 --- a/internal/git/remote/remote_test.go +++ b/internal/git/remote/remote_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/git/repository.go b/internal/git/repository.go index 1f995f3d52..108d803e87 100644 --- a/internal/git/repository.go +++ b/internal/git/repository.go @@ -10,8 +10,8 @@ import ( "os/exec" "strings" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/git/repository" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/repository" ) var ( diff --git a/internal/git/repository_test.go b/internal/git/repository_test.go index b18509bd7b..7959335718 100644 --- a/internal/git/repository_test.go +++ b/internal/git/repository_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) const ( diff --git a/internal/git/safecmd.go b/internal/git/safecmd.go index c45aa3a8f1..af05f39623 100644 --- a/internal/git/safecmd.go +++ b/internal/git/safecmd.go @@ -9,9 +9,9 @@ import ( "strings" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/git/repository" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/repository" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) var ( diff --git a/internal/git/safecmd_test.go b/internal/git/safecmd_test.go index 6ab1993909..f24feb1edf 100644 --- a/internal/git/safecmd_test.go +++ b/internal/git/safecmd_test.go @@ -5,10 +5,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func TestFlagValidation(t *testing.T) { diff --git a/internal/git/stats/analyzehttp.go b/internal/git/stats/analyzehttp.go index 7b7303c4b8..2999cd8272 100644 --- a/internal/git/stats/analyzehttp.go +++ b/internal/git/stats/analyzehttp.go @@ -13,7 +13,7 @@ import ( "strings" "time" - "gitlab.com/gitlab-org/gitaly/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/pktline" ) type Clone struct { diff --git a/internal/git/stats/analyzehttp_test.go b/internal/git/stats/analyzehttp_test.go index c041db9b1c..0b56351a7a 100644 --- a/internal/git/stats/analyzehttp_test.go +++ b/internal/git/stats/analyzehttp_test.go @@ -8,7 +8,7 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestClone(t *testing.T) { diff --git a/internal/git/stats/git.go b/internal/git/stats/git.go index cc8abe59bf..d71fe94f6b 100644 --- a/internal/git/stats/git.go +++ b/internal/git/stats/git.go @@ -8,8 +8,8 @@ import ( "strings" "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/repository" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/repository" ) // LogObjectsInfo read statistics of the git repo objects diff --git a/internal/git/stats/git_test.go b/internal/git/stats/git_test.go index 0909b84009..14e513b7e7 100644 --- a/internal/git/stats/git_test.go +++ b/internal/git/stats/git_test.go @@ -12,9 +12,9 @@ import ( "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" "github.com/sirupsen/logrus" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func TestLogObjectInfo(t *testing.T) { diff --git a/internal/git/stats/packfile_negotiation.go b/internal/git/stats/packfile_negotiation.go index 266d2d545d..3b964fe25c 100644 --- a/internal/git/stats/packfile_negotiation.go +++ b/internal/git/stats/packfile_negotiation.go @@ -8,8 +8,8 @@ import ( "strings" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/internal/git/pktline" - "gitlab.com/gitlab-org/gitaly/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/text" ) type PackfileNegotiation struct { diff --git a/internal/git/stats/packfile_negotiation_test.go b/internal/git/stats/packfile_negotiation_test.go index d9f67ef94d..db756f293b 100644 --- a/internal/git/stats/packfile_negotiation_test.go +++ b/internal/git/stats/packfile_negotiation_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/pktline" ) const ( diff --git a/internal/git/stats/profile.go b/internal/git/stats/profile.go index ea32446e59..e3b7117062 100644 --- a/internal/git/stats/profile.go +++ b/internal/git/stats/profile.go @@ -9,9 +9,9 @@ import ( "strconv" "time" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/repository" - "gitlab.com/gitlab-org/gitaly/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/repository" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" ) // HasBitmap returns whether or not the repository contains an object bitmap. diff --git a/internal/git/stats/profile_test.go b/internal/git/stats/profile_test.go index b259210228..a121e03f71 100644 --- a/internal/git/stats/profile_test.go +++ b/internal/git/stats/profile_test.go @@ -7,7 +7,7 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestRepositoryProfile(t *testing.T) { diff --git a/internal/git/stats/reference_discovery.go b/internal/git/stats/reference_discovery.go index 0bd83628d8..429c273142 100644 --- a/internal/git/stats/reference_discovery.go +++ b/internal/git/stats/reference_discovery.go @@ -7,8 +7,8 @@ import ( "strings" "time" - "gitlab.com/gitlab-org/gitaly/internal/git/pktline" - "gitlab.com/gitlab-org/gitaly/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/text" ) // Reference as used by the reference discovery protocol diff --git a/internal/git/stats/reference_discovery_test.go b/internal/git/stats/reference_discovery_test.go index 00bc947e3d..53fbc053f5 100644 --- a/internal/git/stats/reference_discovery_test.go +++ b/internal/git/stats/reference_discovery_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/pktline" ) func TestSingleRefParses(t *testing.T) { diff --git a/internal/git/stats/testhelper_test.go b/internal/git/stats/testhelper_test.go index 19eea94580..0071696366 100644 --- a/internal/git/stats/testhelper_test.go +++ b/internal/git/stats/testhelper_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/git/updateref/updateref.go b/internal/git/updateref/updateref.go index 10d9901caa..609f9949df 100644 --- a/internal/git/updateref/updateref.go +++ b/internal/git/updateref/updateref.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/repository" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/repository" ) // Updater wraps a `git update-ref --stdin` process, presenting an interface diff --git a/internal/git/updateref/updateref_test.go b/internal/git/updateref/updateref_test.go index f8590ec2c5..8389315172 100644 --- a/internal/git/updateref/updateref_test.go +++ b/internal/git/updateref/updateref_test.go @@ -8,9 +8,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func TestMain(m *testing.M) { diff --git a/internal/git2go/merge.go b/internal/git2go/merge.go index b901353af3..d80aa557a6 100644 --- a/internal/git2go/merge.go +++ b/internal/git2go/merge.go @@ -12,8 +12,8 @@ import ( "strings" "time" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" ) var ( diff --git a/internal/gitaly/config/concurrency.go b/internal/gitaly/config/concurrency.go index 75a58852fc..3f0bd3294c 100644 --- a/internal/gitaly/config/concurrency.go +++ b/internal/gitaly/config/concurrency.go @@ -1,7 +1,7 @@ package config import ( - "gitlab.com/gitlab-org/gitaly/internal/middleware/limithandler" + "gitlab.com/gitlab-org/gitaly/v13/internal/middleware/limithandler" ) // ConfigureConcurrencyLimits configures the per-repo, per RPC rate limits diff --git a/internal/gitaly/config/config.go b/internal/gitaly/config/config.go index 993e095dd2..ea2ef7f097 100644 --- a/internal/gitaly/config/config.go +++ b/internal/gitaly/config/config.go @@ -15,11 +15,11 @@ import ( "github.com/BurntSushi/toml" "github.com/kelseyhightower/envconfig" log "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config/auth" - internallog "gitlab.com/gitlab-org/gitaly/internal/gitaly/config/log" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config/prometheus" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config/sentry" - "gitlab.com/gitlab-org/gitaly/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config/auth" + internallog "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config/prometheus" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config/sentry" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/text" ) var ( diff --git a/internal/gitaly/config/config_test.go b/internal/gitaly/config/config_test.go index 926b6812fb..d4e2c6e3b3 100644 --- a/internal/gitaly/config/config_test.go +++ b/internal/gitaly/config/config_test.go @@ -15,7 +15,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config/sentry" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config/sentry" ) func configFileReader(content string) io.Reader { diff --git a/internal/gitaly/config/locator.go b/internal/gitaly/config/locator.go index b280a6cfb6..c23997f1ae 100644 --- a/internal/gitaly/config/locator.go +++ b/internal/gitaly/config/locator.go @@ -4,8 +4,8 @@ import ( "os" "path/filepath" - "gitlab.com/gitlab-org/gitaly/internal/git/repository" - "gitlab.com/gitlab-org/gitaly/internal/storage" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/repository" + "gitlab.com/gitlab-org/gitaly/v13/internal/storage" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/config/logger.go b/internal/gitaly/config/logger.go index 66e9f47480..02d52b30f0 100644 --- a/internal/gitaly/config/logger.go +++ b/internal/gitaly/config/logger.go @@ -1,7 +1,7 @@ package config import ( - gitalylog "gitlab.com/gitlab-org/gitaly/internal/log" + gitalylog "gitlab.com/gitlab-org/gitaly/v13/internal/log" ) // ConfigureLogging uses the global conf and environmental vars to configure log levels and format diff --git a/internal/gitaly/config/prometheus/config.go b/internal/gitaly/config/prometheus/config.go index 08c4d87037..0f71528af8 100644 --- a/internal/gitaly/config/prometheus/config.go +++ b/internal/gitaly/config/prometheus/config.go @@ -4,7 +4,7 @@ import ( grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" "github.com/prometheus/client_golang/prometheus" log "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/middleware/limithandler" + "gitlab.com/gitlab-org/gitaly/v13/internal/middleware/limithandler" ) // Config contains additional configuration data for prometheus diff --git a/internal/gitaly/config/sentry/sentry.go b/internal/gitaly/config/sentry/sentry.go index 8f408d9a9d..3ea6fa7acd 100644 --- a/internal/gitaly/config/sentry/sentry.go +++ b/internal/gitaly/config/sentry/sentry.go @@ -5,7 +5,7 @@ import ( sentry "github.com/getsentry/sentry-go" log "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/middleware/panichandler" + "gitlab.com/gitlab-org/gitaly/v13/internal/middleware/panichandler" ) // Config contains configuration for sentry diff --git a/internal/gitaly/diff/diff.go b/internal/gitaly/diff/diff.go index a1d53b0d02..bc8a8ee83b 100644 --- a/internal/gitaly/diff/diff.go +++ b/internal/gitaly/diff/diff.go @@ -9,7 +9,7 @@ import ( "regexp" "strconv" - "gitlab.com/gitlab-org/gitaly/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" ) const blankID = "0000000000000000000000000000000000000000" diff --git a/internal/gitaly/hook/access.go b/internal/gitaly/hook/access.go index 07699147c4..32b71e2f4f 100644 --- a/internal/gitaly/hook/access.go +++ b/internal/gitaly/hook/access.go @@ -12,9 +12,9 @@ import ( "regexp" "strings" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "gitlab.com/gitlab-org/gitlab-shell/client" ) diff --git a/internal/gitaly/hook/access_test.go b/internal/gitaly/hook/access_test.go index deb17bfcb8..639876481f 100644 --- a/internal/gitaly/hook/access_test.go +++ b/internal/gitaly/hook/access_test.go @@ -10,10 +10,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) type postReceiveRequest struct { diff --git a/internal/gitaly/hook/custom.go b/internal/gitaly/hook/custom.go index 1e295159a9..2f541ccbbe 100644 --- a/internal/gitaly/hook/custom.go +++ b/internal/gitaly/hook/custom.go @@ -11,9 +11,9 @@ import ( "path/filepath" "strings" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) // customHooksExecutor executes all custom hooks for a given repository and hook name diff --git a/internal/gitaly/hook/custom_test.go b/internal/gitaly/hook/custom_test.go index c20675d78f..396de983bb 100644 --- a/internal/gitaly/hook/custom_test.go +++ b/internal/gitaly/hook/custom_test.go @@ -12,10 +12,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) // printAllScript is a bash script that prints out stdin, the arguments, diff --git a/internal/gitaly/hook/manager.go b/internal/gitaly/hook/manager.go index 09cb82df16..302f811e5c 100644 --- a/internal/gitaly/hook/manager.go +++ b/internal/gitaly/hook/manager.go @@ -5,9 +5,9 @@ import ( "io" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/client" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/client" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) // Manager is an interface providing the ability to execute Git hooks. diff --git a/internal/gitaly/hook/postreceive.go b/internal/gitaly/hook/postreceive.go index 2c77f612ce..a4cbe68b25 100644 --- a/internal/gitaly/hook/postreceive.go +++ b/internal/gitaly/hook/postreceive.go @@ -10,9 +10,9 @@ import ( "math" "strings" - "gitlab.com/gitlab-org/gitaly/internal/git/hooks" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/hooks" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) const ( diff --git a/internal/gitaly/hook/prereceive.go b/internal/gitaly/hook/prereceive.go index 8f8fa79cf2..150a7ba732 100644 --- a/internal/gitaly/hook/prereceive.go +++ b/internal/gitaly/hook/prereceive.go @@ -10,8 +10,8 @@ import ( "path/filepath" "strings" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func getRelativeObjectDirs(repoPath, gitObjectDir, gitAlternateObjectDirs string) (string, []string, error) { diff --git a/internal/gitaly/hook/referencetransaction.go b/internal/gitaly/hook/referencetransaction.go index d16cce80ac..966aece5d1 100644 --- a/internal/gitaly/hook/referencetransaction.go +++ b/internal/gitaly/hook/referencetransaction.go @@ -6,7 +6,7 @@ import ( "io" "io/ioutil" - "gitlab.com/gitlab-org/gitaly/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" ) func (m *GitLabHookManager) ReferenceTransactionHook(ctx context.Context, env []string, stdin io.Reader) error { diff --git a/internal/gitaly/hook/testhelper_test.go b/internal/gitaly/hook/testhelper_test.go index 9e4156e50e..3748904996 100644 --- a/internal/gitaly/hook/testhelper_test.go +++ b/internal/gitaly/hook/testhelper_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/hook/transactions.go b/internal/gitaly/hook/transactions.go index 0b1a78f1d2..348e896f02 100644 --- a/internal/gitaly/hook/transactions.go +++ b/internal/gitaly/hook/transactions.go @@ -7,8 +7,8 @@ import ( "time" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/internal/praefect/metadata" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/metadata" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" ) diff --git a/internal/gitaly/hook/update.go b/internal/gitaly/hook/update.go index 2290ff427b..0e2c3298de 100644 --- a/internal/gitaly/hook/update.go +++ b/internal/gitaly/hook/update.go @@ -4,8 +4,8 @@ import ( "context" "io" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func (m *GitLabHookManager) UpdateHook(ctx context.Context, repo *gitalypb.Repository, ref, oldValue, newValue string, env []string, stdout, stderr io.Writer) error { diff --git a/internal/gitaly/linguist/linguist.go b/internal/gitaly/linguist/linguist.go index 29916e9341..5be72dc71d 100644 --- a/internal/gitaly/linguist/linguist.go +++ b/internal/gitaly/linguist/linguist.go @@ -11,8 +11,8 @@ import ( "os/exec" "path/filepath" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" ) func init() { diff --git a/internal/gitaly/linguist/linguist_test.go b/internal/gitaly/linguist/linguist_test.go index e428aefd2c..12fba75835 100644 --- a/internal/gitaly/linguist/linguist_test.go +++ b/internal/gitaly/linguist/linguist_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/maintenance/daily.go b/internal/gitaly/maintenance/daily.go index dc45c19067..023c9fcd72 100644 --- a/internal/gitaly/maintenance/daily.go +++ b/internal/gitaly/maintenance/daily.go @@ -5,8 +5,8 @@ import ( "time" "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/dontpanic" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/dontpanic" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" ) // StoragesJob runs a job on storages. The string slice param indicates which diff --git a/internal/gitaly/maintenance/daily_test.go b/internal/gitaly/maintenance/daily_test.go index 7f00b05537..a68aab15be 100644 --- a/internal/gitaly/maintenance/daily_test.go +++ b/internal/gitaly/maintenance/daily_test.go @@ -7,8 +7,8 @@ import ( "github.com/sirupsen/logrus" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestStartDaily(t *testing.T) { diff --git a/internal/gitaly/maintenance/optimize.go b/internal/gitaly/maintenance/optimize.go index 3cbb4692ea..815a99e497 100644 --- a/internal/gitaly/maintenance/optimize.go +++ b/internal/gitaly/maintenance/optimize.go @@ -10,9 +10,9 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/storage" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/storage" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" ) diff --git a/internal/gitaly/maintenance/optimize_test.go b/internal/gitaly/maintenance/optimize_test.go index 281c5efcda..25dddc66ce 100644 --- a/internal/gitaly/maintenance/optimize_test.go +++ b/internal/gitaly/maintenance/optimize_test.go @@ -8,10 +8,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/repository" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/repository" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" ) diff --git a/internal/gitaly/rubyserver/concurrency_test.go b/internal/gitaly/rubyserver/concurrency_test.go index 1472ec3895..262783b1f9 100644 --- a/internal/gitaly/rubyserver/concurrency_test.go +++ b/internal/gitaly/rubyserver/concurrency_test.go @@ -7,8 +7,8 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" "google.golang.org/grpc/codes" healthpb "google.golang.org/grpc/health/grpc_health_v1" "google.golang.org/grpc/status" diff --git a/internal/gitaly/rubyserver/proxy.go b/internal/gitaly/rubyserver/proxy.go index 153e699ed3..ee031c4e54 100644 --- a/internal/gitaly/rubyserver/proxy.go +++ b/internal/gitaly/rubyserver/proxy.go @@ -6,9 +6,9 @@ import ( "os" "strings" - "gitlab.com/gitlab-org/gitaly/internal/helper" - praefect_metadata "gitlab.com/gitlab-org/gitaly/internal/praefect/metadata" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + praefect_metadata "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/metadata" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/metadata" ) diff --git a/internal/gitaly/rubyserver/proxy_test.go b/internal/gitaly/rubyserver/proxy_test.go index 142ff38ba6..cb7ee1d85b 100644 --- a/internal/gitaly/rubyserver/proxy_test.go +++ b/internal/gitaly/rubyserver/proxy_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" "google.golang.org/grpc/metadata" ) diff --git a/internal/gitaly/rubyserver/rubyserver.go b/internal/gitaly/rubyserver/rubyserver.go index 3d5db50acc..de1865d0be 100644 --- a/internal/gitaly/rubyserver/rubyserver.go +++ b/internal/gitaly/rubyserver/rubyserver.go @@ -12,16 +12,16 @@ import ( grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware" grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/git/hooks" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver/balancer" - "gitlab.com/gitlab-org/gitaly/internal/gitlabshell" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/supervisor" - "gitlab.com/gitlab-org/gitaly/internal/version" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/hooks" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver/balancer" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitlabshell" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/supervisor" + "gitlab.com/gitlab-org/gitaly/v13/internal/version" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" grpccorrelation "gitlab.com/gitlab-org/labkit/correlation/grpc" grpctracing "gitlab.com/gitlab-org/labkit/tracing/grpc" "google.golang.org/grpc" diff --git a/internal/gitaly/rubyserver/rubyserver_test.go b/internal/gitaly/rubyserver/rubyserver_test.go index be3cbd477d..ac205d9371 100644 --- a/internal/gitaly/rubyserver/rubyserver_test.go +++ b/internal/gitaly/rubyserver/rubyserver_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/rubyserver/testhelper_test.go b/internal/gitaly/rubyserver/testhelper_test.go index 66575e48e8..997788472c 100644 --- a/internal/gitaly/rubyserver/testhelper_test.go +++ b/internal/gitaly/rubyserver/testhelper_test.go @@ -4,8 +4,8 @@ import ( "os" "testing" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) var ( diff --git a/internal/gitaly/rubyserver/worker.go b/internal/gitaly/rubyserver/worker.go index 9fc13f2cd4..dda3d225e2 100644 --- a/internal/gitaly/rubyserver/worker.go +++ b/internal/gitaly/rubyserver/worker.go @@ -7,9 +7,9 @@ import ( "github.com/prometheus/client_golang/prometheus" log "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver/balancer" - "gitlab.com/gitlab-org/gitaly/internal/supervisor" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver/balancer" + "gitlab.com/gitlab-org/gitaly/v13/internal/supervisor" ) var ( diff --git a/internal/gitaly/rubyserver/worker_test.go b/internal/gitaly/rubyserver/worker_test.go index c043b77093..e174fd3bd7 100644 --- a/internal/gitaly/rubyserver/worker_test.go +++ b/internal/gitaly/rubyserver/worker_test.go @@ -6,8 +6,8 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/supervisor" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/supervisor" ) func TestWorker(t *testing.T) { diff --git a/internal/gitaly/server/auth/auth.go b/internal/gitaly/server/auth/auth.go index 3e0e995141..52624e723b 100644 --- a/internal/gitaly/server/auth/auth.go +++ b/internal/gitaly/server/auth/auth.go @@ -6,8 +6,8 @@ import ( grpc_auth "github.com/grpc-ecosystem/go-grpc-middleware/auth" "github.com/prometheus/client_golang/prometheus" - gitalyauth "gitlab.com/gitlab-org/gitaly/auth" - internalauth "gitlab.com/gitlab-org/gitaly/internal/gitaly/config/auth" + gitalyauth "gitlab.com/gitlab-org/gitaly/v13/auth" + internalauth "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config/auth" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/internal/gitaly/server/auth_test.go b/internal/gitaly/server/auth_test.go index 491d21d68b..d17bb83b2a 100644 --- a/internal/gitaly/server/auth_test.go +++ b/internal/gitaly/server/auth_test.go @@ -13,13 +13,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - gitalyauth "gitlab.com/gitlab-org/gitaly/auth" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config/auth" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + gitalyauth "gitlab.com/gitlab-org/gitaly/v13/auth" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config/auth" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/credentials" diff --git a/internal/gitaly/server/server.go b/internal/gitaly/server/server.go index 71e6dc96f5..bb10acc408 100644 --- a/internal/gitaly/server/server.go +++ b/internal/gitaly/server/server.go @@ -11,23 +11,23 @@ import ( grpc_ctxtags "github.com/grpc-ecosystem/go-grpc-middleware/tags" grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" log "github.com/sirupsen/logrus" - diskcache "gitlab.com/gitlab-org/gitaly/internal/cache" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/server/auth" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/internal/helper/fieldextractors" - gitalylog "gitlab.com/gitlab-org/gitaly/internal/log" - "gitlab.com/gitlab-org/gitaly/internal/logsanitizer" - "gitlab.com/gitlab-org/gitaly/internal/middleware/cache" - "gitlab.com/gitlab-org/gitaly/internal/middleware/cancelhandler" - "gitlab.com/gitlab-org/gitaly/internal/middleware/commandstatshandler" - "gitlab.com/gitlab-org/gitaly/internal/middleware/limithandler" - "gitlab.com/gitlab-org/gitaly/internal/middleware/metadatahandler" - "gitlab.com/gitlab-org/gitaly/internal/middleware/panichandler" - "gitlab.com/gitlab-org/gitaly/internal/middleware/sentryhandler" - "gitlab.com/gitlab-org/gitaly/internal/praefect/protoregistry" + diskcache "gitlab.com/gitlab-org/gitaly/v13/internal/cache" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/server/auth" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/fieldextractors" + gitalylog "gitlab.com/gitlab-org/gitaly/v13/internal/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/logsanitizer" + "gitlab.com/gitlab-org/gitaly/v13/internal/middleware/cache" + "gitlab.com/gitlab-org/gitaly/v13/internal/middleware/cancelhandler" + "gitlab.com/gitlab-org/gitaly/v13/internal/middleware/commandstatshandler" + "gitlab.com/gitlab-org/gitaly/v13/internal/middleware/limithandler" + "gitlab.com/gitlab-org/gitaly/v13/internal/middleware/metadatahandler" + "gitlab.com/gitlab-org/gitaly/v13/internal/middleware/panichandler" + "gitlab.com/gitlab-org/gitaly/v13/internal/middleware/sentryhandler" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/protoregistry" grpccorrelation "gitlab.com/gitlab-org/labkit/correlation/grpc" grpctracing "gitlab.com/gitlab-org/labkit/tracing/grpc" "google.golang.org/grpc" diff --git a/internal/gitaly/server/server_factory.go b/internal/gitaly/server/server_factory.go index 92a2d4516c..104766e2de 100644 --- a/internal/gitaly/server/server_factory.go +++ b/internal/gitaly/server/server_factory.go @@ -8,13 +8,13 @@ import ( "time" "github.com/sirupsen/logrus" - gitalyauth "gitlab.com/gitlab-org/gitaly/auth" - "gitlab.com/gitlab-org/gitaly/client" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/maintenance" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + gitalyauth "gitlab.com/gitlab-org/gitaly/v13/auth" + "gitlab.com/gitlab-org/gitaly/v13/client" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/maintenance" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" ) diff --git a/internal/gitaly/server/server_factory_test.go b/internal/gitaly/server/server_factory_test.go index a5ab67853b..ff34f8d01e 100644 --- a/internal/gitaly/server/server_factory_test.go +++ b/internal/gitaly/server/server_factory_test.go @@ -8,10 +8,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/client" - "gitlab.com/gitlab-org/gitaly/internal/bootstrap/starter" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/client" + "gitlab.com/gitlab-org/gitaly/v13/internal/bootstrap/starter" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/credentials" diff --git a/internal/gitaly/service/blob/get_blob.go b/internal/gitaly/service/blob/get_blob.go index 53f5c38959..5136f8d626 100644 --- a/internal/gitaly/service/blob/get_blob.go +++ b/internal/gitaly/service/blob/get_blob.go @@ -4,10 +4,10 @@ import ( "fmt" "io" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/blob/get_blob_test.go b/internal/gitaly/service/blob/get_blob_test.go index ca24b07ad2..b8f8b04cb1 100644 --- a/internal/gitaly/service/blob/get_blob_test.go +++ b/internal/gitaly/service/blob/get_blob_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" ) func TestSuccessfulGetBlob(t *testing.T) { diff --git a/internal/gitaly/service/blob/get_blobs.go b/internal/gitaly/service/blob/get_blobs.go index 18bfbbab61..1ade0dc0a6 100644 --- a/internal/gitaly/service/blob/get_blobs.go +++ b/internal/gitaly/service/blob/get_blobs.go @@ -5,11 +5,11 @@ import ( "io" "io/ioutil" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/commit" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/commit" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/blob/get_blobs_test.go b/internal/gitaly/service/blob/get_blobs_test.go index 308be38799..f8a01e09e4 100644 --- a/internal/gitaly/service/blob/get_blobs_test.go +++ b/internal/gitaly/service/blob/get_blobs_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/blob/lfs_pointers.go b/internal/gitaly/service/blob/lfs_pointers.go index ca96279859..5e5542a7c9 100644 --- a/internal/gitaly/service/blob/lfs_pointers.go +++ b/internal/gitaly/service/blob/lfs_pointers.go @@ -3,11 +3,11 @@ package blob import ( "fmt" - "gitlab.com/gitlab-org/gitaly/internal/errors" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/errors" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/blob/lfs_pointers_test.go b/internal/gitaly/service/blob/lfs_pointers_test.go index 9f2c8de4f1..e07d81aa93 100644 --- a/internal/gitaly/service/blob/lfs_pointers_test.go +++ b/internal/gitaly/service/blob/lfs_pointers_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/blob/server.go b/internal/gitaly/service/blob/server.go index 283fb79cef..21e9ab4478 100644 --- a/internal/gitaly/service/blob/server.go +++ b/internal/gitaly/service/blob/server.go @@ -1,8 +1,8 @@ package blob import ( - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) type server struct { diff --git a/internal/gitaly/service/blob/testhelper_test.go b/internal/gitaly/service/blob/testhelper_test.go index 4a8d086e81..91aa3e9311 100644 --- a/internal/gitaly/service/blob/testhelper_test.go +++ b/internal/gitaly/service/blob/testhelper_test.go @@ -6,9 +6,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/reflection" ) diff --git a/internal/gitaly/service/cleanup/apply_bfg_object_map_stream.go b/internal/gitaly/service/cleanup/apply_bfg_object_map_stream.go index 0b49f0134b..2dfce35877 100644 --- a/internal/gitaly/service/cleanup/apply_bfg_object_map_stream.go +++ b/internal/gitaly/service/cleanup/apply_bfg_object_map_stream.go @@ -5,12 +5,12 @@ import ( "io" "github.com/golang/protobuf/proto" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/cleanup/internalrefs" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/cleanup/notifier" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/cleanup/internalrefs" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/cleanup/notifier" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" ) type bfgStreamReader struct { diff --git a/internal/gitaly/service/cleanup/apply_bfg_object_map_stream_test.go b/internal/gitaly/service/cleanup/apply_bfg_object_map_stream_test.go index b109575b7c..ee6ceb87c2 100644 --- a/internal/gitaly/service/cleanup/apply_bfg_object_map_stream_test.go +++ b/internal/gitaly/service/cleanup/apply_bfg_object_map_stream_test.go @@ -9,10 +9,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/cleanup/internalrefs/cleaner.go b/internal/gitaly/service/cleanup/internalrefs/cleaner.go index dc1c3be0d9..5cd902a73b 100644 --- a/internal/gitaly/service/cleanup/internalrefs/cleaner.go +++ b/internal/gitaly/service/cleanup/internalrefs/cleaner.go @@ -9,9 +9,9 @@ import ( "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" log "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/updateref" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/updateref" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) // Only references in these namespaces are cleaned up diff --git a/internal/gitaly/service/cleanup/notifier/notifier.go b/internal/gitaly/service/cleanup/notifier/notifier.go index a0d66ccbae..fc104e9e37 100644 --- a/internal/gitaly/service/cleanup/notifier/notifier.go +++ b/internal/gitaly/service/cleanup/notifier/notifier.go @@ -3,9 +3,9 @@ package notifier import ( "context" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) // Notifier sends messages stating that an OID has been rewritten, looking diff --git a/internal/gitaly/service/cleanup/server.go b/internal/gitaly/service/cleanup/server.go index e482b6069e..d220d468ee 100644 --- a/internal/gitaly/service/cleanup/server.go +++ b/internal/gitaly/service/cleanup/server.go @@ -1,7 +1,7 @@ package cleanup import ( - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) type server struct { diff --git a/internal/gitaly/service/cleanup/testhelper_test.go b/internal/gitaly/service/cleanup/testhelper_test.go index 7b41fd1234..e0033a64b7 100644 --- a/internal/gitaly/service/cleanup/testhelper_test.go +++ b/internal/gitaly/service/cleanup/testhelper_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/reflection" ) diff --git a/internal/gitaly/service/commit/between.go b/internal/gitaly/service/commit/between.go index 2a424ab485..75227403fc 100644 --- a/internal/gitaly/service/commit/between.go +++ b/internal/gitaly/service/commit/between.go @@ -4,9 +4,9 @@ import ( "fmt" "github.com/golang/protobuf/proto" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) type commitsBetweenSender struct { diff --git a/internal/gitaly/service/commit/between_test.go b/internal/gitaly/service/commit/between_test.go index 14cdbd4c05..bd9fd60af5 100644 --- a/internal/gitaly/service/commit/between_test.go +++ b/internal/gitaly/service/commit/between_test.go @@ -6,8 +6,8 @@ import ( "github.com/golang/protobuf/ptypes/timestamp" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/commit/commit_messages.go b/internal/gitaly/service/commit/commit_messages.go index 2796266872..e0719f1954 100644 --- a/internal/gitaly/service/commit/commit_messages.go +++ b/internal/gitaly/service/commit/commit_messages.go @@ -5,11 +5,11 @@ import ( "fmt" "io" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" ) func (s *server) GetCommitMessages(request *gitalypb.GetCommitMessagesRequest, stream gitalypb.CommitService_GetCommitMessagesServer) error { diff --git a/internal/gitaly/service/commit/commit_messages_test.go b/internal/gitaly/service/commit/commit_messages_test.go index e576028670..975cdb7455 100644 --- a/internal/gitaly/service/commit/commit_messages_test.go +++ b/internal/gitaly/service/commit/commit_messages_test.go @@ -6,9 +6,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/commit/commit_signatures.go b/internal/gitaly/service/commit/commit_signatures.go index 6b9d3ee4b4..a1af84908c 100644 --- a/internal/gitaly/service/commit/commit_signatures.go +++ b/internal/gitaly/service/commit/commit_signatures.go @@ -7,11 +7,11 @@ import ( "fmt" "io" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/commit/commit_signatures_test.go b/internal/gitaly/service/commit/commit_signatures_test.go index 086b2a8859..a627a64fbc 100644 --- a/internal/gitaly/service/commit/commit_signatures_test.go +++ b/internal/gitaly/service/commit/commit_signatures_test.go @@ -6,9 +6,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/commit/commits_by_message.go b/internal/gitaly/service/commit/commits_by_message.go index 9a2388202f..c8ad3a6d22 100644 --- a/internal/gitaly/service/commit/commits_by_message.go +++ b/internal/gitaly/service/commit/commits_by_message.go @@ -4,9 +4,9 @@ import ( "fmt" "github.com/golang/protobuf/proto" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) type commitsByMessageSender struct { diff --git a/internal/gitaly/service/commit/commits_by_message_test.go b/internal/gitaly/service/commit/commits_by_message_test.go index 1077d536dc..686b654b1f 100644 --- a/internal/gitaly/service/commit/commits_by_message_test.go +++ b/internal/gitaly/service/commit/commits_by_message_test.go @@ -6,8 +6,8 @@ import ( "github.com/golang/protobuf/ptypes/timestamp" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/commit/commits_helper.go b/internal/gitaly/service/commit/commits_helper.go index fb9c4627be..2abe9a78bd 100644 --- a/internal/gitaly/service/commit/commits_helper.go +++ b/internal/gitaly/service/commit/commits_helper.go @@ -4,10 +4,10 @@ import ( "context" "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func sendCommits(ctx context.Context, sender chunk.Sender, repo *gitalypb.Repository, revisionRange []string, paths []string, options *gitalypb.GlobalOptions, extraArgs ...git.Option) error { diff --git a/internal/gitaly/service/commit/count_commits.go b/internal/gitaly/service/commit/count_commits.go index 76f9fb7ed8..702ea280aa 100644 --- a/internal/gitaly/service/commit/count_commits.go +++ b/internal/gitaly/service/commit/count_commits.go @@ -9,8 +9,8 @@ import ( "time" "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/commit/count_commits_test.go b/internal/gitaly/service/commit/count_commits_test.go index 3d840dc074..185eb2ff3c 100644 --- a/internal/gitaly/service/commit/count_commits_test.go +++ b/internal/gitaly/service/commit/count_commits_test.go @@ -7,8 +7,8 @@ import ( "github.com/golang/protobuf/ptypes/timestamp" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/commit/count_diverging_commits.go b/internal/gitaly/service/commit/count_diverging_commits.go index 89fb4cd077..d7908371eb 100644 --- a/internal/gitaly/service/commit/count_diverging_commits.go +++ b/internal/gitaly/service/commit/count_diverging_commits.go @@ -8,9 +8,9 @@ import ( "strconv" "strings" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) // CountDivergingCommits counts the diverging commits between from and to. Important to note that when --max-count is applied, the counts are not guaranteed to be diff --git a/internal/gitaly/service/commit/count_diverging_commits_test.go b/internal/gitaly/service/commit/count_diverging_commits_test.go index c22b26ce43..f88dd348b7 100644 --- a/internal/gitaly/service/commit/count_diverging_commits_test.go +++ b/internal/gitaly/service/commit/count_diverging_commits_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/commit/filter_shas_with_signatures.go b/internal/gitaly/service/commit/filter_shas_with_signatures.go index 8cd2f24fca..1dacecda92 100644 --- a/internal/gitaly/service/commit/filter_shas_with_signatures.go +++ b/internal/gitaly/service/commit/filter_shas_with_signatures.go @@ -4,10 +4,10 @@ import ( "errors" "io" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func (s *server) FilterShasWithSignatures(bidi gitalypb.CommitService_FilterShasWithSignaturesServer) error { diff --git a/internal/gitaly/service/commit/filter_shas_with_signatures_test.go b/internal/gitaly/service/commit/filter_shas_with_signatures_test.go index 877a58f5b5..e35870b7f6 100644 --- a/internal/gitaly/service/commit/filter_shas_with_signatures_test.go +++ b/internal/gitaly/service/commit/filter_shas_with_signatures_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func TestFilterShasWithSignaturesSuccessful(t *testing.T) { diff --git a/internal/gitaly/service/commit/find_all_commits.go b/internal/gitaly/service/commit/find_all_commits.go index 5e02cad773..a34906432b 100644 --- a/internal/gitaly/service/commit/find_all_commits.go +++ b/internal/gitaly/service/commit/find_all_commits.go @@ -4,10 +4,10 @@ import ( "fmt" "github.com/golang/protobuf/proto" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/ref" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/ref" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) // We declare this function in variables so that we can override them in our tests diff --git a/internal/gitaly/service/commit/find_all_commits_test.go b/internal/gitaly/service/commit/find_all_commits_test.go index 3071e6b133..c29e43b4ab 100644 --- a/internal/gitaly/service/commit/find_all_commits_test.go +++ b/internal/gitaly/service/commit/find_all_commits_test.go @@ -7,9 +7,9 @@ import ( "github.com/golang/protobuf/ptypes/timestamp" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/ref" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/ref" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/commit/find_commit.go b/internal/gitaly/service/commit/find_commit.go index ca2cf7ca13..0be8f4c141 100644 --- a/internal/gitaly/service/commit/find_commit.go +++ b/internal/gitaly/service/commit/find_commit.go @@ -3,10 +3,10 @@ package commit import ( "context" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func (s *server) FindCommit(ctx context.Context, in *gitalypb.FindCommitRequest) (*gitalypb.FindCommitResponse, error) { diff --git a/internal/gitaly/service/commit/find_commit_test.go b/internal/gitaly/service/commit/find_commit_test.go index 9ada6c2b32..6b00d2353a 100644 --- a/internal/gitaly/service/commit/find_commit_test.go +++ b/internal/gitaly/service/commit/find_commit_test.go @@ -8,12 +8,12 @@ import ( "github.com/golang/protobuf/ptypes/timestamp" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" diff --git a/internal/gitaly/service/commit/find_commits.go b/internal/gitaly/service/commit/find_commits.go index 35fdde103b..0a0a875b9d 100644 --- a/internal/gitaly/service/commit/find_commits.go +++ b/internal/gitaly/service/commit/find_commits.go @@ -8,13 +8,13 @@ import ( "strings" "github.com/golang/protobuf/proto" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func (s *server) FindCommits(req *gitalypb.FindCommitsRequest, stream gitalypb.CommitService_FindCommitsServer) error { diff --git a/internal/gitaly/service/commit/find_commits_test.go b/internal/gitaly/service/commit/find_commits_test.go index c94b801735..b00b824833 100644 --- a/internal/gitaly/service/commit/find_commits_test.go +++ b/internal/gitaly/service/commit/find_commits_test.go @@ -11,9 +11,9 @@ import ( "github.com/golang/protobuf/ptypes/timestamp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/commit/isancestor.go b/internal/gitaly/service/commit/isancestor.go index 6bff2ac623..ed911ffd19 100644 --- a/internal/gitaly/service/commit/isancestor.go +++ b/internal/gitaly/service/commit/isancestor.go @@ -5,8 +5,8 @@ import ( "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" log "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/commit/isancestor_test.go b/internal/gitaly/service/commit/isancestor_test.go index f63b422a84..cf0d1acbf3 100644 --- a/internal/gitaly/service/commit/isancestor_test.go +++ b/internal/gitaly/service/commit/isancestor_test.go @@ -6,10 +6,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/commit/languages.go b/internal/gitaly/service/commit/languages.go index ce08b05343..e99a3a0283 100644 --- a/internal/gitaly/service/commit/languages.go +++ b/internal/gitaly/service/commit/languages.go @@ -9,13 +9,13 @@ import ( "sort" "strings" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/alternates" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/linguist" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/ref" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/alternates" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/linguist" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/ref" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/commit/languages_test.go b/internal/gitaly/service/commit/languages_test.go index ce96393f7d..a348f4a067 100644 --- a/internal/gitaly/service/commit/languages_test.go +++ b/internal/gitaly/service/commit/languages_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/commit/last_commit_for_path.go b/internal/gitaly/service/commit/last_commit_for_path.go index ff54582d73..8bb447e8df 100644 --- a/internal/gitaly/service/commit/last_commit_for_path.go +++ b/internal/gitaly/service/commit/last_commit_for_path.go @@ -3,11 +3,11 @@ package commit import ( "context" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func (s *server) LastCommitForPath(ctx context.Context, in *gitalypb.LastCommitForPathRequest) (*gitalypb.LastCommitForPathResponse, error) { diff --git a/internal/gitaly/service/commit/last_commit_for_path_test.go b/internal/gitaly/service/commit/last_commit_for_path_test.go index 859129e5b6..a9feeb3fc3 100644 --- a/internal/gitaly/service/commit/last_commit_for_path_test.go +++ b/internal/gitaly/service/commit/last_commit_for_path_test.go @@ -5,8 +5,8 @@ import ( "github.com/golang/protobuf/ptypes/timestamp" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/commit/list_commits_by_oid.go b/internal/gitaly/service/commit/list_commits_by_oid.go index 2dc4674960..b2a2da3799 100644 --- a/internal/gitaly/service/commit/list_commits_by_oid.go +++ b/internal/gitaly/service/commit/list_commits_by_oid.go @@ -3,10 +3,10 @@ package commit import ( "github.com/golang/protobuf/proto" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - gitlog "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + gitlog "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) var ( diff --git a/internal/gitaly/service/commit/list_commits_by_oid_test.go b/internal/gitaly/service/commit/list_commits_by_oid_test.go index 3dd2cbb46b..2ed6a94708 100644 --- a/internal/gitaly/service/commit/list_commits_by_oid_test.go +++ b/internal/gitaly/service/commit/list_commits_by_oid_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func TestSuccessfulListCommitsByOidRequest(t *testing.T) { diff --git a/internal/gitaly/service/commit/list_commits_by_ref_name.go b/internal/gitaly/service/commit/list_commits_by_ref_name.go index deb2d04aea..0b47ce5479 100644 --- a/internal/gitaly/service/commit/list_commits_by_ref_name.go +++ b/internal/gitaly/service/commit/list_commits_by_ref_name.go @@ -2,11 +2,11 @@ package commit import ( "github.com/golang/protobuf/proto" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - gitlog "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + gitlog "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func (s *server) ListCommitsByRefName(in *gitalypb.ListCommitsByRefNameRequest, stream gitalypb.CommitService_ListCommitsByRefNameServer) error { diff --git a/internal/gitaly/service/commit/list_commits_by_ref_name_test.go b/internal/gitaly/service/commit/list_commits_by_ref_name_test.go index d876444fe3..4a5227a85c 100644 --- a/internal/gitaly/service/commit/list_commits_by_ref_name_test.go +++ b/internal/gitaly/service/commit/list_commits_by_ref_name_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func TestSuccessfulListCommitsByRefNameRequest(t *testing.T) { diff --git a/internal/gitaly/service/commit/list_files.go b/internal/gitaly/service/commit/list_files.go index 505a9bc926..4541b05205 100644 --- a/internal/gitaly/service/commit/list_files.go +++ b/internal/gitaly/service/commit/list_files.go @@ -7,11 +7,11 @@ import ( "github.com/golang/protobuf/proto" "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" log "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/lstree" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/lstree" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/commit/list_files_test.go b/internal/gitaly/service/commit/list_files_test.go index f07fbdce81..0b5fc01214 100644 --- a/internal/gitaly/service/commit/list_files_test.go +++ b/internal/gitaly/service/commit/list_files_test.go @@ -8,9 +8,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/ref" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/ref" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/commit/list_last_commits_for_tree.go b/internal/gitaly/service/commit/list_last_commits_for_tree.go index 8ca02c3d3a..1d4f8056a2 100644 --- a/internal/gitaly/service/commit/list_last_commits_for_tree.go +++ b/internal/gitaly/service/commit/list_last_commits_for_tree.go @@ -5,13 +5,13 @@ import ( "io" "sort" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/git/lstree" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/lstree" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) const ( diff --git a/internal/gitaly/service/commit/list_last_commits_for_tree_test.go b/internal/gitaly/service/commit/list_last_commits_for_tree_test.go index 86eba6cacb..ecbfd2f260 100644 --- a/internal/gitaly/service/commit/list_last_commits_for_tree_test.go +++ b/internal/gitaly/service/commit/list_last_commits_for_tree_test.go @@ -10,9 +10,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/commit/raw_blame.go b/internal/gitaly/service/commit/raw_blame.go index 9c8100c813..03af6b6b52 100644 --- a/internal/gitaly/service/commit/raw_blame.go +++ b/internal/gitaly/service/commit/raw_blame.go @@ -5,9 +5,9 @@ import ( "io" "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/commit/raw_blame_test.go b/internal/gitaly/service/commit/raw_blame_test.go index 2c373cf5a1..1108e824ad 100644 --- a/internal/gitaly/service/commit/raw_blame_test.go +++ b/internal/gitaly/service/commit/raw_blame_test.go @@ -6,9 +6,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/commit/server.go b/internal/gitaly/service/commit/server.go index d36c6c3e6e..df0439e646 100644 --- a/internal/gitaly/service/commit/server.go +++ b/internal/gitaly/service/commit/server.go @@ -1,9 +1,9 @@ package commit import ( - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/ref" - "gitlab.com/gitlab-org/gitaly/internal/storage" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/ref" + "gitlab.com/gitlab-org/gitaly/v13/internal/storage" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) type server struct { diff --git a/internal/gitaly/service/commit/stats.go b/internal/gitaly/service/commit/stats.go index 1eb7efd0a1..820747ff65 100644 --- a/internal/gitaly/service/commit/stats.go +++ b/internal/gitaly/service/commit/stats.go @@ -7,10 +7,10 @@ import ( "strconv" "strings" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func (s *server) CommitStats(ctx context.Context, in *gitalypb.CommitStatsRequest) (*gitalypb.CommitStatsResponse, error) { diff --git a/internal/gitaly/service/commit/stats_test.go b/internal/gitaly/service/commit/stats_test.go index b69046a129..39d0652eff 100644 --- a/internal/gitaly/service/commit/stats_test.go +++ b/internal/gitaly/service/commit/stats_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/commit/testhelper_test.go b/internal/gitaly/service/commit/testhelper_test.go index 290c4fca9e..40b294c9d5 100644 --- a/internal/gitaly/service/commit/testhelper_test.go +++ b/internal/gitaly/service/commit/testhelper_test.go @@ -6,9 +6,9 @@ import ( "testing" "github.com/golang/protobuf/ptypes/timestamp" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/reflection" ) diff --git a/internal/gitaly/service/commit/tree_entries.go b/internal/gitaly/service/commit/tree_entries.go index e1238c9e30..516333ef5c 100644 --- a/internal/gitaly/service/commit/tree_entries.go +++ b/internal/gitaly/service/commit/tree_entries.go @@ -6,10 +6,10 @@ import ( "github.com/golang/protobuf/proto" "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" log "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/commit/tree_entries_helper.go b/internal/gitaly/service/commit/tree_entries_helper.go index 7d837604b2..1a0794fd27 100644 --- a/internal/gitaly/service/commit/tree_entries_helper.go +++ b/internal/gitaly/service/commit/tree_entries_helper.go @@ -10,8 +10,8 @@ import ( "path/filepath" "strings" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) type revisionPath struct{ revision, path string } diff --git a/internal/gitaly/service/commit/tree_entries_test.go b/internal/gitaly/service/commit/tree_entries_test.go index b3491d8324..74fe6bea95 100644 --- a/internal/gitaly/service/commit/tree_entries_test.go +++ b/internal/gitaly/service/commit/tree_entries_test.go @@ -9,9 +9,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/commit/tree_entry.go b/internal/gitaly/service/commit/tree_entry.go index 10f5b0c4a4..5c5c6f4ebd 100644 --- a/internal/gitaly/service/commit/tree_entry.go +++ b/internal/gitaly/service/commit/tree_entry.go @@ -5,11 +5,11 @@ import ( "io" "strings" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/commit/tree_entry_test.go b/internal/gitaly/service/commit/tree_entry_test.go index 8c0af7566b..3b132d30a2 100644 --- a/internal/gitaly/service/commit/tree_entry_test.go +++ b/internal/gitaly/service/commit/tree_entry_test.go @@ -6,8 +6,8 @@ import ( "io" "testing" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/commit/util.go b/internal/gitaly/service/commit/util.go index ce99e3e58f..43f3b97519 100644 --- a/internal/gitaly/service/commit/util.go +++ b/internal/gitaly/service/commit/util.go @@ -5,7 +5,7 @@ import ( "path/filepath" "strconv" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func newTreeEntry(commitOid, rootOid, rootPath string, filename, oidBytes, modeBytes []byte) (*gitalypb.TreeEntry, error) { diff --git a/internal/gitaly/service/conflicts/list_conflict_files.go b/internal/gitaly/service/conflicts/list_conflict_files.go index 7499c9ab15..5253b01fef 100644 --- a/internal/gitaly/service/conflicts/list_conflict_files.go +++ b/internal/gitaly/service/conflicts/list_conflict_files.go @@ -3,8 +3,8 @@ package conflicts import ( "fmt" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/conflicts/list_conflict_files_test.go b/internal/gitaly/service/conflicts/list_conflict_files_test.go index b384f8b8ca..149361dd1f 100644 --- a/internal/gitaly/service/conflicts/list_conflict_files_test.go +++ b/internal/gitaly/service/conflicts/list_conflict_files_test.go @@ -6,8 +6,8 @@ import ( "github.com/golang/protobuf/proto" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/conflicts/resolve_conflicts.go b/internal/gitaly/service/conflicts/resolve_conflicts.go index d8734ef8d5..8085e9c0a8 100644 --- a/internal/gitaly/service/conflicts/resolve_conflicts.go +++ b/internal/gitaly/service/conflicts/resolve_conflicts.go @@ -3,8 +3,8 @@ package conflicts import ( "fmt" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/conflicts/resolve_conflicts_test.go b/internal/gitaly/service/conflicts/resolve_conflicts_test.go index 0580f1607f..818aaff515 100644 --- a/internal/gitaly/service/conflicts/resolve_conflicts_test.go +++ b/internal/gitaly/service/conflicts/resolve_conflicts_test.go @@ -6,12 +6,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - serverPkg "gitlab.com/gitlab-org/gitaly/internal/gitaly/server" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/conflicts" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + serverPkg "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/server" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/conflicts" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" diff --git a/internal/gitaly/service/conflicts/server.go b/internal/gitaly/service/conflicts/server.go index d339dcca4b..ca24abd40d 100644 --- a/internal/gitaly/service/conflicts/server.go +++ b/internal/gitaly/service/conflicts/server.go @@ -1,8 +1,8 @@ package conflicts import ( - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) type server struct { diff --git a/internal/gitaly/service/conflicts/testhelper_test.go b/internal/gitaly/service/conflicts/testhelper_test.go index e952327a17..93c4491b2b 100644 --- a/internal/gitaly/service/conflicts/testhelper_test.go +++ b/internal/gitaly/service/conflicts/testhelper_test.go @@ -7,11 +7,11 @@ import ( log "github.com/sirupsen/logrus" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git/hooks" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/hooks" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/reflection" ) diff --git a/internal/gitaly/service/diff/commit.go b/internal/gitaly/service/diff/commit.go index 590177d890..93c891eada 100644 --- a/internal/gitaly/service/diff/commit.go +++ b/internal/gitaly/service/diff/commit.go @@ -6,9 +6,9 @@ import ( "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" log "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/diff" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/diff" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/diff/commit_test.go b/internal/gitaly/service/diff/commit_test.go index 1c814cea79..659bbbe86a 100644 --- a/internal/gitaly/service/diff/commit_test.go +++ b/internal/gitaly/service/diff/commit_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/diff" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/diff" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/diff/numstat.go b/internal/gitaly/service/diff/numstat.go index ec892a6816..f872802706 100644 --- a/internal/gitaly/service/diff/numstat.go +++ b/internal/gitaly/service/diff/numstat.go @@ -3,9 +3,9 @@ package diff import ( "io" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/diff" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/diff" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/diff/numstat_test.go b/internal/gitaly/service/diff/numstat_test.go index 13f8432108..4caa2dcf0d 100644 --- a/internal/gitaly/service/diff/numstat_test.go +++ b/internal/gitaly/service/diff/numstat_test.go @@ -5,9 +5,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/diff" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/diff" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/diff/raw.go b/internal/gitaly/service/diff/raw.go index 5e47936f03..b74d5148ad 100644 --- a/internal/gitaly/service/diff/raw.go +++ b/internal/gitaly/service/diff/raw.go @@ -4,9 +4,9 @@ import ( "context" "io" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/diff/raw_test.go b/internal/gitaly/service/diff/raw_test.go index 02dbfc976c..b3fdc7fee9 100644 --- a/internal/gitaly/service/diff/raw_test.go +++ b/internal/gitaly/service/diff/raw_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/diff/server.go b/internal/gitaly/service/diff/server.go index 1966b25a01..7e0b982f78 100644 --- a/internal/gitaly/service/diff/server.go +++ b/internal/gitaly/service/diff/server.go @@ -1,8 +1,8 @@ package diff import ( - "gitlab.com/gitlab-org/gitaly/internal/storage" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/storage" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) const msgSizeThreshold = 5 * 1024 diff --git a/internal/gitaly/service/diff/testhelper_test.go b/internal/gitaly/service/diff/testhelper_test.go index a701953f62..d4f0ee7893 100644 --- a/internal/gitaly/service/diff/testhelper_test.go +++ b/internal/gitaly/service/diff/testhelper_test.go @@ -5,9 +5,9 @@ import ( "os" "testing" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/reflection" ) diff --git a/internal/gitaly/service/hook/post_receive.go b/internal/gitaly/service/hook/post_receive.go index 2fd3ecad4d..989163c2f1 100644 --- a/internal/gitaly/service/hook/post_receive.go +++ b/internal/gitaly/service/hook/post_receive.go @@ -5,9 +5,9 @@ import ( "fmt" "os/exec" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" ) func postReceiveHookResponse(stream gitalypb.HookService_PostReceiveHookServer, code int32, stderr string) error { diff --git a/internal/gitaly/service/hook/post_receive_test.go b/internal/gitaly/service/hook/post_receive_test.go index bd09c2d006..0cb02e6057 100644 --- a/internal/gitaly/service/hook/post_receive_test.go +++ b/internal/gitaly/service/hook/post_receive_test.go @@ -8,13 +8,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - gitalyhook "gitlab.com/gitlab-org/gitaly/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/internal/praefect/metadata" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + gitalyhook "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/metadata" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/hook/pre_receive.go b/internal/gitaly/service/hook/pre_receive.go index 112ea7d53a..133b48ec0c 100644 --- a/internal/gitaly/service/hook/pre_receive.go +++ b/internal/gitaly/service/hook/pre_receive.go @@ -5,11 +5,11 @@ import ( "fmt" "os/exec" - "gitlab.com/gitlab-org/gitaly/internal/git/hooks" - "gitlab.com/gitlab-org/gitaly/internal/gitlabshell" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/hooks" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitlabshell" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" ) type hookRequest interface { diff --git a/internal/gitaly/service/hook/pre_receive_test.go b/internal/gitaly/service/hook/pre_receive_test.go index 2e706a55aa..87c0f05f41 100644 --- a/internal/gitaly/service/hook/pre_receive_test.go +++ b/internal/gitaly/service/hook/pre_receive_test.go @@ -12,13 +12,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - gitalyhook "gitlab.com/gitlab-org/gitaly/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/internal/praefect/metadata" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + gitalyhook "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/metadata" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/hook/reference_transaction.go b/internal/gitaly/service/hook/reference_transaction.go index 2118ceb02f..d757588e70 100644 --- a/internal/gitaly/service/hook/reference_transaction.go +++ b/internal/gitaly/service/hook/reference_transaction.go @@ -3,9 +3,9 @@ package hook import ( "errors" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" ) func validateReferenceTransactionHookRequest(in *gitalypb.ReferenceTransactionHookRequest) error { diff --git a/internal/gitaly/service/hook/reference_transaction_test.go b/internal/gitaly/service/hook/reference_transaction_test.go index 4afef97833..d8111a2f09 100644 --- a/internal/gitaly/service/hook/reference_transaction_test.go +++ b/internal/gitaly/service/hook/reference_transaction_test.go @@ -7,11 +7,11 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/praefect/metadata" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/metadata" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/hook/server.go b/internal/gitaly/service/hook/server.go index fd70866550..ed6e41a4d6 100644 --- a/internal/gitaly/service/hook/server.go +++ b/internal/gitaly/service/hook/server.go @@ -1,8 +1,8 @@ package hook import ( - gitalyhook "gitlab.com/gitlab-org/gitaly/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + gitalyhook "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) type server struct { diff --git a/internal/gitaly/service/hook/testhelper_test.go b/internal/gitaly/service/hook/testhelper_test.go index d0934d5ee1..0aeab5196b 100644 --- a/internal/gitaly/service/hook/testhelper_test.go +++ b/internal/gitaly/service/hook/testhelper_test.go @@ -5,11 +5,11 @@ import ( "testing" "github.com/stretchr/testify/require" - gitalyauth "gitlab.com/gitlab-org/gitaly/auth" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - gitalyhook "gitlab.com/gitlab-org/gitaly/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + gitalyauth "gitlab.com/gitlab-org/gitaly/v13/auth" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + gitalyhook "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/reflection" ) diff --git a/internal/gitaly/service/hook/update.go b/internal/gitaly/service/hook/update.go index 0ee4b29e00..f98ed68c5a 100644 --- a/internal/gitaly/service/hook/update.go +++ b/internal/gitaly/service/hook/update.go @@ -4,9 +4,9 @@ import ( "errors" "os/exec" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" ) func validateUpdateHookRequest(in *gitalypb.UpdateHookRequest) error { diff --git a/internal/gitaly/service/hook/update_test.go b/internal/gitaly/service/hook/update_test.go index 0773bb1d4b..df59f9ea6c 100644 --- a/internal/gitaly/service/hook/update_test.go +++ b/internal/gitaly/service/hook/update_test.go @@ -8,10 +8,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/inspect/inspector.go b/internal/gitaly/service/inspect/inspector.go index fcd8a1aa71..eb7ba48f30 100644 --- a/internal/gitaly/service/inspect/inspector.go +++ b/internal/gitaly/service/inspect/inspector.go @@ -7,8 +7,8 @@ import ( "io/ioutil" "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" - "gitlab.com/gitlab-org/gitaly/internal/git/pktline" - "gitlab.com/gitlab-org/gitaly/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/text" ) // NewWriter returns Writer that will feed 'action' with data on each write to it. diff --git a/internal/gitaly/service/inspect/inspector_test.go b/internal/gitaly/service/inspect/inspector_test.go index 4f119f0e6f..876d7cee65 100644 --- a/internal/gitaly/service/inspect/inspector_test.go +++ b/internal/gitaly/service/inspect/inspector_test.go @@ -12,7 +12,7 @@ import ( "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" "github.com/sirupsen/logrus" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestWrite(t *testing.T) { diff --git a/internal/gitaly/service/internalgitaly/server.go b/internal/gitaly/service/internalgitaly/server.go index 743aa79a63..d87c77154d 100644 --- a/internal/gitaly/service/internalgitaly/server.go +++ b/internal/gitaly/service/internalgitaly/server.go @@ -1,8 +1,8 @@ package internalgitaly import ( - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) type server struct { diff --git a/internal/gitaly/service/internalgitaly/testhelper_test.go b/internal/gitaly/service/internalgitaly/testhelper_test.go index bccec58af9..38a562363b 100644 --- a/internal/gitaly/service/internalgitaly/testhelper_test.go +++ b/internal/gitaly/service/internalgitaly/testhelper_test.go @@ -4,8 +4,8 @@ import ( "net" "testing" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/reflection" ) diff --git a/internal/gitaly/service/internalgitaly/walkrepos.go b/internal/gitaly/service/internalgitaly/walkrepos.go index 1fc565b2a1..e6982fffb8 100644 --- a/internal/gitaly/service/internalgitaly/walkrepos.go +++ b/internal/gitaly/service/internalgitaly/walkrepos.go @@ -5,8 +5,8 @@ import ( "os" "path/filepath" - "gitlab.com/gitlab-org/gitaly/internal/storage" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/storage" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/internalgitaly/walkrepos_test.go b/internal/gitaly/service/internalgitaly/walkrepos_test.go index 1a2919e914..35aee5572e 100644 --- a/internal/gitaly/service/internalgitaly/walkrepos_test.go +++ b/internal/gitaly/service/internalgitaly/walkrepos_test.go @@ -8,9 +8,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/namespace/namespace.go b/internal/gitaly/service/namespace/namespace.go index a06a63e045..b186c6ccd8 100644 --- a/internal/gitaly/service/namespace/namespace.go +++ b/internal/gitaly/service/namespace/namespace.go @@ -7,8 +7,8 @@ import ( "os" "path/filepath" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/namespace/namespace_test.go b/internal/gitaly/service/namespace/namespace_test.go index baf42af035..cb1fb1e2af 100644 --- a/internal/gitaly/service/namespace/namespace_test.go +++ b/internal/gitaly/service/namespace/namespace_test.go @@ -7,10 +7,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/namespace/server.go b/internal/gitaly/service/namespace/server.go index 4b324b3a19..07e1c92a44 100644 --- a/internal/gitaly/service/namespace/server.go +++ b/internal/gitaly/service/namespace/server.go @@ -1,6 +1,6 @@ package namespace -import "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" +import "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" type server struct { } diff --git a/internal/gitaly/service/namespace/testhelper_test.go b/internal/gitaly/service/namespace/testhelper_test.go index 31a6cd00a6..d2540dfef1 100644 --- a/internal/gitaly/service/namespace/testhelper_test.go +++ b/internal/gitaly/service/namespace/testhelper_test.go @@ -4,8 +4,8 @@ import ( "net" "testing" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/reflection" ) diff --git a/internal/gitaly/service/objectpool/alternates.go b/internal/gitaly/service/objectpool/alternates.go index 523f83e317..b5dbf46c18 100644 --- a/internal/gitaly/service/objectpool/alternates.go +++ b/internal/gitaly/service/objectpool/alternates.go @@ -12,10 +12,10 @@ import ( "time" "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) // DisconnectGitAlternates is a slightly dangerous RPC. It optimistically diff --git a/internal/gitaly/service/objectpool/alternates_test.go b/internal/gitaly/service/objectpool/alternates_test.go index 7aee5ef8c8..77cba15faa 100644 --- a/internal/gitaly/service/objectpool/alternates_test.go +++ b/internal/gitaly/service/objectpool/alternates_test.go @@ -7,11 +7,11 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/objectpool" - gconfig "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/objectpool" + gconfig "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func TestDisconnectGitAlternates(t *testing.T) { diff --git a/internal/gitaly/service/objectpool/create.go b/internal/gitaly/service/objectpool/create.go index 407e56287c..6c840b1858 100644 --- a/internal/gitaly/service/objectpool/create.go +++ b/internal/gitaly/service/objectpool/create.go @@ -3,9 +3,9 @@ package objectpool import ( "context" - "gitlab.com/gitlab-org/gitaly/internal/git/objectpool" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/objectpool" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/objectpool/create_test.go b/internal/gitaly/service/objectpool/create_test.go index 9962d54866..47eaaef3df 100644 --- a/internal/gitaly/service/objectpool/create_test.go +++ b/internal/gitaly/service/objectpool/create_test.go @@ -8,10 +8,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git/objectpool" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/objectpool" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/objectpool/fetch_into_object_pool.go b/internal/gitaly/service/objectpool/fetch_into_object_pool.go index e289dccd82..808261014d 100644 --- a/internal/gitaly/service/objectpool/fetch_into_object_pool.go +++ b/internal/gitaly/service/objectpool/fetch_into_object_pool.go @@ -5,10 +5,10 @@ import ( "errors" "fmt" - "gitlab.com/gitlab-org/gitaly/internal/git/objectpool" - "gitlab.com/gitlab-org/gitaly/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/objectpool" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func (s *server) FetchIntoObjectPool(ctx context.Context, req *gitalypb.FetchIntoObjectPoolRequest) (*gitalypb.FetchIntoObjectPoolResponse, error) { diff --git a/internal/gitaly/service/objectpool/fetch_into_object_pool_test.go b/internal/gitaly/service/objectpool/fetch_into_object_pool_test.go index 064645f5e7..05a3aeb699 100644 --- a/internal/gitaly/service/objectpool/fetch_into_object_pool_test.go +++ b/internal/gitaly/service/objectpool/fetch_into_object_pool_test.go @@ -11,10 +11,10 @@ import ( "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git/objectpool" - gconfig "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/objectpool" + gconfig "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "gitlab.com/gitlab-org/labkit/log" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/objectpool/get.go b/internal/gitaly/service/objectpool/get.go index c409ee8693..c3f8f81dd4 100644 --- a/internal/gitaly/service/objectpool/get.go +++ b/internal/gitaly/service/objectpool/get.go @@ -5,9 +5,9 @@ import ( "errors" "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" - "gitlab.com/gitlab-org/gitaly/internal/git/objectpool" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/objectpool" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func (s *server) GetObjectPool(ctx context.Context, in *gitalypb.GetObjectPoolRequest) (*gitalypb.GetObjectPoolResponse, error) { diff --git a/internal/gitaly/service/objectpool/get_test.go b/internal/gitaly/service/objectpool/get_test.go index ef5526226f..3cb151b8d4 100644 --- a/internal/gitaly/service/objectpool/get_test.go +++ b/internal/gitaly/service/objectpool/get_test.go @@ -7,10 +7,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git/objectpool" - gconfig "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/objectpool" + gconfig "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func TestGetObjectPoolSuccess(t *testing.T) { diff --git a/internal/gitaly/service/objectpool/link.go b/internal/gitaly/service/objectpool/link.go index a62b7ec97c..86ba258f80 100644 --- a/internal/gitaly/service/objectpool/link.go +++ b/internal/gitaly/service/objectpool/link.go @@ -5,8 +5,8 @@ import ( "errors" "fmt" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/objectpool/link_test.go b/internal/gitaly/service/objectpool/link_test.go index c98c878d58..4807c96669 100644 --- a/internal/gitaly/service/objectpool/link_test.go +++ b/internal/gitaly/service/objectpool/link_test.go @@ -7,12 +7,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/git/objectpool" - gconfig "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/storage" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/objectpool" + gconfig "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/storage" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/objectpool/reduplicate.go b/internal/gitaly/service/objectpool/reduplicate.go index 9778535cd0..7d45b81978 100644 --- a/internal/gitaly/service/objectpool/reduplicate.go +++ b/internal/gitaly/service/objectpool/reduplicate.go @@ -3,8 +3,8 @@ package objectpool import ( "context" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/objectpool/reduplicate_test.go b/internal/gitaly/service/objectpool/reduplicate_test.go index f901ad4066..ef1cdfda93 100644 --- a/internal/gitaly/service/objectpool/reduplicate_test.go +++ b/internal/gitaly/service/objectpool/reduplicate_test.go @@ -5,11 +5,11 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/objectpool" - gconfig "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/objectpool" + gconfig "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func TestReduplicate(t *testing.T) { diff --git a/internal/gitaly/service/objectpool/server.go b/internal/gitaly/service/objectpool/server.go index bc90a7a589..cab715923c 100644 --- a/internal/gitaly/service/objectpool/server.go +++ b/internal/gitaly/service/objectpool/server.go @@ -1,8 +1,8 @@ package objectpool import ( - "gitlab.com/gitlab-org/gitaly/internal/storage" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/storage" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) type server struct { diff --git a/internal/gitaly/service/objectpool/testhelper_test.go b/internal/gitaly/service/objectpool/testhelper_test.go index 507388ebf4..9d3740490e 100644 --- a/internal/gitaly/service/objectpool/testhelper_test.go +++ b/internal/gitaly/service/objectpool/testhelper_test.go @@ -6,9 +6,9 @@ import ( "os" "testing" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/reflection" ) diff --git a/internal/gitaly/service/operations/apply_patch.go b/internal/gitaly/service/operations/apply_patch.go index 464c79cd07..a1b10cdd80 100644 --- a/internal/gitaly/service/operations/apply_patch.go +++ b/internal/gitaly/service/operations/apply_patch.go @@ -3,8 +3,8 @@ package operations import ( "fmt" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/operations/apply_patch_test.go b/internal/gitaly/service/operations/apply_patch_test.go index 1b24b23915..8e7323fc20 100644 --- a/internal/gitaly/service/operations/apply_patch_test.go +++ b/internal/gitaly/service/operations/apply_patch_test.go @@ -11,10 +11,10 @@ import ( "testing/iotest" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/operations/branches.go b/internal/gitaly/service/operations/branches.go index f3bed19bb6..62f57d98ab 100644 --- a/internal/gitaly/service/operations/branches.go +++ b/internal/gitaly/service/operations/branches.go @@ -5,11 +5,11 @@ import ( "errors" "fmt" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/metadata/featureflag" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/metadata/featureflag" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/operations/branches_test.go b/internal/gitaly/service/operations/branches_test.go index bc5e57eedf..7c7aba596e 100644 --- a/internal/gitaly/service/operations/branches_test.go +++ b/internal/gitaly/service/operations/branches_test.go @@ -9,16 +9,16 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - gitalyhook "gitlab.com/gitlab-org/gitaly/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/hook" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/metadata/featureflag" - "gitlab.com/gitlab-org/gitaly/internal/praefect/metadata" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + gitalyhook "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/hook" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/metadata/featureflag" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/metadata" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/operations/cherry_pick.go b/internal/gitaly/service/operations/cherry_pick.go index 7713f7f863..5ecf652136 100644 --- a/internal/gitaly/service/operations/cherry_pick.go +++ b/internal/gitaly/service/operations/cherry_pick.go @@ -3,8 +3,8 @@ package operations import ( "context" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/operations/cherry_pick_test.go b/internal/gitaly/service/operations/cherry_pick_test.go index 1af9c59748..b88338c783 100644 --- a/internal/gitaly/service/operations/cherry_pick_test.go +++ b/internal/gitaly/service/operations/cherry_pick_test.go @@ -5,9 +5,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" ) diff --git a/internal/gitaly/service/operations/commit_files.go b/internal/gitaly/service/operations/commit_files.go index b67bf30aae..ee9070acbe 100644 --- a/internal/gitaly/service/operations/commit_files.go +++ b/internal/gitaly/service/operations/commit_files.go @@ -3,9 +3,9 @@ package operations import ( "fmt" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/operations/commit_files_test.go b/internal/gitaly/service/operations/commit_files_test.go index 391ba9c24e..b7aa433150 100644 --- a/internal/gitaly/service/operations/commit_files_test.go +++ b/internal/gitaly/service/operations/commit_files_test.go @@ -7,10 +7,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" ) diff --git a/internal/gitaly/service/operations/merge.go b/internal/gitaly/service/operations/merge.go index 466cbf5e05..6b8774fe3c 100644 --- a/internal/gitaly/service/operations/merge.go +++ b/internal/gitaly/service/operations/merge.go @@ -8,17 +8,17 @@ import ( "io" "strings" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/updateref" - "gitlab.com/gitlab-org/gitaly/internal/git2go" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/internal/gitlabshell" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/internal/metadata/featureflag" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/updateref" + "gitlab.com/gitlab-org/gitaly/v13/internal/git2go" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitlabshell" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v13/internal/metadata/featureflag" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) type preReceiveError struct { diff --git a/internal/gitaly/service/operations/merge_test.go b/internal/gitaly/service/operations/merge_test.go index feeb9a4085..47bccdb0af 100644 --- a/internal/gitaly/service/operations/merge_test.go +++ b/internal/gitaly/service/operations/merge_test.go @@ -10,12 +10,12 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/command" - gitlog "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/internal/metadata/featureflag" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + gitlog "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v13/internal/metadata/featureflag" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/operations/rebase.go b/internal/gitaly/service/operations/rebase.go index 0b20e341e7..ce5a5bfa48 100644 --- a/internal/gitaly/service/operations/rebase.go +++ b/internal/gitaly/service/operations/rebase.go @@ -5,10 +5,10 @@ package operations import ( "errors" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func (s *server) UserRebaseConfirmable(stream gitalypb.OperationService_UserRebaseConfirmableServer) error { diff --git a/internal/gitaly/service/operations/rebase_test.go b/internal/gitaly/service/operations/rebase_test.go index 1741968e60..a82fb1ed67 100644 --- a/internal/gitaly/service/operations/rebase_test.go +++ b/internal/gitaly/service/operations/rebase_test.go @@ -9,11 +9,11 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - gitlog "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + gitlog "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" ) diff --git a/internal/gitaly/service/operations/revert.go b/internal/gitaly/service/operations/revert.go index 1ac3cdd9b6..e54fd621ab 100644 --- a/internal/gitaly/service/operations/revert.go +++ b/internal/gitaly/service/operations/revert.go @@ -3,8 +3,8 @@ package operations import ( "context" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/operations/revert_test.go b/internal/gitaly/service/operations/revert_test.go index 0a2af62966..94ec6f2ea3 100644 --- a/internal/gitaly/service/operations/revert_test.go +++ b/internal/gitaly/service/operations/revert_test.go @@ -5,9 +5,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" ) diff --git a/internal/gitaly/service/operations/server.go b/internal/gitaly/service/operations/server.go index 6c2892f19a..7d89bc3cc6 100644 --- a/internal/gitaly/service/operations/server.go +++ b/internal/gitaly/service/operations/server.go @@ -1,11 +1,11 @@ package operations import ( - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/internal/storage" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/internal/storage" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) type server struct { diff --git a/internal/gitaly/service/operations/squash.go b/internal/gitaly/service/operations/squash.go index e354bea8cf..e319f1cbdf 100644 --- a/internal/gitaly/service/operations/squash.go +++ b/internal/gitaly/service/operations/squash.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/operations/squash_test.go b/internal/gitaly/service/operations/squash_test.go index 7164f8dc5c..9e3e7dc716 100644 --- a/internal/gitaly/service/operations/squash_test.go +++ b/internal/gitaly/service/operations/squash_test.go @@ -9,10 +9,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/operations/submodules.go b/internal/gitaly/service/operations/submodules.go index 3408c648d9..fc61749c04 100644 --- a/internal/gitaly/service/operations/submodules.go +++ b/internal/gitaly/service/operations/submodules.go @@ -5,8 +5,8 @@ import ( "fmt" "regexp" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/operations/submodules_test.go b/internal/gitaly/service/operations/submodules_test.go index e3de793b07..a026899b8f 100644 --- a/internal/gitaly/service/operations/submodules_test.go +++ b/internal/gitaly/service/operations/submodules_test.go @@ -7,10 +7,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/git/lstree" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/lstree" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/operations/tags.go b/internal/gitaly/service/operations/tags.go index 158d21b8c7..b358d2c1fd 100644 --- a/internal/gitaly/service/operations/tags.go +++ b/internal/gitaly/service/operations/tags.go @@ -3,8 +3,8 @@ package operations import ( "context" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func (s *server) UserDeleteTag(ctx context.Context, req *gitalypb.UserDeleteTagRequest) (*gitalypb.UserDeleteTagResponse, error) { diff --git a/internal/gitaly/service/operations/tags_test.go b/internal/gitaly/service/operations/tags_test.go index 5181051340..b1a8b46445 100644 --- a/internal/gitaly/service/operations/tags_test.go +++ b/internal/gitaly/service/operations/tags_test.go @@ -10,12 +10,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/internal/metadata/featureflag" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v13/internal/metadata/featureflag" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/operations/testhelper_test.go b/internal/gitaly/service/operations/testhelper_test.go index 036205964e..70b2b5622a 100644 --- a/internal/gitaly/service/operations/testhelper_test.go +++ b/internal/gitaly/service/operations/testhelper_test.go @@ -8,18 +8,18 @@ import ( log "github.com/sirupsen/logrus" "github.com/stretchr/testify/require" - gitalyauth "gitlab.com/gitlab-org/gitaly/auth" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - gitalyhook "gitlab.com/gitlab-org/gitaly/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/commit" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/hook" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/ref" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/repository" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/ssh" - gitalylog "gitlab.com/gitlab-org/gitaly/internal/log" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + gitalyauth "gitlab.com/gitlab-org/gitaly/v13/auth" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + gitalyhook "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/commit" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/hook" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/ref" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/repository" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/ssh" + gitalylog "gitlab.com/gitlab-org/gitaly/v13/internal/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/reflection" ) diff --git a/internal/gitaly/service/operations/update_branches_test.go b/internal/gitaly/service/operations/update_branches_test.go index 9b002c19df..6adbf31090 100644 --- a/internal/gitaly/service/operations/update_branches_test.go +++ b/internal/gitaly/service/operations/update_branches_test.go @@ -7,10 +7,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/metadata/featureflag" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/metadata/featureflag" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/operations/utils.go b/internal/gitaly/service/operations/utils.go index 899a864505..c6c68b1bfa 100644 --- a/internal/gitaly/service/operations/utils.go +++ b/internal/gitaly/service/operations/utils.go @@ -3,7 +3,7 @@ package operations import ( "fmt" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) type cherryPickOrRevertRequest interface { diff --git a/internal/gitaly/service/ref/branches.go b/internal/gitaly/service/ref/branches.go index 67dcaa6a59..a67575c907 100644 --- a/internal/gitaly/service/ref/branches.go +++ b/internal/gitaly/service/ref/branches.go @@ -5,9 +5,9 @@ import ( "errors" "strings" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/ref/branches_test.go b/internal/gitaly/service/ref/branches_test.go index 0dbde77a89..7c86a8aa8f 100644 --- a/internal/gitaly/service/ref/branches_test.go +++ b/internal/gitaly/service/ref/branches_test.go @@ -4,9 +4,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/ref/delete_refs.go b/internal/gitaly/service/ref/delete_refs.go index 4b0baa11e5..d338a6c36d 100644 --- a/internal/gitaly/service/ref/delete_refs.go +++ b/internal/gitaly/service/ref/delete_refs.go @@ -6,10 +6,10 @@ import ( "fmt" "strings" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/updateref" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/updateref" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/ref/delete_refs_test.go b/internal/gitaly/service/ref/delete_refs_test.go index 73a88f7fc3..42fe198f9e 100644 --- a/internal/gitaly/service/ref/delete_refs_test.go +++ b/internal/gitaly/service/ref/delete_refs_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/ref/list_new_blobs.go b/internal/gitaly/service/ref/list_new_blobs.go index fdd03949e5..d4e6b158bb 100644 --- a/internal/gitaly/service/ref/list_new_blobs.go +++ b/internal/gitaly/service/ref/list_new_blobs.go @@ -5,10 +5,10 @@ import ( "fmt" "strings" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func (s *server) ListNewBlobs(in *gitalypb.ListNewBlobsRequest, stream gitalypb.RefService_ListNewBlobsServer) error { diff --git a/internal/gitaly/service/ref/list_new_blobs_test.go b/internal/gitaly/service/ref/list_new_blobs_test.go index 6e16e8c5da..f385b7b10c 100644 --- a/internal/gitaly/service/ref/list_new_blobs_test.go +++ b/internal/gitaly/service/ref/list_new_blobs_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/ref/list_new_commits.go b/internal/gitaly/service/ref/list_new_commits.go index d465dca05d..1fe2197700 100644 --- a/internal/gitaly/service/ref/list_new_commits.go +++ b/internal/gitaly/service/ref/list_new_commits.go @@ -3,11 +3,11 @@ package ref import ( "bufio" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func (s *server) ListNewCommits(in *gitalypb.ListNewCommitsRequest, stream gitalypb.RefService_ListNewCommitsServer) error { diff --git a/internal/gitaly/service/ref/list_new_commits_test.go b/internal/gitaly/service/ref/list_new_commits_test.go index a75ed8c689..48c34c8662 100644 --- a/internal/gitaly/service/ref/list_new_commits_test.go +++ b/internal/gitaly/service/ref/list_new_commits_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/ref/pack_refs.go b/internal/gitaly/service/ref/pack_refs.go index 51e457750c..86e41afdfe 100644 --- a/internal/gitaly/service/ref/pack_refs.go +++ b/internal/gitaly/service/ref/pack_refs.go @@ -5,10 +5,10 @@ import ( "errors" "fmt" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/repository" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/repository" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func (server) PackRefs(ctx context.Context, in *gitalypb.PackRefsRequest) (*gitalypb.PackRefsResponse, error) { diff --git a/internal/gitaly/service/ref/pack_refs_test.go b/internal/gitaly/service/ref/pack_refs_test.go index 6eff598fe5..a4aafd43b5 100644 --- a/internal/gitaly/service/ref/pack_refs_test.go +++ b/internal/gitaly/service/ref/pack_refs_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func TestPackRefsSuccessfulRequest(t *testing.T) { diff --git a/internal/gitaly/service/ref/refexists.go b/internal/gitaly/service/ref/refexists.go index b463d1b2c1..aa3d7b9b20 100644 --- a/internal/gitaly/service/ref/refexists.go +++ b/internal/gitaly/service/ref/refexists.go @@ -5,10 +5,10 @@ import ( "fmt" "strings" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) // RefExists returns true if the given reference exists. The ref must start with the string `ref/` diff --git a/internal/gitaly/service/ref/refexists_test.go b/internal/gitaly/service/ref/refexists_test.go index 557699fda8..0e534ffa45 100644 --- a/internal/gitaly/service/ref/refexists_test.go +++ b/internal/gitaly/service/ref/refexists_test.go @@ -3,9 +3,9 @@ package ref import ( "testing" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/ref/refname.go b/internal/gitaly/service/ref/refname.go index fdd8a4c2cc..7fc3437e32 100644 --- a/internal/gitaly/service/ref/refname.go +++ b/internal/gitaly/service/ref/refname.go @@ -7,9 +7,9 @@ import ( "fmt" "strings" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) // FindRefName returns a ref that starts with the given prefix, if one exists. diff --git a/internal/gitaly/service/ref/refname_test.go b/internal/gitaly/service/ref/refname_test.go index 0b67a0b9bf..be81a376fb 100644 --- a/internal/gitaly/service/ref/refname_test.go +++ b/internal/gitaly/service/ref/refname_test.go @@ -4,10 +4,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/ref/refnames.go b/internal/gitaly/service/ref/refnames.go index e4f12fb5dc..63d0a7dda0 100644 --- a/internal/gitaly/service/ref/refnames.go +++ b/internal/gitaly/service/ref/refnames.go @@ -6,9 +6,9 @@ import ( "github.com/golang/protobuf/proto" "github.com/golang/protobuf/ptypes/wrappers" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) // FindAllBranchNames creates a stream of ref names for all branches in the given repository diff --git a/internal/gitaly/service/ref/refnames_containing.go b/internal/gitaly/service/ref/refnames_containing.go index 43b91f1e5e..2e51dae011 100644 --- a/internal/gitaly/service/ref/refnames_containing.go +++ b/internal/gitaly/service/ref/refnames_containing.go @@ -6,10 +6,10 @@ import ( "github.com/golang/protobuf/proto" "github.com/golang/protobuf/ptypes/wrappers" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) // ListBranchNamesContainingCommit returns a maximum of in.GetLimit() Branch names diff --git a/internal/gitaly/service/ref/refs.go b/internal/gitaly/service/ref/refs.go index 97ddd57964..c41b632d4a 100644 --- a/internal/gitaly/service/ref/refs.go +++ b/internal/gitaly/service/ref/refs.go @@ -10,13 +10,13 @@ import ( "strings" "github.com/golang/protobuf/proto" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - gitlog "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/internal/helper/lines" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + gitlog "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/lines" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) const ( diff --git a/internal/gitaly/service/ref/refs_test.go b/internal/gitaly/service/ref/refs_test.go index 72c5070b29..68060610ed 100644 --- a/internal/gitaly/service/ref/refs_test.go +++ b/internal/gitaly/service/ref/refs_test.go @@ -13,13 +13,13 @@ import ( "github.com/golang/protobuf/ptypes/timestamp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/git/updateref" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/updateref" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/ref/remote_branches.go b/internal/gitaly/service/ref/remote_branches.go index f72b4d2969..0ea9c77b01 100644 --- a/internal/gitaly/service/ref/remote_branches.go +++ b/internal/gitaly/service/ref/remote_branches.go @@ -4,10 +4,10 @@ import ( "fmt" "strings" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func (s *server) FindAllRemoteBranches(req *gitalypb.FindAllRemoteBranchesRequest, stream gitalypb.RefService_FindAllRemoteBranchesServer) error { diff --git a/internal/gitaly/service/ref/remote_branches_test.go b/internal/gitaly/service/ref/remote_branches_test.go index a88ca9f613..d1e3149a89 100644 --- a/internal/gitaly/service/ref/remote_branches_test.go +++ b/internal/gitaly/service/ref/remote_branches_test.go @@ -5,9 +5,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/ref/server.go b/internal/gitaly/service/ref/server.go index 69370613b6..6745d2f6f4 100644 --- a/internal/gitaly/service/ref/server.go +++ b/internal/gitaly/service/ref/server.go @@ -1,8 +1,8 @@ package ref import ( - "gitlab.com/gitlab-org/gitaly/internal/storage" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/storage" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) type server struct { diff --git a/internal/gitaly/service/ref/tag_messages.go b/internal/gitaly/service/ref/tag_messages.go index e632dd7f88..3f25001013 100644 --- a/internal/gitaly/service/ref/tag_messages.go +++ b/internal/gitaly/service/ref/tag_messages.go @@ -5,11 +5,11 @@ import ( "fmt" "io" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/ref/tag_messages_test.go b/internal/gitaly/service/ref/tag_messages_test.go index 16dac869bc..3c1b0105f4 100644 --- a/internal/gitaly/service/ref/tag_messages_test.go +++ b/internal/gitaly/service/ref/tag_messages_test.go @@ -6,9 +6,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/ref/testhelper_test.go b/internal/gitaly/service/ref/testhelper_test.go index 26a82661a7..cb9e30f0a5 100644 --- a/internal/gitaly/service/ref/testhelper_test.go +++ b/internal/gitaly/service/ref/testhelper_test.go @@ -7,10 +7,10 @@ import ( "github.com/golang/protobuf/ptypes/timestamp" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/helper/lines" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/lines" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/reflection" ) diff --git a/internal/gitaly/service/ref/util.go b/internal/gitaly/service/ref/util.go index 883f21cedd..986c6e97d2 100644 --- a/internal/gitaly/service/ref/util.go +++ b/internal/gitaly/service/ref/util.go @@ -4,10 +4,10 @@ import ( "bytes" "fmt" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/helper/lines" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/lines" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) var localBranchFormatFields = []string{"%(refname)", "%(objectname)"} diff --git a/internal/gitaly/service/ref/util_test.go b/internal/gitaly/service/ref/util_test.go index 134747f815..292624ec3f 100644 --- a/internal/gitaly/service/ref/util_test.go +++ b/internal/gitaly/service/ref/util_test.go @@ -5,7 +5,7 @@ import ( "github.com/golang/protobuf/ptypes/timestamp" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func TestBuildLocalBranch(t *testing.T) { diff --git a/internal/gitaly/service/register.go b/internal/gitaly/service/register.go index 736067c868..62190cc8b8 100644 --- a/internal/gitaly/service/register.go +++ b/internal/gitaly/service/register.go @@ -5,28 +5,28 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - gitalyhook "gitlab.com/gitlab-org/gitaly/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/blob" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/cleanup" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/commit" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/conflicts" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/diff" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/hook" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/internalgitaly" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/namespace" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/objectpool" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/operations" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/ref" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/remote" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/repository" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/server" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/smarthttp" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/ssh" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/wiki" - "gitlab.com/gitlab-org/gitaly/internal/storage" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + gitalyhook "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/blob" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/cleanup" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/commit" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/conflicts" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/diff" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/hook" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/internalgitaly" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/namespace" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/objectpool" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/operations" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/ref" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/remote" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/repository" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/server" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/smarthttp" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/ssh" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/wiki" + "gitlab.com/gitlab-org/gitaly/v13/internal/storage" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/health" healthpb "google.golang.org/grpc/health/grpc_health_v1" diff --git a/internal/gitaly/service/remote/fetch_internal_remote.go b/internal/gitaly/service/remote/fetch_internal_remote.go index 311fb1da54..a70e594b3c 100644 --- a/internal/gitaly/service/remote/fetch_internal_remote.go +++ b/internal/gitaly/service/remote/fetch_internal_remote.go @@ -7,11 +7,11 @@ import ( "fmt" "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/ref" - "gitlab.com/gitlab-org/gitaly/internal/gitalyssh" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/ref" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitalyssh" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/remote/fetch_internal_remote_test.go b/internal/gitaly/service/remote/fetch_internal_remote_test.go index 9121fd549a..8e41afb0c9 100644 --- a/internal/gitaly/service/remote/fetch_internal_remote_test.go +++ b/internal/gitaly/service/remote/fetch_internal_remote_test.go @@ -6,14 +6,14 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - serverPkg "gitlab.com/gitlab-org/gitaly/internal/gitaly/server" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/ref" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/remote" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/ssh" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + serverPkg "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/server" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/ref" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/remote" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/ssh" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" diff --git a/internal/gitaly/service/remote/find_remote_root_ref.go b/internal/gitaly/service/remote/find_remote_root_ref.go index 23dd0c03c5..cf5adca77d 100644 --- a/internal/gitaly/service/remote/find_remote_root_ref.go +++ b/internal/gitaly/service/remote/find_remote_root_ref.go @@ -5,8 +5,8 @@ import ( "context" "strings" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/remote/find_remote_root_ref_test.go b/internal/gitaly/service/remote/find_remote_root_ref_test.go index 2fc2351a60..b297776767 100644 --- a/internal/gitaly/service/remote/find_remote_root_ref_test.go +++ b/internal/gitaly/service/remote/find_remote_root_ref_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/remote/remotes.go b/internal/gitaly/service/remote/remotes.go index afe4c0aea1..c5c2955360 100644 --- a/internal/gitaly/service/remote/remotes.go +++ b/internal/gitaly/service/remote/remotes.go @@ -9,11 +9,11 @@ import ( "strings" "github.com/golang/protobuf/proto" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/remote" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/remote" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/remote/remotes_test.go b/internal/gitaly/service/remote/remotes_test.go index 350b890cb4..5135811057 100644 --- a/internal/gitaly/service/remote/remotes_test.go +++ b/internal/gitaly/service/remote/remotes_test.go @@ -9,8 +9,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/remote/server.go b/internal/gitaly/service/remote/server.go index ec090412d2..b577a9ff09 100644 --- a/internal/gitaly/service/remote/server.go +++ b/internal/gitaly/service/remote/server.go @@ -1,10 +1,10 @@ package remote import ( - "gitlab.com/gitlab-org/gitaly/client" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/internal/storage" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/client" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/internal/storage" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) type server struct { diff --git a/internal/gitaly/service/remote/testhelper_test.go b/internal/gitaly/service/remote/testhelper_test.go index aec62d020c..117853804d 100644 --- a/internal/gitaly/service/remote/testhelper_test.go +++ b/internal/gitaly/service/remote/testhelper_test.go @@ -6,10 +6,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/reflection" ) diff --git a/internal/gitaly/service/remote/update_remote_mirror.go b/internal/gitaly/service/remote/update_remote_mirror.go index 97a61af0b4..81f247ea41 100644 --- a/internal/gitaly/service/remote/update_remote_mirror.go +++ b/internal/gitaly/service/remote/update_remote_mirror.go @@ -3,9 +3,9 @@ package remote import ( "fmt" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func (s *server) UpdateRemoteMirror(stream gitalypb.RemoteService_UpdateRemoteMirrorServer) error { diff --git a/internal/gitaly/service/remote/update_remote_mirror_test.go b/internal/gitaly/service/remote/update_remote_mirror_test.go index 80b0d443e8..77bf4715ea 100644 --- a/internal/gitaly/service/remote/update_remote_mirror_test.go +++ b/internal/gitaly/service/remote/update_remote_mirror_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/repository/apply_gitattributes.go b/internal/gitaly/service/repository/apply_gitattributes.go index 9a89aef9d8..b042e65a67 100644 --- a/internal/gitaly/service/repository/apply_gitattributes.go +++ b/internal/gitaly/service/repository/apply_gitattributes.go @@ -8,9 +8,9 @@ import ( "os" "path/filepath" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/repository/apply_gitattributes_test.go b/internal/gitaly/service/repository/apply_gitattributes_test.go index cbb3a87774..79be79c48b 100644 --- a/internal/gitaly/service/repository/apply_gitattributes_test.go +++ b/internal/gitaly/service/repository/apply_gitattributes_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/repository/archive.go b/internal/gitaly/service/repository/archive.go index 807f97ebd7..fa239c1276 100644 --- a/internal/gitaly/service/repository/archive.go +++ b/internal/gitaly/service/repository/archive.go @@ -8,14 +8,14 @@ import ( "os/exec" "strings" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/commit" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/storage" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/commit" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/storage" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" ) func (s *server) GetArchive(in *gitalypb.GetArchiveRequest, stream gitalypb.RepositoryService_GetArchiveServer) error { diff --git a/internal/gitaly/service/repository/archive_test.go b/internal/gitaly/service/repository/archive_test.go index 4f600d836f..3341e7b98d 100644 --- a/internal/gitaly/service/repository/archive_test.go +++ b/internal/gitaly/service/repository/archive_test.go @@ -9,10 +9,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/repository/backup_custom_hooks.go b/internal/gitaly/service/repository/backup_custom_hooks.go index b5dd32f936..76897fac4f 100644 --- a/internal/gitaly/service/repository/backup_custom_hooks.go +++ b/internal/gitaly/service/repository/backup_custom_hooks.go @@ -5,9 +5,9 @@ import ( "os/exec" "path/filepath" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/repository/backup_custom_hooks_test.go b/internal/gitaly/service/repository/backup_custom_hooks_test.go index 8efcec4d52..98b17f265a 100644 --- a/internal/gitaly/service/repository/backup_custom_hooks_test.go +++ b/internal/gitaly/service/repository/backup_custom_hooks_test.go @@ -11,10 +11,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" ) func TestSuccessfullBackupCustomHooksRequest(t *testing.T) { diff --git a/internal/gitaly/service/repository/calculate_checksum.go b/internal/gitaly/service/repository/calculate_checksum.go index 330aa1a210..284414d4f0 100644 --- a/internal/gitaly/service/repository/calculate_checksum.go +++ b/internal/gitaly/service/repository/calculate_checksum.go @@ -10,9 +10,9 @@ import ( "regexp" "strings" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/alternates" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/alternates" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/repository/calculate_checksum_test.go b/internal/gitaly/service/repository/calculate_checksum_test.go index 41835c7208..8c17cfc5ae 100644 --- a/internal/gitaly/service/repository/calculate_checksum_test.go +++ b/internal/gitaly/service/repository/calculate_checksum_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/repository/cleanup.go b/internal/gitaly/service/repository/cleanup.go index 00b7d49c82..48a09d404a 100644 --- a/internal/gitaly/service/repository/cleanup.go +++ b/internal/gitaly/service/repository/cleanup.go @@ -8,8 +8,8 @@ import ( "strings" "time" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/repository/cleanup_test.go b/internal/gitaly/service/repository/cleanup_test.go index d29aeb73af..5e82980a56 100644 --- a/internal/gitaly/service/repository/cleanup_test.go +++ b/internal/gitaly/service/repository/cleanup_test.go @@ -9,10 +9,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func TestCleanupDeletesRefsLocks(t *testing.T) { diff --git a/internal/gitaly/service/repository/clone_from_pool.go b/internal/gitaly/service/repository/clone_from_pool.go index 6f07fb0f25..7990f7ee32 100644 --- a/internal/gitaly/service/repository/clone_from_pool.go +++ b/internal/gitaly/service/repository/clone_from_pool.go @@ -6,9 +6,9 @@ import ( "fmt" "os" - "gitlab.com/gitlab-org/gitaly/internal/git/objectpool" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/objectpool" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func (s *server) CloneFromPool(ctx context.Context, req *gitalypb.CloneFromPoolRequest) (*gitalypb.CloneFromPoolResponse, error) { diff --git a/internal/gitaly/service/repository/clone_from_pool_internal.go b/internal/gitaly/service/repository/clone_from_pool_internal.go index 6e3447cdfc..40694d36ba 100644 --- a/internal/gitaly/service/repository/clone_from_pool_internal.go +++ b/internal/gitaly/service/repository/clone_from_pool_internal.go @@ -6,11 +6,11 @@ import ( "fmt" "os" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/objectpool" - "gitlab.com/gitlab-org/gitaly/internal/git/repository" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/objectpool" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/repository" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func (s *server) CloneFromPoolInternal(ctx context.Context, req *gitalypb.CloneFromPoolInternalRequest) (*gitalypb.CloneFromPoolInternalResponse, error) { diff --git a/internal/gitaly/service/repository/clone_from_pool_internal_test.go b/internal/gitaly/service/repository/clone_from_pool_internal_test.go index 3ea868d9d8..cbb2458597 100644 --- a/internal/gitaly/service/repository/clone_from_pool_internal_test.go +++ b/internal/gitaly/service/repository/clone_from_pool_internal_test.go @@ -8,12 +8,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git/objectpool" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/repository" - "gitlab.com/gitlab-org/gitaly/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/objectpool" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/repository" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/metadata" ) diff --git a/internal/gitaly/service/repository/clone_from_pool_test.go b/internal/gitaly/service/repository/clone_from_pool_test.go index 4c30c0d145..e9f9237019 100644 --- a/internal/gitaly/service/repository/clone_from_pool_test.go +++ b/internal/gitaly/service/repository/clone_from_pool_test.go @@ -6,10 +6,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/repository" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/repository" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/metadata" ) diff --git a/internal/gitaly/service/repository/commit_graph.go b/internal/gitaly/service/repository/commit_graph.go index 845bf3785b..1b39876d7b 100644 --- a/internal/gitaly/service/repository/commit_graph.go +++ b/internal/gitaly/service/repository/commit_graph.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) const ( diff --git a/internal/gitaly/service/repository/commit_graph_test.go b/internal/gitaly/service/repository/commit_graph_test.go index 11efa8a180..c2fb97a4b5 100644 --- a/internal/gitaly/service/repository/commit_graph_test.go +++ b/internal/gitaly/service/repository/commit_graph_test.go @@ -7,8 +7,8 @@ import ( "time" "github.com/stretchr/testify/assert" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func TestWriteCommitGraph(t *testing.T) { diff --git a/internal/gitaly/service/repository/config.go b/internal/gitaly/service/repository/config.go index 91aecab9d4..9a5fbfe68f 100644 --- a/internal/gitaly/service/repository/config.go +++ b/internal/gitaly/service/repository/config.go @@ -3,10 +3,10 @@ package repository import ( "context" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/repository/config_test.go b/internal/gitaly/service/repository/config_test.go index 9cc0fcea14..830b4d8af4 100644 --- a/internal/gitaly/service/repository/config_test.go +++ b/internal/gitaly/service/repository/config_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/repository/create.go b/internal/gitaly/service/repository/create.go index 7f56fca8e6..75dbbfb19b 100644 --- a/internal/gitaly/service/repository/create.go +++ b/internal/gitaly/service/repository/create.go @@ -4,9 +4,9 @@ import ( "context" "os" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func (s *server) CreateRepository(ctx context.Context, req *gitalypb.CreateRepositoryRequest) (*gitalypb.CreateRepositoryResponse, error) { diff --git a/internal/gitaly/service/repository/create_bundle.go b/internal/gitaly/service/repository/create_bundle.go index 4f2d631c5e..bb91524bec 100644 --- a/internal/gitaly/service/repository/create_bundle.go +++ b/internal/gitaly/service/repository/create_bundle.go @@ -3,10 +3,10 @@ package repository import ( "io" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/repository/create_bundle_test.go b/internal/gitaly/service/repository/create_bundle_test.go index 2ad93a0f94..5049e9b170 100644 --- a/internal/gitaly/service/repository/create_bundle_test.go +++ b/internal/gitaly/service/repository/create_bundle_test.go @@ -9,10 +9,10 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/tempdir" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/tempdir" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/repository/create_from_bundle.go b/internal/gitaly/service/repository/create_from_bundle.go index 67031d8eed..8ca1f7d6c7 100644 --- a/internal/gitaly/service/repository/create_from_bundle.go +++ b/internal/gitaly/service/repository/create_from_bundle.go @@ -9,11 +9,11 @@ import ( "path/filepath" "strings" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/tempdir" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/tempdir" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/repository/create_from_bundle_test.go b/internal/gitaly/service/repository/create_from_bundle_test.go index 46262b34b5..87a3fa028a 100644 --- a/internal/gitaly/service/repository/create_from_bundle_test.go +++ b/internal/gitaly/service/repository/create_from_bundle_test.go @@ -9,12 +9,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/tempdir" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/tempdir" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/repository/create_from_snapshot.go b/internal/gitaly/service/repository/create_from_snapshot.go index cdea178767..06ee689f50 100644 --- a/internal/gitaly/service/repository/create_from_snapshot.go +++ b/internal/gitaly/service/repository/create_from_snapshot.go @@ -8,9 +8,9 @@ import ( "os/exec" "time" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/tempdir" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/tempdir" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "gitlab.com/gitlab-org/labkit/correlation" "gitlab.com/gitlab-org/labkit/tracing" "google.golang.org/grpc/codes" diff --git a/internal/gitaly/service/repository/create_from_snapshot_test.go b/internal/gitaly/service/repository/create_from_snapshot_test.go index 0cfb79f54b..952ac89629 100644 --- a/internal/gitaly/service/repository/create_from_snapshot_test.go +++ b/internal/gitaly/service/repository/create_from_snapshot_test.go @@ -11,9 +11,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/archive" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/archive" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/repository/create_from_url.go b/internal/gitaly/service/repository/create_from_url.go index a40488d10b..850f9a74df 100644 --- a/internal/gitaly/service/repository/create_from_url.go +++ b/internal/gitaly/service/repository/create_from_url.go @@ -9,10 +9,10 @@ import ( "net/url" "os" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/repository/create_from_url_test.go b/internal/gitaly/service/repository/create_from_url_test.go index 41a1146435..36527ea0ac 100644 --- a/internal/gitaly/service/repository/create_from_url_test.go +++ b/internal/gitaly/service/repository/create_from_url_test.go @@ -10,9 +10,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/repository/create_test.go b/internal/gitaly/service/repository/create_test.go index 76e18470f2..d5d5b94dd0 100644 --- a/internal/gitaly/service/repository/create_test.go +++ b/internal/gitaly/service/repository/create_test.go @@ -9,9 +9,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/repository/fetch.go b/internal/gitaly/service/repository/fetch.go index cb27a9bc79..f143002c70 100644 --- a/internal/gitaly/service/repository/fetch.go +++ b/internal/gitaly/service/repository/fetch.go @@ -5,12 +5,12 @@ import ( "fmt" "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/internal/gitalyssh" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/metadata/featureflag" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitalyssh" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/metadata/featureflag" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func (s *server) FetchSourceBranch(ctx context.Context, req *gitalypb.FetchSourceBranchRequest) (*gitalypb.FetchSourceBranchResponse, error) { diff --git a/internal/gitaly/service/repository/fetch_remote.go b/internal/gitaly/service/repository/fetch_remote.go index 3c4b7a907c..4aa653db91 100644 --- a/internal/gitaly/service/repository/fetch_remote.go +++ b/internal/gitaly/service/repository/fetch_remote.go @@ -3,8 +3,8 @@ package repository import ( "context" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func (s *server) FetchRemote(ctx context.Context, in *gitalypb.FetchRemoteRequest) (*gitalypb.FetchRemoteResponse, error) { diff --git a/internal/gitaly/service/repository/fetch_remote_test.go b/internal/gitaly/service/repository/fetch_remote_test.go index 7e0f0ad3c4..409ce49bf6 100644 --- a/internal/gitaly/service/repository/fetch_remote_test.go +++ b/internal/gitaly/service/repository/fetch_remote_test.go @@ -13,10 +13,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/repository/fetch_test.go b/internal/gitaly/service/repository/fetch_test.go index d38f61f630..4b2ffeaaa5 100644 --- a/internal/gitaly/service/repository/fetch_test.go +++ b/internal/gitaly/service/repository/fetch_test.go @@ -6,14 +6,14 @@ import ( "testing" "github.com/stretchr/testify/require" - gitLog "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - serverPkg "gitlab.com/gitlab-org/gitaly/internal/gitaly/server" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/repository" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/metadata/featureflag" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + gitLog "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + serverPkg "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/server" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/repository" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/metadata/featureflag" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/codes" healthpb "google.golang.org/grpc/health/grpc_health_v1" diff --git a/internal/gitaly/service/repository/fork.go b/internal/gitaly/service/repository/fork.go index 2ec3abd98c..1f57c7b14a 100644 --- a/internal/gitaly/service/repository/fork.go +++ b/internal/gitaly/service/repository/fork.go @@ -5,9 +5,9 @@ import ( "fmt" "os" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/gitalyssh" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitalyssh" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/repository/fork_test.go b/internal/gitaly/service/repository/fork_test.go index 8f2b557cfc..9774b6452d 100644 --- a/internal/gitaly/service/repository/fork_test.go +++ b/internal/gitaly/service/repository/fork_test.go @@ -8,12 +8,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/repository" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - gitaly_x509 "gitlab.com/gitlab-org/gitaly/internal/x509" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/repository" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + gitaly_x509 "gitlab.com/gitlab-org/gitaly/v13/internal/x509" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" diff --git a/internal/gitaly/service/repository/fsck.go b/internal/gitaly/service/repository/fsck.go index 4c2d5c3cc7..e09b9a6991 100644 --- a/internal/gitaly/service/repository/fsck.go +++ b/internal/gitaly/service/repository/fsck.go @@ -4,9 +4,9 @@ import ( "bytes" "context" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/alternates" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/alternates" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func (s *server) Fsck(ctx context.Context, req *gitalypb.FsckRequest) (*gitalypb.FsckResponse, error) { diff --git a/internal/gitaly/service/repository/fsck_test.go b/internal/gitaly/service/repository/fsck_test.go index 103d244041..c676c4998e 100644 --- a/internal/gitaly/service/repository/fsck_test.go +++ b/internal/gitaly/service/repository/fsck_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func TestFsckSuccess(t *testing.T) { diff --git a/internal/gitaly/service/repository/gc.go b/internal/gitaly/service/repository/gc.go index b333b87668..239d737f9c 100644 --- a/internal/gitaly/service/repository/gc.go +++ b/internal/gitaly/service/repository/gc.go @@ -10,12 +10,12 @@ import ( "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" log "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/helper/housekeeping" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/housekeeping" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/repository/gc_test.go b/internal/gitaly/service/repository/gc_test.go index 2aa44778c1..5ff3709cb7 100644 --- a/internal/gitaly/service/repository/gc_test.go +++ b/internal/gitaly/service/repository/gc_test.go @@ -13,10 +13,10 @@ import ( "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "gitlab.com/gitlab-org/labkit/log" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/repository/info_attributes.go b/internal/gitaly/service/repository/info_attributes.go index e1765cfba8..79ef3700e5 100644 --- a/internal/gitaly/service/repository/info_attributes.go +++ b/internal/gitaly/service/repository/info_attributes.go @@ -5,8 +5,8 @@ import ( "os" "path/filepath" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/repository/info_attributes_test.go b/internal/gitaly/service/repository/info_attributes_test.go index d599b2107f..bf597fc251 100644 --- a/internal/gitaly/service/repository/info_attributes_test.go +++ b/internal/gitaly/service/repository/info_attributes_test.go @@ -8,9 +8,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" ) func TestGetInfoAttributesExisting(t *testing.T) { diff --git a/internal/gitaly/service/repository/license.go b/internal/gitaly/service/repository/license.go index 40d217a0ad..76c69308ec 100644 --- a/internal/gitaly/service/repository/license.go +++ b/internal/gitaly/service/repository/license.go @@ -3,8 +3,8 @@ package repository import ( "context" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func (s *server) FindLicense(ctx context.Context, in *gitalypb.FindLicenseRequest) (*gitalypb.FindLicenseResponse, error) { diff --git a/internal/gitaly/service/repository/license_test.go b/internal/gitaly/service/repository/license_test.go index 63886c5f6c..70ac581a92 100644 --- a/internal/gitaly/service/repository/license_test.go +++ b/internal/gitaly/service/repository/license_test.go @@ -5,9 +5,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func TestSuccessfulFindLicenseRequest(t *testing.T) { diff --git a/internal/gitaly/service/repository/merge_base.go b/internal/gitaly/service/repository/merge_base.go index e663085a0c..705d8c149e 100644 --- a/internal/gitaly/service/repository/merge_base.go +++ b/internal/gitaly/service/repository/merge_base.go @@ -4,9 +4,9 @@ import ( "context" "io/ioutil" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/repository/merge_base_test.go b/internal/gitaly/service/repository/merge_base_test.go index 35b394f8cd..adc55eae73 100644 --- a/internal/gitaly/service/repository/merge_base_test.go +++ b/internal/gitaly/service/repository/merge_base_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/repository/midx.go b/internal/gitaly/service/repository/midx.go index c151af2de8..56dac988de 100644 --- a/internal/gitaly/service/repository/midx.go +++ b/internal/gitaly/service/repository/midx.go @@ -9,11 +9,11 @@ import ( "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" log "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/repository" - "gitlab.com/gitlab-org/gitaly/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/repository" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) const ( diff --git a/internal/gitaly/service/repository/midx_test.go b/internal/gitaly/service/repository/midx_test.go index df22fec9a0..399eedd8b3 100644 --- a/internal/gitaly/service/repository/midx_test.go +++ b/internal/gitaly/service/repository/midx_test.go @@ -11,9 +11,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func TestMidxWrite(t *testing.T) { diff --git a/internal/gitaly/service/repository/optimize.go b/internal/gitaly/service/repository/optimize.go index 9d0d580566..df4a9ebc62 100644 --- a/internal/gitaly/service/repository/optimize.go +++ b/internal/gitaly/service/repository/optimize.go @@ -8,10 +8,10 @@ import ( "path/filepath" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) var ( diff --git a/internal/gitaly/service/repository/optimize_test.go b/internal/gitaly/service/repository/optimize_test.go index cba2caa29e..38da607508 100644 --- a/internal/gitaly/service/repository/optimize_test.go +++ b/internal/gitaly/service/repository/optimize_test.go @@ -7,10 +7,10 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/internal/git/updateref" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/updateref" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/repository/raw_changes.go b/internal/gitaly/service/repository/raw_changes.go index dab1d1fb1d..456110cff3 100644 --- a/internal/gitaly/service/repository/raw_changes.go +++ b/internal/gitaly/service/repository/raw_changes.go @@ -8,12 +8,12 @@ import ( "unicode/utf8" "github.com/golang/protobuf/proto" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/internal/git/rawdiff" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/rawdiff" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func (s *server) GetRawChanges(req *gitalypb.GetRawChangesRequest, stream gitalypb.RepositoryService_GetRawChangesServer) error { diff --git a/internal/gitaly/service/repository/raw_changes_test.go b/internal/gitaly/service/repository/raw_changes_test.go index 07cc8f9758..ea6bde1b3c 100644 --- a/internal/gitaly/service/repository/raw_changes_test.go +++ b/internal/gitaly/service/repository/raw_changes_test.go @@ -7,8 +7,8 @@ import ( "unicode/utf8" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/repository/rebase_in_progress.go b/internal/gitaly/service/repository/rebase_in_progress.go index b72ead5745..b5a1ebecb8 100644 --- a/internal/gitaly/service/repository/rebase_in_progress.go +++ b/internal/gitaly/service/repository/rebase_in_progress.go @@ -8,8 +8,8 @@ import ( "strings" "time" - "gitlab.com/gitlab-org/gitaly/internal/helper/housekeeping" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/housekeeping" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/repository/rebase_in_progress_test.go b/internal/gitaly/service/repository/rebase_in_progress_test.go index efc44b7abc..273a1c02aa 100644 --- a/internal/gitaly/service/repository/rebase_in_progress_test.go +++ b/internal/gitaly/service/repository/rebase_in_progress_test.go @@ -8,8 +8,8 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/repository/redirecting_test_server_test.go b/internal/gitaly/service/repository/redirecting_test_server_test.go index 3ae1e37d4b..6f27e80006 100644 --- a/internal/gitaly/service/repository/redirecting_test_server_test.go +++ b/internal/gitaly/service/repository/redirecting_test_server_test.go @@ -8,8 +8,8 @@ import ( "net/http/httptest" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) const redirectURL = "/redirect_url" diff --git a/internal/gitaly/service/repository/remove.go b/internal/gitaly/service/repository/remove.go index 3a89a1e521..8a97a63b36 100644 --- a/internal/gitaly/service/repository/remove.go +++ b/internal/gitaly/service/repository/remove.go @@ -5,10 +5,10 @@ import ( "os" "path/filepath" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/tempdir" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/tempdir" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func (s *server) RemoveRepository(ctx context.Context, in *gitalypb.RemoveRepositoryRequest) (*gitalypb.RemoveRepositoryResponse, error) { diff --git a/internal/gitaly/service/repository/remove_test.go b/internal/gitaly/service/repository/remove_test.go index 24b31f1cd6..55ded13f28 100644 --- a/internal/gitaly/service/repository/remove_test.go +++ b/internal/gitaly/service/repository/remove_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func TestRemoveRepository(t *testing.T) { diff --git a/internal/gitaly/service/repository/rename.go b/internal/gitaly/service/repository/rename.go index a6477a76eb..3cfa5cf722 100644 --- a/internal/gitaly/service/repository/rename.go +++ b/internal/gitaly/service/repository/rename.go @@ -6,8 +6,8 @@ import ( "os" "path/filepath" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func (s *server) RenameRepository(ctx context.Context, in *gitalypb.RenameRepositoryRequest) (*gitalypb.RenameRepositoryResponse, error) { diff --git a/internal/gitaly/service/repository/rename_test.go b/internal/gitaly/service/repository/rename_test.go index e04d9a6ca1..a47e9bf77f 100644 --- a/internal/gitaly/service/repository/rename_test.go +++ b/internal/gitaly/service/repository/rename_test.go @@ -5,10 +5,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/storage" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/storage" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/repository/repack.go b/internal/gitaly/service/repository/repack.go index c4aa38b3a1..b2e594638a 100644 --- a/internal/gitaly/service/repository/repack.go +++ b/internal/gitaly/service/repository/repack.go @@ -5,10 +5,10 @@ import ( "fmt" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/repository" - "gitlab.com/gitlab-org/gitaly/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/repository" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/repository/repack_test.go b/internal/gitaly/service/repository/repack_test.go index f84f99e974..95eb416c01 100644 --- a/internal/gitaly/service/repository/repack_test.go +++ b/internal/gitaly/service/repository/repack_test.go @@ -13,10 +13,10 @@ import ( "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "gitlab.com/gitlab-org/labkit/log" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/repository/replicate.go b/internal/gitaly/service/repository/replicate.go index 75a7508fc4..ec9a5c74d1 100644 --- a/internal/gitaly/service/repository/replicate.go +++ b/internal/gitaly/service/repository/replicate.go @@ -10,13 +10,13 @@ import ( "path/filepath" "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/safe" - "gitlab.com/gitlab-org/gitaly/internal/storage" - "gitlab.com/gitlab-org/gitaly/internal/tempdir" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/safe" + "gitlab.com/gitlab-org/gitaly/v13/internal/storage" + "gitlab.com/gitlab-org/gitaly/v13/internal/tempdir" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "golang.org/x/sync/errgroup" ) diff --git a/internal/gitaly/service/repository/replicate_test.go b/internal/gitaly/service/repository/replicate_test.go index 8e79664e59..f1f66ba8ab 100644 --- a/internal/gitaly/service/repository/replicate_test.go +++ b/internal/gitaly/service/repository/replicate_test.go @@ -11,12 +11,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/repository" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/repository" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" diff --git a/internal/gitaly/service/repository/repository.go b/internal/gitaly/service/repository/repository.go index 2f57a72a4d..98aae5af8a 100644 --- a/internal/gitaly/service/repository/repository.go +++ b/internal/gitaly/service/repository/repository.go @@ -4,10 +4,10 @@ import ( "context" "io/ioutil" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/storage" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/storage" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/repository/repository_test.go b/internal/gitaly/service/repository/repository_test.go index 7f914d8868..488e3a5abf 100644 --- a/internal/gitaly/service/repository/repository_test.go +++ b/internal/gitaly/service/repository/repository_test.go @@ -7,10 +7,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/repository/restore_custom_hooks.go b/internal/gitaly/service/repository/restore_custom_hooks.go index 670b261e18..667f68a291 100644 --- a/internal/gitaly/service/repository/restore_custom_hooks.go +++ b/internal/gitaly/service/repository/restore_custom_hooks.go @@ -3,9 +3,9 @@ package repository import ( "os/exec" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/repository/restore_custom_hooks_test.go b/internal/gitaly/service/repository/restore_custom_hooks_test.go index d4eb5ca06a..9ce74e2921 100644 --- a/internal/gitaly/service/repository/restore_custom_hooks_test.go +++ b/internal/gitaly/service/repository/restore_custom_hooks_test.go @@ -7,10 +7,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/repository/search_files.go b/internal/gitaly/service/repository/search_files.go index 9588800972..843593fba5 100644 --- a/internal/gitaly/service/repository/search_files.go +++ b/internal/gitaly/service/repository/search_files.go @@ -8,12 +8,12 @@ import ( "math" "regexp" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/helper/lines" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/lines" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/repository/search_files_test.go b/internal/gitaly/service/repository/search_files_test.go index aa625a272f..33904d390a 100644 --- a/internal/gitaly/service/repository/search_files_test.go +++ b/internal/gitaly/service/repository/search_files_test.go @@ -10,9 +10,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/repository/server.go b/internal/gitaly/service/repository/server.go index 5a52d1eaa9..3ecee040d3 100644 --- a/internal/gitaly/service/repository/server.go +++ b/internal/gitaly/service/repository/server.go @@ -3,11 +3,11 @@ package repository import ( "context" - "gitlab.com/gitlab-org/gitaly/client" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/storage" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/client" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/storage" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) type server struct { diff --git a/internal/gitaly/service/repository/server_test.go b/internal/gitaly/service/repository/server_test.go index f249c31059..1cfad86069 100644 --- a/internal/gitaly/service/repository/server_test.go +++ b/internal/gitaly/service/repository/server_test.go @@ -4,9 +4,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/client" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/client" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" "google.golang.org/grpc/metadata" ) diff --git a/internal/gitaly/service/repository/size.go b/internal/gitaly/service/repository/size.go index 8359604ebd..cc1f9ebe10 100644 --- a/internal/gitaly/service/repository/size.go +++ b/internal/gitaly/service/repository/size.go @@ -9,8 +9,8 @@ import ( "strconv" "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func (s *server) RepositorySize(ctx context.Context, in *gitalypb.RepositorySizeRequest) (*gitalypb.RepositorySizeResponse, error) { diff --git a/internal/gitaly/service/repository/size_test.go b/internal/gitaly/service/repository/size_test.go index ff28183ffa..a27921c985 100644 --- a/internal/gitaly/service/repository/size_test.go +++ b/internal/gitaly/service/repository/size_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/repository/snapshot.go b/internal/gitaly/service/repository/snapshot.go index 55e77be854..91bf5df124 100644 --- a/internal/gitaly/service/repository/snapshot.go +++ b/internal/gitaly/service/repository/snapshot.go @@ -8,11 +8,11 @@ import ( "regexp" "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/archive" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/archive" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" ) var objectFiles = []*regexp.Regexp{ diff --git a/internal/gitaly/service/repository/snapshot_test.go b/internal/gitaly/service/repository/snapshot_test.go index 87794021b4..bf87c3ab89 100644 --- a/internal/gitaly/service/repository/snapshot_test.go +++ b/internal/gitaly/service/repository/snapshot_test.go @@ -14,14 +14,14 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/archive" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/archive" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/repository/squash_in_progress.go b/internal/gitaly/service/repository/squash_in_progress.go index a9f1c00637..bcf8400d32 100644 --- a/internal/gitaly/service/repository/squash_in_progress.go +++ b/internal/gitaly/service/repository/squash_in_progress.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/repository/squash_in_progress_test.go b/internal/gitaly/service/repository/squash_in_progress_test.go index 72f0beda73..39ec6ae1c1 100644 --- a/internal/gitaly/service/repository/squash_in_progress_test.go +++ b/internal/gitaly/service/repository/squash_in_progress_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/repository/testhelper_test.go b/internal/gitaly/service/repository/testhelper_test.go index 43dbe466e2..c489832011 100644 --- a/internal/gitaly/service/repository/testhelper_test.go +++ b/internal/gitaly/service/repository/testhelper_test.go @@ -10,15 +10,15 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - gitalyauth "gitlab.com/gitlab-org/gitaly/auth" - "gitlab.com/gitlab-org/gitaly/client" - dcache "gitlab.com/gitlab-org/gitaly/internal/cache" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - mcache "gitlab.com/gitlab-org/gitaly/internal/middleware/cache" - "gitlab.com/gitlab-org/gitaly/internal/praefect/protoregistry" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + gitalyauth "gitlab.com/gitlab-org/gitaly/v13/auth" + "gitlab.com/gitlab-org/gitaly/v13/client" + dcache "gitlab.com/gitlab-org/gitaly/v13/internal/cache" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + mcache "gitlab.com/gitlab-org/gitaly/v13/internal/middleware/cache" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/protoregistry" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/credentials" diff --git a/internal/gitaly/service/repository/util.go b/internal/gitaly/service/repository/util.go index 16839fa44b..b86494273a 100644 --- a/internal/gitaly/service/repository/util.go +++ b/internal/gitaly/service/repository/util.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func removeOriginInRepo(ctx context.Context, repository *gitalypb.Repository) error { diff --git a/internal/gitaly/service/repository/write_ref.go b/internal/gitaly/service/repository/write_ref.go index bbaf239cba..eaf701c035 100644 --- a/internal/gitaly/service/repository/write_ref.go +++ b/internal/gitaly/service/repository/write_ref.go @@ -5,10 +5,10 @@ import ( "context" "fmt" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/updateref" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/updateref" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func (s *server) WriteRef(ctx context.Context, req *gitalypb.WriteRefRequest) (*gitalypb.WriteRefResponse, error) { diff --git a/internal/gitaly/service/repository/write_ref_test.go b/internal/gitaly/service/repository/write_ref_test.go index d84f8ec50f..2a3aff9d1d 100644 --- a/internal/gitaly/service/repository/write_ref_test.go +++ b/internal/gitaly/service/repository/write_ref_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/server/disk_stats.go b/internal/gitaly/service/server/disk_stats.go index 921591c710..018f76ca64 100644 --- a/internal/gitaly/service/server/disk_stats.go +++ b/internal/gitaly/service/server/disk_stats.go @@ -4,8 +4,8 @@ import ( "context" "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func (s *server) DiskStatistics(ctx context.Context, _ *gitalypb.DiskStatisticsRequest) (*gitalypb.DiskStatisticsResponse, error) { diff --git a/internal/gitaly/service/server/disk_stats_test.go b/internal/gitaly/service/server/disk_stats_test.go index 61e59d22ec..fb85356a65 100644 --- a/internal/gitaly/service/server/disk_stats_test.go +++ b/internal/gitaly/service/server/disk_stats_test.go @@ -5,9 +5,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "golang.org/x/sys/unix" ) diff --git a/internal/gitaly/service/server/info.go b/internal/gitaly/service/server/info.go index 0766aa374d..9b6ba609a0 100644 --- a/internal/gitaly/service/server/info.go +++ b/internal/gitaly/service/server/info.go @@ -7,12 +7,12 @@ import ( "path/filepath" "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/helper/fstype" - "gitlab.com/gitlab-org/gitaly/internal/storage" - "gitlab.com/gitlab-org/gitaly/internal/version" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/fstype" + "gitlab.com/gitlab-org/gitaly/v13/internal/storage" + "gitlab.com/gitlab-org/gitaly/v13/internal/version" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func (s *server) ServerInfo(ctx context.Context, in *gitalypb.ServerInfoRequest) (*gitalypb.ServerInfoResponse, error) { diff --git a/internal/gitaly/service/server/info_test.go b/internal/gitaly/service/server/info_test.go index 5aa0475d10..9838e3e82c 100644 --- a/internal/gitaly/service/server/info_test.go +++ b/internal/gitaly/service/server/info_test.go @@ -6,15 +6,15 @@ import ( "testing" "github.com/stretchr/testify/require" - gitalyauth "gitlab.com/gitlab-org/gitaly/auth" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - internalauth "gitlab.com/gitlab-org/gitaly/internal/gitaly/config/auth" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/server/auth" - "gitlab.com/gitlab-org/gitaly/internal/storage" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/internal/version" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + gitalyauth "gitlab.com/gitlab-org/gitaly/v13/auth" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + internalauth "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config/auth" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/server/auth" + "gitlab.com/gitlab-org/gitaly/v13/internal/storage" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/version" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/reflection" diff --git a/internal/gitaly/service/server/server.go b/internal/gitaly/service/server/server.go index 993b10dd4e..aa3a97d25c 100644 --- a/internal/gitaly/service/server/server.go +++ b/internal/gitaly/service/server/server.go @@ -1,8 +1,8 @@ package server import ( - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) type server struct { diff --git a/internal/gitaly/service/server/storage_status_openbsd.go b/internal/gitaly/service/server/storage_status_openbsd.go index 6fdee1eaba..9982c9df1c 100644 --- a/internal/gitaly/service/server/storage_status_openbsd.go +++ b/internal/gitaly/service/server/storage_status_openbsd.go @@ -1,8 +1,8 @@ package server import ( - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "golang.org/x/sys/unix" ) diff --git a/internal/gitaly/service/server/storage_status_unix.go b/internal/gitaly/service/server/storage_status_unix.go index ccce15e6e9..c52d1a7299 100644 --- a/internal/gitaly/service/server/storage_status_unix.go +++ b/internal/gitaly/service/server/storage_status_unix.go @@ -3,8 +3,8 @@ package server import ( - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "golang.org/x/sys/unix" ) diff --git a/internal/gitaly/service/smarthttp/cache.go b/internal/gitaly/service/smarthttp/cache.go index bb953f78c7..2f35ebbefc 100644 --- a/internal/gitaly/service/smarthttp/cache.go +++ b/internal/gitaly/service/smarthttp/cache.go @@ -10,8 +10,8 @@ import ( "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" "github.com/prometheus/client_golang/prometheus" log "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/cache" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/cache" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/smarthttp/inforefs.go b/internal/gitaly/service/smarthttp/inforefs.go index 6e12f4aaa0..0ddfbf8f73 100644 --- a/internal/gitaly/service/smarthttp/inforefs.go +++ b/internal/gitaly/service/smarthttp/inforefs.go @@ -7,11 +7,11 @@ import ( "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" log "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/pktline" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/smarthttp/inforefs_test.go b/internal/gitaly/service/smarthttp/inforefs_test.go index a7c390dff0..25cef583e2 100644 --- a/internal/gitaly/service/smarthttp/inforefs_test.go +++ b/internal/gitaly/service/smarthttp/inforefs_test.go @@ -15,16 +15,16 @@ import ( "github.com/golang/protobuf/proto" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/cache" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/objectpool" - "gitlab.com/gitlab-org/gitaly/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/tempdir" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/cache" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/objectpool" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/tempdir" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/smarthttp/receive_pack.go b/internal/gitaly/service/smarthttp/receive_pack.go index 2a5f389181..9c2d94d263 100644 --- a/internal/gitaly/service/smarthttp/receive_pack.go +++ b/internal/gitaly/service/smarthttp/receive_pack.go @@ -3,11 +3,11 @@ package smarthttp import ( "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" log "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/smarthttp/receive_pack_test.go b/internal/gitaly/service/smarthttp/receive_pack_test.go index 40bbc6b8c8..bf6cf8f5c1 100644 --- a/internal/gitaly/service/smarthttp/receive_pack_test.go +++ b/internal/gitaly/service/smarthttp/receive_pack_test.go @@ -14,19 +14,19 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/hooks" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - gitalyhook "gitlab.com/gitlab-org/gitaly/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/hook" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/internal/metadata/featureflag" - pconfig "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/internal/praefect/metadata" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/hooks" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + gitalyhook "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/hook" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v13/internal/metadata/featureflag" + pconfig "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/metadata" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/reflection" diff --git a/internal/gitaly/service/smarthttp/server.go b/internal/gitaly/service/smarthttp/server.go index 15a6bb9698..ba390962bf 100644 --- a/internal/gitaly/service/smarthttp/server.go +++ b/internal/gitaly/service/smarthttp/server.go @@ -2,7 +2,7 @@ package smarthttp import ( "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) type server struct { diff --git a/internal/gitaly/service/smarthttp/testhelper_test.go b/internal/gitaly/service/smarthttp/testhelper_test.go index 919926a4f9..783df95b6d 100644 --- a/internal/gitaly/service/smarthttp/testhelper_test.go +++ b/internal/gitaly/service/smarthttp/testhelper_test.go @@ -7,14 +7,14 @@ import ( "testing" "github.com/stretchr/testify/require" - gitalyauth "gitlab.com/gitlab-org/gitaly/auth" - diskcache "gitlab.com/gitlab-org/gitaly/internal/cache" - "gitlab.com/gitlab-org/gitaly/internal/git/hooks" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/middleware/cache" - "gitlab.com/gitlab-org/gitaly/internal/praefect/protoregistry" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + gitalyauth "gitlab.com/gitlab-org/gitaly/v13/auth" + diskcache "gitlab.com/gitlab-org/gitaly/v13/internal/cache" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/hooks" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/middleware/cache" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/protoregistry" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/reflection" ) diff --git a/internal/gitaly/service/smarthttp/upload_pack.go b/internal/gitaly/service/smarthttp/upload_pack.go index 6ccec7f164..d39dd75e5a 100644 --- a/internal/gitaly/service/smarthttp/upload_pack.go +++ b/internal/gitaly/service/smarthttp/upload_pack.go @@ -6,13 +6,13 @@ import ( "io" "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/inspect" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/inspect" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/smarthttp/upload_pack_test.go b/internal/gitaly/service/smarthttp/upload_pack_test.go index 235b258824..7a7e4a8946 100644 --- a/internal/gitaly/service/smarthttp/upload_pack_test.go +++ b/internal/gitaly/service/smarthttp/upload_pack_test.go @@ -15,12 +15,12 @@ import ( promtest "github.com/prometheus/client_golang/prometheus/testutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/pktline" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/ssh/monitor_stdin_command.go b/internal/gitaly/service/ssh/monitor_stdin_command.go index c0c2c11fb0..bc836eec9a 100644 --- a/internal/gitaly/service/ssh/monitor_stdin_command.go +++ b/internal/gitaly/service/ssh/monitor_stdin_command.go @@ -5,9 +5,9 @@ import ( "fmt" "io" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/pktline" ) func monitorStdinCommand(ctx context.Context, stdin io.Reader, stdout, stderr io.Writer, env []string, globals []git.Option, sc git.SubCmd) (*command.Command, *pktline.ReadMonitor, error) { diff --git a/internal/gitaly/service/ssh/receive_pack.go b/internal/gitaly/service/ssh/receive_pack.go index 949e35dbb8..8ce1c7a219 100644 --- a/internal/gitaly/service/ssh/receive_pack.go +++ b/internal/gitaly/service/ssh/receive_pack.go @@ -6,11 +6,11 @@ import ( "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" log "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" ) func (s *server) SSHReceivePack(stream gitalypb.SSHService_SSHReceivePackServer) error { diff --git a/internal/gitaly/service/ssh/receive_pack_test.go b/internal/gitaly/service/ssh/receive_pack_test.go index 3dc2049751..a99547ad46 100644 --- a/internal/gitaly/service/ssh/receive_pack_test.go +++ b/internal/gitaly/service/ssh/receive_pack_test.go @@ -14,14 +14,14 @@ import ( "github.com/golang/protobuf/jsonpb" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/hooks" - "gitlab.com/gitlab-org/gitaly/internal/git/objectpool" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/hooks" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/objectpool" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/ssh/server.go b/internal/gitaly/service/ssh/server.go index b86df0a348..97e1be9dca 100644 --- a/internal/gitaly/service/ssh/server.go +++ b/internal/gitaly/service/ssh/server.go @@ -4,7 +4,7 @@ import ( "time" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) var ( diff --git a/internal/gitaly/service/ssh/testhelper_test.go b/internal/gitaly/service/ssh/testhelper_test.go index 6884fa3b92..4cd5bea3fc 100644 --- a/internal/gitaly/service/ssh/testhelper_test.go +++ b/internal/gitaly/service/ssh/testhelper_test.go @@ -7,9 +7,9 @@ import ( log "github.com/sirupsen/logrus" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/reflection" ) diff --git a/internal/gitaly/service/ssh/upload_archive.go b/internal/gitaly/service/ssh/upload_archive.go index ec61468a17..da206a8d0f 100644 --- a/internal/gitaly/service/ssh/upload_archive.go +++ b/internal/gitaly/service/ssh/upload_archive.go @@ -4,12 +4,12 @@ import ( "context" "fmt" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/pktline" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" ) func (s *server) SSHUploadArchive(stream gitalypb.SSHService_SSHUploadArchiveServer) error { diff --git a/internal/gitaly/service/ssh/upload_archive_test.go b/internal/gitaly/service/ssh/upload_archive_test.go index d39f636f2f..b541b9d42e 100644 --- a/internal/gitaly/service/ssh/upload_archive_test.go +++ b/internal/gitaly/service/ssh/upload_archive_test.go @@ -9,9 +9,9 @@ import ( "github.com/golang/protobuf/jsonpb" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/ssh/upload_pack.go b/internal/gitaly/service/ssh/upload_pack.go index 91cb456e34..d43ad32f69 100644 --- a/internal/gitaly/service/ssh/upload_pack.go +++ b/internal/gitaly/service/ssh/upload_pack.go @@ -8,14 +8,14 @@ import ( "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" log "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/git/pktline" - "gitlab.com/gitlab-org/gitaly/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/inspect" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/streamio" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/inspect" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/streamio" ) func (s *server) SSHUploadPack(stream gitalypb.SSHService_SSHUploadPackServer) error { diff --git a/internal/gitaly/service/ssh/upload_pack_test.go b/internal/gitaly/service/ssh/upload_pack_test.go index 62fb7e0f91..360e145804 100644 --- a/internal/gitaly/service/ssh/upload_pack_test.go +++ b/internal/gitaly/service/ssh/upload_pack_test.go @@ -14,11 +14,11 @@ import ( "github.com/prometheus/client_golang/prometheus" promtest "github.com/prometheus/client_golang/prometheus/testutil" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/wiki/delete_page.go b/internal/gitaly/service/wiki/delete_page.go index 6f1fbef0cd..4355b1ddfe 100644 --- a/internal/gitaly/service/wiki/delete_page.go +++ b/internal/gitaly/service/wiki/delete_page.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/wiki/delete_page_test.go b/internal/gitaly/service/wiki/delete_page_test.go index 428ba4b7df..96c504027d 100644 --- a/internal/gitaly/service/wiki/delete_page_test.go +++ b/internal/gitaly/service/wiki/delete_page_test.go @@ -4,9 +4,9 @@ import ( "testing" "github.com/stretchr/testify/require" - gitlog "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + gitlog "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/wiki/find_file.go b/internal/gitaly/service/wiki/find_file.go index 388fdd6336..8e9f7c8fc7 100644 --- a/internal/gitaly/service/wiki/find_file.go +++ b/internal/gitaly/service/wiki/find_file.go @@ -1,9 +1,9 @@ package wiki import ( - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/wiki/find_file_test.go b/internal/gitaly/service/wiki/find_file_test.go index 73e7de7a99..d578779b72 100644 --- a/internal/gitaly/service/wiki/find_file_test.go +++ b/internal/gitaly/service/wiki/find_file_test.go @@ -9,8 +9,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/wiki/find_page.go b/internal/gitaly/service/wiki/find_page.go index 093036d4f6..ef2baa03dd 100644 --- a/internal/gitaly/service/wiki/find_page.go +++ b/internal/gitaly/service/wiki/find_page.go @@ -3,9 +3,9 @@ package wiki import ( "errors" - "gitlab.com/gitlab-org/gitaly/internal/git" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/wiki/find_page_test.go b/internal/gitaly/service/wiki/find_page_test.go index 1591ffb53e..0130889f20 100644 --- a/internal/gitaly/service/wiki/find_page_test.go +++ b/internal/gitaly/service/wiki/find_page_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/wiki/get_all_pages.go b/internal/gitaly/service/wiki/get_all_pages.go index b389c83798..8cfdb87ed0 100644 --- a/internal/gitaly/service/wiki/get_all_pages.go +++ b/internal/gitaly/service/wiki/get_all_pages.go @@ -1,8 +1,8 @@ package wiki import ( - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func (s *server) WikiGetAllPages(request *gitalypb.WikiGetAllPagesRequest, stream gitalypb.WikiService_WikiGetAllPagesServer) error { diff --git a/internal/gitaly/service/wiki/get_all_pages_test.go b/internal/gitaly/service/wiki/get_all_pages_test.go index 7952915c2a..7d7788def9 100644 --- a/internal/gitaly/service/wiki/get_all_pages_test.go +++ b/internal/gitaly/service/wiki/get_all_pages_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/wiki/get_page_versions.go b/internal/gitaly/service/wiki/get_page_versions.go index 7833a7afed..375781a143 100644 --- a/internal/gitaly/service/wiki/get_page_versions.go +++ b/internal/gitaly/service/wiki/get_page_versions.go @@ -1,8 +1,8 @@ package wiki import ( - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/wiki/get_page_versions_test.go b/internal/gitaly/service/wiki/get_page_versions_test.go index 09a8ad15a5..c779721656 100644 --- a/internal/gitaly/service/wiki/get_page_versions_test.go +++ b/internal/gitaly/service/wiki/get_page_versions_test.go @@ -7,9 +7,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func TestWikiGetPageVersionsRequest(t *testing.T) { diff --git a/internal/gitaly/service/wiki/list_pages.go b/internal/gitaly/service/wiki/list_pages.go index f0329eafa0..7f3874321a 100644 --- a/internal/gitaly/service/wiki/list_pages.go +++ b/internal/gitaly/service/wiki/list_pages.go @@ -1,8 +1,8 @@ package wiki import ( - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func (s *server) WikiListPages(request *gitalypb.WikiListPagesRequest, stream gitalypb.WikiService_WikiListPagesServer) error { diff --git a/internal/gitaly/service/wiki/list_pages_test.go b/internal/gitaly/service/wiki/list_pages_test.go index b2e0f164b6..3d78ba05a8 100644 --- a/internal/gitaly/service/wiki/list_pages_test.go +++ b/internal/gitaly/service/wiki/list_pages_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func TestSuccessfulWikiListPagesRequest(t *testing.T) { diff --git a/internal/gitaly/service/wiki/server.go b/internal/gitaly/service/wiki/server.go index 0b695b005a..473cf490ef 100644 --- a/internal/gitaly/service/wiki/server.go +++ b/internal/gitaly/service/wiki/server.go @@ -1,8 +1,8 @@ package wiki import ( - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) type server struct { diff --git a/internal/gitaly/service/wiki/testhelper_test.go b/internal/gitaly/service/wiki/testhelper_test.go index 0a1ed1e794..c54dd0ca95 100644 --- a/internal/gitaly/service/wiki/testhelper_test.go +++ b/internal/gitaly/service/wiki/testhelper_test.go @@ -10,13 +10,13 @@ import ( log "github.com/sirupsen/logrus" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git/hooks" - gitlog "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/hooks" + gitlog "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/reflection" ) diff --git a/internal/gitaly/service/wiki/update_page.go b/internal/gitaly/service/wiki/update_page.go index d9c417b2a5..0d9fa76ab0 100644 --- a/internal/gitaly/service/wiki/update_page.go +++ b/internal/gitaly/service/wiki/update_page.go @@ -3,8 +3,8 @@ package wiki import ( "fmt" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/wiki/update_page_test.go b/internal/gitaly/service/wiki/update_page_test.go index 094628826e..479269b5da 100644 --- a/internal/gitaly/service/wiki/update_page_test.go +++ b/internal/gitaly/service/wiki/update_page_test.go @@ -5,9 +5,9 @@ import ( "testing" "github.com/stretchr/testify/require" - gitlog "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + gitlog "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/wiki/util.go b/internal/gitaly/service/wiki/util.go index cbbbd77785..82d83a84c0 100644 --- a/internal/gitaly/service/wiki/util.go +++ b/internal/gitaly/service/wiki/util.go @@ -3,7 +3,7 @@ package wiki import ( "fmt" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) type requestWithCommitDetails interface { diff --git a/internal/gitaly/service/wiki/write_page.go b/internal/gitaly/service/wiki/write_page.go index 81fe00bb80..cf288b5fcf 100644 --- a/internal/gitaly/service/wiki/write_page.go +++ b/internal/gitaly/service/wiki/write_page.go @@ -3,8 +3,8 @@ package wiki import ( "fmt" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/wiki/write_page_test.go b/internal/gitaly/service/wiki/write_page_test.go index f9ef38d87e..04aed3ed6e 100644 --- a/internal/gitaly/service/wiki/write_page_test.go +++ b/internal/gitaly/service/wiki/write_page_test.go @@ -5,9 +5,9 @@ import ( "testing" "github.com/stretchr/testify/require" - gitlog "gitlab.com/gitlab-org/gitaly/internal/git/log" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + gitlog "gitlab.com/gitlab-org/gitaly/v13/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitalyssh/gitalyssh.go b/internal/gitalyssh/gitalyssh.go index ff4abba245..5269da7523 100644 --- a/internal/gitalyssh/gitalyssh.go +++ b/internal/gitalyssh/gitalyssh.go @@ -11,11 +11,11 @@ import ( "github.com/golang/protobuf/jsonpb" "github.com/golang/protobuf/proto" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/metadata/featureflag" - gitaly_x509 "gitlab.com/gitlab-org/gitaly/internal/x509" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/metadata/featureflag" + gitaly_x509 "gitlab.com/gitlab-org/gitaly/v13/internal/x509" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "gitlab.com/gitlab-org/labkit/correlation" "gitlab.com/gitlab-org/labkit/tracing" "google.golang.org/grpc/codes" diff --git a/internal/gitalyssh/gitalyssh_test.go b/internal/gitalyssh/gitalyssh_test.go index f6e3bf045e..22ec6c59e9 100644 --- a/internal/gitalyssh/gitalyssh_test.go +++ b/internal/gitalyssh/gitalyssh_test.go @@ -9,9 +9,9 @@ import ( "github.com/golang/protobuf/jsonpb" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "gitlab.com/gitlab-org/labkit/correlation" "google.golang.org/grpc/metadata" ) diff --git a/internal/gitalyssh/testhelper_test.go b/internal/gitalyssh/testhelper_test.go index 2337927907..ccb3d3e829 100644 --- a/internal/gitalyssh/testhelper_test.go +++ b/internal/gitalyssh/testhelper_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitlabshell/env.go b/internal/gitlabshell/env.go index 7630013186..beb683dcdd 100644 --- a/internal/gitlabshell/env.go +++ b/internal/gitlabshell/env.go @@ -3,7 +3,7 @@ package gitlabshell import ( "encoding/json" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" ) // Env is a helper that returns a slice with environment variables used by gitlab shell diff --git a/internal/gitlabshell/env_test.go b/internal/gitlabshell/env_test.go index 46c45a81ba..5d1c8c1b2e 100644 --- a/internal/gitlabshell/env_test.go +++ b/internal/gitlabshell/env_test.go @@ -10,9 +10,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/gitlabshell" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitlabshell" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestGitHooksConfig(t *testing.T) { diff --git a/internal/helper/chunk/chunker_test.go b/internal/helper/chunk/chunker_test.go index 0dd22e1b52..af199b3358 100644 --- a/internal/helper/chunk/chunker_test.go +++ b/internal/helper/chunk/chunker_test.go @@ -8,8 +8,8 @@ import ( "github.com/golang/protobuf/proto" "github.com/golang/protobuf/ptypes/wrappers" "github.com/stretchr/testify/require" - test "gitlab.com/gitlab-org/gitaly/internal/helper/chunk/pb" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + test "gitlab.com/gitlab-org/gitaly/v13/internal/helper/chunk/pb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" "google.golang.org/grpc" ) diff --git a/internal/helper/fieldextractors/fieldextractor.go b/internal/helper/fieldextractors/fieldextractor.go index 4318eef5c0..be5eca7afd 100644 --- a/internal/helper/fieldextractors/fieldextractor.go +++ b/internal/helper/fieldextractors/fieldextractor.go @@ -3,7 +3,7 @@ package fieldextractors import ( "strings" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) type repositoryBasedRequest interface { diff --git a/internal/helper/housekeeping/housekeeping_test.go b/internal/helper/housekeeping/housekeeping_test.go index 4077c9f9c9..a9160c27da 100644 --- a/internal/helper/housekeeping/housekeeping_test.go +++ b/internal/helper/housekeeping/housekeeping_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) type entryFinalState int diff --git a/internal/helper/repo.go b/internal/helper/repo.go index 7c9d51351e..ae96e6a0ec 100644 --- a/internal/helper/repo.go +++ b/internal/helper/repo.go @@ -4,9 +4,9 @@ import ( "os" "path/filepath" - "gitlab.com/gitlab-org/gitaly/internal/git/repository" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/storage" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/repository" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/storage" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/helper/repo_test.go b/internal/helper/repo_test.go index 9a9f3578aa..911c49d18b 100644 --- a/internal/helper/repo_test.go +++ b/internal/helper/repo_test.go @@ -6,9 +6,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/helper/storage.go b/internal/helper/storage.go index 523ca7ed61..993948f9d0 100644 --- a/internal/helper/storage.go +++ b/internal/helper/storage.go @@ -7,7 +7,7 @@ import ( "errors" "fmt" - "gitlab.com/gitlab-org/gitaly/internal/storage" + "gitlab.com/gitlab-org/gitaly/v13/internal/storage" "google.golang.org/grpc/metadata" ) diff --git a/internal/helper/storage_test.go b/internal/helper/storage_test.go index d0f229e0e9..a99885d6d9 100644 --- a/internal/helper/storage_test.go +++ b/internal/helper/storage_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/storage" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/storage" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" "google.golang.org/grpc/metadata" ) diff --git a/internal/middleware/cache/cache.go b/internal/middleware/cache/cache.go index d5b67373a1..7a8eac187a 100644 --- a/internal/middleware/cache/cache.go +++ b/internal/middleware/cache/cache.go @@ -8,9 +8,9 @@ import ( "github.com/golang/protobuf/proto" "github.com/sirupsen/logrus" - diskcache "gitlab.com/gitlab-org/gitaly/internal/cache" - "gitlab.com/gitlab-org/gitaly/internal/praefect/protoregistry" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + diskcache "gitlab.com/gitlab-org/gitaly/v13/internal/cache" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/protoregistry" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" ) diff --git a/internal/middleware/cache/cache_test.go b/internal/middleware/cache/cache_test.go index 2ef7635ced..4248d46bf3 100644 --- a/internal/middleware/cache/cache_test.go +++ b/internal/middleware/cache/cache_test.go @@ -12,12 +12,12 @@ import ( "github.com/golang/protobuf/protoc-gen-go/descriptor" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - diskcache "gitlab.com/gitlab-org/gitaly/internal/cache" - "gitlab.com/gitlab-org/gitaly/internal/middleware/cache" - "gitlab.com/gitlab-org/gitaly/internal/middleware/cache/testdata" - "gitlab.com/gitlab-org/gitaly/internal/praefect/protoregistry" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + diskcache "gitlab.com/gitlab-org/gitaly/v13/internal/cache" + "gitlab.com/gitlab-org/gitaly/v13/internal/middleware/cache" + "gitlab.com/gitlab-org/gitaly/v13/internal/middleware/cache/testdata" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/protoregistry" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/health" diff --git a/internal/middleware/cache/prometheus.go b/internal/middleware/cache/prometheus.go index 949945382f..9aa998f94b 100644 --- a/internal/middleware/cache/prometheus.go +++ b/internal/middleware/cache/prometheus.go @@ -2,7 +2,7 @@ package cache import ( "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/internal/praefect/protoregistry" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/protoregistry" ) var ( diff --git a/internal/middleware/cache/testdata/stream.pb.go b/internal/middleware/cache/testdata/stream.pb.go index f8013cf878..623c8eeb0f 100644 --- a/internal/middleware/cache/testdata/stream.pb.go +++ b/internal/middleware/cache/testdata/stream.pb.go @@ -7,7 +7,7 @@ import ( context "context" fmt "fmt" proto "github.com/golang/protobuf/proto" - gitalypb "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + gitalypb "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/internal/middleware/commandstatshandler/commandstatshandler.go b/internal/middleware/commandstatshandler/commandstatshandler.go index 8c3330f38c..4369604618 100644 --- a/internal/middleware/commandstatshandler/commandstatshandler.go +++ b/internal/middleware/commandstatshandler/commandstatshandler.go @@ -5,7 +5,7 @@ import ( grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware" "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" - "gitlab.com/gitlab-org/gitaly/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" "google.golang.org/grpc" ) diff --git a/internal/middleware/commandstatshandler/commandstatshandler_test.go b/internal/middleware/commandstatshandler/commandstatshandler_test.go index c021033233..e26a1b15ce 100644 --- a/internal/middleware/commandstatshandler/commandstatshandler_test.go +++ b/internal/middleware/commandstatshandler/commandstatshandler_test.go @@ -11,11 +11,11 @@ import ( grpc_logrus "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" "github.com/sirupsen/logrus" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/ref" - "gitlab.com/gitlab-org/gitaly/internal/metadata/featureflag" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/ref" + "gitlab.com/gitlab-org/gitaly/v13/internal/metadata/featureflag" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/test/bufconn" ) diff --git a/internal/middleware/limithandler/limithandler_test.go b/internal/middleware/limithandler/limithandler_test.go index c98f7f3891..5a843dac61 100644 --- a/internal/middleware/limithandler/limithandler_test.go +++ b/internal/middleware/limithandler/limithandler_test.go @@ -8,9 +8,9 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/middleware/limithandler" - pb "gitlab.com/gitlab-org/gitaly/internal/middleware/limithandler/testpb" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/middleware/limithandler" + pb "gitlab.com/gitlab-org/gitaly/v13/internal/middleware/limithandler/testpb" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" "google.golang.org/grpc" ) diff --git a/internal/middleware/limithandler/testhelper_test.go b/internal/middleware/limithandler/testhelper_test.go index 4248049284..06114a7e44 100644 --- a/internal/middleware/limithandler/testhelper_test.go +++ b/internal/middleware/limithandler/testhelper_test.go @@ -4,7 +4,7 @@ import ( "context" "sync/atomic" - pb "gitlab.com/gitlab-org/gitaly/internal/middleware/limithandler/testpb" + pb "gitlab.com/gitlab-org/gitaly/v13/internal/middleware/limithandler/testpb" ) type server struct { diff --git a/internal/middleware/metadatahandler/metadatahandler.go b/internal/middleware/metadatahandler/metadatahandler.go index 70e38b7cdf..a944a50166 100644 --- a/internal/middleware/metadatahandler/metadatahandler.go +++ b/internal/middleware/metadatahandler/metadatahandler.go @@ -7,8 +7,8 @@ import ( grpc_ctxtags "github.com/grpc-ecosystem/go-grpc-middleware/tags" grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" "github.com/prometheus/client_golang/prometheus" - gitalyauth "gitlab.com/gitlab-org/gitaly/auth" - "gitlab.com/gitlab-org/gitaly/internal/helper" + gitalyauth "gitlab.com/gitlab-org/gitaly/v13/auth" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" "gitlab.com/gitlab-org/labkit/correlation" "google.golang.org/grpc" "google.golang.org/grpc/metadata" diff --git a/internal/middleware/metadatahandler/metadatahandler_test.go b/internal/middleware/metadatahandler/metadatahandler_test.go index 068162da15..3183f8f4dd 100644 --- a/internal/middleware/metadatahandler/metadatahandler_test.go +++ b/internal/middleware/metadatahandler/metadatahandler_test.go @@ -8,7 +8,7 @@ import ( grpc_ctxtags "github.com/grpc-ecosystem/go-grpc-middleware/tags" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" "gitlab.com/gitlab-org/labkit/correlation" "google.golang.org/grpc/metadata" ) diff --git a/internal/middleware/sentryhandler/sentryhandler.go b/internal/middleware/sentryhandler/sentryhandler.go index 7766e14c56..981d0073e7 100644 --- a/internal/middleware/sentryhandler/sentryhandler.go +++ b/internal/middleware/sentryhandler/sentryhandler.go @@ -10,7 +10,7 @@ import ( sentry "github.com/getsentry/sentry-go" grpc_ctxtags "github.com/grpc-ecosystem/go-grpc-middleware/tags" - "gitlab.com/gitlab-org/gitaly/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" "google.golang.org/grpc" "google.golang.org/grpc/codes" ) diff --git a/internal/middleware/sentryhandler/sentryhandler_test.go b/internal/middleware/sentryhandler/sentryhandler_test.go index 4aaca2c22a..64eda9c122 100644 --- a/internal/middleware/sentryhandler/sentryhandler_test.go +++ b/internal/middleware/sentryhandler/sentryhandler_test.go @@ -8,7 +8,7 @@ import ( grpc_ctxtags "github.com/grpc-ecosystem/go-grpc-middleware/tags" "github.com/stretchr/testify/assert" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/praefect/auth_test.go b/internal/praefect/auth_test.go index 27d19de5da..02eab8e0fc 100644 --- a/internal/praefect/auth_test.go +++ b/internal/praefect/auth_test.go @@ -8,17 +8,17 @@ import ( "github.com/golang/protobuf/proto" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - gitalyauth "gitlab.com/gitlab-org/gitaly/auth" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config/auth" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/internal/praefect/mock" - "gitlab.com/gitlab-org/gitaly/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/internal/praefect/protoregistry" - "gitlab.com/gitlab-org/gitaly/internal/praefect/transactions" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper/promtest" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + gitalyauth "gitlab.com/gitlab-org/gitaly/v13/auth" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config/auth" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/mock" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/protoregistry" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/transactions" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper/promtest" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/codes" ) diff --git a/internal/praefect/config/config.go b/internal/praefect/config/config.go index a06acf9148..dab93919ae 100644 --- a/internal/praefect/config/config.go +++ b/internal/praefect/config/config.go @@ -8,11 +8,11 @@ import ( "github.com/BurntSushi/toml" promclient "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config/auth" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config/log" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config/prometheus" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config/sentry" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config/auth" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config/prometheus" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config/sentry" ) type Failover struct { diff --git a/internal/praefect/config/config_test.go b/internal/praefect/config/config_test.go index be87c9f896..e448e58b33 100644 --- a/internal/praefect/config/config_test.go +++ b/internal/praefect/config/config_test.go @@ -7,10 +7,10 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config/log" - gitaly_prometheus "gitlab.com/gitlab-org/gitaly/internal/gitaly/config/prometheus" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config/sentry" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config/log" + gitaly_prometheus "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config/prometheus" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config/sentry" ) func TestConfigValidation(t *testing.T) { diff --git a/internal/praefect/config/log.go b/internal/praefect/config/log.go index 724d81f92e..47646fdcc0 100644 --- a/internal/praefect/config/log.go +++ b/internal/praefect/config/log.go @@ -2,7 +2,7 @@ package config import ( "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/log" ) // ConfigureLogger applies the settings from the configuration file to the diff --git a/internal/praefect/consistencycheck_test.go b/internal/praefect/consistencycheck_test.go index 29fbc3e4a6..087894f9cf 100644 --- a/internal/praefect/consistencycheck_test.go +++ b/internal/praefect/consistencycheck_test.go @@ -7,10 +7,10 @@ import ( "time" "github.com/stretchr/testify/require" - gconfig "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + gconfig "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func TestConsistencyCheck(t *testing.T) { diff --git a/internal/praefect/coordinator.go b/internal/praefect/coordinator.go index 3d752512bf..0ecd79c028 100644 --- a/internal/praefect/coordinator.go +++ b/internal/praefect/coordinator.go @@ -9,18 +9,18 @@ import ( "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" "github.com/prometheus/client_golang/prometheus" "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/metadata/featureflag" - "gitlab.com/gitlab-org/gitaly/internal/middleware/metadatahandler" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/internal/praefect/grpc-proxy/proxy" - "gitlab.com/gitlab-org/gitaly/internal/praefect/metadata" - "gitlab.com/gitlab-org/gitaly/internal/praefect/metrics" - "gitlab.com/gitlab-org/gitaly/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/internal/praefect/protoregistry" - "gitlab.com/gitlab-org/gitaly/internal/praefect/transactions" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/metadata/featureflag" + "gitlab.com/gitlab-org/gitaly/v13/internal/middleware/metadatahandler" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/grpc-proxy/proxy" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/metadata" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/metrics" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/protoregistry" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/transactions" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "gitlab.com/gitlab-org/labkit/correlation" "golang.org/x/sync/errgroup" ) diff --git a/internal/praefect/coordinator_test.go b/internal/praefect/coordinator_test.go index 01c5603f06..33d5b38152 100644 --- a/internal/praefect/coordinator_test.go +++ b/internal/praefect/coordinator_test.go @@ -15,18 +15,18 @@ import ( "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/metadata/featureflag" - "gitlab.com/gitlab-org/gitaly/internal/middleware/metadatahandler" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore" - praefect_metadata "gitlab.com/gitlab-org/gitaly/internal/praefect/metadata" - "gitlab.com/gitlab-org/gitaly/internal/praefect/mock" - "gitlab.com/gitlab-org/gitaly/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/internal/praefect/protoregistry" - "gitlab.com/gitlab-org/gitaly/internal/praefect/transactions" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper/promtest" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/metadata/featureflag" + "gitlab.com/gitlab-org/gitaly/v13/internal/middleware/metadatahandler" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore" + praefect_metadata "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/metadata" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/mock" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/protoregistry" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/transactions" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper/promtest" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "gitlab.com/gitlab-org/labkit/correlation" "google.golang.org/grpc/codes" "google.golang.org/grpc/health/grpc_health_v1" diff --git a/internal/praefect/correlation.go b/internal/praefect/correlation.go index 29c7d7fb1e..1ef1d6e5db 100644 --- a/internal/praefect/correlation.go +++ b/internal/praefect/correlation.go @@ -4,7 +4,7 @@ import ( "bytes" "time" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) const base62Chars string = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" diff --git a/internal/praefect/datastore/collector_test.go b/internal/praefect/datastore/collector_test.go index 0c5f022e5b..d6a46109d3 100644 --- a/internal/praefect/datastore/collector_test.go +++ b/internal/praefect/datastore/collector_test.go @@ -7,7 +7,7 @@ import ( "github.com/prometheus/client_golang/prometheus/testutil" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) type primaryGetterFunc func(context.Context) (map[string]string, error) diff --git a/internal/praefect/datastore/glsql/postgres.go b/internal/praefect/datastore/glsql/postgres.go index 4b474c179d..c1622a68f5 100644 --- a/internal/praefect/datastore/glsql/postgres.go +++ b/internal/praefect/datastore/glsql/postgres.go @@ -9,8 +9,8 @@ import ( _ "github.com/lib/pq" migrate "github.com/rubenv/sql-migrate" "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore/migrations" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore/migrations" ) // OpenDB returns connection pool to the database. diff --git a/internal/praefect/datastore/glsql/postgres_test.go b/internal/praefect/datastore/glsql/postgres_test.go index 33db541df4..5afd35abdd 100644 --- a/internal/praefect/datastore/glsql/postgres_test.go +++ b/internal/praefect/datastore/glsql/postgres_test.go @@ -14,8 +14,8 @@ import ( "github.com/sirupsen/logrus" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestOpenDB(t *testing.T) { diff --git a/internal/praefect/datastore/glsql/testing.go b/internal/praefect/datastore/glsql/testing.go index 44a1e02f9b..41294b6e88 100644 --- a/internal/praefect/datastore/glsql/testing.go +++ b/internal/praefect/datastore/glsql/testing.go @@ -12,7 +12,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" ) var ( diff --git a/internal/praefect/datastore/init_test.go b/internal/praefect/datastore/init_test.go index a9601791fa..5ec6e04a35 100644 --- a/internal/praefect/datastore/init_test.go +++ b/internal/praefect/datastore/init_test.go @@ -7,8 +7,8 @@ import ( "os" "testing" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore/glsql" ) func TestMain(m *testing.M) { diff --git a/internal/praefect/datastore/memory.go b/internal/praefect/datastore/memory.go index b9994f38cc..3bd08eb015 100644 --- a/internal/praefect/datastore/memory.go +++ b/internal/praefect/datastore/memory.go @@ -9,7 +9,7 @@ import ( "sync" "time" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" ) var ( diff --git a/internal/praefect/datastore/memory_test.go b/internal/praefect/datastore/memory_test.go index e707fed08b..955dbf1dc7 100644 --- a/internal/praefect/datastore/memory_test.go +++ b/internal/praefect/datastore/memory_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestMemoryReplicationEventQueue(t *testing.T) { diff --git a/internal/praefect/datastore/postgres.go b/internal/praefect/datastore/postgres.go index 8e6d1744d3..ac44529e2b 100644 --- a/internal/praefect/datastore/postgres.go +++ b/internal/praefect/datastore/postgres.go @@ -7,9 +7,9 @@ import ( "time" migrate "github.com/rubenv/sql-migrate" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore/glsql" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore/migrations" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore/migrations" ) // MigrationStatusRow represents an entry in the schema migrations table. diff --git a/internal/praefect/datastore/postgres_test.go b/internal/praefect/datastore/postgres_test.go index c23c84af69..b561b70ebd 100644 --- a/internal/praefect/datastore/postgres_test.go +++ b/internal/praefect/datastore/postgres_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" ) func TestMigrateStatus(t *testing.T) { diff --git a/internal/praefect/datastore/queue.go b/internal/praefect/datastore/queue.go index 1899a7bee9..829f341ed8 100644 --- a/internal/praefect/datastore/queue.go +++ b/internal/praefect/datastore/queue.go @@ -10,7 +10,7 @@ import ( "time" "github.com/lib/pq" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore/glsql" ) // ReplicationEventQueue allows to put new events to the persistent queue and retrieve them back. diff --git a/internal/praefect/datastore/queue_bm_test.go b/internal/praefect/datastore/queue_bm_test.go index f3984bf16a..98be178daa 100644 --- a/internal/praefect/datastore/queue_bm_test.go +++ b/internal/praefect/datastore/queue_bm_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func BenchmarkPostgresReplicationEventQueue_Acknowledge(b *testing.B) { diff --git a/internal/praefect/datastore/queue_test.go b/internal/praefect/datastore/queue_test.go index de0a53af65..5c5b6c81c9 100644 --- a/internal/praefect/datastore/queue_test.go +++ b/internal/praefect/datastore/queue_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore/glsql" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestPostgresReplicationEventQueue_Enqueue(t *testing.T) { diff --git a/internal/praefect/datastore/repository_memory_test.go b/internal/praefect/datastore/repository_memory_test.go index 161b63d4d0..84aa38954c 100644 --- a/internal/praefect/datastore/repository_memory_test.go +++ b/internal/praefect/datastore/repository_memory_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) type requireState func(t *testing.T, ctx context.Context, vss virtualStorageState, ss storageState) diff --git a/internal/praefect/datastore/repository_postgres.go b/internal/praefect/datastore/repository_postgres.go index e00974f3b3..42d92d6456 100644 --- a/internal/praefect/datastore/repository_postgres.go +++ b/internal/praefect/datastore/repository_postgres.go @@ -7,7 +7,7 @@ import ( "fmt" "github.com/lib/pq" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore/glsql" ) // GenerationUnknown is used to indicate lack of generation number in diff --git a/internal/praefect/datastore/repository_postgres_bm_test.go b/internal/praefect/datastore/repository_postgres_bm_test.go index 7c8647609e..093a64f311 100644 --- a/internal/praefect/datastore/repository_postgres_bm_test.go +++ b/internal/praefect/datastore/repository_postgres_bm_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) // The test setup takes a lot of time, so it is better to run each sub-benchmark separately with limit on number of repeats. diff --git a/internal/praefect/grpc-proxy/proxy/examples_test.go b/internal/praefect/grpc-proxy/proxy/examples_test.go index eb5508de54..ee8ab07152 100644 --- a/internal/praefect/grpc-proxy/proxy/examples_test.go +++ b/internal/praefect/grpc-proxy/proxy/examples_test.go @@ -11,8 +11,8 @@ import ( "context" "strings" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/praefect/grpc-proxy/proxy" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/grpc-proxy/proxy" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" diff --git a/internal/praefect/grpc-proxy/proxy/handler.go b/internal/praefect/grpc-proxy/proxy/handler.go index 73730b2c7a..eb76136dff 100644 --- a/internal/praefect/grpc-proxy/proxy/handler.go +++ b/internal/praefect/grpc-proxy/proxy/handler.go @@ -12,7 +12,7 @@ import ( "errors" "io" - "gitlab.com/gitlab-org/gitaly/internal/middleware/sentryhandler" + "gitlab.com/gitlab-org/gitaly/v13/internal/middleware/sentryhandler" "golang.org/x/sync/errgroup" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/internal/praefect/grpc-proxy/proxy/handler_test.go b/internal/praefect/grpc-proxy/proxy/handler_test.go index f9ef180a17..51a496328d 100644 --- a/internal/praefect/grpc-proxy/proxy/handler_test.go +++ b/internal/praefect/grpc-proxy/proxy/handler_test.go @@ -24,13 +24,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - "gitlab.com/gitlab-org/gitaly/client" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/helper/fieldextractors" - "gitlab.com/gitlab-org/gitaly/internal/middleware/sentryhandler" - "gitlab.com/gitlab-org/gitaly/internal/praefect/grpc-proxy/proxy" - pb "gitlab.com/gitlab-org/gitaly/internal/praefect/grpc-proxy/testdata" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/client" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/fieldextractors" + "gitlab.com/gitlab-org/gitaly/v13/internal/middleware/sentryhandler" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/grpc-proxy/proxy" + pb "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/grpc-proxy/testdata" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/grpclog" diff --git a/internal/praefect/grpc-proxy/proxy/helper_test.go b/internal/praefect/grpc-proxy/proxy/helper_test.go index c240f8d71b..4e75134a15 100644 --- a/internal/praefect/grpc-proxy/proxy/helper_test.go +++ b/internal/praefect/grpc-proxy/proxy/helper_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/praefect/grpc-proxy/proxy" - testservice "gitlab.com/gitlab-org/gitaly/internal/praefect/grpc-proxy/testdata" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/grpc-proxy/proxy" + testservice "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/grpc-proxy/testdata" "google.golang.org/grpc" ) diff --git a/internal/praefect/grpc-proxy/proxy/peeker_test.go b/internal/praefect/grpc-proxy/proxy/peeker_test.go index 38565da000..16e1e08f59 100644 --- a/internal/praefect/grpc-proxy/proxy/peeker_test.go +++ b/internal/praefect/grpc-proxy/proxy/peeker_test.go @@ -9,10 +9,10 @@ import ( "github.com/golang/protobuf/proto" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/praefect/grpc-proxy/proxy" - testservice "gitlab.com/gitlab-org/gitaly/internal/praefect/grpc-proxy/testdata" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/grpc-proxy/proxy" + testservice "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/grpc-proxy/testdata" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) // TestStreamPeeking demonstrates that a director function is able to peek diff --git a/internal/praefect/helper_test.go b/internal/praefect/helper_test.go index 499df18d82..9bd39737c6 100644 --- a/internal/praefect/helper_test.go +++ b/internal/praefect/helper_test.go @@ -10,24 +10,24 @@ import ( "github.com/golang/protobuf/protoc-gen-go/descriptor" "github.com/sirupsen/logrus" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/client" - gconfig "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - internalauth "gitlab.com/gitlab-org/gitaly/internal/gitaly/config/auth" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/server/auth" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/internalgitaly" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/repository" - gitalyserver "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/server" - "gitlab.com/gitlab-org/gitaly/internal/log" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/internal/praefect/grpc-proxy/proxy" - "gitlab.com/gitlab-org/gitaly/internal/praefect/mock" - "gitlab.com/gitlab-org/gitaly/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/internal/praefect/protoregistry" - "gitlab.com/gitlab-org/gitaly/internal/praefect/transactions" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper/promtest" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/client" + gconfig "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + internalauth "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config/auth" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/server/auth" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/internalgitaly" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/repository" + gitalyserver "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/server" + "gitlab.com/gitlab-org/gitaly/v13/internal/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/grpc-proxy/proxy" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/mock" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/protoregistry" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/transactions" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper/promtest" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" correlation "gitlab.com/gitlab-org/labkit/correlation/grpc" "google.golang.org/grpc" "google.golang.org/grpc/health" diff --git a/internal/praefect/info_service_test.go b/internal/praefect/info_service_test.go index 8d59575bdb..09f2e68a43 100644 --- a/internal/praefect/info_service_test.go +++ b/internal/praefect/info_service_test.go @@ -6,10 +6,10 @@ import ( "testing" "github.com/stretchr/testify/require" - gconfig "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + gconfig "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func TestInfoService_RepositoryReplicas(t *testing.T) { diff --git a/internal/praefect/metadata/server.go b/internal/praefect/metadata/server.go index fa6c36bde3..309f14dd2f 100644 --- a/internal/praefect/metadata/server.go +++ b/internal/praefect/metadata/server.go @@ -10,8 +10,8 @@ import ( "net/url" "strings" - "gitlab.com/gitlab-org/gitaly/internal/bootstrap/starter" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/bootstrap/starter" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" "google.golang.org/grpc/credentials" "google.golang.org/grpc/metadata" "google.golang.org/grpc/peer" diff --git a/internal/praefect/metadata/server_test.go b/internal/praefect/metadata/server_test.go index 44ab3af2b4..5713a0e92e 100644 --- a/internal/praefect/metadata/server_test.go +++ b/internal/praefect/metadata/server_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" "google.golang.org/grpc/credentials" "google.golang.org/grpc/peer" ) diff --git a/internal/praefect/metrics/prometheus.go b/internal/praefect/metrics/prometheus.go index 1c366fe93a..bd0bae91c1 100644 --- a/internal/praefect/metrics/prometheus.go +++ b/internal/praefect/metrics/prometheus.go @@ -2,8 +2,8 @@ package metrics import ( "github.com/prometheus/client_golang/prometheus" - promconfig "gitlab.com/gitlab-org/gitaly/internal/gitaly/config/prometheus" - "gitlab.com/gitlab-org/gitaly/internal/prometheus/metrics" + promconfig "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config/prometheus" + "gitlab.com/gitlab-org/gitaly/v13/internal/prometheus/metrics" ) // RegisterReplicationDelay creates and registers a prometheus histogram diff --git a/internal/praefect/middleware/errorhandler.go b/internal/praefect/middleware/errorhandler.go index 5339419a51..2644dabd72 100644 --- a/internal/praefect/middleware/errorhandler.go +++ b/internal/praefect/middleware/errorhandler.go @@ -5,8 +5,8 @@ import ( "fmt" "io" - "gitlab.com/gitlab-org/gitaly/internal/praefect/nodes/tracker" - "gitlab.com/gitlab-org/gitaly/internal/praefect/protoregistry" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/nodes/tracker" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/protoregistry" "google.golang.org/grpc" ) diff --git a/internal/praefect/middleware/errorhandler_test.go b/internal/praefect/middleware/errorhandler_test.go index 490c4a99d3..91ecbf172e 100644 --- a/internal/praefect/middleware/errorhandler_test.go +++ b/internal/praefect/middleware/errorhandler_test.go @@ -10,12 +10,12 @@ import ( "github.com/golang/protobuf/ptypes/empty" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/praefect/grpc-proxy/proxy" - "gitlab.com/gitlab-org/gitaly/internal/praefect/mock" - "gitlab.com/gitlab-org/gitaly/internal/praefect/nodes/tracker" - "gitlab.com/gitlab-org/gitaly/internal/praefect/protoregistry" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/grpc-proxy/proxy" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/mock" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/nodes/tracker" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/protoregistry" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" "google.golang.org/grpc" ) diff --git a/internal/praefect/middleware/methodtype.go b/internal/praefect/middleware/methodtype.go index c8a980dc09..0e68f37310 100644 --- a/internal/praefect/middleware/methodtype.go +++ b/internal/praefect/middleware/methodtype.go @@ -4,8 +4,8 @@ import ( "context" "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/praefect/metrics" - "gitlab.com/gitlab-org/gitaly/internal/praefect/protoregistry" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/metrics" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/protoregistry" "google.golang.org/grpc" ) diff --git a/internal/praefect/mock/mock.pb.go b/internal/praefect/mock/mock.pb.go index 6f66b292bc..e424fe10bd 100644 --- a/internal/praefect/mock/mock.pb.go +++ b/internal/praefect/mock/mock.pb.go @@ -10,7 +10,7 @@ import ( proto "github.com/golang/protobuf/proto" empty "github.com/golang/protobuf/ptypes/empty" - gitalypb "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + gitalypb "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/internal/praefect/mocksvc_test.go b/internal/praefect/mocksvc_test.go index e7b1c12579..5d4745ca1e 100644 --- a/internal/praefect/mocksvc_test.go +++ b/internal/praefect/mocksvc_test.go @@ -4,7 +4,7 @@ import ( "context" "github.com/golang/protobuf/ptypes/empty" - "gitlab.com/gitlab-org/gitaly/internal/praefect/mock" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/mock" ) type ( diff --git a/internal/praefect/nodes/disabled_elector.go b/internal/praefect/nodes/disabled_elector.go index 5464a8fd0d..a85bc0249f 100644 --- a/internal/praefect/nodes/disabled_elector.go +++ b/internal/praefect/nodes/disabled_elector.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "gitlab.com/gitlab-org/gitaly/internal/praefect/metrics" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/metrics" ) // newDisabledElector returns a stub that always returns the same shard where the diff --git a/internal/praefect/nodes/health_manager.go b/internal/praefect/nodes/health_manager.go index 1e37beb811..a14f2bfe74 100644 --- a/internal/praefect/nodes/health_manager.go +++ b/internal/praefect/nodes/health_manager.go @@ -9,8 +9,8 @@ import ( "github.com/lib/pq" "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore/glsql" "google.golang.org/grpc/health/grpc_health_v1" ) diff --git a/internal/praefect/nodes/health_manager_test.go b/internal/praefect/nodes/health_manager_test.go index 4e4a94b644..a386c39d41 100644 --- a/internal/praefect/nodes/health_manager_test.go +++ b/internal/praefect/nodes/health_manager_test.go @@ -8,9 +8,9 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore/glsql" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" "google.golang.org/grpc" "google.golang.org/grpc/health/grpc_health_v1" ) diff --git a/internal/praefect/nodes/init_test.go b/internal/praefect/nodes/init_test.go index 70c50dd305..3ce74a0fdf 100644 --- a/internal/praefect/nodes/init_test.go +++ b/internal/praefect/nodes/init_test.go @@ -7,7 +7,7 @@ import ( "os" "testing" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore/glsql" ) func TestMain(m *testing.M) { diff --git a/internal/praefect/nodes/local_elector.go b/internal/praefect/nodes/local_elector.go index e72b47cdaf..32756ab188 100644 --- a/internal/praefect/nodes/local_elector.go +++ b/internal/praefect/nodes/local_elector.go @@ -6,7 +6,7 @@ import ( "time" "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/praefect/metrics" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/metrics" ) // localElector relies on an in-memory datastore to track the primary diff --git a/internal/praefect/nodes/local_elector_test.go b/internal/praefect/nodes/local_elector_test.go index 766f880a19..6348cdd3cf 100644 --- a/internal/praefect/nodes/local_elector_test.go +++ b/internal/praefect/nodes/local_elector_test.go @@ -6,9 +6,9 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper/promtest" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper/promtest" "google.golang.org/grpc" ) diff --git a/internal/praefect/nodes/manager.go b/internal/praefect/nodes/manager.go index 20c50201c5..c08c18133d 100644 --- a/internal/praefect/nodes/manager.go +++ b/internal/praefect/nodes/manager.go @@ -12,17 +12,17 @@ import ( "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" "github.com/sirupsen/logrus" - gitalyauth "gitlab.com/gitlab-org/gitaly/auth" - "gitlab.com/gitlab-org/gitaly/client" - "gitlab.com/gitlab-org/gitaly/internal/metadata/featureflag" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/internal/praefect/grpc-proxy/proxy" - "gitlab.com/gitlab-org/gitaly/internal/praefect/metrics" - "gitlab.com/gitlab-org/gitaly/internal/praefect/middleware" - "gitlab.com/gitlab-org/gitaly/internal/praefect/nodes/tracker" - "gitlab.com/gitlab-org/gitaly/internal/praefect/protoregistry" - prommetrics "gitlab.com/gitlab-org/gitaly/internal/prometheus/metrics" + gitalyauth "gitlab.com/gitlab-org/gitaly/v13/auth" + "gitlab.com/gitlab-org/gitaly/v13/client" + "gitlab.com/gitlab-org/gitaly/v13/internal/metadata/featureflag" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/grpc-proxy/proxy" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/metrics" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/middleware" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/nodes/tracker" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/protoregistry" + prommetrics "gitlab.com/gitlab-org/gitaly/v13/internal/prometheus/metrics" "google.golang.org/grpc" healthpb "google.golang.org/grpc/health/grpc_health_v1" ) diff --git a/internal/praefect/nodes/manager_test.go b/internal/praefect/nodes/manager_test.go index 3da9f2b570..f892ec5f5c 100644 --- a/internal/praefect/nodes/manager_test.go +++ b/internal/praefect/nodes/manager_test.go @@ -9,12 +9,12 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/client" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/internal/praefect/protoregistry" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper/promtest" + "gitlab.com/gitlab-org/gitaly/v13/client" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/protoregistry" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper/promtest" "google.golang.org/grpc" "google.golang.org/grpc/health" "google.golang.org/grpc/health/grpc_health_v1" diff --git a/internal/praefect/nodes/sql_elector.go b/internal/praefect/nodes/sql_elector.go index f5dbd1c9e5..3feddf9acf 100644 --- a/internal/praefect/nodes/sql_elector.go +++ b/internal/praefect/nodes/sql_elector.go @@ -13,8 +13,8 @@ import ( "github.com/google/uuid" "github.com/lib/pq" "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/internal/praefect/metrics" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/metrics" ) const ( diff --git a/internal/praefect/nodes/sql_elector_test.go b/internal/praefect/nodes/sql_elector_test.go index f942f2ff72..ba51587ab1 100644 --- a/internal/praefect/nodes/sql_elector_test.go +++ b/internal/praefect/nodes/sql_elector_test.go @@ -8,10 +8,10 @@ import ( "github.com/sirupsen/logrus/hooks/test" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore/glsql" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper/promtest" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper/promtest" "google.golang.org/grpc" "google.golang.org/grpc/health/grpc_health_v1" ) diff --git a/internal/praefect/nodes/tracker/errors_test.go b/internal/praefect/nodes/tracker/errors_test.go index 95b4a3ab9f..59b1317c43 100644 --- a/internal/praefect/nodes/tracker/errors_test.go +++ b/internal/praefect/nodes/tracker/errors_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestErrorTracker_IncrErrors(t *testing.T) { diff --git a/internal/praefect/protoregistry/find_oid.go b/internal/praefect/protoregistry/find_oid.go index abc87ccb0c..b50463310f 100644 --- a/internal/praefect/protoregistry/find_oid.go +++ b/internal/praefect/protoregistry/find_oid.go @@ -8,7 +8,7 @@ import ( "strconv" "github.com/golang/protobuf/proto" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) const ( diff --git a/internal/praefect/protoregistry/find_oid_test.go b/internal/praefect/protoregistry/find_oid_test.go index a040bb17bf..c1efa92f0f 100644 --- a/internal/praefect/protoregistry/find_oid_test.go +++ b/internal/praefect/protoregistry/find_oid_test.go @@ -7,8 +7,8 @@ import ( "github.com/golang/protobuf/proto" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/praefect/protoregistry" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/protoregistry" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func TestProtoRegistryTargetRepo(t *testing.T) { diff --git a/internal/praefect/protoregistry/protoregistry.go b/internal/praefect/protoregistry/protoregistry.go index 62fc906f9a..4c7bfa598d 100644 --- a/internal/praefect/protoregistry/protoregistry.go +++ b/internal/praefect/protoregistry/protoregistry.go @@ -10,8 +10,8 @@ import ( "github.com/golang/protobuf/proto" "github.com/golang/protobuf/protoc-gen-go/descriptor" - "gitlab.com/gitlab-org/gitaly/internal/protoutil" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/protoutil" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) // GitalyProtoFileDescriptors is a slice of all gitaly registered file descriptors diff --git a/internal/praefect/protoregistry/protoregistry_test.go b/internal/praefect/protoregistry/protoregistry_test.go index df78744040..c4705a29df 100644 --- a/internal/praefect/protoregistry/protoregistry_test.go +++ b/internal/praefect/protoregistry/protoregistry_test.go @@ -6,9 +6,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/praefect/protoregistry" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/protoregistry" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func TestNewProtoRegistry(t *testing.T) { diff --git a/internal/praefect/reconciler/reconciler.go b/internal/praefect/reconciler/reconciler.go index ec084cc6fe..cb745077f0 100644 --- a/internal/praefect/reconciler/reconciler.go +++ b/internal/praefect/reconciler/reconciler.go @@ -7,9 +7,9 @@ import ( "github.com/lib/pq" "github.com/prometheus/client_golang/prometheus" "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore/glsql" - "gitlab.com/gitlab-org/gitaly/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/nodes" ) // Reconciler implements reconciliation logic for repairing outdated repository replicas. diff --git a/internal/praefect/reconciler/reconciler_benchmark_test.go b/internal/praefect/reconciler/reconciler_benchmark_test.go index 7ee0b12176..34feb9f2a2 100644 --- a/internal/praefect/reconciler/reconciler_benchmark_test.go +++ b/internal/praefect/reconciler/reconciler_benchmark_test.go @@ -8,8 +8,8 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func BenchmarkReconcile(b *testing.B) { diff --git a/internal/praefect/reconciler/reconciler_test.go b/internal/praefect/reconciler/reconciler_test.go index 320967ed4a..32d45bbb8e 100644 --- a/internal/praefect/reconciler/reconciler_test.go +++ b/internal/praefect/reconciler/reconciler_test.go @@ -10,12 +10,12 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/middleware/metadatahandler" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore/glsql" - "gitlab.com/gitlab-org/gitaly/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/middleware/metadatahandler" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/praefect/replicator.go b/internal/praefect/replicator.go index ab56c5d07c..974805614d 100644 --- a/internal/praefect/replicator.go +++ b/internal/praefect/replicator.go @@ -8,14 +8,14 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/middleware/metadatahandler" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/internal/praefect/metrics" - "gitlab.com/gitlab-org/gitaly/internal/praefect/nodes" - prommetrics "gitlab.com/gitlab-org/gitaly/internal/prometheus/metrics" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/middleware/metadatahandler" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/metrics" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/nodes" + prommetrics "gitlab.com/gitlab-org/gitaly/v13/internal/prometheus/metrics" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "gitlab.com/gitlab-org/labkit/correlation" "golang.org/x/sync/errgroup" "google.golang.org/grpc" diff --git a/internal/praefect/replicator_test.go b/internal/praefect/replicator_test.go index 994c51f69b..b16e24f7f2 100644 --- a/internal/praefect/replicator_test.go +++ b/internal/praefect/replicator_test.go @@ -18,27 +18,27 @@ import ( "github.com/sirupsen/logrus/hooks/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - gitalyauth "gitlab.com/gitlab-org/gitaly/auth" - "gitlab.com/gitlab-org/gitaly/internal/git/objectpool" - gitaly_config "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/rubyserver" - serverPkg "gitlab.com/gitlab-org/gitaly/internal/gitaly/server" - objectpoolservice "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/objectpool" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/ref" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/remote" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/repository" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/service/ssh" - "gitlab.com/gitlab-org/gitaly/internal/middleware/metadatahandler" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/internal/praefect/protoregistry" - "gitlab.com/gitlab-org/gitaly/internal/praefect/transactions" - "gitlab.com/gitlab-org/gitaly/internal/storage" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper/promtest" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + gitalyauth "gitlab.com/gitlab-org/gitaly/v13/auth" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/objectpool" + gitaly_config "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/rubyserver" + serverPkg "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/server" + objectpoolservice "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/objectpool" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/ref" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/remote" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/repository" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/service/ssh" + "gitlab.com/gitlab-org/gitaly/v13/internal/middleware/metadatahandler" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/protoregistry" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/transactions" + "gitlab.com/gitlab-org/gitaly/v13/internal/storage" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper/promtest" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "gitlab.com/gitlab-org/labkit/correlation" "google.golang.org/grpc" "google.golang.org/grpc/health" diff --git a/internal/praefect/router.go b/internal/praefect/router.go index 29513d67ae..fa7903ccd0 100644 --- a/internal/praefect/router.go +++ b/internal/praefect/router.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/nodes" "google.golang.org/grpc" ) diff --git a/internal/praefect/server.go b/internal/praefect/server.go index ea263b6025..5572e38f4c 100644 --- a/internal/praefect/server.go +++ b/internal/praefect/server.go @@ -10,23 +10,23 @@ import ( grpc_ctxtags "github.com/grpc-ecosystem/go-grpc-middleware/tags" grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/server/auth" - "gitlab.com/gitlab-org/gitaly/internal/helper/fieldextractors" - "gitlab.com/gitlab-org/gitaly/internal/middleware/cancelhandler" - "gitlab.com/gitlab-org/gitaly/internal/middleware/metadatahandler" - "gitlab.com/gitlab-org/gitaly/internal/middleware/panichandler" - "gitlab.com/gitlab-org/gitaly/internal/middleware/sentryhandler" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/internal/praefect/grpc-proxy/proxy" - "gitlab.com/gitlab-org/gitaly/internal/praefect/middleware" - "gitlab.com/gitlab-org/gitaly/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/internal/praefect/protoregistry" - "gitlab.com/gitlab-org/gitaly/internal/praefect/service/info" - "gitlab.com/gitlab-org/gitaly/internal/praefect/service/server" - "gitlab.com/gitlab-org/gitaly/internal/praefect/service/transaction" - "gitlab.com/gitlab-org/gitaly/internal/praefect/transactions" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/server/auth" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/fieldextractors" + "gitlab.com/gitlab-org/gitaly/v13/internal/middleware/cancelhandler" + "gitlab.com/gitlab-org/gitaly/v13/internal/middleware/metadatahandler" + "gitlab.com/gitlab-org/gitaly/v13/internal/middleware/panichandler" + "gitlab.com/gitlab-org/gitaly/v13/internal/middleware/sentryhandler" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/grpc-proxy/proxy" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/middleware" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/protoregistry" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/service/info" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/service/server" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/service/transaction" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/transactions" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" grpccorrelation "gitlab.com/gitlab-org/labkit/correlation/grpc" grpctracing "gitlab.com/gitlab-org/labkit/tracing/grpc" "google.golang.org/grpc" diff --git a/internal/praefect/server_factory.go b/internal/praefect/server_factory.go index 568997089a..d579723be5 100644 --- a/internal/praefect/server_factory.go +++ b/internal/praefect/server_factory.go @@ -7,12 +7,12 @@ import ( "sync" "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/internal/praefect/grpc-proxy/proxy" - "gitlab.com/gitlab-org/gitaly/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/internal/praefect/protoregistry" - "gitlab.com/gitlab-org/gitaly/internal/praefect/transactions" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/grpc-proxy/proxy" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/protoregistry" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/transactions" "google.golang.org/grpc" "google.golang.org/grpc/credentials" ) diff --git a/internal/praefect/server_factory_test.go b/internal/praefect/server_factory_test.go index 5c57aaef27..bf7aae6fcb 100644 --- a/internal/praefect/server_factory_test.go +++ b/internal/praefect/server_factory_test.go @@ -10,19 +10,19 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/client" - "gitlab.com/gitlab-org/gitaly/internal/bootstrap/starter" - gconfig "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/server" - "gitlab.com/gitlab-org/gitaly/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/internal/praefect/protoregistry" - "gitlab.com/gitlab-org/gitaly/internal/praefect/transactions" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper/promtest" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/client" + "gitlab.com/gitlab-org/gitaly/v13/internal/bootstrap/starter" + gconfig "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/server" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/protoregistry" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/transactions" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper/promtest" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/credentials" healthpb "google.golang.org/grpc/health/grpc_health_v1" diff --git a/internal/praefect/server_test.go b/internal/praefect/server_test.go index bf6de086e5..e96675ae76 100644 --- a/internal/praefect/server_test.go +++ b/internal/praefect/server_test.go @@ -21,23 +21,23 @@ import ( "github.com/sirupsen/logrus/hooks/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git" - gconfig "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/internal/praefect/grpc-proxy/proxy" - "gitlab.com/gitlab-org/gitaly/internal/praefect/metadata" - "gitlab.com/gitlab-org/gitaly/internal/praefect/mock" - "gitlab.com/gitlab-org/gitaly/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/internal/praefect/nodes/tracker" - "gitlab.com/gitlab-org/gitaly/internal/praefect/protoregistry" - "gitlab.com/gitlab-org/gitaly/internal/praefect/transactions" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper/promtest" - "gitlab.com/gitlab-org/gitaly/internal/version" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/git" + gconfig "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/grpc-proxy/proxy" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/metadata" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/mock" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/nodes/tracker" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/protoregistry" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/transactions" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper/promtest" + "gitlab.com/gitlab-org/gitaly/v13/internal/version" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/health" diff --git a/internal/praefect/service/info/consistencycheck.go b/internal/praefect/service/info/consistencycheck.go index 24510db79f..6b55996a90 100644 --- a/internal/praefect/service/info/consistencycheck.go +++ b/internal/praefect/service/info/consistencycheck.go @@ -4,10 +4,10 @@ import ( "context" "io" - "gitlab.com/gitlab-org/gitaly/internal/middleware/metadatahandler" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/middleware/metadatahandler" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "gitlab.com/gitlab-org/labkit/correlation" "golang.org/x/sync/errgroup" "google.golang.org/grpc/codes" diff --git a/internal/praefect/service/info/dataloss.go b/internal/praefect/service/info/dataloss.go index cf657685fa..b1ede1ab23 100644 --- a/internal/praefect/service/info/dataloss.go +++ b/internal/praefect/service/info/dataloss.go @@ -4,7 +4,7 @@ import ( "context" "sort" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func (s *Server) DatalossCheck(ctx context.Context, req *gitalypb.DatalossCheckRequest) (*gitalypb.DatalossCheckResponse, error) { diff --git a/internal/praefect/service/info/repositories.go b/internal/praefect/service/info/repositories.go index ec6e3ba668..67572b310c 100644 --- a/internal/praefect/service/info/repositories.go +++ b/internal/praefect/service/info/repositories.go @@ -3,9 +3,9 @@ package info import ( "context" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "golang.org/x/sync/errgroup" "google.golang.org/grpc" ) diff --git a/internal/praefect/service/info/server.go b/internal/praefect/service/info/server.go index 9a812a4d17..c9037484a0 100644 --- a/internal/praefect/service/info/server.go +++ b/internal/praefect/service/info/server.go @@ -3,11 +3,11 @@ package info import ( "context" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) // Server is a InfoService server diff --git a/internal/praefect/service/server/disk_stats.go b/internal/praefect/service/server/disk_stats.go index 607bf334f7..f5aee991da 100644 --- a/internal/praefect/service/server/disk_stats.go +++ b/internal/praefect/service/server/disk_stats.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) // DiskStatistics sends DiskStatisticsRequest to all of a praefect server's internal gitaly nodes and aggregates the diff --git a/internal/praefect/service/server/info.go b/internal/praefect/service/server/info.go index 30c17374e0..88ba77f447 100644 --- a/internal/praefect/service/server/info.go +++ b/internal/praefect/service/server/info.go @@ -5,7 +5,7 @@ import ( "sync" "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) // ServerInfo sends ServerInfoRequest to all of a praefect server's internal gitaly nodes and aggregates the results into diff --git a/internal/praefect/service/server/server.go b/internal/praefect/service/server/server.go index 1788307ed5..9e465ea899 100644 --- a/internal/praefect/service/server/server.go +++ b/internal/praefect/service/server/server.go @@ -1,9 +1,9 @@ package server import ( - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) // Server is a ServerService server diff --git a/internal/praefect/service/transaction/server.go b/internal/praefect/service/transaction/server.go index 96fd12efd1..675e4d7e64 100644 --- a/internal/praefect/service/transaction/server.go +++ b/internal/praefect/service/transaction/server.go @@ -4,9 +4,9 @@ import ( "context" "errors" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/praefect/transactions" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/transactions" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/praefect/transaction_test.go b/internal/praefect/transaction_test.go index 71f5e3bc06..d04789b6e9 100644 --- a/internal/praefect/transaction_test.go +++ b/internal/praefect/transaction_test.go @@ -11,10 +11,10 @@ import ( "github.com/prometheus/client_golang/prometheus/testutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/internal/praefect/transactions" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/transactions" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/internal/praefect/transactions/manager.go b/internal/praefect/transactions/manager.go index b663c4827d..c6163de6ef 100644 --- a/internal/praefect/transactions/manager.go +++ b/internal/praefect/transactions/manager.go @@ -14,7 +14,7 @@ import ( "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" "github.com/prometheus/client_golang/prometheus" "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" ) var ErrNotFound = errors.New("transaction not found") diff --git a/internal/praefect/transactions/transaction_test.go b/internal/praefect/transactions/transaction_test.go index 6a9ff1e539..d92e2bb7d5 100644 --- a/internal/praefect/transactions/transaction_test.go +++ b/internal/praefect/transactions/transaction_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestTransactionCancellationWithEmptyTransaction(t *testing.T) { diff --git a/internal/praefect/version.go b/internal/praefect/version.go index 25758f35a4..b82c78d1c7 100644 --- a/internal/praefect/version.go +++ b/internal/praefect/version.go @@ -3,7 +3,7 @@ package praefect import ( "fmt" - "gitlab.com/gitlab-org/gitaly/internal/version" + "gitlab.com/gitlab-org/gitaly/v13/internal/version" ) // GetVersionString returns a standard version header diff --git a/internal/protoutil/extension.go b/internal/protoutil/extension.go index 34e54d5044..0af8235749 100644 --- a/internal/protoutil/extension.go +++ b/internal/protoutil/extension.go @@ -6,7 +6,7 @@ import ( "github.com/golang/protobuf/proto" "github.com/golang/protobuf/protoc-gen-go/descriptor" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) // GetOpExtension gets the OperationMsg from a method descriptor diff --git a/internal/safe/file_writer_test.go b/internal/safe/file_writer_test.go index 308e3eb7a0..be34cc7484 100644 --- a/internal/safe/file_writer_test.go +++ b/internal/safe/file_writer_test.go @@ -10,8 +10,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/safe" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/safe" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestFile(t *testing.T) { diff --git a/internal/storage/locator.go b/internal/storage/locator.go index 43fce7f5b1..f4366a0d31 100644 --- a/internal/storage/locator.go +++ b/internal/storage/locator.go @@ -6,7 +6,7 @@ import ( "path/filepath" "strings" - "gitlab.com/gitlab-org/gitaly/internal/git/repository" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/repository" ) // Locator allows to get info about location of the repository or storage at the local file system. diff --git a/internal/storage/metadata.go b/internal/storage/metadata.go index 67a84bf18d..1532f45285 100644 --- a/internal/storage/metadata.go +++ b/internal/storage/metadata.go @@ -6,7 +6,7 @@ import ( "path/filepath" "github.com/google/uuid" - "gitlab.com/gitlab-org/gitaly/internal/safe" + "gitlab.com/gitlab-org/gitaly/v13/internal/safe" ) const ( diff --git a/internal/stream/std_stream.go b/internal/stream/std_stream.go index a6ba0f0a26..e5813d788b 100644 --- a/internal/stream/std_stream.go +++ b/internal/stream/std_stream.go @@ -4,7 +4,7 @@ import ( "fmt" "io" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) // StdoutStderrResponse is an interface for RPC responses that need to stream stderr and stdout diff --git a/internal/supervisor/monitor.go b/internal/supervisor/monitor.go index a5f609cf6b..860804ca6e 100644 --- a/internal/supervisor/monitor.go +++ b/internal/supervisor/monitor.go @@ -5,7 +5,7 @@ import ( "github.com/prometheus/client_golang/prometheus" log "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/ps" + "gitlab.com/gitlab-org/gitaly/v13/internal/ps" ) var ( diff --git a/internal/supervisor/supervisor_test.go b/internal/supervisor/supervisor_test.go index 2af3b655fb..f8df9a0993 100644 --- a/internal/supervisor/supervisor_test.go +++ b/internal/supervisor/supervisor_test.go @@ -14,7 +14,7 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) var ( diff --git a/internal/tempdir/tempdir.go b/internal/tempdir/tempdir.go index 25969efc62..871aa689d7 100644 --- a/internal/tempdir/tempdir.go +++ b/internal/tempdir/tempdir.go @@ -10,10 +10,10 @@ import ( "time" log "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/internal/dontpanic" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/helper/housekeeping" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/dontpanic" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/housekeeping" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) const ( diff --git a/internal/tempdir/tempdir_test.go b/internal/tempdir/tempdir_test.go index 37595be873..c3acde7cc2 100644 --- a/internal/tempdir/tempdir_test.go +++ b/internal/tempdir/tempdir_test.go @@ -9,10 +9,10 @@ import ( "github.com/sirupsen/logrus/hooks/test" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/helper" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) func TestNewAsRepositorySuccess(t *testing.T) { diff --git a/internal/tempdir/testhelper_test.go b/internal/tempdir/testhelper_test.go index acb32d1e35..fcf3766908 100644 --- a/internal/tempdir/testhelper_test.go +++ b/internal/tempdir/testhelper_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/testhelper/commit.go b/internal/testhelper/commit.go index 12cdbf0eeb..c38690543c 100644 --- a/internal/testhelper/commit.go +++ b/internal/testhelper/commit.go @@ -10,8 +10,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/text" ) // CreateCommitOpts holds extra options for CreateCommit. diff --git a/internal/testhelper/config_test.go b/internal/testhelper/config_test.go index 401f82c870..90e64a4ff6 100644 --- a/internal/testhelper/config_test.go +++ b/internal/testhelper/config_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" ) var cfgData = ` diff --git a/internal/testhelper/git_protocol.go b/internal/testhelper/git_protocol.go index 0e0a3690a2..a0f3ea2348 100644 --- a/internal/testhelper/git_protocol.go +++ b/internal/testhelper/git_protocol.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" ) // EnableGitProtocolV2Support replaces the git binary in config with a diff --git a/internal/testhelper/githttp.go b/internal/testhelper/githttp.go index 106d604610..65989dfe62 100644 --- a/internal/testhelper/githttp.go +++ b/internal/testhelper/githttp.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" ) func GitServer(t testing.TB, repoPath string, middleware func(http.ResponseWriter, *http.Request, http.Handler)) (int, func() error) { diff --git a/internal/testhelper/grpc_test.go b/internal/testhelper/grpc_test.go index 6b1272c3f4..6fa988cbc0 100644 --- a/internal/testhelper/grpc_test.go +++ b/internal/testhelper/grpc_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v13/internal/testhelper" "google.golang.org/grpc" ) diff --git a/internal/testhelper/hook_env.go b/internal/testhelper/hook_env.go index 6960c924e1..5727a33b71 100644 --- a/internal/testhelper/hook_env.go +++ b/internal/testhelper/hook_env.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/git/hooks" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/hooks" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" ) // CaptureHookEnv creates a bogus 'update' Git hook to sniff out what @@ -45,7 +45,7 @@ func ConfigureGitalyHooksBinary() { "build", "-o", filepath.Join(config.Config.BinDir, "gitaly-hooks"), - "gitlab.com/gitlab-org/gitaly/cmd/gitaly-hooks", + "gitlab.com/gitlab-org/gitaly/v13/cmd/gitaly-hooks", } MustRunCommand(nil, nil, "go", goBuildArgs...) } diff --git a/internal/testhelper/tag.go b/internal/testhelper/tag.go index 3b94e84fda..f762f4c66d 100644 --- a/internal/testhelper/tag.go +++ b/internal/testhelper/tag.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "gitlab.com/gitlab-org/gitaly/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/text" ) // CreateTagOpts holds extra options for CreateTag. diff --git a/internal/testhelper/testhelper.go b/internal/testhelper/testhelper.go index 134367ead7..c51fb363e9 100644 --- a/internal/testhelper/testhelper.go +++ b/internal/testhelper/testhelper.go @@ -34,14 +34,14 @@ import ( log "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/internal/command" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/helper/fieldextractors" - "gitlab.com/gitlab-org/gitaly/internal/helper/text" - gitalylog "gitlab.com/gitlab-org/gitaly/internal/log" - "gitlab.com/gitlab-org/gitaly/internal/metadata/featureflag" - "gitlab.com/gitlab-org/gitaly/internal/storage" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/command" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/fieldextractors" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/text" + gitalylog "gitlab.com/gitlab-org/gitaly/v13/internal/log" + "gitlab.com/gitlab-org/gitaly/v13/internal/metadata/featureflag" + "gitlab.com/gitlab-org/gitaly/v13/internal/storage" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" @@ -604,7 +604,7 @@ func ConfigureGitalySSH() { "build", "-o", filepath.Join(config.Config.BinDir, "gitaly-ssh"), - "gitlab.com/gitlab-org/gitaly/cmd/gitaly-ssh", + "gitlab.com/gitlab-org/gitaly/v13/cmd/gitaly-ssh", } MustRunCommand(nil, nil, "go", goBuildArgs...) } @@ -619,7 +619,7 @@ func ConfigureGitalyGit2Go() { "build", "-tags", "static,system_libgit2", "-o", filepath.Join(config.Config.BinDir, "gitaly-git2go"), - "gitlab.com/gitlab-org/gitaly/cmd/gitaly-git2go", + "gitlab.com/gitlab-org/gitaly/v13/cmd/gitaly-git2go", } MustRunCommand(nil, nil, "go", goBuildArgs...) } diff --git a/internal/testhelper/testserver.go b/internal/testhelper/testserver.go index dcbab20a54..d666f5f622 100644 --- a/internal/testhelper/testserver.go +++ b/internal/testhelper/testserver.go @@ -26,15 +26,15 @@ import ( grpc_ctxtags "github.com/grpc-ecosystem/go-grpc-middleware/tags" log "github.com/sirupsen/logrus" "github.com/stretchr/testify/require" - gitalyauth "gitlab.com/gitlab-org/gitaly/auth" - "gitlab.com/gitlab-org/gitaly/internal/git/hooks" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/gitaly/config/auth" - serverauth "gitlab.com/gitlab-org/gitaly/internal/gitaly/server/auth" - "gitlab.com/gitlab-org/gitaly/internal/gitlabshell" - "gitlab.com/gitlab-org/gitaly/internal/helper/fieldextractors" - praefectconfig "gitlab.com/gitlab-org/gitaly/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + gitalyauth "gitlab.com/gitlab-org/gitaly/v13/auth" + "gitlab.com/gitlab-org/gitaly/v13/internal/git/hooks" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/config/auth" + serverauth "gitlab.com/gitlab-org/gitaly/v13/internal/gitaly/server/auth" + "gitlab.com/gitlab-org/gitaly/v13/internal/gitlabshell" + "gitlab.com/gitlab-org/gitaly/v13/internal/helper/fieldextractors" + praefectconfig "gitlab.com/gitlab-org/gitaly/v13/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" grpccorrelation "gitlab.com/gitlab-org/labkit/correlation/grpc" "google.golang.org/grpc" "google.golang.org/grpc/health" diff --git a/proto/go/internal/cmd/protoc-gen-gitaly/main.go b/proto/go/internal/cmd/protoc-gen-gitaly/main.go index 3968c3fc5e..2afa304cc6 100644 --- a/proto/go/internal/cmd/protoc-gen-gitaly/main.go +++ b/proto/go/internal/cmd/protoc-gen-gitaly/main.go @@ -64,7 +64,7 @@ import ( "github.com/golang/protobuf/proto" plugin "github.com/golang/protobuf/protoc-gen-go/plugin" - "gitlab.com/gitlab-org/gitaly/proto/go/internal/linter" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/internal/linter" ) const ( diff --git a/proto/go/internal/linter/lint.go b/proto/go/internal/linter/lint.go index ca8606831b..9013909d1f 100644 --- a/proto/go/internal/linter/lint.go +++ b/proto/go/internal/linter/lint.go @@ -7,8 +7,8 @@ import ( "github.com/golang/protobuf/proto" "github.com/golang/protobuf/protoc-gen-go/descriptor" plugin "github.com/golang/protobuf/protoc-gen-go/plugin" - "gitlab.com/gitlab-org/gitaly/internal/protoutil" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/protoutil" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) // ensureMethodOpType will ensure that method includes the op_type option. diff --git a/proto/go/internal/linter/lint_test.go b/proto/go/internal/linter/lint_test.go index ca530daae7..0e516b3a3e 100644 --- a/proto/go/internal/linter/lint_test.go +++ b/proto/go/internal/linter/lint_test.go @@ -9,8 +9,8 @@ import ( plugin "github.com/golang/protobuf/protoc-gen-go/plugin" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/proto/go/internal" - _ "gitlab.com/gitlab-org/gitaly/proto/go/internal/linter/testdata" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/internal" + _ "gitlab.com/gitlab-org/gitaly/v13/proto/go/internal/linter/testdata" ) func TestLintFile(t *testing.T) { diff --git a/proto/go/internal/linter/method.go b/proto/go/internal/linter/method.go index 30f78e1b38..71f164de76 100644 --- a/proto/go/internal/linter/method.go +++ b/proto/go/internal/linter/method.go @@ -7,8 +7,8 @@ import ( "github.com/golang/protobuf/protoc-gen-go/descriptor" plugin "github.com/golang/protobuf/protoc-gen-go/plugin" - "gitlab.com/gitlab-org/gitaly/internal/protoutil" - "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v13/internal/protoutil" + "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" ) type methodLinter struct { diff --git a/proto/go/internal/linter/testdata/invalid.pb.go b/proto/go/internal/linter/testdata/invalid.pb.go index 5a0b4a5154..9b8812088b 100644 --- a/proto/go/internal/linter/testdata/invalid.pb.go +++ b/proto/go/internal/linter/testdata/invalid.pb.go @@ -7,7 +7,7 @@ import ( context "context" fmt "fmt" proto "github.com/golang/protobuf/proto" - gitalypb "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + gitalypb "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/proto/go/internal/linter/testdata/valid.pb.go b/proto/go/internal/linter/testdata/valid.pb.go index 2402fa89f4..4302f00ddd 100644 --- a/proto/go/internal/linter/testdata/valid.pb.go +++ b/proto/go/internal/linter/testdata/valid.pb.go @@ -7,7 +7,7 @@ import ( context "context" fmt "fmt" proto "github.com/golang/protobuf/proto" - gitalypb "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" + gitalypb "gitlab.com/gitlab-org/gitaly/v13/proto/go/gitalypb" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" -- GitLab From 4fd2bce4f70ec3bb91cc6c0fe9cb9871761e8852 Mon Sep 17 00:00:00 2001 From: Alessio Caiazza <376774-nolith@users.noreply.gitlab.com> Date: Fri, 2 Oct 2020 13:19:33 +0200 Subject: [PATCH 2/2] Bump noticegen to v13 --- NOTICE | 4 ++-- _support/noticegen/noticegen.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/NOTICE b/NOTICE index 81db0288b4..1a04aa1059 100644 --- a/NOTICE +++ b/NOTICE @@ -3153,7 +3153,7 @@ LICENSE - github.com/uber/jaeger-lib/metrics limitations under the License. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -LICENSE - gitlab.com/gitlab-org/gitaly/internal/middleware/panichandler +LICENSE - gitlab.com/gitlab-org/gitaly/v13/internal/middleware/panichandler Copyright (c) 2016 Masahiro Sano MIT License @@ -3178,7 +3178,7 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -LICENSE.txt - gitlab.com/gitlab-org/gitaly/internal/praefect/grpc-proxy/proxy +LICENSE.txt - gitlab.com/gitlab-org/gitaly/v13/internal/praefect/grpc-proxy/proxy Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ diff --git a/_support/noticegen/noticegen.go b/_support/noticegen/noticegen.go index c54d1df7d1..373f6fe922 100644 --- a/_support/noticegen/noticegen.go +++ b/_support/noticegen/noticegen.go @@ -47,7 +47,7 @@ func main() { log.Fatal(err) } - if p == "gitlab.com/gitlab-org/gitaly" { + if p == "gitlab.com/gitlab-org/gitaly/v13" { return nil } -- GitLab