From 1afbbc19b79bc3bc58cd89e24d7ac3962c49b04c Mon Sep 17 00:00:00 2001 From: James Liu Date: Thu, 27 Feb 2025 11:25:22 +1100 Subject: [PATCH 1/2] chore: Update Go module and linting rules to v17 --- .golangci.yml | 12 +-- auth/extract_test.go | 2 +- auth/testhelper_test.go | 2 +- client/dial.go | 10 +- client/dial_test.go | 12 +-- client/pool.go | 2 +- client/pool_test.go | 10 +- client/receive_pack.go | 4 +- client/sidechannel.go | 8 +- client/testhelper_test.go | 2 +- client/upload_archive.go | 4 +- client/upload_pack.go | 4 +- cmd/gitaly-backup/main.go | 2 +- cmd/gitaly-blackbox/main.go | 6 +- cmd/gitaly-debug/analyzehttp.go | 2 +- cmd/gitaly-debug/bitmap.go | 4 +- cmd/gitaly-debug/main.go | 2 +- cmd/gitaly-debug/simulatehttp.go | 2 +- cmd/gitaly-gpg/main.go | 4 +- cmd/gitaly-gpg/main_test.go | 2 +- cmd/gitaly-gpg/testhelper_test.go | 2 +- cmd/gitaly-hooks/hooks.go | 22 ++--- cmd/gitaly-hooks/hooks_test.go | 52 +++++------ cmd/gitaly-hooks/testhelper_test.go | 2 +- cmd/gitaly-lfs-smudge/main.go | 6 +- cmd/gitaly-lfs-smudge/main_test.go | 12 +-- cmd/gitaly-lfs-smudge/smudge.go | 10 +- cmd/gitaly-lfs-smudge/smudge_test.go | 10 +- cmd/gitaly-lfs-smudge/testhelper_test.go | 6 +- cmd/gitaly-ssh/auth_test.go | 18 ++-- cmd/gitaly-ssh/main.go | 10 +- cmd/gitaly-ssh/main_test.go | 4 +- cmd/gitaly-ssh/receive_pack.go | 6 +- cmd/gitaly-ssh/testhelper_test.go | 2 +- cmd/gitaly-ssh/upload_archive.go | 6 +- cmd/gitaly-ssh/upload_pack.go | 6 +- cmd/gitaly-ssh/upload_pack_test.go | 14 +-- cmd/gitaly-wrapper/main.go | 8 +- cmd/gitaly-wrapper/main_test.go | 8 +- cmd/gitaly-wrapper/testhelper_test.go | 2 +- cmd/gitaly/check_test.go | 8 +- cmd/gitaly/main.go | 2 +- cmd/gitaly/main_test.go | 6 +- cmd/gitaly/testhelper_test.go | 2 +- cmd/praefect/main.go | 2 +- cmd/validate.go | 2 +- go.mod | 2 +- internal/archive/archive.go | 2 +- internal/archive/archive_test.go | 4 +- internal/archive/tar_builder.go | 2 +- internal/archive/testhelper_test.go | 2 +- internal/backoff/testhelper_test.go | 2 +- internal/backup/backup.go | 22 ++--- internal/backup/backup_test.go | 36 ++++---- internal/backup/lazy_test.go | 2 +- internal/backup/locator.go | 6 +- internal/backup/locator_test.go | 14 +-- internal/backup/log_entry.go | 10 +- internal/backup/log_entry_test.go | 12 +-- internal/backup/manifest.go | 2 +- internal/backup/manifest_test.go | 4 +- internal/backup/partition_backup.go | 8 +- internal/backup/partition_backup_test.go | 20 ++-- internal/backup/pipeline.go | 6 +- internal/backup/pipeline_test.go | 6 +- internal/backup/repository.go | 32 +++---- internal/backup/repository_test.go | 30 +++--- internal/backup/server_side.go | 8 +- internal/backup/server_side_test.go | 22 ++--- internal/backup/sink.go | 2 +- internal/backup/sink_test.go | 4 +- internal/backup/testhelper_test.go | 2 +- internal/blackbox/blackbox.go | 6 +- internal/blackbox/config.go | 4 +- internal/blackbox/config_test.go | 2 +- internal/blackbox/testhelper_test.go | 2 +- internal/bootstrap/bootstrap.go | 6 +- internal/bootstrap/bootstrap_test.go | 6 +- internal/bootstrap/starter/starter.go | 4 +- internal/bootstrap/starter/testhelper_test.go | 2 +- internal/bootstrap/testhelper_test.go | 2 +- internal/bundleuri/git_config.go | 4 +- internal/bundleuri/git_config_test.go | 6 +- internal/bundleuri/manager.go | 16 ++-- internal/bundleuri/manager_test.go | 12 +-- internal/bundleuri/sink.go | 2 +- internal/bundleuri/sink_test.go | 12 +-- internal/bundleuri/strategy.go | 2 +- internal/bundleuri/strategy_occurences.go | 6 +- .../bundleuri/strategy_occurences_test.go | 10 +- internal/bundleuri/strategy_simple.go | 2 +- internal/bundleuri/testhelper_test.go | 2 +- internal/cache/cache.go | 2 +- internal/cache/diskcache.go | 14 +-- internal/cache/diskcache_test.go | 12 +-- internal/cache/keyer.go | 14 +-- internal/cache/testhelper_test.go | 2 +- internal/cache/walker.go | 6 +- internal/cache/walker_test.go | 8 +- internal/cgroups/cgroups.go | 6 +- internal/cgroups/cgroups_linux_test.go | 4 +- internal/cgroups/handler_linux_test.go | 6 +- internal/cgroups/manager.go | 4 +- internal/cgroups/manager_linux.go | 4 +- internal/cgroups/manager_linux_test.go | 4 +- internal/cgroups/mock_linux_test.go | 8 +- internal/cgroups/testhelper_test.go | 4 +- internal/cgroups/v1_linux.go | 6 +- internal/cgroups/v2_linux.go | 8 +- internal/cli/gitaly/app.go | 2 +- internal/cli/gitaly/serve.go | 92 +++++++++---------- internal/cli/gitaly/subcmd_badger_db.go | 6 +- internal/cli/gitaly/subcmd_badger_db_test.go | 8 +- internal/cli/gitaly/subcmd_bundleuri.go | 4 +- internal/cli/gitaly/subcmd_check.go | 16 ++-- internal/cli/gitaly/subcmd_configuration.go | 6 +- .../cli/gitaly/subcmd_configuration_test.go | 6 +- internal/cli/gitaly/subcmd_git.go | 6 +- internal/cli/gitaly/subcmd_git_test.go | 6 +- internal/cli/gitaly/subcmd_hooks.go | 12 +-- internal/cli/gitaly/subcmd_hooks_test.go | 24 ++--- internal/cli/gitaly/subcmd_recovery.go | 34 +++---- internal/cli/gitaly/subcmd_recovery_test.go | 38 ++++---- internal/cli/gitaly/testhelper_test.go | 2 +- internal/cli/gitalybackup/create.go | 10 +- internal/cli/gitalybackup/create_test.go | 16 ++-- internal/cli/gitalybackup/main.go | 2 +- internal/cli/gitalybackup/partition.go | 8 +- internal/cli/gitalybackup/partition_test.go | 20 ++-- internal/cli/gitalybackup/restore.go | 10 +- internal/cli/gitalybackup/restore_test.go | 18 ++-- internal/cli/gitalybackup/testhelper_test.go | 2 +- internal/cli/praefect/main.go | 4 +- internal/cli/praefect/main_test.go | 8 +- internal/cli/praefect/serve.go | 42 ++++----- internal/cli/praefect/server_options.go | 2 +- .../cli/praefect/server_options_testing.go | 4 +- internal/cli/praefect/subcmd.go | 8 +- .../cli/praefect/subcmd_accept_dataloss.go | 4 +- .../praefect/subcmd_accept_dataloss_test.go | 10 +- internal/cli/praefect/subcmd_check.go | 4 +- internal/cli/praefect/subcmd_check_test.go | 4 +- .../praefect/subcmd_configuration_validate.go | 6 +- .../subcmd_configuration_validate_test.go | 8 +- internal/cli/praefect/subcmd_dataloss.go | 4 +- internal/cli/praefect/subcmd_dataloss_test.go | 10 +- internal/cli/praefect/subcmd_dial_nodes.go | 4 +- .../cli/praefect/subcmd_dial_nodes_test.go | 4 +- internal/cli/praefect/subcmd_list_storages.go | 2 +- .../cli/praefect/subcmd_list_storages_test.go | 2 +- .../subcmd_list_untracked_repositories.go | 12 +-- ...subcmd_list_untracked_repositories_test.go | 18 ++-- internal/cli/praefect/subcmd_metadata.go | 4 +- internal/cli/praefect/subcmd_metadata_test.go | 10 +- .../cli/praefect/subcmd_remove_repository.go | 12 +-- .../praefect/subcmd_remove_repository_test.go | 26 +++--- .../praefect/subcmd_set_replication_factor.go | 4 +- .../subcmd_set_replication_factor_test.go | 12 +-- internal/cli/praefect/subcmd_sql_migrate.go | 6 +- .../cli/praefect/subcmd_sql_migrate_down.go | 4 +- .../praefect/subcmd_sql_migrate_down_test.go | 6 +- .../cli/praefect/subcmd_sql_migrate_status.go | 4 +- .../subcmd_sql_migrate_status_test.go | 6 +- .../cli/praefect/subcmd_sql_migrate_test.go | 6 +- internal/cli/praefect/subcmd_sql_ping.go | 4 +- internal/cli/praefect/subcmd_sql_ping_test.go | 4 +- internal/cli/praefect/subcmd_test.go | 4 +- .../cli/praefect/subcmd_track_repositories.go | 4 +- .../subcmd_track_repositories_test.go | 26 +++--- .../cli/praefect/subcmd_track_repository.go | 16 ++-- .../praefect/subcmd_track_repository_test.go | 26 +++--- internal/cli/praefect/subcmd_verify.go | 4 +- internal/cli/praefect/subcmd_verify_test.go | 10 +- internal/cli/praefect/testhelper_test.go | 2 +- internal/command/command.go | 10 +- internal/command/command_test.go | 4 +- internal/command/option.go | 6 +- internal/command/subprocess_logger.go | 2 +- internal/command/subprocess_logger_test.go | 4 +- internal/command/testdata/subprocess/main.go | 2 +- internal/command/testhelper_test.go | 2 +- internal/datastructure/testhelper_test.go | 2 +- internal/dontpanic/retry.go | 2 +- internal/dontpanic/retry_test.go | 4 +- internal/dontpanic/testhelper_test.go | 2 +- internal/errors/cfgerror/testhelper_test.go | 2 +- internal/errors/cfgerror/validate_test.go | 4 +- internal/featureflag/context_test.go | 2 +- internal/featureflag/featureflag.go | 2 +- internal/git/catfile/cache.go | 10 +- internal/git/catfile/cache_test.go | 12 +-- internal/git/catfile/commit.go | 10 +- internal/git/catfile/commit_test.go | 8 +- internal/git/catfile/object_content_reader.go | 2 +- internal/git/catfile/object_info_reader.go | 4 +- .../git/catfile/object_info_reader_fuzz.go | 2 +- internal/git/catfile/object_reader.go | 8 +- internal/git/catfile/object_reader_test.go | 12 +-- internal/git/catfile/parse_commit.go | 6 +- internal/git/catfile/parse_commit_test.go | 8 +- internal/git/catfile/parser.go | 4 +- internal/git/catfile/parser_test.go | 6 +- internal/git/catfile/request_queue.go | 6 +- internal/git/catfile/request_queue_test.go | 16 ++-- internal/git/catfile/tag.go | 8 +- internal/git/catfile/tag_test.go | 10 +- internal/git/catfile/testhelper_test.go | 20 ++-- internal/git/catfile/tracing.go | 2 +- internal/git/catfile/tree_entries.go | 6 +- internal/git/conflict/parser_test.go | 2 +- internal/git/conflict/resolve.go | 2 +- internal/git/conflict/resolve_test.go | 4 +- internal/git/conflict/testhelper_test.go | 2 +- internal/git/dirs.go | 2 +- internal/git/dirs_test.go | 4 +- internal/git/gitattributes/check_attr.go | 8 +- internal/git/gitattributes/check_attr_test.go | 12 +-- internal/git/gitattributes/testhelper_test.go | 2 +- internal/git/gitcmd/bitmap.go | 8 +- internal/git/gitcmd/blob.go | 6 +- internal/git/gitcmd/command_description.go | 4 +- .../git/gitcmd/command_description_test.go | 4 +- internal/git/gitcmd/command_factory.go | 22 ++--- .../git/gitcmd/command_factory_cgroup_test.go | 10 +- internal/git/gitcmd/command_factory_test.go | 26 +++--- internal/git/gitcmd/command_options.go | 16 ++-- internal/git/gitcmd/command_options_test.go | 12 +-- internal/git/gitcmd/decoder.go | 2 +- internal/git/gitcmd/decoder_test.go | 10 +- internal/git/gitcmd/execution_environment.go | 4 +- .../git/gitcmd/execution_environment_test.go | 10 +- internal/git/gitcmd/fetch_scanner.go | 2 +- internal/git/gitcmd/fetch_scanner_test.go | 2 +- internal/git/gitcmd/hooks_options.go | 14 +-- internal/git/gitcmd/hooks_options_test.go | 14 +-- internal/git/gitcmd/hooks_payload.go | 14 +-- internal/git/gitcmd/hooks_payload_test.go | 14 +-- internal/git/gitcmd/object_id.go | 2 +- internal/git/gitcmd/object_id_test.go | 14 +-- internal/git/gitcmd/protocol.go | 6 +- internal/git/gitcmd/protocol_test.go | 2 +- internal/git/gitcmd/reference.go | 2 +- internal/git/gitcmd/reference_backend.go | 2 +- internal/git/gitcmd/repository.go | 6 +- internal/git/gitcmd/ssh.go | 4 +- internal/git/gitcmd/ssh_test.go | 2 +- internal/git/gitcmd/testhelper_test.go | 4 +- internal/git/gitio/testhelper_test.go | 2 +- internal/git/gitpipe/catfile_info.go | 10 +- internal/git/gitpipe/catfile_info_iterator.go | 2 +- internal/git/gitpipe/catfile_info_test.go | 12 +-- internal/git/gitpipe/catfile_object.go | 4 +- .../git/gitpipe/catfile_object_iterator.go | 2 +- internal/git/gitpipe/catfile_object_test.go | 10 +- internal/git/gitpipe/diff_tree.go | 6 +- internal/git/gitpipe/diff_tree_test.go | 10 +- internal/git/gitpipe/ls_tree.go | 4 +- internal/git/gitpipe/ls_tree_test.go | 10 +- internal/git/gitpipe/object_iterator.go | 2 +- internal/git/gitpipe/pipeline_test.go | 12 +-- internal/git/gitpipe/revision.go | 6 +- internal/git/gitpipe/revision_iterator.go | 2 +- internal/git/gitpipe/revision_test.go | 10 +- internal/git/gitpipe/testhelper_test.go | 6 +- internal/git/gittest/blob.go | 8 +- internal/git/gittest/command.go | 14 +-- internal/git/gittest/command_factory.go | 6 +- internal/git/gittest/command_test.go | 2 +- internal/git/gittest/commit.go | 10 +- internal/git/gittest/commit_test.go | 4 +- .../git/gittest/counting_command_factory.go | 8 +- .../gittest/counting_command_factory_test.go | 4 +- internal/git/gittest/delta_islands.go | 6 +- internal/git/gittest/hooks.go | 4 +- internal/git/gittest/http_server.go | 6 +- .../gittest/intercepting_command_factory.go | 12 +-- .../intercepting_command_factory_test.go | 6 +- internal/git/gittest/object_hash.go | 2 +- internal/git/gittest/objectpool.go | 4 +- internal/git/gittest/objects.go | 6 +- internal/git/gittest/pktline.go | 2 +- internal/git/gittest/protocol.go | 6 +- internal/git/gittest/ref.go | 12 +-- internal/git/gittest/ref_test.go | 2 +- internal/git/gittest/reference_backend.go | 6 +- internal/git/gittest/repo.go | 22 ++--- internal/git/gittest/repository_suite.go | 6 +- internal/git/gittest/tag.go | 6 +- internal/git/gittest/testhelper_test.go | 8 +- internal/git/gittest/tree.go | 8 +- internal/git/gittest/tree_test.go | 2 +- internal/git/gittest/user.go | 2 +- internal/git/gittest/version.go | 8 +- internal/git/housekeeping/clean_stale_data.go | 10 +- .../git/housekeeping/clean_stale_data_test.go | 12 +-- internal/git/housekeeping/commit_graph.go | 10 +- .../git/housekeeping/commit_graph_test.go | 10 +- internal/git/housekeeping/manager/manager.go | 12 +-- .../manager/optimize_repository.go | 18 ++-- .../manager/optimize_repository_ext_test.go | 18 ++-- .../manager/optimize_repository_test.go | 38 ++++---- .../housekeeping/manager/testhelper_test.go | 32 +++---- internal/git/housekeeping/metrics.go | 4 +- internal/git/housekeeping/objects.go | 14 +-- internal/git/housekeeping/objects_test.go | 22 ++--- internal/git/housekeeping/offloading.go | 12 +-- internal/git/housekeeping/offloading_test.go | 18 ++-- .../git/housekeeping/optimization_strategy.go | 6 +- .../optimization_strategy_test.go | 8 +- internal/git/housekeeping/testhelper_test.go | 8 +- internal/git/housekeeping/worktrees.go | 8 +- internal/git/housekeeping/worktrees_test.go | 14 +-- internal/git/localrepo/blob.go | 4 +- internal/git/localrepo/blob_test.go | 6 +- internal/git/localrepo/bundle.go | 14 +-- internal/git/localrepo/bundle_test.go | 20 ++-- internal/git/localrepo/commit.go | 18 ++-- internal/git/localrepo/commit_test.go | 18 ++-- internal/git/localrepo/config.go | 12 +-- internal/git/localrepo/config_test.go | 20 ++-- internal/git/localrepo/factory.go | 10 +- internal/git/localrepo/factory_test.go | 14 +-- internal/git/localrepo/merge.go | 10 +- internal/git/localrepo/merge_test.go | 10 +- internal/git/localrepo/objects.go | 8 +- internal/git/localrepo/objects_test.go | 12 +-- internal/git/localrepo/parser.go | 2 +- internal/git/localrepo/parser_test.go | 8 +- internal/git/localrepo/paths.go | 4 +- internal/git/localrepo/paths_test.go | 20 ++-- internal/git/localrepo/rebase.go | 10 +- internal/git/localrepo/rebase_test.go | 14 +-- internal/git/localrepo/refs.go | 10 +- internal/git/localrepo/refs_external_test.go | 36 ++++---- internal/git/localrepo/refs_test.go | 18 ++-- internal/git/localrepo/remote.go | 4 +- internal/git/localrepo/remote_extra_test.go | 24 ++--- internal/git/localrepo/remote_test.go | 14 +-- internal/git/localrepo/repo.go | 26 +++--- internal/git/localrepo/repo_test.go | 16 ++-- internal/git/localrepo/snapshot.go | 6 +- internal/git/localrepo/snapshot_test.go | 10 +- internal/git/localrepo/tag.go | 6 +- internal/git/localrepo/tag_test.go | 8 +- internal/git/localrepo/testhelper_test.go | 12 +-- internal/git/localrepo/tree.go | 10 +- internal/git/localrepo/tree_test.go | 12 +-- internal/git/log/last_commit.go | 10 +- internal/git/log/parser.go | 8 +- internal/git/object_id.go | 2 +- internal/git/object_id_test.go | 16 ++-- internal/git/objectpool/create.go | 22 ++--- internal/git/objectpool/create_test.go | 28 +++--- internal/git/objectpool/disconnect.go | 16 ++-- internal/git/objectpool/disconnect_test.go | 34 +++---- internal/git/objectpool/fetch.go | 24 ++--- internal/git/objectpool/fetch_test.go | 36 ++++---- internal/git/objectpool/link.go | 12 +-- internal/git/objectpool/link_test.go | 20 ++-- internal/git/objectpool/pool.go | 18 ++-- internal/git/objectpool/pool_test.go | 14 +-- internal/git/objectpool/testhelper_test.go | 24 ++--- internal/git/packfile/bitmap.go | 2 +- internal/git/packfile/index.go | 12 +-- internal/git/packfile/index_test.go | 16 ++-- internal/git/packfile/testhelper_test.go | 2 +- internal/git/packfile_test.go | 8 +- internal/git/pktline/read_monitor.go | 2 +- internal/git/pktline/read_monitor_test.go | 4 +- internal/git/pktline/testhelper_test.go | 2 +- internal/git/quarantine/quarantine.go | 14 +-- .../git/quarantine/quarantine_ext_test.go | 14 +-- internal/git/quarantine/quarantine_test.go | 12 +-- internal/git/quarantine/testhelper_test.go | 2 +- internal/git/rawdiff/testhelper_test.go | 2 +- internal/git/reference_test.go | 6 +- internal/git/reftable_test.go | 8 +- internal/git/remoterepo/repository.go | 8 +- internal/git/remoterepo/repository_test.go | 20 ++-- internal/git/remoterepo/testhelper_test.go | 20 ++-- internal/git/signature.go | 2 +- internal/git/signature_test.go | 2 +- internal/git/smudge/config.go | 6 +- internal/git/smudge/config_test.go | 2 +- internal/git/smudge/testhelper_test.go | 2 +- internal/git/stats/commit_graph_test.go | 6 +- internal/git/stats/fetch_pack.go | 2 +- internal/git/stats/http_clone_test.go | 6 +- internal/git/stats/http_fetch_pack.go | 2 +- internal/git/stats/http_push.go | 2 +- internal/git/stats/http_push_test.go | 10 +- internal/git/stats/http_send_pack.go | 4 +- internal/git/stats/packfile_negotiation.go | 8 +- .../git/stats/packfile_negotiation_test.go | 2 +- internal/git/stats/reference_discovery.go | 4 +- .../git/stats/reference_discovery_test.go | 2 +- internal/git/stats/repository_info.go | 8 +- internal/git/stats/repository_info_test.go | 14 +-- internal/git/stats/send_pack.go | 2 +- internal/git/stats/send_pack_test.go | 2 +- internal/git/stats/testhelper_test.go | 2 +- internal/git/testhelper_test.go | 2 +- internal/git/trace2/manager_test.go | 2 +- internal/git/trace2/parser.go | 4 +- internal/git/trace2/parser_test.go | 2 +- internal/git/trace2/testhelper_test.go | 2 +- internal/git/trace2hooks/log_exporter.go | 4 +- internal/git/trace2hooks/log_exporter_test.go | 4 +- .../git/trace2hooks/packobjects_metrics.go | 4 +- .../packobjects_metrics_ext_test.go | 20 ++-- .../trace2hooks/packobjects_metrics_test.go | 6 +- internal/git/trace2hooks/testhelper_test.go | 2 +- internal/git/trace2hooks/trace_helper_test.go | 2 +- internal/git/trace2hooks/tracingexporter.go | 4 +- .../git/trace2hooks/tracingexporter_test.go | 6 +- internal/git/trailerparser/testhelper_test.go | 2 +- internal/git/trailerparser/trailerparser.go | 2 +- internal/git/tree_entry.go | 2 +- internal/git/updateref/testhelper_test.go | 2 +- internal/git/updateref/updateref.go | 8 +- internal/git/updateref/updateref_test.go | 16 ++-- internal/gitaly/config/cgroups/cgroups.go | 2 +- .../gitaly/config/cgroups/cgroups_test.go | 2 +- .../gitaly/config/cgroups/testhelper_test.go | 2 +- internal/gitaly/config/config.go | 16 ++-- internal/gitaly/config/config_test.go | 16 ++-- internal/gitaly/config/locator.go | 4 +- internal/gitaly/config/locator_test.go | 20 ++-- internal/gitaly/config/prometheus/config.go | 6 +- .../gitaly/config/prometheus/config_test.go | 4 +- .../config/prometheus/testhelper_test.go | 2 +- internal/gitaly/config/sentry/sentry.go | 4 +- internal/gitaly/config/temp_dir.go | 2 +- internal/gitaly/config/temp_dir_test.go | 4 +- internal/gitaly/config/testhelper_test.go | 2 +- internal/gitaly/diff/diff.go | 6 +- internal/gitaly/diff/diff_test.go | 2 +- internal/gitaly/diff/testhelper_test.go | 2 +- internal/gitaly/gitalyclient/receive_pack.go | 6 +- .../gitaly/gitalyclient/upload_archive.go | 6 +- internal/gitaly/gitalyclient/upload_pack.go | 6 +- internal/gitaly/hook/check.go | 2 +- internal/gitaly/hook/custom.go | 10 +- internal/gitaly/hook/custom_test.go | 16 ++-- internal/gitaly/hook/manager.go | 16 ++-- internal/gitaly/hook/manager_mock.go | 2 +- internal/gitaly/hook/postreceive.go | 10 +- internal/gitaly/hook/postreceive_test.go | 32 +++---- internal/gitaly/hook/prereceive.go | 10 +- internal/gitaly/hook/prereceive_test.go | 34 +++---- internal/gitaly/hook/procreceive_handler.go | 8 +- .../gitaly/hook/procreceive_handler_test.go | 12 +-- internal/gitaly/hook/procreceive_registry.go | 4 +- .../gitaly/hook/procreceive_registry_test.go | 14 +-- .../gitaly/hook/receivepack/receive_pack.go | 22 ++--- .../hook/receivepack/receive_pack_test.go | 22 ++--- .../hook/receivepack/testhelper_test.go | 2 +- internal/gitaly/hook/referencetransaction.go | 8 +- internal/gitaly/hook/sidechannel.go | 6 +- internal/gitaly/hook/sidechannel_test.go | 6 +- internal/gitaly/hook/testhelper_test.go | 14 +-- internal/gitaly/hook/transactions.go | 6 +- internal/gitaly/hook/transactions_test.go | 24 ++--- internal/gitaly/hook/update.go | 8 +- internal/gitaly/hook/update_test.go | 30 +++--- .../gitaly/hook/updateref/testhelper_test.go | 2 +- .../hook/updateref/update_with_hooks.go | 26 +++--- .../hook/updateref/update_with_hooks_test.go | 32 +++---- internal/gitaly/linguist/file_instance.go | 4 +- internal/gitaly/linguist/language_stats.go | 6 +- .../gitaly/linguist/language_stats_test.go | 12 +-- internal/gitaly/linguist/linguist.go | 18 ++-- internal/gitaly/linguist/linguist_test.go | 22 ++--- internal/gitaly/linguist/testhelper_test.go | 2 +- internal/gitaly/maintenance/daily.go | 6 +- internal/gitaly/maintenance/daily_test.go | 8 +- internal/gitaly/maintenance/optimize.go | 10 +- internal/gitaly/maintenance/optimize_test.go | 26 +++--- .../gitaly/maintenance/randomwalker_test.go | 4 +- .../gitaly/maintenance/testhelper_test.go | 2 +- internal/gitaly/rangediff/range_diff.go | 2 +- internal/gitaly/rangediff/range_diff_test.go | 4 +- internal/gitaly/rangediff/testhelper_test.go | 2 +- internal/gitaly/repoutil/create.go | 34 +++---- internal/gitaly/repoutil/create_test.go | 36 ++++---- internal/gitaly/repoutil/custom_hooks.go | 22 ++--- internal/gitaly/repoutil/custom_hooks_test.go | 18 ++-- internal/gitaly/repoutil/lock.go | 10 +- internal/gitaly/repoutil/lock_test.go | 14 +-- internal/gitaly/repoutil/remove.go | 18 ++-- internal/gitaly/repoutil/remove_test.go | 18 ++-- internal/gitaly/repoutil/testhelper_test.go | 2 +- internal/gitaly/server/auth/auth.go | 4 +- internal/gitaly/server/auth_test.go | 42 ++++----- internal/gitaly/server/server.go | 32 +++---- internal/gitaly/server/server_factory.go | 10 +- internal/gitaly/server/server_factory_test.go | 14 +-- internal/gitaly/server/testhelper_test.go | 2 +- .../service/analysis/check_generated.go | 8 +- .../service/analysis/check_generated_test.go | 16 ++-- internal/gitaly/service/analysis/server.go | 12 +-- .../service/analysis/testhelper_test.go | 2 +- internal/gitaly/service/blob/blobs.go | 18 ++-- internal/gitaly/service/blob/blobs_test.go | 14 +-- internal/gitaly/service/blob/get_blob.go | 12 +-- internal/gitaly/service/blob/get_blob_test.go | 12 +-- internal/gitaly/service/blob/get_blobs.go | 12 +-- .../gitaly/service/blob/get_blobs_test.go | 12 +-- internal/gitaly/service/blob/lfs_pointers.go | 14 +-- .../gitaly/service/blob/lfs_pointers_test.go | 26 +++--- internal/gitaly/service/blob/server.go | 12 +-- .../gitaly/service/blob/testhelper_test.go | 14 +-- .../cleanup/apply_bfg_object_map_stream.go | 10 +- .../apply_bfg_object_map_stream_test.go | 14 +-- internal/gitaly/service/cleanup/cleaner.go | 8 +- internal/gitaly/service/cleanup/notifier.go | 10 +- .../gitaly/service/cleanup/rewrite_history.go | 12 +-- .../service/cleanup/rewrite_history_test.go | 14 +-- internal/gitaly/service/cleanup/server.go | 16 ++-- .../gitaly/service/cleanup/testhelper_test.go | 20 ++-- .../service/commit/check_objects_exist.go | 10 +- .../commit/check_objects_exist_test.go | 10 +- .../gitaly/service/commit/commit_messages.go | 12 +-- .../service/commit/commit_messages_test.go | 12 +-- .../service/commit/commits_by_message.go | 10 +- .../service/commit/commits_by_message_test.go | 12 +-- .../gitaly/service/commit/commits_helper.go | 10 +- .../gitaly/service/commit/commits_sender.go | 2 +- .../gitaly/service/commit/count_commits.go | 10 +- .../service/commit/count_commits_test.go | 10 +- .../service/commit/count_diverging_commits.go | 6 +- .../commit/count_diverging_commits_test.go | 12 +-- .../commit/filter_shas_with_signatures.go | 10 +- .../filter_shas_with_signatures_test.go | 14 +-- .../gitaly/service/commit/find_all_commits.go | 10 +- .../service/commit/find_all_commits_test.go | 12 +-- internal/gitaly/service/commit/find_commit.go | 10 +- .../gitaly/service/commit/find_commit_test.go | 18 ++-- .../gitaly/service/commit/find_commits.go | 18 ++-- .../service/commit/find_commits_test.go | 16 ++-- .../service/commit/get_commit_signatures.go | 12 +-- .../commit/get_commit_signatures_test.go | 22 ++--- .../gitaly/service/commit/get_tree_entries.go | 16 ++-- .../service/commit/get_tree_entries_test.go | 16 ++-- internal/gitaly/service/commit/isancestor.go | 10 +- .../gitaly/service/commit/isancestor_test.go | 12 +-- internal/gitaly/service/commit/languages.go | 12 +-- .../gitaly/service/commit/languages_test.go | 14 +-- .../service/commit/last_commit_for_path.go | 12 +-- .../commit/last_commit_for_path_test.go | 12 +-- .../gitaly/service/commit/list_all_commits.go | 14 +-- .../service/commit/list_all_commits_test.go | 18 ++-- .../gitaly/service/commit/list_commits.go | 14 +-- .../service/commit/list_commits_by_oid.go | 10 +- .../commit/list_commits_by_oid_test.go | 10 +- .../commit/list_commits_by_ref_name.go | 10 +- .../commit/list_commits_by_ref_name_test.go | 12 +-- .../service/commit/list_commits_test.go | 12 +-- internal/gitaly/service/commit/list_files.go | 16 ++-- .../gitaly/service/commit/list_files_test.go | 12 +-- .../commit/list_last_commits_for_tree.go | 16 ++-- .../commit/list_last_commits_for_tree_test.go | 14 +-- internal/gitaly/service/commit/raw_blame.go | 16 ++-- .../gitaly/service/commit/raw_blame_test.go | 12 +-- internal/gitaly/service/commit/server.go | 16 ++-- internal/gitaly/service/commit/stats.go | 10 +- internal/gitaly/service/commit/stats_test.go | 10 +- .../gitaly/service/commit/testhelper_test.go | 22 ++--- internal/gitaly/service/commit/tree_entry.go | 12 +-- .../gitaly/service/commit/tree_entry_test.go | 10 +- .../service/conflicts/list_conflict_files.go | 12 +-- .../conflicts/list_conflict_files_test.go | 10 +- .../service/conflicts/resolve_conflicts.go | 14 +-- .../conflicts/resolve_conflicts_test.go | 22 ++--- internal/gitaly/service/conflicts/server.go | 22 ++--- .../service/conflicts/testhelper_test.go | 22 ++--- internal/gitaly/service/dependencies.go | 46 +++++----- internal/gitaly/service/diff/commit_delta.go | 10 +- .../gitaly/service/diff/commit_delta_test.go | 10 +- internal/gitaly/service/diff/commit_diff.go | 10 +- .../gitaly/service/diff/commit_diff_test.go | 12 +-- internal/gitaly/service/diff/diff_blobs.go | 16 ++-- .../gitaly/service/diff/diff_blobs_test.go | 8 +- .../gitaly/service/diff/find_changed_paths.go | 12 +-- .../service/diff/find_changed_paths_test.go | 10 +- internal/gitaly/service/diff/numstat.go | 8 +- internal/gitaly/service/diff/numstat_test.go | 10 +- internal/gitaly/service/diff/patch_id.go | 10 +- internal/gitaly/service/diff/patch_id_test.go | 12 +-- internal/gitaly/service/diff/range_diff.go | 12 +-- .../gitaly/service/diff/range_diff_test.go | 12 +-- internal/gitaly/service/diff/raw.go | 8 +- .../gitaly/service/diff/raw_range_diff.go | 12 +-- .../service/diff/raw_range_diff_test.go | 12 +-- internal/gitaly/service/diff/raw_test.go | 12 +-- internal/gitaly/service/diff/server.go | 14 +-- .../gitaly/service/diff/testhelper_test.go | 14 +-- internal/gitaly/service/diff/utils.go | 12 +-- internal/gitaly/service/hook/pack_objects.go | 18 ++-- .../gitaly/service/hook/pack_objects_test.go | 30 +++--- internal/gitaly/service/hook/post_receive.go | 8 +- .../gitaly/service/hook/post_receive_test.go | 32 +++---- internal/gitaly/service/hook/pre_receive.go | 8 +- .../gitaly/service/hook/pre_receive_test.go | 34 +++---- internal/gitaly/service/hook/proc_receive.go | 8 +- .../gitaly/service/hook/proc_receive_test.go | 22 ++--- .../service/hook/reference_transaction.go | 12 +-- .../hook/reference_transaction_test.go | 24 ++--- internal/gitaly/service/hook/server.go | 18 ++-- .../gitaly/service/hook/testhelper_test.go | 20 ++-- internal/gitaly/service/hook/update.go | 8 +- internal/gitaly/service/hook/update_test.go | 18 ++-- .../gitaly/service/internalgitaly/server.go | 10 +- .../service/internalgitaly/testhelper_test.go | 10 +- .../service/internalgitaly/walkrepos.go | 6 +- .../service/internalgitaly/walkrepos_test.go | 16 ++-- .../gitaly/service/objectpool/alternates.go | 8 +- .../service/objectpool/alternates_test.go | 14 +-- internal/gitaly/service/objectpool/create.go | 10 +- .../gitaly/service/objectpool/create_test.go | 32 +++---- internal/gitaly/service/objectpool/delete.go | 10 +- .../gitaly/service/objectpool/delete_test.go | 12 +-- .../objectpool/fetch_into_object_pool.go | 12 +-- .../objectpool/fetch_into_object_pool_test.go | 26 +++--- internal/gitaly/service/objectpool/get.go | 8 +- .../gitaly/service/objectpool/get_test.go | 12 +-- internal/gitaly/service/objectpool/link.go | 4 +- .../gitaly/service/objectpool/link_test.go | 20 ++-- internal/gitaly/service/objectpool/server.go | 22 ++--- .../service/objectpool/testhelper_test.go | 36 ++++---- internal/gitaly/service/objectpool/util.go | 6 +- .../gitaly/service/operations/apply_patch.go | 18 ++-- .../service/operations/apply_patch_test.go | 26 +++--- .../gitaly/service/operations/cherry_pick.go | 10 +- .../service/operations/cherry_pick_test.go | 26 +++--- .../gitaly/service/operations/commit_files.go | 18 ++-- .../service/operations/commit_files_test.go | 26 +++--- .../gitaly/service/operations/ff_branch.go | 10 +- .../service/operations/ff_branch_test.go | 14 +-- .../gitaly/service/operations/merge_branch.go | 16 ++-- .../service/operations/merge_branch_test.go | 36 ++++---- .../gitaly/service/operations/merge_to_ref.go | 10 +- .../service/operations/merge_to_ref_test.go | 14 +-- .../gitaly/service/operations/merge_utils.go | 4 +- .../service/operations/rebase_confirmable.go | 12 +-- .../operations/rebase_confirmable_test.go | 26 +++--- .../service/operations/rebase_to_ref.go | 8 +- .../service/operations/rebase_to_ref_test.go | 16 ++-- internal/gitaly/service/operations/revert.go | 14 +-- .../gitaly/service/operations/revert_test.go | 24 ++--- internal/gitaly/service/operations/server.go | 26 +++--- internal/gitaly/service/operations/squash.go | 14 +-- .../gitaly/service/operations/squash_test.go | 32 +++---- .../gitaly/service/operations/submodules.go | 12 +-- .../service/operations/submodules_test.go | 16 ++-- internal/gitaly/service/operations/tags.go | 16 ++-- .../gitaly/service/operations/tags_test.go | 26 +++--- .../service/operations/testhelper_test.go | 32 +++---- .../service/operations/update_with_hooks.go | 6 +- .../service/operations/user_create_branch.go | 10 +- .../operations/user_create_branch_test.go | 28 +++--- .../service/operations/user_delete_branch.go | 12 +-- .../operations/user_delete_branch_test.go | 32 +++---- .../service/operations/user_update_branch.go | 10 +- .../operations/user_update_branch_test.go | 12 +-- internal/gitaly/service/operations/utils.go | 8 +- .../service/partition/backup_partition.go | 12 +-- .../partition/backup_partition_test.go | 22 ++--- .../service/partition/list_partitions.go | 6 +- .../service/partition/list_partitions_test.go | 12 +-- internal/gitaly/service/partition/server.go | 12 +-- .../service/partition/testhelper_test.go | 14 +-- internal/gitaly/service/raft/send_message.go | 4 +- .../gitaly/service/raft/send_message_test.go | 14 +-- internal/gitaly/service/raft/server.go | 10 +- .../gitaly/service/raft/testhelper_test.go | 4 +- internal/gitaly/service/ref/branches.go | 6 +- internal/gitaly/service/ref/branches_test.go | 14 +-- internal/gitaly/service/ref/delete_refs.go | 18 ++-- .../gitaly/service/ref/delete_refs_test.go | 32 +++---- .../gitaly/service/ref/find_all_branches.go | 6 +- .../service/ref/find_all_branches_test.go | 12 +-- .../service/ref/find_all_remote_branches.go | 8 +- .../ref/find_all_remote_branches_test.go | 12 +-- internal/gitaly/service/ref/find_all_tags.go | 12 +-- .../gitaly/service/ref/find_all_tags_test.go | 18 ++-- .../service/ref/find_default_branch_name.go | 4 +- .../ref/find_default_branch_name_test.go | 14 +-- .../gitaly/service/ref/find_local_branches.go | 8 +- .../service/ref/find_local_branches_test.go | 14 +-- .../gitaly/service/ref/find_refs_by_oid.go | 8 +- .../service/ref/find_refs_by_oid_test.go | 10 +- internal/gitaly/service/ref/find_tag.go | 10 +- internal/gitaly/service/ref/find_tag_test.go | 14 +-- internal/gitaly/service/ref/list_refs.go | 12 +-- internal/gitaly/service/ref/list_refs_test.go | 12 +-- internal/gitaly/service/ref/refexists.go | 8 +- internal/gitaly/service/ref/refexists_test.go | 12 +-- .../gitaly/service/ref/refnames_containing.go | 8 +- .../service/ref/refnames_containing_test.go | 12 +-- internal/gitaly/service/ref/server.go | 14 +-- internal/gitaly/service/ref/tag_messages.go | 12 +-- .../gitaly/service/ref/tag_messages_test.go | 12 +-- internal/gitaly/service/ref/tag_signatures.go | 14 +-- .../gitaly/service/ref/tag_signatures_test.go | 14 +-- .../gitaly/service/ref/testhelper_test.go | 24 ++--- .../gitaly/service/ref/update_references.go | 8 +- .../service/ref/update_references_test.go | 18 ++-- internal/gitaly/service/ref/util.go | 12 +-- .../service/remote/find_remote_repository.go | 8 +- .../remote/find_remote_repository_test.go | 8 +- .../service/remote/find_remote_root_ref.go | 8 +- .../remote/find_remote_root_ref_test.go | 16 ++-- internal/gitaly/service/remote/server.go | 18 ++-- .../gitaly/service/remote/testhelper_test.go | 14 +-- .../service/remote/update_remote_mirror.go | 14 +-- .../remote/update_remote_mirror_test.go | 30 +++--- internal/gitaly/service/repository/archive.go | 18 ++-- .../gitaly/service/repository/archive_test.go | 28 +++--- .../service/repository/backup_repository.go | 8 +- .../repository/backup_repository_test.go | 18 ++-- .../gitaly/service/repository/bundle_uri.go | 4 +- .../service/repository/bundle_uri_test.go | 16 ++-- .../service/repository/calculate_checksum.go | 8 +- .../repository/calculate_checksum_test.go | 14 +-- internal/gitaly/service/repository/config.go | 8 +- .../gitaly/service/repository/config_test.go | 14 +-- .../service/repository/create_bundle.go | 8 +- .../repository/create_bundle_from_ref_list.go | 10 +- .../create_bundle_from_ref_list_test.go | 16 ++-- .../service/repository/create_bundle_test.go | 18 ++-- .../gitaly/service/repository/create_fork.go | 14 +-- .../service/repository/create_fork_test.go | 20 ++-- .../service/repository/create_repository.go | 10 +- .../create_repository_from_bundle.go | 10 +- .../create_repository_from_bundle_test.go | 28 +++--- .../create_repository_from_snapshot.go | 10 +- .../create_repository_from_snapshot_test.go | 16 ++-- .../repository/create_repository_from_url.go | 16 ++-- .../create_repository_from_url_test.go | 20 ++-- .../repository/create_repository_test.go | 26 +++--- .../gitaly/service/repository/fast_export.go | 10 +- .../service/repository/fast_export_test.go | 6 +- internal/gitaly/service/repository/fetch.go | 12 +-- .../gitaly/service/repository/fetch_bundle.go | 8 +- .../service/repository/fetch_bundle_test.go | 22 ++--- .../gitaly/service/repository/fetch_remote.go | 14 +-- .../service/repository/fetch_remote_test.go | 28 +++--- .../gitaly/service/repository/fetch_test.go | 22 ++--- .../service/repository/file_attributes.go | 10 +- .../repository/file_attributes_test.go | 8 +- internal/gitaly/service/repository/fsck.go | 6 +- .../gitaly/service/repository/fsck_test.go | 12 +-- .../service/repository/get_custom_hooks.go | 8 +- .../repository/get_custom_hooks_test.go | 18 ++-- .../service/repository/has_local_branches.go | 4 +- .../repository/has_local_branches_test.go | 10 +- .../service/repository/info_attributes.go | 8 +- .../repository/info_attributes_test.go | 12 +-- internal/gitaly/service/repository/license.go | 14 +-- .../gitaly/service/repository/license_test.go | 14 +-- .../gitaly/service/repository/merge_base.go | 8 +- .../service/repository/merge_base_test.go | 10 +- .../service/repository/object_format.go | 4 +- .../service/repository/object_format_test.go | 12 +-- .../gitaly/service/repository/objects_size.go | 8 +- .../service/repository/objects_size_test.go | 14 +-- .../gitaly/service/repository/optimize.go | 10 +- .../service/repository/optimize_test.go | 26 +++--- .../repository/prune_unreachable_objects.go | 12 +-- .../prune_unreachable_objects_test.go | 16 ++-- .../gitaly/service/repository/raw_changes.go | 14 +-- .../service/repository/raw_changes_test.go | 10 +- .../redirecting_test_server_test.go | 6 +- internal/gitaly/service/repository/remove.go | 8 +- .../gitaly/service/repository/remove_test.go | 14 +-- .../gitaly/service/repository/replicate.go | 32 +++---- .../service/repository/replicate_test.go | 40 ++++---- .../service/repository/repository_exists.go | 4 +- .../repository/repository_exists_test.go | 12 +-- .../service/repository/repository_info.go | 8 +- .../repository/repository_info_test.go | 14 +-- .../service/repository/restore_repository.go | 8 +- .../repository/restore_repository_test.go | 16 ++-- .../gitaly/service/repository/search_files.go | 16 ++-- .../service/repository/search_files_test.go | 10 +- internal/gitaly/service/repository/server.go | 38 ++++---- .../gitaly/service/repository/server_test.go | 6 +- .../service/repository/set_custom_hooks.go | 8 +- .../repository/set_custom_hooks_test.go | 30 +++--- internal/gitaly/service/repository/size.go | 4 +- .../gitaly/service/repository/size_test.go | 20 ++-- .../gitaly/service/repository/snapshot.go | 8 +- .../service/repository/snapshot_test.go | 18 ++-- .../service/repository/testhelper_test.go | 30 +++--- internal/gitaly/service/repository/util.go | 2 +- .../gitaly/service/repository/write_ref.go | 12 +-- .../service/repository/write_ref_test.go | 24 ++--- internal/gitaly/service/server/disk_stats.go | 2 +- .../gitaly/service/server/disk_stats_test.go | 6 +- internal/gitaly/service/server/info.go | 12 +-- internal/gitaly/service/server/info_test.go | 22 ++--- internal/gitaly/service/server/readiness.go | 2 +- internal/gitaly/service/server/server.go | 10 +- internal/gitaly/service/server/signature.go | 4 +- .../gitaly/service/server/signature_test.go | 8 +- .../service/server/storage_status_openbsd.go | 4 +- .../service/server/storage_status_unix.go | 4 +- .../gitaly/service/server/testhelper_test.go | 2 +- internal/gitaly/service/setup/register.go | 42 ++++----- internal/gitaly/service/smarthttp/cache.go | 10 +- internal/gitaly/service/smarthttp/inforefs.go | 16 ++-- .../gitaly/service/smarthttp/inforefs_test.go | 32 +++---- .../gitaly/service/smarthttp/receive_pack.go | 20 ++-- .../service/smarthttp/receive_pack_test.go | 42 ++++----- internal/gitaly/service/smarthttp/server.go | 24 ++--- .../service/smarthttp/testhelper_test.go | 24 ++--- .../gitaly/service/smarthttp/upload_pack.go | 14 +-- .../service/smarthttp/upload_pack_test.go | 34 +++---- internal/gitaly/service/ssh/receive_pack.go | 22 ++--- .../gitaly/service/ssh/receive_pack_test.go | 42 ++++----- internal/gitaly/service/ssh/server.go | 26 +++--- .../gitaly/service/ssh/testhelper_test.go | 18 ++-- internal/gitaly/service/ssh/upload_archive.go | 14 +-- .../gitaly/service/ssh/upload_archive_test.go | 16 ++-- internal/gitaly/service/ssh/upload_command.go | 10 +- internal/gitaly/service/ssh/upload_pack.go | 18 ++-- .../gitaly/service/ssh/upload_pack_test.go | 36 ++++---- internal/gitaly/storage/context_test.go | 2 +- internal/gitaly/storage/counter/counter.go | 10 +- .../gitaly/storage/counter/counter_test.go | 12 +-- .../gitaly/storage/counter/testhelper_test.go | 2 +- internal/gitaly/storage/fs.go | 4 +- internal/gitaly/storage/fs_test.go | 4 +- .../gitaly/storage/gitstorage/alternates.go | 2 +- internal/gitaly/storage/keyvalue/badger.go | 2 +- .../gitaly/storage/keyvalue/databasemgr/db.go | 12 +-- .../storage/keyvalue/databasemgr/db_test.go | 10 +- .../keyvalue/databasemgr/testhelper_test.go | 2 +- .../gitaly/storage/keyvalue/prefixed_test.go | 2 +- .../gitaly/storage/keyvalue/recorder_test.go | 2 +- .../storage/keyvalue/testhelper_test.go | 2 +- internal/gitaly/storage/locator.go | 2 +- internal/gitaly/storage/locator_test.go | 2 +- internal/gitaly/storage/lsn.go | 2 +- internal/gitaly/storage/mdfile/metadata.go | 2 +- .../gitaly/storage/mdfile/metadata_test.go | 2 +- .../gitaly/storage/mdfile/testhelper_test.go | 2 +- internal/gitaly/storage/mode/mode.go | 2 +- internal/gitaly/storage/mode/mode_test.go | 2 +- .../mode/permission/permission_test.go | 2 +- .../mode/permission/testhelper_test.go | 2 +- .../gitaly/storage/mode/testhelper_test.go | 2 +- internal/gitaly/storage/node/manager.go | 4 +- internal/gitaly/storage/node/manager_test.go | 4 +- .../gitaly/storage/node/testhelper_test.go | 2 +- .../gitaly/storage/raftmgr/entry_recorder.go | 4 +- .../storage/raftmgr/entry_recorder_test.go | 4 +- .../gitaly/storage/raftmgr/event_registry.go | 2 +- .../storage/raftmgr/event_registry_test.go | 2 +- .../gitaly/storage/raftmgr/grpc_transport.go | 14 +-- .../storage/raftmgr/grpc_transport_test.go | 18 ++-- internal/gitaly/storage/raftmgr/logger.go | 2 +- .../gitaly/storage/raftmgr/logger_test.go | 2 +- internal/gitaly/storage/raftmgr/manager.go | 2 +- internal/gitaly/storage/raftmgr/storage.go | 14 +-- .../gitaly/storage/raftmgr/storage_test.go | 20 ++-- .../gitaly/storage/raftmgr/testhelper_test.go | 6 +- .../gitaly/storage/repository_path_test.go | 6 +- internal/gitaly/storage/servers.go | 2 +- internal/gitaly/storage/servers_test.go | 4 +- .../gitaly/storage/set_directory_mode_test.go | 6 +- internal/gitaly/storage/storage.go | 8 +- internal/gitaly/storage/storagemgr/factory.go | 6 +- internal/gitaly/storage/storagemgr/metrics.go | 2 +- .../gitaly/storage/storagemgr/middleware.go | 14 +-- .../storage/storagemgr/middleware_ext_test.go | 22 ++--- .../storage/storagemgr/middleware_recovery.go | 6 +- .../storagemgr/middleware_recovery_test.go | 22 ++--- .../storage/storagemgr/middleware_test.go | 22 ++--- .../storagemgr/partition/apply_operations.go | 4 +- .../partition/apply_operations_test.go | 12 +-- .../storagemgr/partition/check_objects.go | 8 +- .../partition/conflict/fshistory/errors.go | 4 +- .../partition/conflict/fshistory/history.go | 2 +- .../conflict/fshistory/history_test.go | 2 +- .../conflict/fshistory/testhelper_test.go | 2 +- .../partition/conflict/fshistory/tree.go | 2 +- .../storagemgr/partition/conflict/manager.go | 8 +- .../partition/conflict/manager_test.go | 4 +- .../partition/conflict/refdb/errors.go | 4 +- .../partition/conflict/refdb/history.go | 4 +- .../partition/conflict/refdb/history_test.go | 6 +- .../conflict/refdb/historymgr/manager.go | 6 +- .../conflict/refdb/historymgr/manager_test.go | 6 +- .../refdb/historymgr/testhelper_test.go | 2 +- .../conflict/refdb/testhelper_test.go | 2 +- .../partition/conflict/refdb/tree.go | 2 +- .../partition/conflict/testhelper_test.go | 2 +- .../storage/storagemgr/partition/factory.go | 14 +-- .../storagemgr/partition/fsrecorder/fs.go | 2 +- .../partition/fsrecorder/testhelper_test.go | 2 +- .../storagemgr/partition/log/log_manager.go | 6 +- .../partition/log/log_manager_test.go | 6 +- .../storagemgr/partition/log/positions.go | 2 +- .../partition/log/positions_test.go | 2 +- .../partition/log/testhelper_test.go | 2 +- .../storage/storagemgr/partition/metrics.go | 4 +- .../storagemgr/partition/migration/dryrun.go | 8 +- .../partition/migration/dryrun_test.go | 26 +++--- .../storagemgr/partition/migration/factory.go | 8 +- .../storagemgr/partition/migration/manager.go | 8 +- .../partition/migration/manager_test.go | 24 ++--- .../partition/migration/migration.go | 2 +- .../partition/migration/migration_test.go | 8 +- .../storagemgr/partition/migration/state.go | 2 +- .../partition/migration/testhelper_test.go | 2 +- .../migration/xxxx_reftable_migration.go | 12 +-- .../migration/xxxx_reftable_migration_test.go | 28 +++--- .../storagemgr/partition/snapshot/manager.go | 4 +- .../partition/snapshot/manager_test.go | 4 +- .../storagemgr/partition/snapshot/snapshot.go | 10 +- .../partition/snapshot/testhelper_test.go | 2 +- .../storagemgr/partition/testhelper_test.go | 40 ++++---- .../partition/transaction_manager.go | 44 ++++----- .../transaction_manager_alternate_test.go | 16 ++-- .../transaction_manager_consumer_test.go | 10 +- ...transaction_manager_default_branch_test.go | 6 +- .../transaction_manager_hook_test.go | 12 +-- .../transaction_manager_housekeeping_test.go | 18 ++-- .../transaction_manager_key_value_test.go | 2 +- .../transaction_manager_refs_test.go | 20 ++-- .../transaction_manager_repo_test.go | 16 ++-- .../partition/transaction_manager_test.go | 30 +++--- .../storage/storagemgr/partition_assigner.go | 6 +- .../storagemgr/partition_assigner_test.go | 16 ++-- .../storage/storagemgr/partition_manager.go | 16 ++-- .../storagemgr/partition_manager_test.go | 24 ++--- .../storage/storagemgr/testhelper_test.go | 2 +- .../storagemgr/transaction_registry.go | 2 +- .../storagemgr/transaction_registry_test.go | 2 +- internal/gitaly/storage/sync_test.go | 2 +- internal/gitaly/storage/testhelper_test.go | 2 +- internal/gitaly/storage/wal/entry.go | 6 +- internal/gitaly/storage/wal/entry_test.go | 4 +- internal/gitaly/storage/wal/get_inode_test.go | 2 +- internal/gitaly/storage/wal/manifest.go | 4 +- internal/gitaly/storage/wal/manifest_test.go | 6 +- internal/gitaly/storage/wal/operations.go | 4 +- .../gitaly/storage/wal/operations_test.go | 6 +- .../gitaly/storage/wal/reference_recorder.go | 4 +- .../storage/wal/reference_recorder_test.go | 12 +-- .../storage/wal/reftree/testhelper_test.go | 2 +- .../gitaly/storage/wal/testhelper_test.go | 2 +- .../gitaly/storage/walk/testhelper_test.go | 2 +- internal/gitaly/storage/walk/walk.go | 8 +- internal/gitaly/storage/walk/walk_test.go | 10 +- internal/gitaly/transaction/manager.go | 14 +-- internal/gitaly/transaction/manager_test.go | 16 ++-- internal/gitaly/transaction/mock.go | 4 +- .../gitaly/transaction/testhelper_test.go | 2 +- internal/gitaly/transaction/voting.go | 6 +- internal/gitaly/transaction/voting_test.go | 12 +-- internal/gitlab/client/gitlabnet.go | 2 +- internal/gitlab/client/gitlabnet_test.go | 2 +- internal/gitlab/client/testhelper_test.go | 2 +- internal/gitlab/http_client.go | 12 +-- internal/gitlab/http_client_test.go | 14 +-- internal/gitlab/test_server.go | 4 +- internal/gitlab/testhelper_test.go | 2 +- internal/grpc/backchannel/backchannel.go | 2 +- .../backchannel/backchannel_example_test.go | 8 +- internal/grpc/backchannel/backchannel_test.go | 6 +- internal/grpc/backchannel/client.go | 2 +- internal/grpc/backchannel/server.go | 2 +- internal/grpc/backchannel/testhelper_test.go | 2 +- internal/grpc/client/dial.go | 8 +- internal/grpc/client/dial_ext_test.go | 16 ++-- internal/grpc/client/dial_test.go | 8 +- internal/grpc/client/pool.go | 2 +- internal/grpc/client/testhelper_test.go | 2 +- internal/grpc/dnsresolver/builder.go | 6 +- internal/grpc/dnsresolver/builder_test.go | 2 +- internal/grpc/dnsresolver/resolver.go | 6 +- internal/grpc/dnsresolver/resolver_test.go | 6 +- internal/grpc/dnsresolver/target.go | 2 +- internal/grpc/dnsresolver/target_test.go | 4 +- internal/grpc/dnsresolver/testhelper_test.go | 2 +- internal/grpc/grpcstats/stats.go | 2 +- internal/grpc/grpcstats/stats_test.go | 8 +- internal/grpc/grpcstats/testhelper_test.go | 2 +- internal/grpc/listenmux/mux_test.go | 2 +- internal/grpc/listenmux/testhelper_test.go | 2 +- internal/grpc/metadata/metadata_test.go | 4 +- internal/grpc/metadata/testhelper_test.go | 2 +- internal/grpc/middleware/cache/cache.go | 6 +- internal/grpc/middleware/cache/cache_test.go | 8 +- internal/grpc/middleware/cache/prometheus.go | 2 +- .../grpc/middleware/cache/testhelper_test.go | 2 +- .../customfields_handler.go | 2 +- .../customfields_handler_test.go | 26 +++--- .../customfieldshandler/testhelper_test.go | 2 +- .../featureflag/featureflag_handler.go | 4 +- .../featureflag/featureflag_handler_test.go | 8 +- .../middleware/featureflag/testhelper_test.go | 2 +- .../middleware/limithandler/middleware.go | 8 +- .../limithandler/middleware_test.go | 14 +-- .../limithandler/testhelper_test.go | 2 +- .../grpc/middleware/loghandler/loghandler.go | 2 +- .../middleware/loghandler/loghandler_test.go | 2 +- .../middleware/loghandler/testhelper_test.go | 2 +- .../middleware/panichandler/panic_handler.go | 2 +- .../requestinfohandler/requestinfohandler.go | 8 +- .../requestinfohandler_test.go | 8 +- .../requestinfohandler/testhelper_test.go | 2 +- .../middleware/sentryhandler/sentryhandler.go | 4 +- .../sentryhandler/sentryhandler_test.go | 4 +- .../sentryhandler/testhelper_test.go | 2 +- .../middleware/statushandler/statushandler.go | 2 +- .../statushandler/statushandler_test.go | 4 +- .../statushandler/testhelper_test.go | 2 +- internal/grpc/protoregistry/method_info.go | 6 +- .../grpc/protoregistry/method_info_test.go | 6 +- internal/grpc/protoregistry/registry.go | 4 +- .../grpc/protoregistry/testhelper_test.go | 2 +- internal/grpc/proxy/handler.go | 2 +- internal/grpc/proxy/handler_ext_test.go | 10 +- internal/grpc/proxy/peeker_test.go | 6 +- .../grpc/proxy/proxy_test_testhelper_test.go | 4 +- internal/grpc/proxy/testhelper_test.go | 2 +- internal/grpc/sidechannel/conn.go | 8 +- internal/grpc/sidechannel/proxy.go | 4 +- internal/grpc/sidechannel/proxy_test.go | 12 +-- internal/grpc/sidechannel/registry_test.go | 2 +- internal/grpc/sidechannel/sidechannel.go | 10 +- internal/grpc/sidechannel/sidechannel_test.go | 6 +- internal/grpc/sidechannel/testhelper_test.go | 2 +- internal/helper/chunk/chunker_test.go | 2 +- internal/helper/chunk/testhelper_test.go | 2 +- internal/helper/duration/testhelper_test.go | 2 +- internal/helper/env/env_test.go | 4 +- internal/helper/env/testhelper_test.go | 2 +- internal/helper/fstype/testhelper_test.go | 2 +- internal/helper/lines/testhelper_test.go | 2 +- internal/helper/perm/fix_permissions.go | 2 +- internal/helper/perm/perm_test.go | 2 +- internal/helper/perm/testhelper_test.go | 2 +- internal/helper/testhelper_test.go | 2 +- internal/helper/text/chomp_test.go | 2 +- internal/helper/text/testhelper_test.go | 2 +- internal/kernel/testhelper_test.go | 2 +- internal/kernel/version.go | 2 +- internal/kernel/version_test.go | 2 +- internal/limiter/adaptive_calculator.go | 4 +- internal/limiter/adaptive_calculator_test.go | 4 +- internal/limiter/concurrency_limiter.go | 8 +- internal/limiter/concurrency_limiter_test.go | 6 +- internal/limiter/monitor.go | 2 +- internal/limiter/monitor_test.go | 6 +- internal/limiter/rate_limiter.go | 8 +- internal/limiter/rate_limiter_test.go | 4 +- internal/limiter/resizable_semaphore_test.go | 2 +- internal/limiter/testhelper_test.go | 2 +- .../limiter/watchers/cgroup_cpu_watcher.go | 4 +- .../watchers/cgroup_cpu_watcher_test.go | 6 +- .../limiter/watchers/cgroup_memory_watcher.go | 4 +- .../watchers/cgroup_memory_watcher_test.go | 6 +- internal/limiter/watchers/testhelper_test.go | 4 +- internal/log/customfields_test.go | 4 +- internal/log/matcher.go | 2 +- internal/log/testhelper_test.go | 2 +- internal/offloading/options.go | 2 +- internal/offloading/sink.go | 2 +- internal/offloading/sink_test.go | 6 +- internal/offloading/testhelper_test.go | 2 +- internal/praefect/auth_test.go | 22 ++--- internal/praefect/config/config.go | 14 +-- internal/praefect/config/config_test.go | 16 ++-- internal/praefect/config/node.go | 2 +- internal/praefect/config/node_test.go | 2 +- internal/praefect/config/testhelper_test.go | 2 +- internal/praefect/coordinator.go | 28 +++--- internal/praefect/coordinator_pg_test.go | 20 ++-- internal/praefect/coordinator_test.go | 50 +++++----- internal/praefect/datastore/assignment.go | 2 +- .../praefect/datastore/assignment_test.go | 6 +- internal/praefect/datastore/collector.go | 4 +- internal/praefect/datastore/collector_test.go | 6 +- internal/praefect/datastore/glsql/postgres.go | 4 +- .../praefect/datastore/glsql/postgres_test.go | 10 +- .../datastore/glsql/testhelper_test.go | 2 +- internal/praefect/datastore/listener.go | 8 +- internal/praefect/datastore/listener_test.go | 10 +- 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 | 4 +- internal/praefect/datastore/queue.go | 2 +- internal/praefect/datastore/queue_bm_test.go | 4 +- internal/praefect/datastore/queue_test.go | 4 +- .../praefect/datastore/repository_store.go | 4 +- .../datastore/repository_store_bm_test.go | 4 +- .../datastore/repository_store_mock.go | 2 +- .../datastore/repository_store_test.go | 6 +- .../praefect/datastore/storage_cleanup.go | 2 +- .../datastore/storage_cleanup_test.go | 4 +- .../praefect/datastore/storage_provider.go | 6 +- .../datastore/storage_provider_test.go | 10 +- .../praefect/datastore/testhelper_test.go | 2 +- internal/praefect/delete_object_pool.go | 14 +-- internal/praefect/delete_object_pool_test.go | 12 +-- internal/praefect/dependencies.go | 16 ++-- internal/praefect/get_object_pool.go | 10 +- internal/praefect/get_object_pool_test.go | 28 +++--- internal/praefect/helper_test.go | 4 +- internal/praefect/info_service_test.go | 34 +++---- internal/praefect/metrics/prometheus.go | 6 +- internal/praefect/metrics/prometheus_test.go | 4 +- internal/praefect/metrics/testhelper_test.go | 2 +- internal/praefect/middleware/errorhandler.go | 4 +- .../praefect/middleware/errorhandler_test.go | 16 ++-- internal/praefect/middleware/methodtype.go | 6 +- .../praefect/middleware/testhelper_test.go | 2 +- internal/praefect/node.go | 14 +-- internal/praefect/node_test.go | 6 +- internal/praefect/nodes/disabled_elector.go | 2 +- internal/praefect/nodes/health_manager.go | 6 +- .../praefect/nodes/health_manager_test.go | 8 +- internal/praefect/nodes/local_elector.go | 4 +- internal/praefect/nodes/local_elector_test.go | 6 +- internal/praefect/nodes/manager.go | 26 +++--- internal/praefect/nodes/manager_test.go | 14 +-- internal/praefect/nodes/per_repository.go | 6 +- .../praefect/nodes/per_repository_test.go | 8 +- internal/praefect/nodes/ping.go | 8 +- internal/praefect/nodes/ping_test.go | 2 +- internal/praefect/nodes/sql_elector.go | 8 +- internal/praefect/nodes/sql_elector_test.go | 18 ++-- internal/praefect/nodes/testhelper_test.go | 2 +- internal/praefect/nodes/tracker/errors.go | 2 +- .../praefect/nodes/tracker/errors_test.go | 2 +- .../praefect/nodes/tracker/testhelper_test.go | 2 +- internal/praefect/reconciler/reconciler.go | 10 +- .../reconciler/reconciler_benchmark_test.go | 6 +- .../praefect/reconciler/reconciler_test.go | 12 +-- .../praefect/reconciler/testhelper_test.go | 2 +- internal/praefect/remove_repository.go | 10 +- internal/praefect/remove_repository_test.go | 28 +++--- internal/praefect/replicator.go | 18 ++-- internal/praefect/replicator_pg_test.go | 12 +-- internal/praefect/replicator_test.go | 34 +++---- internal/praefect/repocleaner/action_log.go | 2 +- .../praefect/repocleaner/action_log_test.go | 4 +- internal/praefect/repocleaner/repository.go | 10 +- .../praefect/repocleaner/repository_test.go | 28 +++--- .../praefect/repocleaner/testhelper_test.go | 2 +- internal/praefect/repository_exists.go | 8 +- internal/praefect/repository_exists_test.go | 18 ++-- internal/praefect/router.go | 2 +- internal/praefect/router_node_manager.go | 6 +- internal/praefect/router_per_repository.go | 8 +- .../praefect/router_per_repository_test.go | 12 +-- internal/praefect/server.go | 44 ++++----- internal/praefect/server_factory_test.go | 42 ++++----- internal/praefect/server_test.go | 58 ++++++------ internal/praefect/service/checks.go | 10 +- internal/praefect/service/checks_test.go | 14 +-- internal/praefect/service/info/dataloss.go | 6 +- internal/praefect/service/info/metadata.go | 6 +- .../service/info/replication_factor.go | 6 +- .../praefect/service/info/repositories.go | 6 +- internal/praefect/service/info/server.go | 12 +-- .../praefect/service/info/verification.go | 2 +- .../praefect/service/server/disk_stats.go | 2 +- internal/praefect/service/server/info.go | 4 +- internal/praefect/service/server/readiness.go | 2 +- .../praefect/service/server/readiness_test.go | 16 ++-- internal/praefect/service/server/server.go | 8 +- internal/praefect/service/server/signature.go | 2 +- .../service/server/testhelper_test.go | 2 +- internal/praefect/service/testhelper_test.go | 2 +- .../praefect/service/transaction/server.go | 8 +- internal/praefect/testhelper_test.go | 4 +- internal/praefect/testserver.go | 30 +++--- internal/praefect/transaction_test.go | 8 +- internal/praefect/transactions/manager.go | 6 +- .../praefect/transactions/manager_test.go | 4 +- .../praefect/transactions/subtransaction.go | 2 +- .../transactions/subtransaction_test.go | 4 +- .../praefect/transactions/testhelper_test.go | 2 +- internal/praefect/transactions/transaction.go | 2 +- .../praefect/transactions/transaction_test.go | 4 +- internal/praefect/verifier.go | 8 +- internal/praefect/verifier_test.go | 40 ++++---- internal/praefect/walkrepos.go | 8 +- internal/praefect/walkrepos_test.go | 16 ++-- internal/protoutil/extension.go | 2 +- internal/ps/testhelper_test.go | 2 +- internal/safe/file_writer.go | 2 +- internal/safe/file_writer_test.go | 6 +- internal/safe/locking_directory.go | 2 +- internal/safe/locking_directory_test.go | 6 +- internal/safe/locking_file_writer.go | 2 +- internal/safe/locking_file_writer_test.go | 10 +- internal/safe/sync_test.go | 2 +- internal/safe/testhelper_test.go | 2 +- internal/signature/testhelper_test.go | 2 +- internal/stream/pktline.go | 2 +- internal/stream/std_stream.go | 2 +- internal/streamcache/cache.go | 8 +- internal/streamcache/cache_test.go | 8 +- internal/streamcache/filestore.go | 8 +- internal/streamcache/filestore_test.go | 4 +- internal/streamcache/min_occurrences_test.go | 2 +- internal/streamcache/pipe_test.go | 2 +- internal/streamcache/sendfile_test.go | 2 +- internal/streamcache/testhelper_test.go | 2 +- internal/structerr/grpc_server.go | 2 +- internal/tempdir/clean.go | 10 +- internal/tempdir/clean_test.go | 12 +-- internal/tempdir/tempdir.go | 8 +- internal/tempdir/tempdir_test.go | 10 +- internal/tempdir/testhelper_test.go | 2 +- internal/testhelper/configure.go | 4 +- internal/testhelper/directory.go | 2 +- internal/testhelper/directory_test.go | 4 +- internal/testhelper/featureset.go | 2 +- internal/testhelper/featureset_test.go | 2 +- internal/testhelper/gitlabtest.go | 2 +- internal/testhelper/grpc.go | 4 +- internal/testhelper/grpc_test.go | 2 +- internal/testhelper/leakage.go | 4 +- internal/testhelper/logger.go | 2 +- internal/testhelper/testcfg/binaries.go | 8 +- internal/testhelper/testcfg/gitaly.go | 8 +- internal/testhelper/testcfg/metadata.go | 4 +- internal/testhelper/testdb/db.go | 8 +- internal/testhelper/testdb/health.go | 2 +- internal/testhelper/testdb/testhelper_test.go | 2 +- internal/testhelper/testhelper.go | 8 +- internal/testhelper/testserver/gitaly.go | 76 +++++++-------- internal/testhelper/testserver/praefect.go | 8 +- .../testserver/structerr_interceptors.go | 4 +- .../testserver/structerr_interceptors_test.go | 8 +- .../testhelper/testserver/testhelper_test.go | 2 +- internal/testhelper/transactiontest/gitaly.go | 2 +- internal/tracing/passthrough_test.go | 2 +- internal/tracing/testhelper_test.go | 2 +- internal/tracing/tracing_test.go | 2 +- internal/transaction/txinfo/transaction.go | 2 +- internal/transaction/voting/phase.go | 2 +- .../transaction/voting/testhelper_test.go | 2 +- internal/unarycache/cache.go | 2 +- internal/unarycache/cache_test.go | 8 +- internal/unarycache/testhelper_test.go | 2 +- packed_binaries.go | 2 +- packed_binaries_test.go | 2 +- streamio/testhelper_test.go | 2 +- testhelper_test.go | 2 +- tools/protoc-gen-gitaly-lint/lint.go | 4 +- tools/protoc-gen-gitaly-lint/lint_test.go | 2 +- tools/protoc-gen-gitaly-lint/method.go | 4 +- tools/test-boot/main.go | 2 +- 1263 files changed, 6158 insertions(+), 6158 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 961b81122d..9fa0b53db5 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -56,9 +56,9 @@ linters-settings: exclude-functions: - (*database/sql.DB).Close - (*database/sql.Rows).Close - - (*gitlab.com/gitlab-org/gitaly/v16/internal/grpc/sidechannel.ServerConn).Close - - (*gitlab.com/gitlab-org/gitaly/v16/internal/streamcache.pipe).Close - - (*gitlab.com/gitlab-org/gitaly/v16/internal/streamcache.pipeReader).Close + - (*gitlab.com/gitlab-org/gitaly/v17/internal/grpc/sidechannel.ServerConn).Close + - (*gitlab.com/gitlab-org/gitaly/v17/internal/streamcache.pipe).Close + - (*gitlab.com/gitlab-org/gitaly/v17/internal/streamcache.pipeReader).Close - (*google.golang.org/grpc.ClientConn).Close - (*google.golang.org/grpc.ServerConn).Close - (*io.PipeReader).Close @@ -172,13 +172,13 @@ linters-settings: error_wrap: included-functions: - fmt.Errorf - - gitlab.com/gitlab-org/gitaly/v16/internal/structerr.* + - gitlab.com/gitlab-org/gitaly/v17/internal/structerr.* unavailable_code: included-functions: - - gitlab.com/gitlab-org/gitaly/v16/internal/structerr.NewUnavailable + - gitlab.com/gitlab-org/gitaly/v17/internal/structerr.NewUnavailable testhelper_run: included-functions: - - gitlab.com/gitlab-org/gitaly/v16/internal/testhelper.Run + - gitlab.com/gitlab-org/gitaly/v17/internal/testhelper.Run issues: exclude-use-default: false diff --git a/auth/extract_test.go b/auth/extract_test.go index 5b39b9e6eb..67b9fc8a4f 100644 --- a/auth/extract_test.go +++ b/auth/extract_test.go @@ -6,7 +6,7 @@ import ( "github.com/grpc-ecosystem/go-grpc-middleware/v2/metadata" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestCheckTokenV2(t *testing.T) { diff --git a/auth/testhelper_test.go b/auth/testhelper_test.go index cb7efe0005..353f6813ba 100644 --- a/auth/testhelper_test.go +++ b/auth/testhelper_test.go @@ -3,7 +3,7 @@ package gitalyauth import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/client/dial.go b/client/dial.go index ed4e02a667..d18e20775e 100644 --- a/client/dial.go +++ b/client/dial.go @@ -7,11 +7,11 @@ import ( "time" "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/v16/internal/backoff" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/dnsresolver" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/sidechannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/backoff" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/dnsresolver" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/sidechannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" "google.golang.org/grpc" ) diff --git a/client/dial_test.go b/client/dial_test.go index 72738c23bc..d8c6a4ecb5 100644 --- a/client/dial_test.go +++ b/client/dial_test.go @@ -17,12 +17,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/uber/jaeger-client-go" - gitalyauth "gitlab.com/gitlab-org/gitaly/v16/auth" - internalclient "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/tracing" - gitalyx509 "gitlab.com/gitlab-org/gitaly/v16/internal/x509" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + gitalyauth "gitlab.com/gitlab-org/gitaly/v17/auth" + internalclient "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/tracing" + gitalyx509 "gitlab.com/gitlab-org/gitaly/v17/internal/x509" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "gitlab.com/gitlab-org/labkit/correlation" grpccorrelation "gitlab.com/gitlab-org/labkit/correlation/grpc" grpctracing "gitlab.com/gitlab-org/labkit/tracing/grpc" diff --git a/client/pool.go b/client/pool.go index 1354f726c7..24e0468fc2 100644 --- a/client/pool.go +++ b/client/pool.go @@ -3,7 +3,7 @@ package client import ( "context" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" "google.golang.org/grpc" ) diff --git a/client/pool_test.go b/client/pool_test.go index 262fa85a5a..a8a21be72f 100644 --- a/client/pool_test.go +++ b/client/pool_test.go @@ -8,11 +8,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - gitalyauth "gitlab.com/gitlab-org/gitaly/v16/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/bootstrap/starter" - gitalycfgauth "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/server/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + gitalyauth "gitlab.com/gitlab-org/gitaly/v17/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/bootstrap/starter" + gitalycfgauth "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/server/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/health" diff --git a/client/receive_pack.go b/client/receive_pack.go index 2d8d68e444..3686627ebe 100644 --- a/client/receive_pack.go +++ b/client/receive_pack.go @@ -4,8 +4,8 @@ import ( "context" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/gitalyclient" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/gitalyclient" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" ) diff --git a/client/sidechannel.go b/client/sidechannel.go index b88d415588..239e14c68d 100644 --- a/client/sidechannel.go +++ b/client/sidechannel.go @@ -5,10 +5,10 @@ import ( "io" "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/listenmux" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/sidechannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/listenmux" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/sidechannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" "google.golang.org/grpc" "google.golang.org/grpc/credentials" ) diff --git a/client/testhelper_test.go b/client/testhelper_test.go index 137104d4d8..cacb27732a 100644 --- a/client/testhelper_test.go +++ b/client/testhelper_test.go @@ -3,7 +3,7 @@ package client import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/client/upload_archive.go b/client/upload_archive.go index 572e6bc9b3..44e2ea7e38 100644 --- a/client/upload_archive.go +++ b/client/upload_archive.go @@ -4,8 +4,8 @@ import ( "context" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/gitalyclient" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/gitalyclient" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" ) diff --git a/client/upload_pack.go b/client/upload_pack.go index 11033cc8e0..1a42a14380 100644 --- a/client/upload_pack.go +++ b/client/upload_pack.go @@ -4,8 +4,8 @@ import ( "context" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/gitalyclient" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/gitalyclient" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" ) diff --git a/cmd/gitaly-backup/main.go b/cmd/gitaly-backup/main.go index 171e45476f..4973e97d83 100644 --- a/cmd/gitaly-backup/main.go +++ b/cmd/gitaly-backup/main.go @@ -3,7 +3,7 @@ package main import ( "os" - cli "gitlab.com/gitlab-org/gitaly/v16/internal/cli/gitalybackup" + cli "gitlab.com/gitlab-org/gitaly/v17/internal/cli/gitalybackup" ) func main() { diff --git a/cmd/gitaly-blackbox/main.go b/cmd/gitaly-blackbox/main.go index b71ab54f79..9c7ce26435 100644 --- a/cmd/gitaly-blackbox/main.go +++ b/cmd/gitaly-blackbox/main.go @@ -6,9 +6,9 @@ import ( "os" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/blackbox" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/version" + "gitlab.com/gitlab-org/gitaly/v17/internal/blackbox" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/version" ) var flagVersion = flag.Bool("version", false, "Print version and exit") diff --git a/cmd/gitaly-debug/analyzehttp.go b/cmd/gitaly-debug/analyzehttp.go index f8cda3f434..b7915d5f8f 100644 --- a/cmd/gitaly-debug/analyzehttp.go +++ b/cmd/gitaly-debug/analyzehttp.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" ) func analyzeHTTPClone(cloneURL string) { diff --git a/cmd/gitaly-debug/bitmap.go b/cmd/gitaly-debug/bitmap.go index 8d6f89f4d0..6f5219c75b 100644 --- a/cmd/gitaly-debug/bitmap.go +++ b/cmd/gitaly-debug/bitmap.go @@ -5,8 +5,8 @@ import ( "fmt" "os" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/packfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/packfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) func listBitmapPack(logger log.Logger, idxFile string) { diff --git a/cmd/gitaly-debug/main.go b/cmd/gitaly-debug/main.go index 2d0d9e2365..1d42b6cd7d 100644 --- a/cmd/gitaly-debug/main.go +++ b/cmd/gitaly-debug/main.go @@ -5,7 +5,7 @@ import ( "io" "os" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) const ( diff --git a/cmd/gitaly-debug/simulatehttp.go b/cmd/gitaly-debug/simulatehttp.go index 3b24ba843a..831a4b1994 100644 --- a/cmd/gitaly-debug/simulatehttp.go +++ b/cmd/gitaly-debug/simulatehttp.go @@ -9,7 +9,7 @@ import ( "regexp" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/pktline" ) func simulateHTTPClone(gitDir string) { diff --git a/cmd/gitaly-gpg/main.go b/cmd/gitaly-gpg/main.go index de0b8406c8..0f07f43d68 100644 --- a/cmd/gitaly-gpg/main.go +++ b/cmd/gitaly-gpg/main.go @@ -9,8 +9,8 @@ import ( "time" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/signature" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/signature" ) func gpgApp() *cli.App { diff --git a/cmd/gitaly-gpg/main_test.go b/cmd/gitaly-gpg/main_test.go index c61c37a720..825a670f10 100644 --- a/cmd/gitaly-gpg/main_test.go +++ b/cmd/gitaly-gpg/main_test.go @@ -10,7 +10,7 @@ import ( "github.com/ProtonMail/go-crypto/openpgp" "github.com/ProtonMail/go-crypto/openpgp/packet" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) var ( diff --git a/cmd/gitaly-gpg/testhelper_test.go b/cmd/gitaly-gpg/testhelper_test.go index 432115dc03..e100347b18 100644 --- a/cmd/gitaly-gpg/testhelper_test.go +++ b/cmd/gitaly-gpg/testhelper_test.go @@ -3,7 +3,7 @@ package main import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/cmd/gitaly-hooks/hooks.go b/cmd/gitaly-hooks/hooks.go index aa53056fc5..b24478f826 100644 --- a/cmd/gitaly-hooks/hooks.go +++ b/cmd/gitaly-hooks/hooks.go @@ -10,17 +10,17 @@ import ( "path/filepath" "github.com/sirupsen/logrus" - gitalyauth "gitlab.com/gitlab-org/gitaly/v16/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/env" - "gitlab.com/gitlab-org/gitaly/v16/internal/stream" - "gitlab.com/gitlab-org/gitaly/v16/internal/tracing" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + gitalyauth "gitlab.com/gitlab-org/gitaly/v17/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/env" + "gitlab.com/gitlab-org/gitaly/v17/internal/stream" + "gitlab.com/gitlab-org/gitaly/v17/internal/tracing" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" labkitcorrelation "gitlab.com/gitlab-org/labkit/correlation/grpc" labkittracing "gitlab.com/gitlab-org/labkit/tracing" "google.golang.org/grpc" diff --git a/cmd/gitaly-hooks/hooks_test.go b/cmd/gitaly-hooks/hooks_test.go index 9b88cd52b1..afd758f54a 100644 --- a/cmd/gitaly-hooks/hooks_test.go +++ b/cmd/gitaly-hooks/hooks_test.go @@ -13,32 +13,32 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/pktline" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/prometheus" - gitalyhook "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitlab" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/limiter" - gitalylog "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/prometheus" + gitalyhook "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitlab" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/limiter" + gitalylog "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "gitlab.com/gitlab-org/labkit/correlation" labkitcorrelation "gitlab.com/gitlab-org/labkit/correlation/grpc" labkittracing "gitlab.com/gitlab-org/labkit/tracing" diff --git a/cmd/gitaly-hooks/testhelper_test.go b/cmd/gitaly-hooks/testhelper_test.go index 432115dc03..e100347b18 100644 --- a/cmd/gitaly-hooks/testhelper_test.go +++ b/cmd/gitaly-hooks/testhelper_test.go @@ -3,7 +3,7 @@ package main import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/cmd/gitaly-lfs-smudge/main.go b/cmd/gitaly-lfs-smudge/main.go index bbfede04c7..d79f953bf6 100644 --- a/cmd/gitaly-lfs-smudge/main.go +++ b/cmd/gitaly-lfs-smudge/main.go @@ -6,9 +6,9 @@ import ( "io" "os" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/smudge" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/smudge" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" "gitlab.com/gitlab-org/labkit/tracing" ) diff --git a/cmd/gitaly-lfs-smudge/main_test.go b/cmd/gitaly-lfs-smudge/main_test.go index b6b735579c..169db90849 100644 --- a/cmd/gitaly-lfs-smudge/main_test.go +++ b/cmd/gitaly-lfs-smudge/main_test.go @@ -8,12 +8,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/smudge" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/smudge" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) type capturedOutput struct { diff --git a/cmd/gitaly-lfs-smudge/smudge.go b/cmd/gitaly-lfs-smudge/smudge.go index 69554e7668..95bf486064 100644 --- a/cmd/gitaly-lfs-smudge/smudge.go +++ b/cmd/gitaly-lfs-smudge/smudge.go @@ -10,11 +10,11 @@ import ( "net/url" "github.com/git-lfs/git-lfs/v3/lfs" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/pktline" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/smudge" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitlab" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/smudge" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/prometheus" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitlab" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) func filter(ctx context.Context, cfg smudge.Config, to io.Writer, from io.Reader, logger log.Logger) (returnedErr error) { diff --git a/cmd/gitaly-lfs-smudge/smudge_test.go b/cmd/gitaly-lfs-smudge/smudge_test.go index 97689e286a..8d3e5403ef 100644 --- a/cmd/gitaly-lfs-smudge/smudge_test.go +++ b/cmd/gitaly-lfs-smudge/smudge_test.go @@ -8,11 +8,11 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/pktline" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/smudge" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitlab" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/smudge" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitlab" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) const ( diff --git a/cmd/gitaly-lfs-smudge/testhelper_test.go b/cmd/gitaly-lfs-smudge/testhelper_test.go index 122d6b7682..e191e1dbda 100644 --- a/cmd/gitaly-lfs-smudge/testhelper_test.go +++ b/cmd/gitaly-lfs-smudge/testhelper_test.go @@ -4,9 +4,9 @@ import ( "path/filepath" "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitlab" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitlab" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/cmd/gitaly-ssh/auth_test.go b/cmd/gitaly-ssh/auth_test.go index 54d165ed79..7a354be713 100644 --- a/cmd/gitaly-ssh/auth_test.go +++ b/cmd/gitaly-ssh/auth_test.go @@ -8,15 +8,15 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/setup" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/internal/x509" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/setup" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/x509" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/encoding/protojson" ) diff --git a/cmd/gitaly-ssh/main.go b/cmd/gitaly-ssh/main.go index e18350e095..98a9e1b9ec 100644 --- a/cmd/gitaly-ssh/main.go +++ b/cmd/gitaly-ssh/main.go @@ -8,11 +8,11 @@ import ( "strconv" "strings" - gitalyauth "gitlab.com/gitlab-org/gitaly/v16/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/sidechannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + gitalyauth "gitlab.com/gitlab-org/gitaly/v17/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/sidechannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" "gitlab.com/gitlab-org/labkit/tracing" "google.golang.org/grpc" ) diff --git a/cmd/gitaly-ssh/main_test.go b/cmd/gitaly-ssh/main_test.go index 640b7e5e65..17cb3c766c 100644 --- a/cmd/gitaly-ssh/main_test.go +++ b/cmd/gitaly-ssh/main_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/sidechannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/sidechannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" "google.golang.org/grpc" ) diff --git a/cmd/gitaly-ssh/receive_pack.go b/cmd/gitaly-ssh/receive_pack.go index 268e3d69f4..59a1e8f323 100644 --- a/cmd/gitaly-ssh/receive_pack.go +++ b/cmd/gitaly-ssh/receive_pack.go @@ -5,9 +5,9 @@ import ( "fmt" "os" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/gitalyclient" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/sidechannel" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/gitalyclient" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/sidechannel" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/protobuf/encoding/protojson" ) diff --git a/cmd/gitaly-ssh/testhelper_test.go b/cmd/gitaly-ssh/testhelper_test.go index 432115dc03..e100347b18 100644 --- a/cmd/gitaly-ssh/testhelper_test.go +++ b/cmd/gitaly-ssh/testhelper_test.go @@ -3,7 +3,7 @@ package main import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/cmd/gitaly-ssh/upload_archive.go b/cmd/gitaly-ssh/upload_archive.go index f92ffa9655..acc8fe0e35 100644 --- a/cmd/gitaly-ssh/upload_archive.go +++ b/cmd/gitaly-ssh/upload_archive.go @@ -5,9 +5,9 @@ import ( "fmt" "os" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/gitalyclient" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/sidechannel" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/gitalyclient" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/sidechannel" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/protobuf/encoding/protojson" ) diff --git a/cmd/gitaly-ssh/upload_pack.go b/cmd/gitaly-ssh/upload_pack.go index 59b9915171..d2dcd63588 100644 --- a/cmd/gitaly-ssh/upload_pack.go +++ b/cmd/gitaly-ssh/upload_pack.go @@ -5,9 +5,9 @@ import ( "fmt" "os" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/gitalyclient" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/sidechannel" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/gitalyclient" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/sidechannel" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/protobuf/encoding/protojson" ) diff --git a/cmd/gitaly-ssh/upload_pack_test.go b/cmd/gitaly-ssh/upload_pack_test.go index da700f8fd9..4d82385c7c 100644 --- a/cmd/gitaly-ssh/upload_pack_test.go +++ b/cmd/gitaly-ssh/upload_pack_test.go @@ -7,13 +7,13 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/setup" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/setup" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/encoding/protojson" ) diff --git a/cmd/gitaly-wrapper/main.go b/cmd/gitaly-wrapper/main.go index 33c3343620..c3e9e07587 100644 --- a/cmd/gitaly-wrapper/main.go +++ b/cmd/gitaly-wrapper/main.go @@ -11,10 +11,10 @@ import ( "syscall" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/bootstrap" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/env" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/ps" + "gitlab.com/gitlab-org/gitaly/v17/internal/bootstrap" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/env" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/ps" "golang.org/x/sys/unix" ) diff --git a/cmd/gitaly-wrapper/main_test.go b/cmd/gitaly-wrapper/main_test.go index 84c97ddf7c..7a973df65d 100644 --- a/cmd/gitaly-wrapper/main_test.go +++ b/cmd/gitaly-wrapper/main_test.go @@ -13,10 +13,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/bootstrap" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/bootstrap" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) // TestStolenPid tests for regressions in https://gitlab.com/gitlab-org/gitaly/issues/1661 diff --git a/cmd/gitaly-wrapper/testhelper_test.go b/cmd/gitaly-wrapper/testhelper_test.go index 432115dc03..e100347b18 100644 --- a/cmd/gitaly-wrapper/testhelper_test.go +++ b/cmd/gitaly-wrapper/testhelper_test.go @@ -3,7 +3,7 @@ package main import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/cmd/gitaly/check_test.go b/cmd/gitaly/check_test.go index 128d934a38..7006dff5e6 100644 --- a/cmd/gitaly/check_test.go +++ b/cmd/gitaly/check_test.go @@ -8,10 +8,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitlab" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitlab" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func createTestServer(t *testing.T) (user, password, url string, cleanup func()) { diff --git a/cmd/gitaly/main.go b/cmd/gitaly/main.go index 14190f3eba..ce80df9943 100644 --- a/cmd/gitaly/main.go +++ b/cmd/gitaly/main.go @@ -4,7 +4,7 @@ import ( "log" "os" - cli "gitlab.com/gitlab-org/gitaly/v16/internal/cli/gitaly" + cli "gitlab.com/gitlab-org/gitaly/v17/internal/cli/gitaly" ) func main() { diff --git a/cmd/gitaly/main_test.go b/cmd/gitaly/main_test.go index 06d96618a1..839d1e46c0 100644 --- a/cmd/gitaly/main_test.go +++ b/cmd/gitaly/main_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/version" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/version" ) func TestGitalyCLI(t *testing.T) { diff --git a/cmd/gitaly/testhelper_test.go b/cmd/gitaly/testhelper_test.go index 432115dc03..e100347b18 100644 --- a/cmd/gitaly/testhelper_test.go +++ b/cmd/gitaly/testhelper_test.go @@ -3,7 +3,7 @@ package main import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/cmd/praefect/main.go b/cmd/praefect/main.go index f03cb78f42..d5119afa91 100644 --- a/cmd/praefect/main.go +++ b/cmd/praefect/main.go @@ -4,7 +4,7 @@ import ( "log" "os" - cli "gitlab.com/gitlab-org/gitaly/v16/internal/cli/praefect" + cli "gitlab.com/gitlab-org/gitaly/v17/internal/cli/praefect" ) func main() { diff --git a/cmd/validate.go b/cmd/validate.go index 8c7e3cc530..1170f9992a 100644 --- a/cmd/validate.go +++ b/cmd/validate.go @@ -7,7 +7,7 @@ import ( "io" "github.com/pelletier/go-toml/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/errors/cfgerror" + "gitlab.com/gitlab-org/gitaly/v17/internal/errors/cfgerror" ) // Validate invokes validator and processes the result. If there are any errors returned diff --git a/go.mod b/go.mod index 902c9163ad..e2cf900467 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module gitlab.com/gitlab-org/gitaly/v16 +module gitlab.com/gitlab-org/gitaly/v17 go 1.22.0 diff --git a/internal/archive/archive.go b/internal/archive/archive.go index 040ec879a8..a8c2b97b81 100644 --- a/internal/archive/archive.go +++ b/internal/archive/archive.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) const ( diff --git a/internal/archive/archive_test.go b/internal/archive/archive_test.go index 514e7e1c01..36128ad51a 100644 --- a/internal/archive/archive_test.go +++ b/internal/archive/archive_test.go @@ -10,8 +10,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestWriteTarball(t *testing.T) { diff --git a/internal/archive/tar_builder.go b/internal/archive/tar_builder.go index 3f52d2dd4f..0a03aa77bc 100644 --- a/internal/archive/tar_builder.go +++ b/internal/archive/tar_builder.go @@ -10,7 +10,7 @@ import ( "regexp" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode/permission" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode/permission" "golang.org/x/sys/unix" ) diff --git a/internal/archive/testhelper_test.go b/internal/archive/testhelper_test.go index b8f9015cb3..d9062ddf53 100644 --- a/internal/archive/testhelper_test.go +++ b/internal/archive/testhelper_test.go @@ -3,7 +3,7 @@ package archive import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/backoff/testhelper_test.go b/internal/backoff/testhelper_test.go index cc3edbe5d0..f4bbc24fd0 100644 --- a/internal/backoff/testhelper_test.go +++ b/internal/backoff/testhelper_test.go @@ -3,7 +3,7 @@ package backoff import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/backup/backup.go b/internal/backup/backup.go index 6870bbf4ad..ab8889d711 100644 --- a/internal/backup/backup.go +++ b/internal/backup/backup.go @@ -12,17 +12,17 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/counter" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/migration" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/counter" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/migration" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/backup/backup_test.go b/internal/backup/backup_test.go index 0ab3045aa5..19d1846391 100644 --- a/internal/backup/backup_test.go +++ b/internal/backup/backup_test.go @@ -9,24 +9,24 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/archive" - "gitlab.com/gitlab-org/gitaly/v16/internal/backup" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/setup" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/counter" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/migration" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/archive" + "gitlab.com/gitlab-org/gitaly/v17/internal/backup" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/setup" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/counter" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/migration" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/proto" ) diff --git a/internal/backup/lazy_test.go b/internal/backup/lazy_test.go index 15cce10756..f7b45b4baf 100644 --- a/internal/backup/lazy_test.go +++ b/internal/backup/lazy_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestLazyWriter(t *testing.T) { diff --git a/internal/backup/locator.go b/internal/backup/locator.go index c52e644102..94495b2a12 100644 --- a/internal/backup/locator.go +++ b/internal/backup/locator.go @@ -9,9 +9,9 @@ import ( "strconv" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" ) // LegacyLocator locates backup paths for historic backups. This is the diff --git a/internal/backup/locator_test.go b/internal/backup/locator_test.go index 516807318c..882c7d5e25 100644 --- a/internal/backup/locator_test.go +++ b/internal/backup/locator_test.go @@ -9,13 +9,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestLegacyLocator(t *testing.T) { diff --git a/internal/backup/log_entry.go b/internal/backup/log_entry.go index 3d2935b83b..3be13729a0 100644 --- a/internal/backup/log_entry.go +++ b/internal/backup/log_entry.go @@ -11,11 +11,11 @@ import ( "time" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/archive" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - logging "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/archive" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + logging "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) const ( diff --git a/internal/backup/log_entry_test.go b/internal/backup/log_entry_test.go index bef0b03ece..c827853441 100644 --- a/internal/backup/log_entry_test.go +++ b/internal/backup/log_entry_test.go @@ -15,12 +15,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/archive" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/archive" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) type mockPartition struct { diff --git a/internal/backup/manifest.go b/internal/backup/manifest.go index 19f659ed06..9060882635 100644 --- a/internal/backup/manifest.go +++ b/internal/backup/manifest.go @@ -6,7 +6,7 @@ import ( "path" "github.com/pelletier/go-toml/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" ) // ManifestLoader reads and writes manifest files from a Sink. Manifest files diff --git a/internal/backup/manifest_test.go b/internal/backup/manifest_test.go index 92cb482304..d435a32292 100644 --- a/internal/backup/manifest_test.go +++ b/internal/backup/manifest_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestManifestLoader_ReadManifest(t *testing.T) { diff --git a/internal/backup/partition_backup.go b/internal/backup/partition_backup.go index f2db683d6e..a9c820facd 100644 --- a/internal/backup/partition_backup.go +++ b/internal/backup/partition_backup.go @@ -6,10 +6,10 @@ import ( "sync/atomic" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "golang.org/x/sync/errgroup" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/internal/backup/partition_backup_test.go b/internal/backup/partition_backup_test.go index 38ca581b11..88691ea464 100644 --- a/internal/backup/partition_backup_test.go +++ b/internal/backup/partition_backup_test.go @@ -10,16 +10,16 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/backup" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/setup" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/backup" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/setup" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" ) diff --git a/internal/backup/pipeline.go b/internal/backup/pipeline.go index 2ae5b7cb66..7e73900583 100644 --- a/internal/backup/pipeline.go +++ b/internal/backup/pipeline.go @@ -7,9 +7,9 @@ import ( "strings" "sync" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // repositoryKey uniquely identifies a repository, and is used here to key the diff --git a/internal/backup/pipeline_test.go b/internal/backup/pipeline_test.go index 01b85d735f..7c9f92456d 100644 --- a/internal/backup/pipeline_test.go +++ b/internal/backup/pipeline_test.go @@ -10,9 +10,9 @@ import ( "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestPipeline(t *testing.T) { diff --git a/internal/backup/repository.go b/internal/backup/repository.go index fb1d221601..87a8fdc084 100644 --- a/internal/backup/repository.go +++ b/internal/backup/repository.go @@ -9,22 +9,22 @@ import ( "io" "math" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/repoutil" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/counter" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/migration" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/repoutil" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/counter" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/migration" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/internal/backup/repository_test.go b/internal/backup/repository_test.go index cc2d1d1f07..424f9b2737 100644 --- a/internal/backup/repository_test.go +++ b/internal/backup/repository_test.go @@ -9,21 +9,21 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/backup" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/setup" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/counter" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/migration" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/backup" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/setup" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/counter" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/migration" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func removeHeadReference(refs []git.Reference) []git.Reference { diff --git a/internal/backup/server_side.go b/internal/backup/server_side.go index c266d621da..c19ecf7706 100644 --- a/internal/backup/server_side.go +++ b/internal/backup/server_side.go @@ -4,10 +4,10 @@ import ( "context" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/backup/server_side_test.go b/internal/backup/server_side_test.go index 28bf5a6ff5..4e48e0f9a7 100644 --- a/internal/backup/server_side_test.go +++ b/internal/backup/server_side_test.go @@ -6,17 +6,17 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/backup" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/setup" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/backup" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/setup" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestServerSideAdapter_Create(t *testing.T) { diff --git a/internal/backup/sink.go b/internal/backup/sink.go index d0fafc3279..58dd4c4380 100644 --- a/internal/backup/sink.go +++ b/internal/backup/sink.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" "gocloud.dev/blob" "gocloud.dev/blob/azureblob" "gocloud.dev/blob/fileblob" diff --git a/internal/backup/sink_test.go b/internal/backup/sink_test.go index ad3c4f79a0..53cf3e913f 100644 --- a/internal/backup/sink_test.go +++ b/internal/backup/sink_test.go @@ -14,8 +14,8 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/container" "github.com/aws/aws-sdk-go-v2/service/s3" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" _ "gocloud.dev/blob/memblob" ) diff --git a/internal/backup/testhelper_test.go b/internal/backup/testhelper_test.go index 53f50c4ae7..0d99646972 100644 --- a/internal/backup/testhelper_test.go +++ b/internal/backup/testhelper_test.go @@ -3,7 +3,7 @@ package backup import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/blackbox/blackbox.go b/internal/blackbox/blackbox.go index 6321f75d22..b144c29d88 100644 --- a/internal/blackbox/blackbox.go +++ b/internal/blackbox/blackbox.go @@ -9,9 +9,9 @@ import ( "time" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" "gitlab.com/gitlab-org/labkit/monitoring" ) diff --git a/internal/blackbox/config.go b/internal/blackbox/config.go index a36ad767cb..0beaba2180 100644 --- a/internal/blackbox/config.go +++ b/internal/blackbox/config.go @@ -6,8 +6,8 @@ import ( "time" "github.com/pelletier/go-toml/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/duration" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/duration" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) // Config is the configuration for gitaly-blackbox. diff --git a/internal/blackbox/config_test.go b/internal/blackbox/config_test.go index 476e747d57..47c8162836 100644 --- a/internal/blackbox/config_test.go +++ b/internal/blackbox/config_test.go @@ -7,7 +7,7 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/duration" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/duration" ) func TestConfigParseFailures(t *testing.T) { diff --git a/internal/blackbox/testhelper_test.go b/internal/blackbox/testhelper_test.go index e88e9446dd..babed5543d 100644 --- a/internal/blackbox/testhelper_test.go +++ b/internal/blackbox/testhelper_test.go @@ -3,7 +3,7 @@ package blackbox import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/bootstrap/bootstrap.go b/internal/bootstrap/bootstrap.go index 3618805c45..793c9f8942 100644 --- a/internal/bootstrap/bootstrap.go +++ b/internal/bootstrap/bootstrap.go @@ -9,9 +9,9 @@ import ( "github.com/cloudflare/tableflip" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/env" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/env" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" "golang.org/x/sys/unix" ) diff --git a/internal/bootstrap/bootstrap_test.go b/internal/bootstrap/bootstrap_test.go index 4e3a84b036..850b446eb4 100644 --- a/internal/bootstrap/bootstrap_test.go +++ b/internal/bootstrap/bootstrap_test.go @@ -12,9 +12,9 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestBootstrap_unixListener(t *testing.T) { diff --git a/internal/bootstrap/starter/starter.go b/internal/bootstrap/starter/starter.go index b167f1f8d1..c1c6743bc7 100644 --- a/internal/bootstrap/starter/starter.go +++ b/internal/bootstrap/starter/starter.go @@ -8,8 +8,8 @@ import ( "strings" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/bootstrap" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/bootstrap" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) const ( diff --git a/internal/bootstrap/starter/testhelper_test.go b/internal/bootstrap/starter/testhelper_test.go index ab294fdf6e..3a102341c5 100644 --- a/internal/bootstrap/starter/testhelper_test.go +++ b/internal/bootstrap/starter/testhelper_test.go @@ -3,7 +3,7 @@ package starter import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/bootstrap/testhelper_test.go b/internal/bootstrap/testhelper_test.go index 26d268ccd8..2475d8869f 100644 --- a/internal/bootstrap/testhelper_test.go +++ b/internal/bootstrap/testhelper_test.go @@ -3,7 +3,7 @@ package bootstrap import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/bundleuri/git_config.go b/internal/bundleuri/git_config.go index 6412e5c02c..422ef0dba1 100644 --- a/internal/bundleuri/git_config.go +++ b/internal/bundleuri/git_config.go @@ -5,8 +5,8 @@ import ( "fmt" "strconv" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" ) // CapabilitiesGitConfig returns a slice of gitcmd.ConfigPairs that can be injected diff --git a/internal/bundleuri/git_config_test.go b/internal/bundleuri/git_config_test.go index 47027fa1b1..b77dcdd7b0 100644 --- a/internal/bundleuri/git_config_test.go +++ b/internal/bundleuri/git_config_test.go @@ -5,9 +5,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestCapabilitiesGitConfig(t *testing.T) { diff --git a/internal/bundleuri/manager.go b/internal/bundleuri/manager.go index 6a4d029ad7..a40cbe1863 100644 --- a/internal/bundleuri/manager.go +++ b/internal/bundleuri/manager.go @@ -9,14 +9,14 @@ import ( "strings" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/backup" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/backup" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/bundleuri/manager_test.go b/internal/bundleuri/manager_test.go index b3deff6561..4014817ed8 100644 --- a/internal/bundleuri/manager_test.go +++ b/internal/bundleuri/manager_test.go @@ -7,12 +7,12 @@ import ( "github.com/prometheus/client_golang/prometheus/testutil" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestGenerationManager_Generate(t *testing.T) { diff --git a/internal/bundleuri/sink.go b/internal/bundleuri/sink.go index e5d18fadbf..35852d8385 100644 --- a/internal/bundleuri/sink.go +++ b/internal/bundleuri/sink.go @@ -7,7 +7,7 @@ import ( "io" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" "gocloud.dev/blob" _ "gocloud.dev/blob/azureblob" // register Azure driver diff --git a/internal/bundleuri/sink_test.go b/internal/bundleuri/sink_test.go index 07b04ccfa9..febc8d7fad 100644 --- a/internal/bundleuri/sink_test.go +++ b/internal/bundleuri/sink_test.go @@ -6,12 +6,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestSink_SignedURL(t *testing.T) { diff --git a/internal/bundleuri/strategy.go b/internal/bundleuri/strategy.go index 5307ec2df1..b881a2aa44 100644 --- a/internal/bundleuri/strategy.go +++ b/internal/bundleuri/strategy.go @@ -3,7 +3,7 @@ package bundleuri import ( "context" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" ) // StrategyCallbackFn defines a function type that the `Evaluate` method diff --git a/internal/bundleuri/strategy_occurences.go b/internal/bundleuri/strategy_occurences.go index 444da80d6e..db61227acc 100644 --- a/internal/bundleuri/strategy_occurences.go +++ b/internal/bundleuri/strategy_occurences.go @@ -7,9 +7,9 @@ import ( "time" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) // evaluateRequest is a helper struct to pass along multiple diff --git a/internal/bundleuri/strategy_occurences_test.go b/internal/bundleuri/strategy_occurences_test.go index c2f3035bb3..bf9059f1e1 100644 --- a/internal/bundleuri/strategy_occurences_test.go +++ b/internal/bundleuri/strategy_occurences_test.go @@ -7,11 +7,11 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestOccurrenceStrategy_Evaluate(t *testing.T) { diff --git a/internal/bundleuri/strategy_simple.go b/internal/bundleuri/strategy_simple.go index 0263539d34..737e40d645 100644 --- a/internal/bundleuri/strategy_simple.go +++ b/internal/bundleuri/strategy_simple.go @@ -3,7 +3,7 @@ package bundleuri import ( "context" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" ) // SimpleStrategy is a very simple strategy used diff --git a/internal/bundleuri/testhelper_test.go b/internal/bundleuri/testhelper_test.go index b2dd3cfea3..6b869188b5 100644 --- a/internal/bundleuri/testhelper_test.go +++ b/internal/bundleuri/testhelper_test.go @@ -3,7 +3,7 @@ package bundleuri import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/cache/cache.go b/internal/cache/cache.go index aec6b508a1..577424a795 100644 --- a/internal/cache/cache.go +++ b/internal/cache/cache.go @@ -4,7 +4,7 @@ import ( "context" "io" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/proto" ) diff --git a/internal/cache/diskcache.go b/internal/cache/diskcache.go index 0d9cfef73d..9e76b0b50b 100644 --- a/internal/cache/diskcache.go +++ b/internal/cache/diskcache.go @@ -9,13 +9,13 @@ import ( "sync" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/dontpanic" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/safe" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/dontpanic" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/safe" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/proto" ) diff --git a/internal/cache/diskcache_test.go b/internal/cache/diskcache_test.go index 273e29d03b..31df79dfb9 100644 --- a/internal/cache/diskcache_test.go +++ b/internal/cache/diskcache_test.go @@ -9,12 +9,12 @@ import ( promtest "github.com/prometheus/client_golang/prometheus/testutil" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestStreamDBNaiveKeyer(t *testing.T) { diff --git a/internal/cache/keyer.go b/internal/cache/keyer.go index e35461fb5a..16ebad356a 100644 --- a/internal/cache/keyer.go +++ b/internal/cache/keyer.go @@ -14,13 +14,13 @@ import ( "time" "github.com/google/uuid" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/safe" - "gitlab.com/gitlab-org/gitaly/v16/internal/version" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/safe" + "gitlab.com/gitlab-org/gitaly/v17/internal/version" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/protobuf/proto" ) diff --git a/internal/cache/testhelper_test.go b/internal/cache/testhelper_test.go index 6c55da37a0..dced38bf56 100644 --- a/internal/cache/testhelper_test.go +++ b/internal/cache/testhelper_test.go @@ -3,7 +3,7 @@ package cache import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/cache/walker.go b/internal/cache/walker.go index 9444540c43..37a105116f 100644 --- a/internal/cache/walker.go +++ b/internal/cache/walker.go @@ -13,9 +13,9 @@ import ( "path/filepath" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/dontpanic" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/dontpanic" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" ) func (c *DiskCache) logWalkErr(err error, path, msg string) { diff --git a/internal/cache/walker_test.go b/internal/cache/walker_test.go index a5d09f6b02..1fff0acd58 100644 --- a/internal/cache/walker_test.go +++ b/internal/cache/walker_test.go @@ -11,10 +11,10 @@ import ( promtest "github.com/prometheus/client_golang/prometheus/testutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestDiskCacheObjectWalker(t *testing.T) { diff --git a/internal/cgroups/cgroups.go b/internal/cgroups/cgroups.go index 8c918399e6..6481be4f97 100644 --- a/internal/cgroups/cgroups.go +++ b/internal/cgroups/cgroups.go @@ -5,9 +5,9 @@ import ( "os/exec" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/dontpanic" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/cgroups" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/dontpanic" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/cgroups" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) type addCommandCfg struct { diff --git a/internal/cgroups/cgroups_linux_test.go b/internal/cgroups/cgroups_linux_test.go index 80a307a941..a72ed223cd 100644 --- a/internal/cgroups/cgroups_linux_test.go +++ b/internal/cgroups/cgroups_linux_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/cgroups" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/cgroups" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestNewManagerNoop(t *testing.T) { diff --git a/internal/cgroups/handler_linux_test.go b/internal/cgroups/handler_linux_test.go index fd0da0c40a..7628e71623 100644 --- a/internal/cgroups/handler_linux_test.go +++ b/internal/cgroups/handler_linux_test.go @@ -16,9 +16,9 @@ import ( cgrps "github.com/containerd/cgroups/v3" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/cgroups" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/cgroups" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func defaultCgroupsConfig() cgroups.Config { diff --git a/internal/cgroups/manager.go b/internal/cgroups/manager.go index 5697a90da8..4ac9879124 100644 --- a/internal/cgroups/manager.go +++ b/internal/cgroups/manager.go @@ -3,8 +3,8 @@ package cgroups import ( - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/cgroups" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/cgroups" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) func newCgroupManager(cgroups.Config, log.Logger, int) Manager { diff --git a/internal/cgroups/manager_linux.go b/internal/cgroups/manager_linux.go index f586e29892..f7ff616438 100644 --- a/internal/cgroups/manager_linux.go +++ b/internal/cgroups/manager_linux.go @@ -20,8 +20,8 @@ import ( cgrps "github.com/containerd/cgroups/v3" "github.com/opencontainers/runtime-spec/specs-go" "github.com/prometheus/client_golang/prometheus" - cgroupscfg "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/cgroups" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + cgroupscfg "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/cgroups" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) // cfs_period_us hardcoded to be 100ms. diff --git a/internal/cgroups/manager_linux_test.go b/internal/cgroups/manager_linux_test.go index 30068edc4d..3bfcce28b4 100644 --- a/internal/cgroups/manager_linux_test.go +++ b/internal/cgroups/manager_linux_test.go @@ -10,8 +10,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/cgroups" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/cgroups" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) // mockRand is a mock for random number generator that implements randomizer interface of cgroups package. diff --git a/internal/cgroups/mock_linux_test.go b/internal/cgroups/mock_linux_test.go index 5cea6c9ad7..f841c261bb 100644 --- a/internal/cgroups/mock_linux_test.go +++ b/internal/cgroups/mock_linux_test.go @@ -30,10 +30,10 @@ import ( cgrps "github.com/containerd/cgroups/v3" "github.com/containerd/cgroups/v3/cgroup1" "github.com/stretchr/testify/require" - cgroupscfg "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/cgroups" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + cgroupscfg "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/cgroups" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) type mockCgroup interface { diff --git a/internal/cgroups/testhelper_test.go b/internal/cgroups/testhelper_test.go index 32ab9c545d..512fb36794 100644 --- a/internal/cgroups/testhelper_test.go +++ b/internal/cgroups/testhelper_test.go @@ -9,8 +9,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/cgroups" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/cgroups" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) // cmdArgs are Command arguments used processes to be added to a cgroup. diff --git a/internal/cgroups/v1_linux.go b/internal/cgroups/v1_linux.go index e7b1a2e5a1..87606dc007 100644 --- a/internal/cgroups/v1_linux.go +++ b/internal/cgroups/v1_linux.go @@ -11,9 +11,9 @@ import ( "github.com/containerd/cgroups/v3/cgroup1" specs "github.com/opencontainers/runtime-spec/specs-go" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - cgroupscfg "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/cgroups" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + cgroupscfg "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/cgroups" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) type cgroupV1Handler struct { diff --git a/internal/cgroups/v2_linux.go b/internal/cgroups/v2_linux.go index 1683e13ae4..8599c0e509 100644 --- a/internal/cgroups/v2_linux.go +++ b/internal/cgroups/v2_linux.go @@ -13,10 +13,10 @@ import ( "github.com/containerd/cgroups/v3/cgroup2" "github.com/opencontainers/runtime-spec/specs-go" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - cgroupscfg "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/cgroups" - "gitlab.com/gitlab-org/gitaly/v16/internal/kernel" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + cgroupscfg "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/cgroups" + "gitlab.com/gitlab-org/gitaly/v17/internal/kernel" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) type cgroupV2Handler struct { diff --git a/internal/cli/gitaly/app.go b/internal/cli/gitaly/app.go index b3c621083b..77198cdc51 100644 --- a/internal/cli/gitaly/app.go +++ b/internal/cli/gitaly/app.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/version" + "gitlab.com/gitlab-org/gitaly/v17/internal/version" ) func init() { diff --git a/internal/cli/gitaly/serve.go b/internal/cli/gitaly/serve.go index 09a0d8649f..4aa882a122 100644 --- a/internal/cli/gitaly/serve.go +++ b/internal/cli/gitaly/serve.go @@ -11,51 +11,51 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16" - "gitlab.com/gitlab-org/gitaly/v16/internal/backup" - "gitlab.com/gitlab-org/gitaly/v16/internal/bootstrap" - "gitlab.com/gitlab-org/gitaly/v16/internal/bootstrap/starter" - "gitlab.com/gitlab-org/gitaly/v16/internal/bundleuri" - "gitlab.com/gitlab-org/gitaly/v16/internal/cache" - "gitlab.com/gitlab-org/gitaly/v16/internal/cgroups" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping" - housekeepingmgr "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping/manager" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/sentry" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/maintenance" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/server" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/setup" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/counter" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue/databasemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mdfile" - nodeimpl "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/node" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/raftmgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/migration" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitlab" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/limithandler" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/env" - "gitlab.com/gitlab-org/gitaly/v16/internal/limiter" - "gitlab.com/gitlab-org/gitaly/v16/internal/limiter/watchers" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/streamcache" - "gitlab.com/gitlab-org/gitaly/v16/internal/tempdir" - "gitlab.com/gitlab-org/gitaly/v16/internal/tracing" - "gitlab.com/gitlab-org/gitaly/v16/internal/version" + "gitlab.com/gitlab-org/gitaly/v17" + "gitlab.com/gitlab-org/gitaly/v17/internal/backup" + "gitlab.com/gitlab-org/gitaly/v17/internal/bootstrap" + "gitlab.com/gitlab-org/gitaly/v17/internal/bootstrap/starter" + "gitlab.com/gitlab-org/gitaly/v17/internal/bundleuri" + "gitlab.com/gitlab-org/gitaly/v17/internal/cache" + "gitlab.com/gitlab-org/gitaly/v17/internal/cgroups" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping" + housekeepingmgr "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping/manager" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/sentry" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/maintenance" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/server" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/setup" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/counter" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue/databasemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mdfile" + nodeimpl "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/node" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/raftmgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/migration" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitlab" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/middleware/limithandler" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/env" + "gitlab.com/gitlab-org/gitaly/v17/internal/limiter" + "gitlab.com/gitlab-org/gitaly/v17/internal/limiter/watchers" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/streamcache" + "gitlab.com/gitlab-org/gitaly/v17/internal/tempdir" + "gitlab.com/gitlab-org/gitaly/v17/internal/tracing" + "gitlab.com/gitlab-org/gitaly/v17/internal/version" "gitlab.com/gitlab-org/labkit/fips" "gitlab.com/gitlab-org/labkit/monitoring" labkittracing "gitlab.com/gitlab-org/labkit/tracing" @@ -63,7 +63,7 @@ import ( "google.golang.org/grpc" // Import to register the proxy codec with gRPC. - _ "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/proxy" + _ "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/proxy" ) func newServeCommand() *cli.Command { diff --git a/internal/cli/gitaly/subcmd_badger_db.go b/internal/cli/gitaly/subcmd_badger_db.go index 841c3bd4f7..3848fff4a2 100644 --- a/internal/cli/gitaly/subcmd_badger_db.go +++ b/internal/cli/gitaly/subcmd_badger_db.go @@ -9,9 +9,9 @@ import ( "strconv" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/encoding/prototext" "google.golang.org/protobuf/proto" ) diff --git a/internal/cli/gitaly/subcmd_badger_db_test.go b/internal/cli/gitaly/subcmd_badger_db_test.go index 756691cfbb..755b60150d 100644 --- a/internal/cli/gitaly/subcmd_badger_db_test.go +++ b/internal/cli/gitaly/subcmd_badger_db_test.go @@ -8,10 +8,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/proto" ) diff --git a/internal/cli/gitaly/subcmd_bundleuri.go b/internal/cli/gitaly/subcmd_bundleuri.go index b6c92b5807..ed6c906d23 100644 --- a/internal/cli/gitaly/subcmd_bundleuri.go +++ b/internal/cli/gitaly/subcmd_bundleuri.go @@ -5,8 +5,8 @@ import ( "time" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func newBundleURICommand() *cli.Command { diff --git a/internal/cli/gitaly/subcmd_check.go b/internal/cli/gitaly/subcmd_check.go index 5c1a9e6fc7..4a956da68f 100644 --- a/internal/cli/gitaly/subcmd_check.go +++ b/internal/cli/gitaly/subcmd_check.go @@ -7,14 +7,14 @@ import ( "os" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitlab" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/prometheus" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitlab" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) func newCheckCommand() *cli.Command { diff --git a/internal/cli/gitaly/subcmd_configuration.go b/internal/cli/gitaly/subcmd_configuration.go index 6e5a2d702f..67d6a76bdd 100644 --- a/internal/cli/gitaly/subcmd_configuration.go +++ b/internal/cli/gitaly/subcmd_configuration.go @@ -2,9 +2,9 @@ package gitaly import ( "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/cmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/cmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) const validationErrorCode = 2 diff --git a/internal/cli/gitaly/subcmd_configuration_test.go b/internal/cli/gitaly/subcmd_configuration_test.go index 153a939ced..9a27f23c88 100644 --- a/internal/cli/gitaly/subcmd_configuration_test.go +++ b/internal/cli/gitaly/subcmd_configuration_test.go @@ -10,9 +10,9 @@ import ( "github.com/pelletier/go-toml/v2" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestConfiguration(t *testing.T) { diff --git a/internal/cli/gitaly/subcmd_git.go b/internal/cli/gitaly/subcmd_git.go index 256f6125c9..044b36ee0e 100644 --- a/internal/cli/gitaly/subcmd_git.go +++ b/internal/cli/gitaly/subcmd_git.go @@ -9,9 +9,9 @@ import ( "strings" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) func gitalyConfigFlag() *cli.StringFlag { diff --git a/internal/cli/gitaly/subcmd_git_test.go b/internal/cli/gitaly/subcmd_git_test.go index f7d491f656..b33b08b3e0 100644 --- a/internal/cli/gitaly/subcmd_git_test.go +++ b/internal/cli/gitaly/subcmd_git_test.go @@ -8,9 +8,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestGitalyGitCommand(t *testing.T) { diff --git a/internal/cli/gitaly/subcmd_hooks.go b/internal/cli/gitaly/subcmd_hooks.go index 9b81003f35..a1ab4aeb3e 100644 --- a/internal/cli/gitaly/subcmd_hooks.go +++ b/internal/cli/gitaly/subcmd_hooks.go @@ -8,12 +8,12 @@ import ( "time" "github.com/urfave/cli/v2" - gitalyauth "gitlab.com/gitlab-org/gitaly/v16/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + gitalyauth "gitlab.com/gitlab-org/gitaly/v17/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" "google.golang.org/grpc" ) diff --git a/internal/cli/gitaly/subcmd_hooks_test.go b/internal/cli/gitaly/subcmd_hooks_test.go index 01b4942a49..674fc82a0d 100644 --- a/internal/cli/gitaly/subcmd_hooks_test.go +++ b/internal/cli/gitaly/subcmd_hooks_test.go @@ -10,18 +10,18 @@ import ( "testing" "github.com/stretchr/testify/require" - gitalyauth "gitlab.com/gitlab-org/gitaly/v16/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/archive" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/setup" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + gitalyauth "gitlab.com/gitlab-org/gitaly/v17/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/archive" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/setup" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" "google.golang.org/grpc" ) diff --git a/internal/cli/gitaly/subcmd_recovery.go b/internal/cli/gitaly/subcmd_recovery.go index b589382525..9c53e26822 100644 --- a/internal/cli/gitaly/subcmd_recovery.go +++ b/internal/cli/gitaly/subcmd_recovery.go @@ -15,23 +15,23 @@ import ( "time" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16" - "gitlab.com/gitlab-org/gitaly/v16/internal/backup" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue/databasemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - nodeimpl "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/node" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/migration" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17" + "gitlab.com/gitlab-org/gitaly/v17/internal/backup" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue/databasemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + nodeimpl "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/node" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/migration" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" "golang.org/x/sync/errgroup" ) diff --git a/internal/cli/gitaly/subcmd_recovery_test.go b/internal/cli/gitaly/subcmd_recovery_test.go index 24f89366c9..c5c937b3bf 100644 --- a/internal/cli/gitaly/subcmd_recovery_test.go +++ b/internal/cli/gitaly/subcmd_recovery_test.go @@ -11,25 +11,25 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/repoutil" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/counter" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue/databasemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/node" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/repoutil" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/counter" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue/databasemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/node" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/proto" ) diff --git a/internal/cli/gitaly/testhelper_test.go b/internal/cli/gitaly/testhelper_test.go index 0aa8282d5e..276c23c79a 100644 --- a/internal/cli/gitaly/testhelper_test.go +++ b/internal/cli/gitaly/testhelper_test.go @@ -3,7 +3,7 @@ package gitaly import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/cli/gitalybackup/create.go b/internal/cli/gitalybackup/create.go index 4127f4e645..bfcd884894 100644 --- a/internal/cli/gitalybackup/create.go +++ b/internal/cli/gitalybackup/create.go @@ -10,11 +10,11 @@ import ( "time" cli "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/backup" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/backup" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) type serverRepository struct { diff --git a/internal/cli/gitalybackup/create_test.go b/internal/cli/gitalybackup/create_test.go index a82ac02d29..fe28be7c98 100644 --- a/internal/cli/gitalybackup/create_test.go +++ b/internal/cli/gitalybackup/create_test.go @@ -10,14 +10,14 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/backup" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/setup" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/backup" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/setup" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestCreateSubcommand(t *testing.T) { diff --git a/internal/cli/gitalybackup/main.go b/internal/cli/gitalybackup/main.go index 743c269895..4a45868b50 100644 --- a/internal/cli/gitalybackup/main.go +++ b/internal/cli/gitalybackup/main.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/version" + "gitlab.com/gitlab-org/gitaly/v17/internal/version" ) func init() { diff --git a/internal/cli/gitalybackup/partition.go b/internal/cli/gitalybackup/partition.go index 1a2c08d687..b6d1424ec6 100644 --- a/internal/cli/gitalybackup/partition.go +++ b/internal/cli/gitalybackup/partition.go @@ -9,10 +9,10 @@ import ( "syscall" cli "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/backup" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/backup" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) type partitionCreateSubcommand struct { diff --git a/internal/cli/gitalybackup/partition_test.go b/internal/cli/gitalybackup/partition_test.go index 615ec85661..d1f4472083 100644 --- a/internal/cli/gitalybackup/partition_test.go +++ b/internal/cli/gitalybackup/partition_test.go @@ -8,16 +8,16 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/archive" - "gitlab.com/gitlab-org/gitaly/v16/internal/backup" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/setup" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/archive" + "gitlab.com/gitlab-org/gitaly/v17/internal/backup" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/setup" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" ) func TestPartitionSubcommand_Create(t *testing.T) { diff --git a/internal/cli/gitalybackup/restore.go b/internal/cli/gitalybackup/restore.go index 9be9b2de7a..f625c7d3ee 100644 --- a/internal/cli/gitalybackup/restore.go +++ b/internal/cli/gitalybackup/restore.go @@ -9,11 +9,11 @@ import ( "runtime" cli "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/backup" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/backup" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/cli/gitalybackup/restore_test.go b/internal/cli/gitalybackup/restore_test.go index 223642fef0..aab4b95bc9 100644 --- a/internal/cli/gitalybackup/restore_test.go +++ b/internal/cli/gitalybackup/restore_test.go @@ -11,15 +11,15 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/backup" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/setup" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/backup" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/setup" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestRestoreSubcommand(t *testing.T) { diff --git a/internal/cli/gitalybackup/testhelper_test.go b/internal/cli/gitalybackup/testhelper_test.go index b0413c9be3..63d2f59fa5 100644 --- a/internal/cli/gitalybackup/testhelper_test.go +++ b/internal/cli/gitalybackup/testhelper_test.go @@ -3,7 +3,7 @@ package gitalybackup import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/cli/praefect/main.go b/internal/cli/praefect/main.go index 6ae5451665..b7b5fd2085 100644 --- a/internal/cli/praefect/main.go +++ b/internal/cli/praefect/main.go @@ -19,8 +19,8 @@ import ( "slices" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/version" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/version" ) func init() { diff --git a/internal/cli/praefect/main_test.go b/internal/cli/praefect/main_test.go index 66664830f4..f9e3cc6812 100644 --- a/internal/cli/praefect/main_test.go +++ b/internal/cli/praefect/main_test.go @@ -9,10 +9,10 @@ import ( "github.com/pelletier/go-toml/v2" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/bootstrap/starter" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/bootstrap/starter" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) type stubFlag struct{} diff --git a/internal/cli/praefect/serve.go b/internal/cli/praefect/serve.go index 82be8d6483..15aa24224a 100644 --- a/internal/cli/praefect/serve.go +++ b/internal/cli/praefect/serve.go @@ -15,27 +15,27 @@ import ( "github.com/prometheus/client_golang/prometheus/promauto" "github.com/prometheus/client_golang/prometheus/promhttp" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/bootstrap" - "gitlab.com/gitlab-org/gitaly/v16/internal/bootstrap/starter" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/sentry" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/sidechannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/glsql" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/metrics" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes/tracker" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/reconciler" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/repocleaner" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/service/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/transactions" - "gitlab.com/gitlab-org/gitaly/v16/internal/version" + "gitlab.com/gitlab-org/gitaly/v17/internal/bootstrap" + "gitlab.com/gitlab-org/gitaly/v17/internal/bootstrap/starter" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/sentry" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/sidechannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/metrics" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/nodes/tracker" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/reconciler" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/repocleaner" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/service/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/transactions" + "gitlab.com/gitlab-org/gitaly/v17/internal/version" "gitlab.com/gitlab-org/labkit/monitoring" "gitlab.com/gitlab-org/labkit/tracing" ) diff --git a/internal/cli/praefect/server_options.go b/internal/cli/praefect/server_options.go index 5989eb9770..b193f8621a 100644 --- a/internal/cli/praefect/server_options.go +++ b/internal/cli/praefect/server_options.go @@ -2,7 +2,7 @@ package praefect -import "gitlab.com/gitlab-org/gitaly/v16/internal/praefect" +import "gitlab.com/gitlab-org/gitaly/v17/internal/praefect" // defaultServerOptions are only required by our testing infrastructure. When spawning Praefect as // an external, proxying executable we want to be able to use test-only interceptors. So if the diff --git a/internal/cli/praefect/server_options_testing.go b/internal/cli/praefect/server_options_testing.go index f86439e41a..1c7c0a1859 100644 --- a/internal/cli/praefect/server_options_testing.go +++ b/internal/cli/praefect/server_options_testing.go @@ -3,8 +3,8 @@ package praefect import ( - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" ) // defaultServerOptions are only required by our testing infrastructure. When spawning Praefect as diff --git a/internal/cli/praefect/subcmd.go b/internal/cli/praefect/subcmd.go index bb171b2a32..ea15f1a869 100644 --- a/internal/cli/praefect/subcmd.go +++ b/internal/cli/praefect/subcmd.go @@ -8,10 +8,10 @@ import ( "io" "time" - gitalyauth "gitlab.com/gitlab-org/gitaly/v16/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/glsql" + gitalyauth "gitlab.com/gitlab-org/gitaly/v17/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/glsql" "google.golang.org/grpc" ) diff --git a/internal/cli/praefect/subcmd_accept_dataloss.go b/internal/cli/praefect/subcmd_accept_dataloss.go index 6228940a0c..bbfdfae89f 100644 --- a/internal/cli/praefect/subcmd_accept_dataloss.go +++ b/internal/cli/praefect/subcmd_accept_dataloss.go @@ -4,8 +4,8 @@ import ( "fmt" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func newAcceptDatalossCommand() *cli.Command { diff --git a/internal/cli/praefect/subcmd_accept_dataloss_test.go b/internal/cli/praefect/subcmd_accept_dataloss_test.go index d2d4ae2dee..b83c52a5fa 100644 --- a/internal/cli/praefect/subcmd_accept_dataloss_test.go +++ b/internal/cli/praefect/subcmd_accept_dataloss_test.go @@ -4,11 +4,11 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/service/info" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/service/info" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" ) func TestAcceptDatalossSubcommand(t *testing.T) { diff --git a/internal/cli/praefect/subcmd_check.go b/internal/cli/praefect/subcmd_check.go index 5d85136002..afd28a1b9c 100644 --- a/internal/cli/praefect/subcmd_check.go +++ b/internal/cli/praefect/subcmd_check.go @@ -8,8 +8,8 @@ import ( "time" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/service" ) func newCheckCommand(checkFuncs []service.CheckFunc) *cli.Command { diff --git a/internal/cli/praefect/subcmd_check_test.go b/internal/cli/praefect/subcmd_check_test.go index c970b8520d..eb3811741d 100644 --- a/internal/cli/praefect/subcmd_check_test.go +++ b/internal/cli/praefect/subcmd_check_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/service" ) func TestCheckSubcommand(t *testing.T) { diff --git a/internal/cli/praefect/subcmd_configuration_validate.go b/internal/cli/praefect/subcmd_configuration_validate.go index 949f297b5e..b33dac6c7c 100644 --- a/internal/cli/praefect/subcmd_configuration_validate.go +++ b/internal/cli/praefect/subcmd_configuration_validate.go @@ -4,9 +4,9 @@ import ( "io" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/cmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/cmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" ) const validationErrorCode = 2 diff --git a/internal/cli/praefect/subcmd_configuration_validate_test.go b/internal/cli/praefect/subcmd_configuration_validate_test.go index 94ba135d8e..185e625ee0 100644 --- a/internal/cli/praefect/subcmd_configuration_validate_test.go +++ b/internal/cli/praefect/subcmd_configuration_validate_test.go @@ -9,15 +9,15 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestConfiguration_validate(t *testing.T) { t.Parallel() - praefectBin := testcfg.BuildBinary(t, testhelper.TempDir(t), "gitlab.com/gitlab-org/gitaly/v16/cmd/praefect") + praefectBin := testcfg.BuildBinary(t, testhelper.TempDir(t), "gitlab.com/gitlab-org/gitaly/v17/cmd/praefect") for _, tc := range []struct { name string diff --git a/internal/cli/praefect/subcmd_dataloss.go b/internal/cli/praefect/subcmd_dataloss.go index e2fa1e5ea0..bca17364c4 100644 --- a/internal/cli/praefect/subcmd_dataloss.go +++ b/internal/cli/praefect/subcmd_dataloss.go @@ -8,8 +8,8 @@ import ( "strings" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func newDatalossCommand() *cli.Command { diff --git a/internal/cli/praefect/subcmd_dataloss_test.go b/internal/cli/praefect/subcmd_dataloss_test.go index 0e2e76f767..9c3351f656 100644 --- a/internal/cli/praefect/subcmd_dataloss_test.go +++ b/internal/cli/praefect/subcmd_dataloss_test.go @@ -6,11 +6,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/service/info" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/service/info" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" ) func TestDatalossSubcommand(t *testing.T) { diff --git a/internal/cli/praefect/subcmd_dial_nodes.go b/internal/cli/praefect/subcmd_dial_nodes.go index 7c2bda57ea..15b0b33cdd 100644 --- a/internal/cli/praefect/subcmd_dial_nodes.go +++ b/internal/cli/praefect/subcmd_dial_nodes.go @@ -4,8 +4,8 @@ import ( "context" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/nodes" ) func newDialNodesCommand() *cli.Command { diff --git a/internal/cli/praefect/subcmd_dial_nodes_test.go b/internal/cli/praefect/subcmd_dial_nodes_test.go index 37dc49d7a2..8086b442d6 100644 --- a/internal/cli/praefect/subcmd_dial_nodes_test.go +++ b/internal/cli/praefect/subcmd_dial_nodes_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) type mockServerService struct { diff --git a/internal/cli/praefect/subcmd_list_storages.go b/internal/cli/praefect/subcmd_list_storages.go index c2b89202ca..bcf08365c4 100644 --- a/internal/cli/praefect/subcmd_list_storages.go +++ b/internal/cli/praefect/subcmd_list_storages.go @@ -5,7 +5,7 @@ import ( "github.com/olekukonko/tablewriter" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) func newListStoragesCommand() *cli.Command { diff --git a/internal/cli/praefect/subcmd_list_storages_test.go b/internal/cli/praefect/subcmd_list_storages_test.go index 44bcf9e760..e8e2379798 100644 --- a/internal/cli/praefect/subcmd_list_storages_test.go +++ b/internal/cli/praefect/subcmd_list_storages_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" ) func TestListStoragesSubcommand(t *testing.T) { diff --git a/internal/cli/praefect/subcmd_list_untracked_repositories.go b/internal/cli/praefect/subcmd_list_untracked_repositories.go index af356deba1..28bda5a875 100644 --- a/internal/cli/praefect/subcmd_list_untracked_repositories.go +++ b/internal/cli/praefect/subcmd_list_untracked_repositories.go @@ -9,12 +9,12 @@ import ( "time" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/glsql" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/repocleaner" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/repocleaner" "gitlab.com/gitlab-org/labkit/correlation" "google.golang.org/grpc/metadata" ) diff --git a/internal/cli/praefect/subcmd_list_untracked_repositories_test.go b/internal/cli/praefect/subcmd_list_untracked_repositories_test.go index 7f53020326..4ad1a0a485 100644 --- a/internal/cli/praefect/subcmd_list_untracked_repositories_test.go +++ b/internal/cli/praefect/subcmd_list_untracked_repositories_test.go @@ -11,15 +11,15 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/setup" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/setup" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestListUntrackedRepositoriesCommand(t *testing.T) { diff --git a/internal/cli/praefect/subcmd_metadata.go b/internal/cli/praefect/subcmd_metadata.go index 44c7ef8293..cf9c8ce6c9 100644 --- a/internal/cli/praefect/subcmd_metadata.go +++ b/internal/cli/praefect/subcmd_metadata.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func newMetadataCommand() *cli.Command { diff --git a/internal/cli/praefect/subcmd_metadata_test.go b/internal/cli/praefect/subcmd_metadata_test.go index b2e901a330..b994e674ff 100644 --- a/internal/cli/praefect/subcmd_metadata_test.go +++ b/internal/cli/praefect/subcmd_metadata_test.go @@ -9,11 +9,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/service/info" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/service/info" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/cli/praefect/subcmd_remove_repository.go b/internal/cli/praefect/subcmd_remove_repository.go index 9fa906d430..863a4489d7 100644 --- a/internal/cli/praefect/subcmd_remove_repository.go +++ b/internal/cli/praefect/subcmd_remove_repository.go @@ -10,12 +10,12 @@ import ( "time" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/glsql" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "gitlab.com/gitlab-org/labkit/correlation" "google.golang.org/grpc/metadata" ) diff --git a/internal/cli/praefect/subcmd_remove_repository_test.go b/internal/cli/praefect/subcmd_remove_repository_test.go index 3f0a6b62b2..d5b26df45d 100644 --- a/internal/cli/praefect/subcmd_remove_repository_test.go +++ b/internal/cli/praefect/subcmd_remove_repository_test.go @@ -11,19 +11,19 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - gitalycfg "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/setup" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/glsql" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + gitalycfg "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/setup" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" ) diff --git a/internal/cli/praefect/subcmd_set_replication_factor.go b/internal/cli/praefect/subcmd_set_replication_factor.go index fa1d41800d..8e12fd8bc7 100644 --- a/internal/cli/praefect/subcmd_set_replication_factor.go +++ b/internal/cli/praefect/subcmd_set_replication_factor.go @@ -5,8 +5,8 @@ import ( "strings" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) const ( diff --git a/internal/cli/praefect/subcmd_set_replication_factor_test.go b/internal/cli/praefect/subcmd_set_replication_factor_test.go index 7c70d28ca6..75766bbf70 100644 --- a/internal/cli/praefect/subcmd_set_replication_factor_test.go +++ b/internal/cli/praefect/subcmd_set_replication_factor_test.go @@ -7,12 +7,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/service/info" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/service/info" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/cli/praefect/subcmd_sql_migrate.go b/internal/cli/praefect/subcmd_sql_migrate.go index a98b14aa9d..3be6b9a4b0 100644 --- a/internal/cli/praefect/subcmd_sql_migrate.go +++ b/internal/cli/praefect/subcmd_sql_migrate.go @@ -6,9 +6,9 @@ import ( migrate "github.com/rubenv/sql-migrate" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/glsql" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/migrations" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/migrations" ) const ( diff --git a/internal/cli/praefect/subcmd_sql_migrate_down.go b/internal/cli/praefect/subcmd_sql_migrate_down.go index 4c643cc540..e1c035c792 100644 --- a/internal/cli/praefect/subcmd_sql_migrate_down.go +++ b/internal/cli/praefect/subcmd_sql_migrate_down.go @@ -5,8 +5,8 @@ import ( "strconv" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" ) const sqlMigrateDownCmdName = "sql-migrate-down" diff --git a/internal/cli/praefect/subcmd_sql_migrate_down_test.go b/internal/cli/praefect/subcmd_sql_migrate_down_test.go index 70983f79af..7a03afa97a 100644 --- a/internal/cli/praefect/subcmd_sql_migrate_down_test.go +++ b/internal/cli/praefect/subcmd_sql_migrate_down_test.go @@ -6,9 +6,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/migrations" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/migrations" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" ) func TestSQLMigrateDownSubcommand(t *testing.T) { diff --git a/internal/cli/praefect/subcmd_sql_migrate_status.go b/internal/cli/praefect/subcmd_sql_migrate_status.go index 45bdd80973..8f780bd08d 100644 --- a/internal/cli/praefect/subcmd_sql_migrate_status.go +++ b/internal/cli/praefect/subcmd_sql_migrate_status.go @@ -5,8 +5,8 @@ import ( "github.com/olekukonko/tablewriter" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" ) const sqlMigrateStatusCmdName = "sql-migrate-status" diff --git a/internal/cli/praefect/subcmd_sql_migrate_status_test.go b/internal/cli/praefect/subcmd_sql_migrate_status_test.go index a2c978314d..82d2ec52a7 100644 --- a/internal/cli/praefect/subcmd_sql_migrate_status_test.go +++ b/internal/cli/praefect/subcmd_sql_migrate_status_test.go @@ -6,9 +6,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/migrations" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/migrations" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" ) func TestSQLMigrateStatusSubcommand(t *testing.T) { diff --git a/internal/cli/praefect/subcmd_sql_migrate_test.go b/internal/cli/praefect/subcmd_sql_migrate_test.go index 387dd75886..681ffeea88 100644 --- a/internal/cli/praefect/subcmd_sql_migrate_test.go +++ b/internal/cli/praefect/subcmd_sql_migrate_test.go @@ -7,9 +7,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/migrations" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/migrations" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" ) func TestSubCmdSqlMigrate(t *testing.T) { diff --git a/internal/cli/praefect/subcmd_sql_ping.go b/internal/cli/praefect/subcmd_sql_ping.go index 3811c8739f..b6104b9214 100644 --- a/internal/cli/praefect/subcmd_sql_ping.go +++ b/internal/cli/praefect/subcmd_sql_ping.go @@ -4,8 +4,8 @@ import ( "fmt" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" ) const sqlPingCmdName = "sql-ping" diff --git a/internal/cli/praefect/subcmd_sql_ping_test.go b/internal/cli/praefect/subcmd_sql_ping_test.go index 525ce3aa59..d1265b4906 100644 --- a/internal/cli/praefect/subcmd_sql_ping_test.go +++ b/internal/cli/praefect/subcmd_sql_ping_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" ) func TestSQLPingSubcommand(t *testing.T) { diff --git a/internal/cli/praefect/subcmd_test.go b/internal/cli/praefect/subcmd_test.go index 6b56040427..8b4d701715 100644 --- a/internal/cli/praefect/subcmd_test.go +++ b/internal/cli/praefect/subcmd_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/health" diff --git a/internal/cli/praefect/subcmd_track_repositories.go b/internal/cli/praefect/subcmd_track_repositories.go index bde162108a..5a526ba2fc 100644 --- a/internal/cli/praefect/subcmd_track_repositories.go +++ b/internal/cli/praefect/subcmd_track_repositories.go @@ -10,8 +10,8 @@ import ( "os" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" "gitlab.com/gitlab-org/labkit/correlation" ) diff --git a/internal/cli/praefect/subcmd_track_repositories_test.go b/internal/cli/praefect/subcmd_track_repositories_test.go index 77a2718635..f5230ccecc 100644 --- a/internal/cli/praefect/subcmd_track_repositories_test.go +++ b/internal/cli/praefect/subcmd_track_repositories_test.go @@ -12,19 +12,19 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/setup" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/promtest" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/setup" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/promtest" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestTrackRepositoriesSubcommand(t *testing.T) { diff --git a/internal/cli/praefect/subcmd_track_repository.go b/internal/cli/praefect/subcmd_track_repository.go index d54adac78f..93e48b3b34 100644 --- a/internal/cli/praefect/subcmd_track_repository.go +++ b/internal/cli/praefect/subcmd_track_repository.go @@ -10,14 +10,14 @@ import ( "time" "github.com/urfave/cli/v2" - glcli "gitlab.com/gitlab-org/gitaly/v16/internal/cli" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/glsql" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + glcli "gitlab.com/gitlab-org/gitaly/v17/internal/cli" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "gitlab.com/gitlab-org/labkit/correlation" "google.golang.org/grpc/metadata" ) diff --git a/internal/cli/praefect/subcmd_track_repository_test.go b/internal/cli/praefect/subcmd_track_repository_test.go index 332988d801..b11bc13b2d 100644 --- a/internal/cli/praefect/subcmd_track_repository_test.go +++ b/internal/cli/praefect/subcmd_track_repository_test.go @@ -7,19 +7,19 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/setup" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/promtest" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/setup" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/promtest" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestTrackRepositorySubcommand(t *testing.T) { diff --git a/internal/cli/praefect/subcmd_verify.go b/internal/cli/praefect/subcmd_verify.go index 6c5da4a56c..d55055daf3 100644 --- a/internal/cli/praefect/subcmd_verify.go +++ b/internal/cli/praefect/subcmd_verify.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) const verifyCmdName = "verify" diff --git a/internal/cli/praefect/subcmd_verify_test.go b/internal/cli/praefect/subcmd_verify_test.go index a2f63a3566..a24c0dc876 100644 --- a/internal/cli/praefect/subcmd_verify_test.go +++ b/internal/cli/praefect/subcmd_verify_test.go @@ -8,11 +8,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/service/info" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/service/info" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" ) func TestVerifySubcommand(t *testing.T) { diff --git a/internal/cli/praefect/testhelper_test.go b/internal/cli/praefect/testhelper_test.go index 9817ac4d53..3ff41ce77d 100644 --- a/internal/cli/praefect/testhelper_test.go +++ b/internal/cli/praefect/testhelper_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/command/command.go b/internal/command/command.go index f943559064..d21133dc1a 100644 --- a/internal/command/command.go +++ b/internal/command/command.go @@ -17,11 +17,11 @@ import ( "github.com/opentracing/opentracing-go" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "gitlab.com/gitlab-org/gitaly/v16/internal/command/commandcounter" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/requestinfohandler" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/tracing" + "gitlab.com/gitlab-org/gitaly/v17/internal/command/commandcounter" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/middleware/requestinfohandler" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/tracing" labkittracing "gitlab.com/gitlab-org/labkit/tracing" ) diff --git a/internal/command/command_test.go b/internal/command/command_test.go index b3cbdf8b17..05b2bc9882 100644 --- a/internal/command/command_test.go +++ b/internal/command/command_test.go @@ -19,8 +19,8 @@ import ( "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/cgroups" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/cgroups" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestNew_environment(t *testing.T) { diff --git a/internal/command/option.go b/internal/command/option.go index a7d2d68d37..b036465d41 100644 --- a/internal/command/option.go +++ b/internal/command/option.go @@ -4,9 +4,9 @@ import ( "context" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/cgroups" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/cgroups" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) type config struct { diff --git a/internal/command/subprocess_logger.go b/internal/command/subprocess_logger.go index 962c7016d3..ef8fc5e886 100644 --- a/internal/command/subprocess_logger.go +++ b/internal/command/subprocess_logger.go @@ -9,7 +9,7 @@ import ( "os" "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" "gitlab.com/gitlab-org/labkit/correlation" ) diff --git a/internal/command/subprocess_logger_test.go b/internal/command/subprocess_logger_test.go index df19016028..fa349527c3 100644 --- a/internal/command/subprocess_logger_test.go +++ b/internal/command/subprocess_logger_test.go @@ -13,8 +13,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) type capturedOutput struct { diff --git a/internal/command/testdata/subprocess/main.go b/internal/command/testdata/subprocess/main.go index 58ae2843f7..6d0cd3d6ef 100644 --- a/internal/command/testdata/subprocess/main.go +++ b/internal/command/testdata/subprocess/main.go @@ -10,7 +10,7 @@ import ( "os" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" ) // main implements a helper binary for testing subprocess loggers. It sets up a subprocess logger and diff --git a/internal/command/testhelper_test.go b/internal/command/testhelper_test.go index e0296fc34e..2fcec9bd9d 100644 --- a/internal/command/testhelper_test.go +++ b/internal/command/testhelper_test.go @@ -3,7 +3,7 @@ package command import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/datastructure/testhelper_test.go b/internal/datastructure/testhelper_test.go index ec72a17896..6c2c731644 100644 --- a/internal/datastructure/testhelper_test.go +++ b/internal/datastructure/testhelper_test.go @@ -3,7 +3,7 @@ package datastructure import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/dontpanic/retry.go b/internal/dontpanic/retry.go index 8672619c49..7d5e82c382 100644 --- a/internal/dontpanic/retry.go +++ b/internal/dontpanic/retry.go @@ -12,7 +12,7 @@ import ( "time" sentry "github.com/getsentry/sentry-go" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) // Try will wrap the provided function with a panic recovery. If a panic occurs, diff --git a/internal/dontpanic/retry_test.go b/internal/dontpanic/retry_test.go index ff65c39ca9..cb462fef98 100644 --- a/internal/dontpanic/retry_test.go +++ b/internal/dontpanic/retry_test.go @@ -5,8 +5,8 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/dontpanic" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/dontpanic" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestTry(t *testing.T) { diff --git a/internal/dontpanic/testhelper_test.go b/internal/dontpanic/testhelper_test.go index 18067f32d0..4c9d9a4994 100644 --- a/internal/dontpanic/testhelper_test.go +++ b/internal/dontpanic/testhelper_test.go @@ -3,7 +3,7 @@ package dontpanic import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/errors/cfgerror/testhelper_test.go b/internal/errors/cfgerror/testhelper_test.go index 9ce72044ee..adf55dab22 100644 --- a/internal/errors/cfgerror/testhelper_test.go +++ b/internal/errors/cfgerror/testhelper_test.go @@ -3,7 +3,7 @@ package cfgerror import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/errors/cfgerror/validate_test.go b/internal/errors/cfgerror/validate_test.go index 0c9731cd96..539feb2b42 100644 --- a/internal/errors/cfgerror/validate_test.go +++ b/internal/errors/cfgerror/validate_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestValidationError_Error(t *testing.T) { diff --git a/internal/featureflag/context_test.go b/internal/featureflag/context_test.go index 5cebf88dba..b0e4215a1b 100644 --- a/internal/featureflag/context_test.go +++ b/internal/featureflag/context_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/stretchr/testify/require" - gitaly_metadata "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" + gitaly_metadata "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" "google.golang.org/grpc/metadata" ) diff --git a/internal/featureflag/featureflag.go b/internal/featureflag/featureflag.go index 0ccf7ba31d..221ac407eb 100644 --- a/internal/featureflag/featureflag.go +++ b/internal/featureflag/featureflag.go @@ -9,7 +9,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/env" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/env" "google.golang.org/grpc/metadata" ) diff --git a/internal/git/catfile/cache.go b/internal/git/catfile/cache.go index e3e9cf5b69..2f09178ca0 100644 --- a/internal/git/catfile/cache.go +++ b/internal/git/catfile/cache.go @@ -8,11 +8,11 @@ import ( "time" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/tracing" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/tracing" "gitlab.com/gitlab-org/labkit/correlation" ) diff --git a/internal/git/catfile/cache_test.go b/internal/git/catfile/cache_test.go index 6b233097a3..2d29ef39e5 100644 --- a/internal/git/catfile/cache_test.go +++ b/internal/git/catfile/cache_test.go @@ -10,12 +10,12 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" "gitlab.com/gitlab-org/labkit/correlation" "google.golang.org/grpc/metadata" ) diff --git a/internal/git/catfile/commit.go b/internal/git/catfile/commit.go index 31bc3a51c3..208c1c787f 100644 --- a/internal/git/catfile/commit.go +++ b/internal/git/catfile/commit.go @@ -7,11 +7,11 @@ import ( "fmt" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/trailerparser" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/trailerparser" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // GetCommit looks up a commit by revision using an existing Batch instance. diff --git a/internal/git/catfile/commit_test.go b/internal/git/catfile/commit_test.go index 2142e56064..dfdb1228a8 100644 --- a/internal/git/catfile/commit_test.go +++ b/internal/git/catfile/commit_test.go @@ -4,10 +4,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/metadata" ) diff --git a/internal/git/catfile/object_content_reader.go b/internal/git/catfile/object_content_reader.go index 379ea66084..de179c0605 100644 --- a/internal/git/catfile/object_content_reader.go +++ b/internal/git/catfile/object_content_reader.go @@ -4,7 +4,7 @@ import ( "context" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" ) // ObjectContentReader is a reader for Git objects. diff --git a/internal/git/catfile/object_info_reader.go b/internal/git/catfile/object_info_reader.go index 7ccea1e68a..82cbc31e1f 100644 --- a/internal/git/catfile/object_info_reader.go +++ b/internal/git/catfile/object_info_reader.go @@ -7,8 +7,8 @@ import ( "strconv" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" ) // ObjectInfoReader returns information about an object referenced by a given revision. diff --git a/internal/git/catfile/object_info_reader_fuzz.go b/internal/git/catfile/object_info_reader_fuzz.go index bc7258b7e5..cd75e11df8 100644 --- a/internal/git/catfile/object_info_reader_fuzz.go +++ b/internal/git/catfile/object_info_reader_fuzz.go @@ -6,7 +6,7 @@ import ( "bufio" "bytes" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" ) func Fuzz(data []byte) int { diff --git a/internal/git/catfile/object_reader.go b/internal/git/catfile/object_reader.go index 3f2c300e67..078778a868 100644 --- a/internal/git/catfile/object_reader.go +++ b/internal/git/catfile/object_reader.go @@ -7,10 +7,10 @@ import ( "sync/atomic" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" ) // ObjectReader returns information about an object referenced by a given revision. diff --git a/internal/git/catfile/object_reader_test.go b/internal/git/catfile/object_reader_test.go index 78ec9782bb..143a35585f 100644 --- a/internal/git/catfile/object_reader_test.go +++ b/internal/git/catfile/object_reader_test.go @@ -11,12 +11,12 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/testutil" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestObjectReader_reader(t *testing.T) { diff --git a/internal/git/catfile/parse_commit.go b/internal/git/catfile/parse_commit.go index 6c96aeb89e..dbcc6b08ab 100644 --- a/internal/git/catfile/parse_commit.go +++ b/internal/git/catfile/parse_commit.go @@ -7,9 +7,9 @@ import ( "io" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) const ( diff --git a/internal/git/catfile/parse_commit_test.go b/internal/git/catfile/parse_commit_test.go index e6bf8edfce..5d4f1c4015 100644 --- a/internal/git/catfile/parse_commit_test.go +++ b/internal/git/catfile/parse_commit_test.go @@ -7,10 +7,10 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/internal/git/catfile/parser.go b/internal/git/catfile/parser.go index 9a08411fc2..b550175c2a 100644 --- a/internal/git/catfile/parser.go +++ b/internal/git/catfile/parser.go @@ -10,8 +10,8 @@ import ( "strings" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/internal/git/catfile/parser_test.go b/internal/git/catfile/parser_test.go index b54251965b..2914092c73 100644 --- a/internal/git/catfile/parser_test.go +++ b/internal/git/catfile/parser_test.go @@ -5,9 +5,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/internal/git/catfile/request_queue.go b/internal/git/catfile/request_queue.go index 130898013b..c66f8ace81 100644 --- a/internal/git/catfile/request_queue.go +++ b/internal/git/catfile/request_queue.go @@ -11,9 +11,9 @@ import ( "sync/atomic" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" ) const ( diff --git a/internal/git/catfile/request_queue_test.go b/internal/git/catfile/request_queue_test.go index 5bb2c5cb79..04a522746d 100644 --- a/internal/git/catfile/request_queue_test.go +++ b/internal/git/catfile/request_queue_test.go @@ -10,14 +10,14 @@ import ( "unsafe" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestRequestQueue_ReadObject(t *testing.T) { diff --git a/internal/git/catfile/tag.go b/internal/git/catfile/tag.go index d47df1dabe..c163a56410 100644 --- a/internal/git/catfile/tag.go +++ b/internal/git/catfile/tag.go @@ -6,10 +6,10 @@ import ( "fmt" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/tracing" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/tracing" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // GetTag looks up a commit by tagID using an existing catfile.Batch instance. Note: we pass diff --git a/internal/git/catfile/tag_test.go b/internal/git/catfile/tag_test.go index 69d5c664e7..f17bfe65c9 100644 --- a/internal/git/catfile/tag_test.go +++ b/internal/git/catfile/tag_test.go @@ -6,11 +6,11 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestGetTag(t *testing.T) { diff --git a/internal/git/catfile/testhelper_test.go b/internal/git/catfile/testhelper_test.go index 11cf5d94da..b80869af9d 100644 --- a/internal/git/catfile/testhelper_test.go +++ b/internal/git/catfile/testhelper_test.go @@ -8,16 +8,16 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestMain(m *testing.M) { diff --git a/internal/git/catfile/tracing.go b/internal/git/catfile/tracing.go index 3fff31360d..b31dcc529c 100644 --- a/internal/git/catfile/tracing.go +++ b/internal/git/catfile/tracing.go @@ -6,7 +6,7 @@ import ( "github.com/opentracing/opentracing-go" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/tracing" + "gitlab.com/gitlab-org/gitaly/v17/internal/tracing" ) type trace struct { diff --git a/internal/git/catfile/tree_entries.go b/internal/git/catfile/tree_entries.go index df6caeeb11..cf241389fd 100644 --- a/internal/git/catfile/tree_entries.go +++ b/internal/git/catfile/tree_entries.go @@ -11,9 +11,9 @@ import ( "path/filepath" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/tracing" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/tracing" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) type revisionPath struct{ revision, path string } diff --git a/internal/git/conflict/parser_test.go b/internal/git/conflict/parser_test.go index 35f315d893..ef32f78912 100644 --- a/internal/git/conflict/parser_test.go +++ b/internal/git/conflict/parser_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" ) func TestFile_Resolve(t *testing.T) { diff --git a/internal/git/conflict/resolve.go b/internal/git/conflict/resolve.go index 1b970220e9..56f4f47035 100644 --- a/internal/git/conflict/resolve.go +++ b/internal/git/conflict/resolve.go @@ -9,7 +9,7 @@ import ( "io" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" ) // section denotes the various conflict sections diff --git a/internal/git/conflict/resolve_test.go b/internal/git/conflict/resolve_test.go index 878479446d..4c21912e73 100644 --- a/internal/git/conflict/resolve_test.go +++ b/internal/git/conflict/resolve_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" ) func TestResolve(t *testing.T) { diff --git a/internal/git/conflict/testhelper_test.go b/internal/git/conflict/testhelper_test.go index 2de131e4b1..24a105ee81 100644 --- a/internal/git/conflict/testhelper_test.go +++ b/internal/git/conflict/testhelper_test.go @@ -3,7 +3,7 @@ package conflict import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/git/dirs.go b/internal/git/dirs.go index 7bfd7197a7..7d486ff09b 100644 --- a/internal/git/dirs.go +++ b/internal/git/dirs.go @@ -7,7 +7,7 @@ import ( "path/filepath" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) // alternateOutsideStorageError is returned when an alternates file contains an diff --git a/internal/git/dirs_test.go b/internal/git/dirs_test.go index 170315843d..b271f08e96 100644 --- a/internal/git/dirs_test.go +++ b/internal/git/dirs_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestObjectDirs(t *testing.T) { diff --git a/internal/git/gitattributes/check_attr.go b/internal/git/gitattributes/check_attr.go index b94007a9ae..f4bee21e2a 100644 --- a/internal/git/gitattributes/check_attr.go +++ b/internal/git/gitattributes/check_attr.go @@ -8,10 +8,10 @@ import ( "strings" "sync" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" ) // CheckAttrCmd can be used to get the gitattributes(5) for a set of files in a diff --git a/internal/git/gitattributes/check_attr_test.go b/internal/git/gitattributes/check_attr_test.go index cb051ec723..10384a87f7 100644 --- a/internal/git/gitattributes/check_attr_test.go +++ b/internal/git/gitattributes/check_attr_test.go @@ -4,12 +4,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestCheckAttr(t *testing.T) { diff --git a/internal/git/gitattributes/testhelper_test.go b/internal/git/gitattributes/testhelper_test.go index a7037d0873..95fa355a93 100644 --- a/internal/git/gitattributes/testhelper_test.go +++ b/internal/git/gitattributes/testhelper_test.go @@ -3,7 +3,7 @@ package gitattributes import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/git/gitcmd/bitmap.go b/internal/git/gitcmd/bitmap.go index d0b684cab6..9cf29ad742 100644 --- a/internal/git/gitcmd/bitmap.go +++ b/internal/git/gitcmd/bitmap.go @@ -8,10 +8,10 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/requestinfohandler" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/middleware/requestinfohandler" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) var badBitmapRequestCount = promauto.NewCounterVec( diff --git a/internal/git/gitcmd/blob.go b/internal/git/gitcmd/blob.go index 6c554f4fcc..cb082a173d 100644 --- a/internal/git/gitcmd/blob.go +++ b/internal/git/gitcmd/blob.go @@ -6,9 +6,9 @@ import ( "io" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" ) // WriteBlobConfig is the configuration used to write blobs into the repository. diff --git a/internal/git/gitcmd/command_description.go b/internal/git/gitcmd/command_description.go index 5899e4ace4..f1f8e71593 100644 --- a/internal/git/gitcmd/command_description.go +++ b/internal/git/gitcmd/command_description.go @@ -7,8 +7,8 @@ import ( "runtime" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" ) const ( diff --git a/internal/git/gitcmd/command_description_test.go b/internal/git/gitcmd/command_description_test.go index 686701eda4..f4779f5a01 100644 --- a/internal/git/gitcmd/command_description_test.go +++ b/internal/git/gitcmd/command_description_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestCommandDescriptions_revListPositionalArgs(t *testing.T) { diff --git a/internal/git/gitcmd/command_factory.go b/internal/git/gitcmd/command_factory.go index a1533b8323..bc78b5950e 100644 --- a/internal/git/gitcmd/command_factory.go +++ b/internal/git/gitcmd/command_factory.go @@ -11,17 +11,17 @@ import ( "sync" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/cgroups" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/alternates" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/trace2" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/trace2hooks" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/tracing" + "gitlab.com/gitlab-org/gitaly/v17/internal/cgroups" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/alternates" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/trace2" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/trace2hooks" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/tracing" "gitlab.com/gitlab-org/labkit/correlation" "golang.org/x/time/rate" ) diff --git a/internal/git/gitcmd/command_factory_cgroup_test.go b/internal/git/gitcmd/command_factory_cgroup_test.go index 7332e2d28f..89c18ab00c 100644 --- a/internal/git/gitcmd/command_factory_cgroup_test.go +++ b/internal/git/gitcmd/command_factory_cgroup_test.go @@ -6,11 +6,11 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/cgroups" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/cgroups" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) type mockCgroupsManager struct { diff --git a/internal/git/gitcmd/command_factory_test.go b/internal/git/gitcmd/command_factory_test.go index ad30832611..a11bb9f4ee 100644 --- a/internal/git/gitcmd/command_factory_test.go +++ b/internal/git/gitcmd/command_factory_test.go @@ -13,19 +13,19 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/trace2" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/trace2hooks" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/tracing" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/trace2" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/trace2hooks" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/tracing" "golang.org/x/time/rate" ) diff --git a/internal/git/gitcmd/command_options.go b/internal/git/gitcmd/command_options.go index f01273cf57..6b2e92617b 100644 --- a/internal/git/gitcmd/command_options.go +++ b/internal/git/gitcmd/command_options.go @@ -8,14 +8,14 @@ import ( "regexp" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/x509" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/x509" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "gitlab.com/gitlab-org/labkit/correlation" "google.golang.org/protobuf/encoding/protojson" ) diff --git a/internal/git/gitcmd/command_options_test.go b/internal/git/gitcmd/command_options_test.go index a5aef34ed6..8b1faf0d2b 100644 --- a/internal/git/gitcmd/command_options_test.go +++ b/internal/git/gitcmd/command_options_test.go @@ -7,12 +7,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/errors/cfgerror" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/errors/cfgerror" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "gitlab.com/gitlab-org/labkit/correlation" "google.golang.org/grpc/metadata" "google.golang.org/protobuf/encoding/protojson" diff --git a/internal/git/gitcmd/decoder.go b/internal/git/gitcmd/decoder.go index 1c93b93086..779b8895dd 100644 --- a/internal/git/gitcmd/decoder.go +++ b/internal/git/gitcmd/decoder.go @@ -6,7 +6,7 @@ import ( "io" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" ) // ShowRefDecoder parses the output format of git-show-ref diff --git a/internal/git/gitcmd/decoder_test.go b/internal/git/gitcmd/decoder_test.go index 3315f3947e..ce9e75c385 100644 --- a/internal/git/gitcmd/decoder_test.go +++ b/internal/git/gitcmd/decoder_test.go @@ -7,11 +7,11 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestShowRefDecoder(t *testing.T) { diff --git a/internal/git/gitcmd/execution_environment.go b/internal/git/gitcmd/execution_environment.go index 3cf80b1a02..eacd80bc8c 100644 --- a/internal/git/gitcmd/execution_environment.go +++ b/internal/git/gitcmd/execution_environment.go @@ -8,8 +8,8 @@ import ( "os/exec" "path/filepath" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" "golang.org/x/sys/unix" ) diff --git a/internal/git/gitcmd/execution_environment_test.go b/internal/git/gitcmd/execution_environment_test.go index caeb242481..a6869e32d4 100644 --- a/internal/git/gitcmd/execution_environment_test.go +++ b/internal/git/gitcmd/execution_environment_test.go @@ -7,11 +7,11 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestDistributedGitEnvironmentConstructor(t *testing.T) { diff --git a/internal/git/gitcmd/fetch_scanner.go b/internal/git/gitcmd/fetch_scanner.go index 19b7a430f6..02dac539b4 100644 --- a/internal/git/gitcmd/fetch_scanner.go +++ b/internal/git/gitcmd/fetch_scanner.go @@ -8,7 +8,7 @@ import ( "io" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" ) // RefUpdateType represents the type of update a FetchStatusLine is. The diff --git a/internal/git/gitcmd/fetch_scanner_test.go b/internal/git/gitcmd/fetch_scanner_test.go index fb41a7c0ba..078ee0df83 100644 --- a/internal/git/gitcmd/fetch_scanner_test.go +++ b/internal/git/gitcmd/fetch_scanner_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" ) func TestFetchScannerScan(t *testing.T) { diff --git a/internal/git/gitcmd/hooks_options.go b/internal/git/gitcmd/hooks_options.go index fadb62b5d7..09884a4b92 100644 --- a/internal/git/gitcmd/hooks_options.go +++ b/internal/git/gitcmd/hooks_options.go @@ -5,13 +5,13 @@ import ( "errors" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" labkittracing "gitlab.com/gitlab-org/labkit/tracing" ) diff --git a/internal/git/gitcmd/hooks_options_test.go b/internal/git/gitcmd/hooks_options_test.go index 6f96d61e33..0d26ad7184 100644 --- a/internal/git/gitcmd/hooks_options_test.go +++ b/internal/git/gitcmd/hooks_options_test.go @@ -5,13 +5,13 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" grpcmetadata "google.golang.org/grpc/metadata" ) diff --git a/internal/git/gitcmd/hooks_payload.go b/internal/git/gitcmd/hooks_payload.go index dd7768ca94..2e65cfa3a0 100644 --- a/internal/git/gitcmd/hooks_payload.go +++ b/internal/git/gitcmd/hooks_payload.go @@ -8,13 +8,13 @@ import ( "fmt" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/encoding/protojson" ) diff --git a/internal/git/gitcmd/hooks_payload_test.go b/internal/git/gitcmd/hooks_payload_test.go index 4350cedb5f..f46217703a 100644 --- a/internal/git/gitcmd/hooks_payload_test.go +++ b/internal/git/gitcmd/hooks_payload_test.go @@ -5,13 +5,13 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" ) func TestHooksPayload(t *testing.T) { diff --git a/internal/git/gitcmd/object_id.go b/internal/git/gitcmd/object_id.go index 2d8846a0d9..626fba94dd 100644 --- a/internal/git/gitcmd/object_id.go +++ b/internal/git/gitcmd/object_id.go @@ -9,7 +9,7 @@ import ( "path/filepath" "regexp" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" ) var regexpObjectFormat = regexp.MustCompile(`^[ \t]*(?i:objectformat)[ \t]*=[ \t]*(.*)[ \t;#]?`) diff --git a/internal/git/gitcmd/object_id_test.go b/internal/git/gitcmd/object_id_test.go index 97dd5e02db..16a38f3ced 100644 --- a/internal/git/gitcmd/object_id_test.go +++ b/internal/git/gitcmd/object_id_test.go @@ -5,13 +5,13 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestDetectObjectHash(t *testing.T) { diff --git a/internal/git/gitcmd/protocol.go b/internal/git/gitcmd/protocol.go index df67c345d8..698079d876 100644 --- a/internal/git/gitcmd/protocol.go +++ b/internal/git/gitcmd/protocol.go @@ -6,9 +6,9 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/requestinfohandler" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/middleware/requestinfohandler" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) const ( diff --git a/internal/git/gitcmd/protocol_test.go b/internal/git/gitcmd/protocol_test.go index b02823012f..5215828317 100644 --- a/internal/git/gitcmd/protocol_test.go +++ b/internal/git/gitcmd/protocol_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) type fakeProtocolMessage struct { diff --git a/internal/git/gitcmd/reference.go b/internal/git/gitcmd/reference.go index a54f467435..73bf6d3cb6 100644 --- a/internal/git/gitcmd/reference.go +++ b/internal/git/gitcmd/reference.go @@ -8,7 +8,7 @@ import ( "fmt" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" ) // GetReferencesConfig is configuration that can be passed to GetReferences in order to change its default behaviour. diff --git a/internal/git/gitcmd/reference_backend.go b/internal/git/gitcmd/reference_backend.go index cd59f7f8a6..a69447a198 100644 --- a/internal/git/gitcmd/reference_backend.go +++ b/internal/git/gitcmd/reference_backend.go @@ -9,7 +9,7 @@ import ( "path/filepath" "regexp" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" ) var regexpReferenceBackend = regexp.MustCompile(`^[ \t]*(?i:refstorage)[ \t]*=[ \t]*(.*)[ \t;#]?`) diff --git a/internal/git/gitcmd/repository.go b/internal/git/gitcmd/repository.go index c25563f008..e6b22500c1 100644 --- a/internal/git/gitcmd/repository.go +++ b/internal/git/gitcmd/repository.go @@ -3,9 +3,9 @@ package gitcmd import ( "context" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" ) // Repository is the common interface of different repository implementations. diff --git a/internal/git/gitcmd/ssh.go b/internal/git/gitcmd/ssh.go index e17d58f49e..4c4128eee6 100644 --- a/internal/git/gitcmd/ssh.go +++ b/internal/git/gitcmd/ssh.go @@ -7,8 +7,8 @@ import ( "path/filepath" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) // BuildSSHInvocation builds a command line to invoke SSH with the provided key and known hosts. diff --git a/internal/git/gitcmd/ssh_test.go b/internal/git/gitcmd/ssh_test.go index 21783244fb..1ed50c81fe 100644 --- a/internal/git/gitcmd/ssh_test.go +++ b/internal/git/gitcmd/ssh_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestBuildSSHInvocation(t *testing.T) { diff --git a/internal/git/gitcmd/testhelper_test.go b/internal/git/gitcmd/testhelper_test.go index e9aa833437..22e4ca1346 100644 --- a/internal/git/gitcmd/testhelper_test.go +++ b/internal/git/gitcmd/testhelper_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/git/gitio/testhelper_test.go b/internal/git/gitio/testhelper_test.go index 39575eb47e..b0056bf6f2 100644 --- a/internal/git/gitio/testhelper_test.go +++ b/internal/git/gitio/testhelper_test.go @@ -3,7 +3,7 @@ package gitio import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/git/gitpipe/catfile_info.go b/internal/git/gitpipe/catfile_info.go index ac40ff7e53..85aa08518c 100644 --- a/internal/git/gitpipe/catfile_info.go +++ b/internal/git/gitpipe/catfile_info.go @@ -9,11 +9,11 @@ import ( "io" "sync/atomic" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" ) // CatfileInfoResult is a result for the CatfileInfo pipeline step. diff --git a/internal/git/gitpipe/catfile_info_iterator.go b/internal/git/gitpipe/catfile_info_iterator.go index ef4efdeabf..0a635f7b32 100644 --- a/internal/git/gitpipe/catfile_info_iterator.go +++ b/internal/git/gitpipe/catfile_info_iterator.go @@ -3,7 +3,7 @@ package gitpipe import ( "context" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" ) // CatfileInfoIterator is an iterator returned by the Revlist function. diff --git a/internal/git/gitpipe/catfile_info_test.go b/internal/git/gitpipe/catfile_info_test.go index 8d5cd03d46..4fa3c49a66 100644 --- a/internal/git/gitpipe/catfile_info_test.go +++ b/internal/git/gitpipe/catfile_info_test.go @@ -8,12 +8,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" "google.golang.org/grpc/metadata" ) diff --git a/internal/git/gitpipe/catfile_object.go b/internal/git/gitpipe/catfile_object.go index 1ca4c08319..cb5508cd78 100644 --- a/internal/git/gitpipe/catfile_object.go +++ b/internal/git/gitpipe/catfile_object.go @@ -8,8 +8,8 @@ import ( "sync" "sync/atomic" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" ) // CatfileObjectResult is a result for the CatfileObject pipeline step. diff --git a/internal/git/gitpipe/catfile_object_iterator.go b/internal/git/gitpipe/catfile_object_iterator.go index 3aa6ef0256..4f9ca2bfb1 100644 --- a/internal/git/gitpipe/catfile_object_iterator.go +++ b/internal/git/gitpipe/catfile_object_iterator.go @@ -3,7 +3,7 @@ package gitpipe import ( "context" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" ) // CatfileObjectIterator is an iterator returned by the Revlist function. diff --git a/internal/git/gitpipe/catfile_object_test.go b/internal/git/gitpipe/catfile_object_test.go index 59872be139..105d738fe0 100644 --- a/internal/git/gitpipe/catfile_object_test.go +++ b/internal/git/gitpipe/catfile_object_test.go @@ -9,11 +9,11 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" "google.golang.org/grpc/metadata" ) diff --git a/internal/git/gitpipe/diff_tree.go b/internal/git/gitpipe/diff_tree.go index 1b0a3607eb..efea728adf 100644 --- a/internal/git/gitpipe/diff_tree.go +++ b/internal/git/gitpipe/diff_tree.go @@ -7,9 +7,9 @@ import ( "fmt" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" ) // diffTreeConfig is configuration for the DiffTree pipeline step. diff --git a/internal/git/gitpipe/diff_tree_test.go b/internal/git/gitpipe/diff_tree_test.go index a883d3b0de..631f7b0c8b 100644 --- a/internal/git/gitpipe/diff_tree_test.go +++ b/internal/git/gitpipe/diff_tree_test.go @@ -6,11 +6,11 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestDiffTree(t *testing.T) { diff --git a/internal/git/gitpipe/ls_tree.go b/internal/git/gitpipe/ls_tree.go index 5ff7867e7e..3df5caed1a 100644 --- a/internal/git/gitpipe/ls_tree.go +++ b/internal/git/gitpipe/ls_tree.go @@ -7,8 +7,8 @@ import ( "io" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" ) // lsTreeConfig is configuration for the LsTree pipeline step. diff --git a/internal/git/gitpipe/ls_tree_test.go b/internal/git/gitpipe/ls_tree_test.go index 1b69673afd..587a08db4a 100644 --- a/internal/git/gitpipe/ls_tree_test.go +++ b/internal/git/gitpipe/ls_tree_test.go @@ -6,11 +6,11 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestLsTree(t *testing.T) { diff --git a/internal/git/gitpipe/object_iterator.go b/internal/git/gitpipe/object_iterator.go index e013ff518d..7522bb1083 100644 --- a/internal/git/gitpipe/object_iterator.go +++ b/internal/git/gitpipe/object_iterator.go @@ -1,6 +1,6 @@ package gitpipe -import "gitlab.com/gitlab-org/gitaly/v16/internal/git" +import "gitlab.com/gitlab-org/gitaly/v17/internal/git" // ObjectIterator is a common interface that is shared across the pipeline steps that work with // objects. diff --git a/internal/git/gitpipe/pipeline_test.go b/internal/git/gitpipe/pipeline_test.go index ec41836752..d2f8ab8e68 100644 --- a/internal/git/gitpipe/pipeline_test.go +++ b/internal/git/gitpipe/pipeline_test.go @@ -8,12 +8,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestPipeline_revlist(t *testing.T) { diff --git a/internal/git/gitpipe/revision.go b/internal/git/gitpipe/revision.go index d294045f08..bd984fbf71 100644 --- a/internal/git/gitpipe/revision.go +++ b/internal/git/gitpipe/revision.go @@ -10,9 +10,9 @@ import ( "strings" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" ) // RevisionResult is a result for the revlist pipeline step. diff --git a/internal/git/gitpipe/revision_iterator.go b/internal/git/gitpipe/revision_iterator.go index 3f4b91f5fa..d7535ae8a1 100644 --- a/internal/git/gitpipe/revision_iterator.go +++ b/internal/git/gitpipe/revision_iterator.go @@ -3,7 +3,7 @@ package gitpipe import ( "context" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" ) // RevisionIterator is an iterator returned by the Revlist function. diff --git a/internal/git/gitpipe/revision_test.go b/internal/git/gitpipe/revision_test.go index 97ab4a942c..32657d217d 100644 --- a/internal/git/gitpipe/revision_test.go +++ b/internal/git/gitpipe/revision_test.go @@ -9,11 +9,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestRevlist(t *testing.T) { diff --git a/internal/git/gitpipe/testhelper_test.go b/internal/git/gitpipe/testhelper_test.go index df850aec79..54a0526626 100644 --- a/internal/git/gitpipe/testhelper_test.go +++ b/internal/git/gitpipe/testhelper_test.go @@ -3,9 +3,9 @@ package gitpipe import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/git/gittest/blob.go b/internal/git/gittest/blob.go index cc3b858f0b..34d36638af 100644 --- a/internal/git/gittest/blob.go +++ b/internal/git/gittest/blob.go @@ -7,10 +7,10 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) // WriteBlobs writes n distinct blobs into the git repository's object diff --git a/internal/git/gittest/command.go b/internal/git/gittest/command.go index ab964a84a1..22483ffee5 100644 --- a/internal/git/gittest/command.go +++ b/internal/git/gittest/command.go @@ -10,13 +10,13 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // ExecConfig contains configuration for ExecOpts. diff --git a/internal/git/gittest/command_factory.go b/internal/git/gittest/command_factory.go index b0b0b5ad0d..85ba558ded 100644 --- a/internal/git/gittest/command_factory.go +++ b/internal/git/gittest/command_factory.go @@ -5,9 +5,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) // NewCommandFactory creates a new Git command factory. diff --git a/internal/git/gittest/command_test.go b/internal/git/gittest/command_test.go index 7438995cae..a6475c1a84 100644 --- a/internal/git/gittest/command_test.go +++ b/internal/git/gittest/command_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" ) func TestExecOpts(t *testing.T) { diff --git a/internal/git/gittest/commit.go b/internal/git/gittest/commit.go index 88e28c703a..4669be978a 100644 --- a/internal/git/gittest/commit.go +++ b/internal/git/gittest/commit.go @@ -10,11 +10,11 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/internal/git/gittest/commit_test.go b/internal/git/gittest/commit_test.go index 9efb5a9ac1..66febb2d37 100644 --- a/internal/git/gittest/commit_test.go +++ b/internal/git/gittest/commit_test.go @@ -6,8 +6,8 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" ) func TestWriteCommit(t *testing.T) { diff --git a/internal/git/gittest/counting_command_factory.go b/internal/git/gittest/counting_command_factory.go index c41cf6061e..b8e517041c 100644 --- a/internal/git/gittest/counting_command_factory.go +++ b/internal/git/gittest/counting_command_factory.go @@ -6,10 +6,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" ) var _ gitcmd.CommandFactory = &CountingCommandFactory{} diff --git a/internal/git/gittest/counting_command_factory_test.go b/internal/git/gittest/counting_command_factory_test.go index e25a103e8c..752b88cc3f 100644 --- a/internal/git/gittest/counting_command_factory_test.go +++ b/internal/git/gittest/counting_command_factory_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestCountingCommandFactory(t *testing.T) { diff --git a/internal/git/gittest/delta_islands.go b/internal/git/gittest/delta_islands.go index 213f15e4f2..e35cc5b0d8 100644 --- a/internal/git/gittest/delta_islands.go +++ b/internal/git/gittest/delta_islands.go @@ -5,9 +5,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" ) // TestDeltaIslands checks whether functions that repack objects in a repository correctly set up diff --git a/internal/git/gittest/hooks.go b/internal/git/gittest/hooks.go index b93a74741e..8d33cae42d 100644 --- a/internal/git/gittest/hooks.go +++ b/internal/git/gittest/hooks.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) // WriteEnvToCustomHook dumps the env vars that the custom hooks receives to a file diff --git a/internal/git/gittest/http_server.go b/internal/git/gittest/http_server.go index fe48604e3d..b3ba6375f5 100644 --- a/internal/git/gittest/http_server.go +++ b/internal/git/gittest/http_server.go @@ -10,9 +10,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) // HTTPServer starts an HTTP server with git-http-backend(1) as CGI handler. The repository is diff --git a/internal/git/gittest/intercepting_command_factory.go b/internal/git/gittest/intercepting_command_factory.go index e67389773a..1a487471e9 100644 --- a/internal/git/gittest/intercepting_command_factory.go +++ b/internal/git/gittest/intercepting_command_factory.go @@ -6,12 +6,12 @@ import ( "path/filepath" "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) var _ gitcmd.CommandFactory = &InterceptingCommandFactory{} diff --git a/internal/git/gittest/intercepting_command_factory_test.go b/internal/git/gittest/intercepting_command_factory_test.go index 5876a8e977..80b6ce315f 100644 --- a/internal/git/gittest/intercepting_command_factory_test.go +++ b/internal/git/gittest/intercepting_command_factory_test.go @@ -6,9 +6,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestInterceptingCommandFactory(t *testing.T) { diff --git a/internal/git/gittest/object_hash.go b/internal/git/gittest/object_hash.go index 5306b5c33f..a5e8cd15d5 100644 --- a/internal/git/gittest/object_hash.go +++ b/internal/git/gittest/object_hash.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" ) // DefaultObjectHash is the default object hash used for running tests. diff --git a/internal/git/gittest/objectpool.go b/internal/git/gittest/objectpool.go index 4ea1237a1c..38de501b84 100644 --- a/internal/git/gittest/objectpool.go +++ b/internal/git/gittest/objectpool.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" ) diff --git a/internal/git/gittest/objects.go b/internal/git/gittest/objects.go index fd07e38db0..9fb26457bf 100644 --- a/internal/git/gittest/objects.go +++ b/internal/git/gittest/objects.go @@ -9,9 +9,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" ) // ListObjects returns a list of all object IDs in the repository. diff --git a/internal/git/gittest/pktline.go b/internal/git/gittest/pktline.go index 12ccd6dc99..d4c1eb7fc7 100644 --- a/internal/git/gittest/pktline.go +++ b/internal/git/gittest/pktline.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/pktline" ) // Pktlinef formats the given formatting string into a pktline. diff --git a/internal/git/gittest/protocol.go b/internal/git/gittest/protocol.go index 75eef0b4ad..dd6ff0611e 100644 --- a/internal/git/gittest/protocol.go +++ b/internal/git/gittest/protocol.go @@ -8,9 +8,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) // ProtocolDetectingCommandFactory is an intercepting Git command factory that allows the protocol diff --git a/internal/git/gittest/ref.go b/internal/git/gittest/ref.go index 54db894ec3..fede22e575 100644 --- a/internal/git/gittest/ref.go +++ b/internal/git/gittest/ref.go @@ -7,12 +7,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // WriteRef writes a reference into the repository pointing to the given object ID. diff --git a/internal/git/gittest/ref_test.go b/internal/git/gittest/ref_test.go index 30ccf0bd7a..0e26f9026d 100644 --- a/internal/git/gittest/ref_test.go +++ b/internal/git/gittest/ref_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" ) func TestResolveRevision(t *testing.T) { diff --git a/internal/git/gittest/reference_backend.go b/internal/git/gittest/reference_backend.go index 29307ef868..92c337d626 100644 --- a/internal/git/gittest/reference_backend.go +++ b/internal/git/gittest/reference_backend.go @@ -9,9 +9,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" ) // DefaultReferenceBackend is the default reftable backend used for running tests. diff --git a/internal/git/gittest/repo.go b/internal/git/gittest/repo.go index f3a5dd42e9..f3e17bda52 100644 --- a/internal/git/gittest/repo.go +++ b/internal/git/gittest/repo.go @@ -10,17 +10,17 @@ import ( "testing" "github.com/stretchr/testify/require" - gitalyauth "gitlab.com/gitlab-org/gitaly/v16/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/transactiontest" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + gitalyauth "gitlab.com/gitlab-org/gitaly/v17/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/transactiontest" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/internal/git/gittest/repository_suite.go b/internal/git/gittest/repository_suite.go index 2bcee5b3df..ed294a4f11 100644 --- a/internal/git/gittest/repository_suite.go +++ b/internal/git/gittest/repository_suite.go @@ -5,9 +5,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) // RepositorySuiteState is the state used by TestRepository. diff --git a/internal/git/gittest/tag.go b/internal/git/gittest/tag.go index 760d6c9ba2..5e9feaff22 100644 --- a/internal/git/gittest/tag.go +++ b/internal/git/gittest/tag.go @@ -7,9 +7,9 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" ) // WriteTagConfig holds extra options for WriteTag. diff --git a/internal/git/gittest/testhelper_test.go b/internal/git/gittest/testhelper_test.go index 029fbbdeca..a3c159a574 100644 --- a/internal/git/gittest/testhelper_test.go +++ b/internal/git/gittest/testhelper_test.go @@ -3,10 +3,10 @@ package gittest import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestMain(m *testing.M) { diff --git a/internal/git/gittest/tree.go b/internal/git/gittest/tree.go index e9c8ab0e22..38c277da44 100644 --- a/internal/git/gittest/tree.go +++ b/internal/git/gittest/tree.go @@ -10,10 +10,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // TreeEntry represents an entry of a git tree object. diff --git a/internal/git/gittest/tree_test.go b/internal/git/gittest/tree_test.go index 35d37ef0f5..c8659eab7a 100644 --- a/internal/git/gittest/tree_test.go +++ b/internal/git/gittest/tree_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" ) func TestWriteTree(t *testing.T) { diff --git a/internal/git/gittest/user.go b/internal/git/gittest/user.go index 3e0ce95077..2890d54f5c 100644 --- a/internal/git/gittest/user.go +++ b/internal/git/gittest/user.go @@ -1,7 +1,7 @@ package gittest import ( - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) const ( diff --git a/internal/git/gittest/version.go b/internal/git/gittest/version.go index 03a9910918..a61a981a96 100644 --- a/internal/git/gittest/version.go +++ b/internal/git/gittest/version.go @@ -5,10 +5,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) // IsGitVersionLessThan checks if the Git version in use is less than then specified version. diff --git a/internal/git/housekeeping/clean_stale_data.go b/internal/git/housekeeping/clean_stale_data.go index 1e3c671045..759544aa12 100644 --- a/internal/git/housekeeping/clean_stale_data.go +++ b/internal/git/housekeeping/clean_stale_data.go @@ -11,11 +11,11 @@ import ( "strings" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/safe" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/safe" ) const ( diff --git a/internal/git/housekeeping/clean_stale_data_test.go b/internal/git/housekeeping/clean_stale_data_test.go index 98711eaae9..1d07a653d0 100644 --- a/internal/git/housekeeping/clean_stale_data_test.go +++ b/internal/git/housekeeping/clean_stale_data_test.go @@ -8,12 +8,12 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) const ( diff --git a/internal/git/housekeeping/commit_graph.go b/internal/git/housekeeping/commit_graph.go index e690502432..7a2f2eccaa 100644 --- a/internal/git/housekeeping/commit_graph.go +++ b/internal/git/housekeeping/commit_graph.go @@ -4,11 +4,11 @@ import ( "bytes" "context" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" ) // WriteCommitGraphConfigForRepository returns the optimal default-configuration for the given repo. diff --git a/internal/git/housekeeping/commit_graph_test.go b/internal/git/housekeeping/commit_graph_test.go index 8051765635..ee9876f6d6 100644 --- a/internal/git/housekeeping/commit_graph_test.go +++ b/internal/git/housekeeping/commit_graph_test.go @@ -4,11 +4,11 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestWriteCommitGraphConfigForRepository(t *testing.T) { diff --git a/internal/git/housekeeping/manager/manager.go b/internal/git/housekeeping/manager/manager.go index 4de73dfc90..ed11bb8182 100644 --- a/internal/git/housekeeping/manager/manager.go +++ b/internal/git/housekeeping/manager/manager.go @@ -5,12 +5,12 @@ import ( "sync" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - gitalycfgprom "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + gitalycfgprom "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/prometheus" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) // Manager is a housekeeping manager. It is supposed to handle housekeeping tasks for repositories diff --git a/internal/git/housekeeping/manager/optimize_repository.go b/internal/git/housekeeping/manager/optimize_repository.go index d25a5fa556..a8029262cd 100644 --- a/internal/git/housekeeping/manager/optimize_repository.go +++ b/internal/git/housekeeping/manager/optimize_repository.go @@ -7,15 +7,15 @@ import ( "fmt" "os" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/tracing" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/tracing" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/git/housekeeping/manager/optimize_repository_ext_test.go b/internal/git/housekeeping/manager/optimize_repository_ext_test.go index fd222c94d4..4ec0e75eab 100644 --- a/internal/git/housekeeping/manager/optimize_repository_ext_test.go +++ b/internal/git/housekeeping/manager/optimize_repository_ext_test.go @@ -8,15 +8,15 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - housekeepingmgr "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping/manager" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/setup" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + housekeepingmgr "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping/manager" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/setup" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" ) func TestPruneIfNeeded(t *testing.T) { diff --git a/internal/git/housekeeping/manager/optimize_repository_test.go b/internal/git/housekeeping/manager/optimize_repository_test.go index 462e5a60d0..c15de8a67a 100644 --- a/internal/git/housekeeping/manager/optimize_repository_test.go +++ b/internal/git/housekeeping/manager/optimize_repository_test.go @@ -14,25 +14,25 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - gitalycfg "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - gitalycfgprom "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/perm" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + gitalycfg "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + gitalycfgprom "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/prometheus" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/perm" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/peer" ) diff --git a/internal/git/housekeeping/manager/testhelper_test.go b/internal/git/housekeeping/manager/testhelper_test.go index f1b463bfac..d4f910ee16 100644 --- a/internal/git/housekeeping/manager/testhelper_test.go +++ b/internal/git/housekeeping/manager/testhelper_test.go @@ -11,22 +11,22 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue/databasemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - nodeimpl "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/node" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue/databasemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + nodeimpl "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/node" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestMain(m *testing.M) { diff --git a/internal/git/housekeeping/metrics.go b/internal/git/housekeeping/metrics.go index fb424af975..7a351e8c0d 100644 --- a/internal/git/housekeeping/metrics.go +++ b/internal/git/housekeeping/metrics.go @@ -5,8 +5,8 @@ import ( "time" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - gitalycfgprom "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/prometheus" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + gitalycfgprom "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/prometheus" ) // Metrics stores prometheus metrics of housekeeping tasks. diff --git a/internal/git/housekeeping/objects.go b/internal/git/housekeeping/objects.go index 8f779c24a6..c2804fd27d 100644 --- a/internal/git/housekeeping/objects.go +++ b/internal/git/housekeeping/objects.go @@ -10,13 +10,13 @@ import ( "strings" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" ) const ( diff --git a/internal/git/housekeeping/objects_test.go b/internal/git/housekeeping/objects_test.go index d1c444610f..375dc81c4a 100644 --- a/internal/git/housekeeping/objects_test.go +++ b/internal/git/housekeeping/objects_test.go @@ -10,17 +10,17 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestRepackObjects(t *testing.T) { diff --git a/internal/git/housekeeping/offloading.go b/internal/git/housekeeping/offloading.go index df8bad1158..72abeb66af 100644 --- a/internal/git/housekeeping/offloading.go +++ b/internal/git/housekeeping/offloading.go @@ -7,12 +7,12 @@ import ( "path/filepath" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" ) // OffloadingPromisorRemote is the name of the Git remote used for offloading. diff --git a/internal/git/housekeeping/offloading_test.go b/internal/git/housekeeping/offloading_test.go index b225ea86db..e858215372 100644 --- a/internal/git/housekeeping/offloading_test.go +++ b/internal/git/housekeeping/offloading_test.go @@ -9,15 +9,15 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/packfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/packfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestSetOffloadingGitConfig(t *testing.T) { diff --git a/internal/git/housekeeping/optimization_strategy.go b/internal/git/housekeeping/optimization_strategy.go index ea6e3f20e7..f1cd240592 100644 --- a/internal/git/housekeeping/optimization_strategy.go +++ b/internal/git/housekeeping/optimization_strategy.go @@ -6,9 +6,9 @@ import ( "math" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" ) const ( diff --git a/internal/git/housekeeping/optimization_strategy_test.go b/internal/git/housekeeping/optimization_strategy_test.go index 33627208cd..9fa1393c7e 100644 --- a/internal/git/housekeeping/optimization_strategy_test.go +++ b/internal/git/housekeeping/optimization_strategy_test.go @@ -5,10 +5,10 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestHeuristicalOptimizationStrategy_ShouldRepackObjects(t *testing.T) { diff --git a/internal/git/housekeeping/testhelper_test.go b/internal/git/housekeeping/testhelper_test.go index b3d7fac005..8cbd5bb57f 100644 --- a/internal/git/housekeeping/testhelper_test.go +++ b/internal/git/housekeeping/testhelper_test.go @@ -4,10 +4,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/git/housekeeping/worktrees.go b/internal/git/housekeeping/worktrees.go index e0eac4aaad..dfeca1b9a2 100644 --- a/internal/git/housekeeping/worktrees.go +++ b/internal/git/housekeeping/worktrees.go @@ -11,10 +11,10 @@ import ( "strings" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" ) const ( diff --git a/internal/git/housekeeping/worktrees_test.go b/internal/git/housekeeping/worktrees_test.go index 0262900447..fe66e77daf 100644 --- a/internal/git/housekeeping/worktrees_test.go +++ b/internal/git/housekeeping/worktrees_test.go @@ -6,13 +6,13 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestCleanupDisconnectedWorktrees_doesNothingWithoutWorktrees(t *testing.T) { diff --git a/internal/git/localrepo/blob.go b/internal/git/localrepo/blob.go index 1399bea5ce..2b123670a7 100644 --- a/internal/git/localrepo/blob.go +++ b/internal/git/localrepo/blob.go @@ -4,8 +4,8 @@ import ( "context" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" ) // WriteBlobConfig is the configuration used to write blobs into the repository. diff --git a/internal/git/localrepo/blob_test.go b/internal/git/localrepo/blob_test.go index b6b20d0fdf..f8ab9897e1 100644 --- a/internal/git/localrepo/blob_test.go +++ b/internal/git/localrepo/blob_test.go @@ -11,9 +11,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) type ReaderFunc func([]byte) (int, error) diff --git a/internal/git/localrepo/bundle.go b/internal/git/localrepo/bundle.go index 949480073b..7722efb0eb 100644 --- a/internal/git/localrepo/bundle.go +++ b/internal/git/localrepo/bundle.go @@ -10,13 +10,13 @@ import ( "path/filepath" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/tempdir" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/tempdir" ) // ErrEmptyBundle is returned when the bundle to be created would have been empty. diff --git a/internal/git/localrepo/bundle_test.go b/internal/git/localrepo/bundle_test.go index 53a7b8359a..b56d8aed40 100644 --- a/internal/git/localrepo/bundle_test.go +++ b/internal/git/localrepo/bundle_test.go @@ -12,16 +12,16 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestRepoCreateBundle(t *testing.T) { diff --git a/internal/git/localrepo/commit.go b/internal/git/localrepo/commit.go index 703dd42428..d02e3d2b2f 100644 --- a/internal/git/localrepo/commit.go +++ b/internal/git/localrepo/commit.go @@ -10,15 +10,15 @@ import ( "strings" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) var ( diff --git a/internal/git/localrepo/commit_test.go b/internal/git/localrepo/commit_test.go index 16a6fc2321..e0d5779338 100644 --- a/internal/git/localrepo/commit_test.go +++ b/internal/git/localrepo/commit_test.go @@ -12,15 +12,15 @@ import ( "github.com/ProtonMail/go-crypto/openpgp" "github.com/ProtonMail/go-crypto/openpgp/packet" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/signature" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/signature" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/internal/git/localrepo/config.go b/internal/git/localrepo/config.go index 21dd759799..67829e0674 100644 --- a/internal/git/localrepo/config.go +++ b/internal/git/localrepo/config.go @@ -7,12 +7,12 @@ import ( "path/filepath" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/safe" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/safe" ) func isExitWithCode(err error, code int) bool { diff --git a/internal/git/localrepo/config_test.go b/internal/git/localrepo/config_test.go index 6ba4f947fd..87d41bd860 100644 --- a/internal/git/localrepo/config_test.go +++ b/internal/git/localrepo/config_test.go @@ -8,16 +8,16 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/safe" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/safe" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" "google.golang.org/grpc/peer" ) diff --git a/internal/git/localrepo/factory.go b/internal/git/localrepo/factory.go index bed810fd76..6ab0b8791f 100644 --- a/internal/git/localrepo/factory.go +++ b/internal/git/localrepo/factory.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // Factory builds Repo instances. diff --git a/internal/git/localrepo/factory_test.go b/internal/git/localrepo/factory_test.go index 9c1d97408c..4661e37f71 100644 --- a/internal/git/localrepo/factory_test.go +++ b/internal/git/localrepo/factory_test.go @@ -5,13 +5,13 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestFactory(t *testing.T) { diff --git a/internal/git/localrepo/merge.go b/internal/git/localrepo/merge.go index 2acdc93963..15211ad2cf 100644 --- a/internal/git/localrepo/merge.go +++ b/internal/git/localrepo/merge.go @@ -7,11 +7,11 @@ import ( "strconv" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" ) // MergeStage denotes the stage indicated by git-merge-tree(1) in the conflicting diff --git a/internal/git/localrepo/merge_test.go b/internal/git/localrepo/merge_test.go index 702f71e70e..5d493bd8ee 100644 --- a/internal/git/localrepo/merge_test.go +++ b/internal/git/localrepo/merge_test.go @@ -8,11 +8,11 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestMergeTree(t *testing.T) { diff --git a/internal/git/localrepo/objects.go b/internal/git/localrepo/objects.go index 85f571e714..94dff8d2f1 100644 --- a/internal/git/localrepo/objects.go +++ b/internal/git/localrepo/objects.go @@ -7,10 +7,10 @@ import ( "fmt" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" ) // ObjectType is an Enum for the type of object of diff --git a/internal/git/localrepo/objects_test.go b/internal/git/localrepo/objects_test.go index 1e219ae4db..9736118837 100644 --- a/internal/git/localrepo/objects_test.go +++ b/internal/git/localrepo/objects_test.go @@ -8,12 +8,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" "google.golang.org/grpc/metadata" ) diff --git a/internal/git/localrepo/parser.go b/internal/git/localrepo/parser.go index 1b8c7469ca..09d2371281 100644 --- a/internal/git/localrepo/parser.go +++ b/internal/git/localrepo/parser.go @@ -6,7 +6,7 @@ import ( "fmt" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" ) // ErrParse is returned when the parse of an entry was unsuccessful diff --git a/internal/git/localrepo/parser_test.go b/internal/git/localrepo/parser_test.go index 8edbea8a80..668da1fc0a 100644 --- a/internal/git/localrepo/parser_test.go +++ b/internal/git/localrepo/parser_test.go @@ -7,10 +7,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestParser(t *testing.T) { diff --git a/internal/git/localrepo/paths.go b/internal/git/localrepo/paths.go index e463334b73..e673dbc3de 100644 --- a/internal/git/localrepo/paths.go +++ b/internal/git/localrepo/paths.go @@ -7,8 +7,8 @@ import ( "path/filepath" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" ) // Path returns the on-disk path of the repository. diff --git a/internal/git/localrepo/paths_test.go b/internal/git/localrepo/paths_test.go index 6d737639a4..0704c3599f 100644 --- a/internal/git/localrepo/paths_test.go +++ b/internal/git/localrepo/paths_test.go @@ -6,16 +6,16 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/quarantine" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/quarantine" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "google.golang.org/protobuf/proto" diff --git a/internal/git/localrepo/rebase.go b/internal/git/localrepo/rebase.go index f187eb1ab3..71ac73230a 100644 --- a/internal/git/localrepo/rebase.go +++ b/internal/git/localrepo/rebase.go @@ -9,11 +9,11 @@ import ( "strings" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) type rebaseConfig struct { diff --git a/internal/git/localrepo/rebase_test.go b/internal/git/localrepo/rebase_test.go index a44816889e..f1e1289f49 100644 --- a/internal/git/localrepo/rebase_test.go +++ b/internal/git/localrepo/rebase_test.go @@ -7,13 +7,13 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/internal/git/localrepo/refs.go b/internal/git/localrepo/refs.go index 39e224d9cb..871b364c85 100644 --- a/internal/git/localrepo/refs.go +++ b/internal/git/localrepo/refs.go @@ -9,11 +9,11 @@ import ( "io" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" ) // ErrMismatchingState is similar to updateref.MismatchingStateError. It's declared separately to avoid diff --git a/internal/git/localrepo/refs_external_test.go b/internal/git/localrepo/refs_external_test.go index 2bfee94903..6c47599163 100644 --- a/internal/git/localrepo/refs_external_test.go +++ b/internal/git/localrepo/refs_external_test.go @@ -9,24 +9,24 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/peer" ) diff --git a/internal/git/localrepo/refs_test.go b/internal/git/localrepo/refs_test.go index e95fdc5278..8dd5030268 100644 --- a/internal/git/localrepo/refs_test.go +++ b/internal/git/localrepo/refs_test.go @@ -9,15 +9,15 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestRepo_ContainsRef(t *testing.T) { diff --git a/internal/git/localrepo/remote.go b/internal/git/localrepo/remote.go index 7fd9934257..ac8d43fbf2 100644 --- a/internal/git/localrepo/remote.go +++ b/internal/git/localrepo/remote.go @@ -8,8 +8,8 @@ import ( "io" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // FetchOptsTags controls what tags needs to be imported on fetch. diff --git a/internal/git/localrepo/remote_extra_test.go b/internal/git/localrepo/remote_extra_test.go index 4f08f187c6..15a3da780d 100644 --- a/internal/git/localrepo/remote_extra_test.go +++ b/internal/git/localrepo/remote_extra_test.go @@ -6,18 +6,18 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/repository" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/ssh" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/repository" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/ssh" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" ) diff --git a/internal/git/localrepo/remote_test.go b/internal/git/localrepo/remote_test.go index 7e8be98c06..05cef65f54 100644 --- a/internal/git/localrepo/remote_test.go +++ b/internal/git/localrepo/remote_test.go @@ -10,13 +10,13 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestRepo_FetchRemote(t *testing.T) { diff --git a/internal/git/localrepo/repo.go b/internal/git/localrepo/repo.go index d43ff99096..55cf129e20 100644 --- a/internal/git/localrepo/repo.go +++ b/internal/git/localrepo/repo.go @@ -12,19 +12,19 @@ import ( "github.com/sirupsen/logrus" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/quarantine" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/quarantine" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/proto" ) diff --git a/internal/git/localrepo/repo_test.go b/internal/git/localrepo/repo_test.go index a9c6d7ae96..915fdf8a09 100644 --- a/internal/git/localrepo/repo_test.go +++ b/internal/git/localrepo/repo_test.go @@ -8,14 +8,14 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestRepo(t *testing.T) { diff --git a/internal/git/localrepo/snapshot.go b/internal/git/localrepo/snapshot.go index 08ab194639..d138bf29e9 100644 --- a/internal/git/localrepo/snapshot.go +++ b/internal/git/localrepo/snapshot.go @@ -9,9 +9,9 @@ import ( "path/filepath" "regexp" - "gitlab.com/gitlab-org/gitaly/v16/internal/archive" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/archive" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" ) var objectFiles = []*regexp.Regexp{ diff --git a/internal/git/localrepo/snapshot_test.go b/internal/git/localrepo/snapshot_test.go index 6f1a0c5a38..f3626e8933 100644 --- a/internal/git/localrepo/snapshot_test.go +++ b/internal/git/localrepo/snapshot_test.go @@ -11,11 +11,11 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/archive" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/archive" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestCreateSnapshot(t *testing.T) { diff --git a/internal/git/localrepo/tag.go b/internal/git/localrepo/tag.go index 59b8da8d8d..8da670486c 100644 --- a/internal/git/localrepo/tag.go +++ b/internal/git/localrepo/tag.go @@ -7,9 +7,9 @@ import ( "strings" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" ) // FormatTagError is used by FormatTag() below diff --git a/internal/git/localrepo/tag_test.go b/internal/git/localrepo/tag_test.go index ed4b3703ad..b156791af6 100644 --- a/internal/git/localrepo/tag_test.go +++ b/internal/git/localrepo/tag_test.go @@ -6,10 +6,10 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestFormatTag(t *testing.T) { diff --git a/internal/git/localrepo/testhelper_test.go b/internal/git/localrepo/testhelper_test.go index 88c4315827..6399554f06 100644 --- a/internal/git/localrepo/testhelper_test.go +++ b/internal/git/localrepo/testhelper_test.go @@ -3,12 +3,12 @@ package localrepo import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestMain(m *testing.M) { diff --git a/internal/git/localrepo/tree.go b/internal/git/localrepo/tree.go index b56e172d31..e8386f686e 100644 --- a/internal/git/localrepo/tree.go +++ b/internal/git/localrepo/tree.go @@ -10,11 +10,11 @@ import ( "sort" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" ) // Entries holds every ls-tree Entry diff --git a/internal/git/localrepo/tree_test.go b/internal/git/localrepo/tree_test.go index d17400f236..cb875e8a89 100644 --- a/internal/git/localrepo/tree_test.go +++ b/internal/git/localrepo/tree_test.go @@ -11,12 +11,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestTreeEntry_Write(t *testing.T) { diff --git a/internal/git/log/last_commit.go b/internal/git/log/last_commit.go index d63be7f2a6..45807fd73f 100644 --- a/internal/git/log/last_commit.go +++ b/internal/git/log/last_commit.go @@ -6,11 +6,11 @@ import ( "regexp" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) var badRevisionRegex = regexp.MustCompile(`^fatal: bad revision '.*'\n$`) diff --git a/internal/git/log/parser.go b/internal/git/log/parser.go index f819711143..7fc9cac1c5 100644 --- a/internal/git/log/parser.go +++ b/internal/git/log/parser.go @@ -6,10 +6,10 @@ import ( "fmt" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // Parser holds necessary state for parsing a git log stream diff --git a/internal/git/object_id.go b/internal/git/object_id.go index 546947524f..d38e57dff5 100644 --- a/internal/git/object_id.go +++ b/internal/git/object_id.go @@ -7,7 +7,7 @@ import ( "fmt" "hash" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) var ( diff --git a/internal/git/object_id_test.go b/internal/git/object_id_test.go index bac844e06e..5222c238b9 100644 --- a/internal/git/object_id_test.go +++ b/internal/git/object_id_test.go @@ -9,14 +9,14 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestObjectHashByFormat(t *testing.T) { diff --git a/internal/git/objectpool/create.go b/internal/git/objectpool/create.go index d5a6ed1f04..e977e8fb44 100644 --- a/internal/git/objectpool/create.go +++ b/internal/git/objectpool/create.go @@ -7,17 +7,17 @@ import ( "fmt" "os" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - housekeepingmgr "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping/manager" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + housekeepingmgr "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping/manager" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // Create creates an object pool for the given source repository. This is done by creating a local diff --git a/internal/git/objectpool/create_test.go b/internal/git/objectpool/create_test.go index ec0521d6d2..085089b159 100644 --- a/internal/git/objectpool/create_test.go +++ b/internal/git/objectpool/create_test.go @@ -8,20 +8,20 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - housekeepingmgr "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping/manager" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + housekeepingmgr "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping/manager" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestCreate(t *testing.T) { diff --git a/internal/git/objectpool/disconnect.go b/internal/git/objectpool/disconnect.go index dcf8e02e34..6ecd6b4a4a 100644 --- a/internal/git/objectpool/disconnect.go +++ b/internal/git/objectpool/disconnect.go @@ -11,14 +11,14 @@ import ( "strings" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" ) // Disconnect disconnects the specified repository from its object pool. If the repository does not diff --git a/internal/git/objectpool/disconnect_test.go b/internal/git/objectpool/disconnect_test.go index 70d067183e..7303e8720b 100644 --- a/internal/git/objectpool/disconnect_test.go +++ b/internal/git/objectpool/disconnect_test.go @@ -13,23 +13,23 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - housekeepingmgr "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping/manager" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + housekeepingmgr "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping/manager" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/peer" ) diff --git a/internal/git/objectpool/fetch.go b/internal/git/objectpool/fetch.go index 0e11cb4803..97ae2c697d 100644 --- a/internal/git/objectpool/fetch.go +++ b/internal/git/objectpool/fetch.go @@ -8,18 +8,18 @@ import ( "io" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) var objectPoolRefspec = fmt.Sprintf("+refs/*:%s/*", git.ObjectPoolRefNamespace) diff --git a/internal/git/objectpool/fetch_test.go b/internal/git/objectpool/fetch_test.go index e50efd05e5..85cef696fd 100644 --- a/internal/git/objectpool/fetch_test.go +++ b/internal/git/objectpool/fetch_test.go @@ -10,24 +10,24 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue/databasemgr" - nodeimpl "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/node" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue/databasemgr" + nodeimpl "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/node" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestFetchFromOrigin_dangling(t *testing.T) { diff --git a/internal/git/objectpool/link.go b/internal/git/objectpool/link.go index ce3ef69c27..1b5d4b8567 100644 --- a/internal/git/objectpool/link.go +++ b/internal/git/objectpool/link.go @@ -8,12 +8,12 @@ import ( "path/filepath" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/safe" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/safe" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" ) // Link calls the non-receiver method version of Link with the parameters diff --git a/internal/git/objectpool/link_test.go b/internal/git/objectpool/link_test.go index 3e3abf7249..5a7ba444f1 100644 --- a/internal/git/objectpool/link_test.go +++ b/internal/git/objectpool/link_test.go @@ -9,16 +9,16 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" "google.golang.org/grpc/peer" ) diff --git a/internal/git/objectpool/pool.go b/internal/git/objectpool/pool.go index cd1d297ee8..22c2ec5794 100644 --- a/internal/git/objectpool/pool.go +++ b/internal/git/objectpool/pool.go @@ -8,15 +8,15 @@ import ( "path/filepath" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - housekeepingmgr "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping/manager" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + housekeepingmgr "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping/manager" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) var ( diff --git a/internal/git/objectpool/pool_test.go b/internal/git/objectpool/pool_test.go index 6ed52644ae..279ec88f04 100644 --- a/internal/git/objectpool/pool_test.go +++ b/internal/git/objectpool/pool_test.go @@ -6,13 +6,13 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestFromProto(t *testing.T) { diff --git a/internal/git/objectpool/testhelper_test.go b/internal/git/objectpool/testhelper_test.go index 600424d89e..f5994638be 100644 --- a/internal/git/objectpool/testhelper_test.go +++ b/internal/git/objectpool/testhelper_test.go @@ -5,18 +5,18 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - housekeepingmgr "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping/manager" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + housekeepingmgr "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping/manager" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestMain(m *testing.M) { diff --git a/internal/git/packfile/bitmap.go b/internal/git/packfile/bitmap.go index 5be97e3276..c22134fdf7 100644 --- a/internal/git/packfile/bitmap.go +++ b/internal/git/packfile/bitmap.go @@ -12,7 +12,7 @@ import ( "math/big" "os" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitio" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitio" ) // IndexBitmap is the in-memory representation of a .bitmap file. diff --git a/internal/git/packfile/index.go b/internal/git/packfile/index.go index 05ba1eb43a..82d2c2af53 100644 --- a/internal/git/packfile/index.go +++ b/internal/git/packfile/index.go @@ -15,12 +15,12 @@ import ( "strconv" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" ) // Index is an in-memory representation of a packfile .idx file. diff --git a/internal/git/packfile/index_test.go b/internal/git/packfile/index_test.go index 0aacb78959..be07182faa 100644 --- a/internal/git/packfile/index_test.go +++ b/internal/git/packfile/index_test.go @@ -8,14 +8,14 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/packfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/packfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestReadIndexWithGitCmdFactory(t *testing.T) { diff --git a/internal/git/packfile/testhelper_test.go b/internal/git/packfile/testhelper_test.go index 5c11ab6051..4c9db499a0 100644 --- a/internal/git/packfile/testhelper_test.go +++ b/internal/git/packfile/testhelper_test.go @@ -3,7 +3,7 @@ package packfile_test import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/git/packfile_test.go b/internal/git/packfile_test.go index 4d9690d923..69e77f1e17 100644 --- a/internal/git/packfile_test.go +++ b/internal/git/packfile_test.go @@ -5,10 +5,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestListPackfiles(t *testing.T) { diff --git a/internal/git/pktline/read_monitor.go b/internal/git/pktline/read_monitor.go index 177a2ec3d6..878153132b 100644 --- a/internal/git/pktline/read_monitor.go +++ b/internal/git/pktline/read_monitor.go @@ -7,7 +7,7 @@ import ( "os" "sync" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" ) // ReadMonitor monitors an io.Reader, waiting for a specified packet. If the diff --git a/internal/git/pktline/read_monitor_test.go b/internal/git/pktline/read_monitor_test.go index f66dff5692..fc02fc9be3 100644 --- a/internal/git/pktline/read_monitor_test.go +++ b/internal/git/pktline/read_monitor_test.go @@ -10,8 +10,8 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestReadMonitorTimeout(t *testing.T) { diff --git a/internal/git/pktline/testhelper_test.go b/internal/git/pktline/testhelper_test.go index 528293c8c8..392e28294d 100644 --- a/internal/git/pktline/testhelper_test.go +++ b/internal/git/pktline/testhelper_test.go @@ -3,7 +3,7 @@ package pktline import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/git/quarantine/quarantine.go b/internal/git/quarantine/quarantine.go index e04849241a..1161454cd0 100644 --- a/internal/git/quarantine/quarantine.go +++ b/internal/git/quarantine/quarantine.go @@ -9,13 +9,13 @@ import ( "sort" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/safe" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/tempdir" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/safe" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/tempdir" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/proto" ) diff --git a/internal/git/quarantine/quarantine_ext_test.go b/internal/git/quarantine/quarantine_ext_test.go index 97fc28f851..ac1c734095 100644 --- a/internal/git/quarantine/quarantine_ext_test.go +++ b/internal/git/quarantine/quarantine_ext_test.go @@ -5,13 +5,13 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/quarantine" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/quarantine" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestQuarantine_localrepo(t *testing.T) { diff --git a/internal/git/quarantine/quarantine_test.go b/internal/git/quarantine/quarantine_test.go index 208af699e9..735b01fe62 100644 --- a/internal/git/quarantine/quarantine_test.go +++ b/internal/git/quarantine/quarantine_test.go @@ -7,12 +7,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/proto" ) diff --git a/internal/git/quarantine/testhelper_test.go b/internal/git/quarantine/testhelper_test.go index b2771ec162..5605a99b88 100644 --- a/internal/git/quarantine/testhelper_test.go +++ b/internal/git/quarantine/testhelper_test.go @@ -3,7 +3,7 @@ package quarantine import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/git/rawdiff/testhelper_test.go b/internal/git/rawdiff/testhelper_test.go index f52f567c22..a2be4db75d 100644 --- a/internal/git/rawdiff/testhelper_test.go +++ b/internal/git/rawdiff/testhelper_test.go @@ -3,7 +3,7 @@ package rawdiff import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/git/reference_test.go b/internal/git/reference_test.go index d423106798..fe586b2159 100644 --- a/internal/git/reference_test.go +++ b/internal/git/reference_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestValidateReference(t *testing.T) { diff --git a/internal/git/reftable_test.go b/internal/git/reftable_test.go index e2be2e38cb..50d6cc3ad7 100644 --- a/internal/git/reftable_test.go +++ b/internal/git/reftable_test.go @@ -10,10 +10,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func getReftables(repoPath string) []string { diff --git a/internal/git/remoterepo/repository.go b/internal/git/remoterepo/repository.go index 22adf59796..6e34abd8a1 100644 --- a/internal/git/remoterepo/repository.go +++ b/internal/git/remoterepo/repository.go @@ -5,10 +5,10 @@ import ( "fmt" "sync" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" ) diff --git a/internal/git/remoterepo/repository_test.go b/internal/git/remoterepo/repository_test.go index d739342665..1c85deddbd 100644 --- a/internal/git/remoterepo/repository_test.go +++ b/internal/git/remoterepo/repository_test.go @@ -8,16 +8,16 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/remoterepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/remoterepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestRepository(t *testing.T) { diff --git a/internal/git/remoterepo/testhelper_test.go b/internal/git/remoterepo/testhelper_test.go index ce54d6e044..e8e2faad95 100644 --- a/internal/git/remoterepo/testhelper_test.go +++ b/internal/git/remoterepo/testhelper_test.go @@ -3,16 +3,16 @@ package remoterepo_test import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/commit" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/ref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/repository" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/commit" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/ref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/repository" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" ) diff --git a/internal/git/signature.go b/internal/git/signature.go index 300ad7a83b..048d496691 100644 --- a/internal/git/signature.go +++ b/internal/git/signature.go @@ -5,7 +5,7 @@ import ( "strings" "time" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/internal/git/signature_test.go b/internal/git/signature_test.go index 8fc1f92949..347cd7f251 100644 --- a/internal/git/signature_test.go +++ b/internal/git/signature_test.go @@ -8,7 +8,7 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/internal/git/smudge/config.go b/internal/git/smudge/config.go index 4ff6f9930b..0b34400b1a 100644 --- a/internal/git/smudge/config.go +++ b/internal/git/smudge/config.go @@ -5,9 +5,9 @@ import ( "errors" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/env" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/env" ) // ConfigEnvironmentKey is the key that gitaly-lfs-smudge expects the configuration to exist at. The diff --git a/internal/git/smudge/config_test.go b/internal/git/smudge/config_test.go index 7885ef06d4..6fa6450c24 100644 --- a/internal/git/smudge/config_test.go +++ b/internal/git/smudge/config_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" ) func TestConfigFromEnvironment(t *testing.T) { diff --git a/internal/git/smudge/testhelper_test.go b/internal/git/smudge/testhelper_test.go index b19dd75b5e..6f753c390d 100644 --- a/internal/git/smudge/testhelper_test.go +++ b/internal/git/smudge/testhelper_test.go @@ -3,7 +3,7 @@ package smudge import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/git/stats/commit_graph_test.go b/internal/git/stats/commit_graph_test.go index 894070b99a..848a732d15 100644 --- a/internal/git/stats/commit_graph_test.go +++ b/internal/git/stats/commit_graph_test.go @@ -5,9 +5,9 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestCommitGraphInfoForRepository(t *testing.T) { diff --git a/internal/git/stats/fetch_pack.go b/internal/git/stats/fetch_pack.go index e6a77a181e..68e1a0fde2 100644 --- a/internal/git/stats/fetch_pack.go +++ b/internal/git/stats/fetch_pack.go @@ -7,7 +7,7 @@ import ( "io" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/pktline" ) // FetchPack is used to parse the response body of a git-fetch-pack(1) request. diff --git a/internal/git/stats/http_clone_test.go b/internal/git/stats/http_clone_test.go index ecda64e6a9..6a99dc484d 100644 --- a/internal/git/stats/http_clone_test.go +++ b/internal/git/stats/http_clone_test.go @@ -8,9 +8,9 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestClone(t *testing.T) { diff --git a/internal/git/stats/http_fetch_pack.go b/internal/git/stats/http_fetch_pack.go index 5cbd6731c9..6385650541 100644 --- a/internal/git/stats/http_fetch_pack.go +++ b/internal/git/stats/http_fetch_pack.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/pktline" ) // HTTPFetchPack is a FetchPack obtained via a clone of a target repository via HTTP. It contains diff --git a/internal/git/stats/http_push.go b/internal/git/stats/http_push.go index 384e511c2f..3b1b2d88f9 100644 --- a/internal/git/stats/http_push.go +++ b/internal/git/stats/http_push.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" ) // HTTPPush hosts information about a typical HTTP-based push. diff --git a/internal/git/stats/http_push_test.go b/internal/git/stats/http_push_test.go index 0b5353e50a..6bd063bbf0 100644 --- a/internal/git/stats/http_push_test.go +++ b/internal/git/stats/http_push_test.go @@ -11,11 +11,11 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestPerformHTTPPush(t *testing.T) { diff --git a/internal/git/stats/http_send_pack.go b/internal/git/stats/http_send_pack.go index 3630b87e09..a5ed73ec05 100644 --- a/internal/git/stats/http_send_pack.go +++ b/internal/git/stats/http_send_pack.go @@ -9,8 +9,8 @@ import ( "net/http" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/pktline" ) // ResponseBody returns how long it took to receive the last bytes of the response body. diff --git a/internal/git/stats/packfile_negotiation.go b/internal/git/stats/packfile_negotiation.go index 95a47d5a8f..6e5cf31102 100644 --- a/internal/git/stats/packfile_negotiation.go +++ b/internal/git/stats/packfile_negotiation.go @@ -7,10 +7,10 @@ import ( "strings" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/pktline" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) //nolint:revive // This is unintentionally missing documentation. diff --git a/internal/git/stats/packfile_negotiation_test.go b/internal/git/stats/packfile_negotiation_test.go index bc6621669b..6bd85c3a0c 100644 --- a/internal/git/stats/packfile_negotiation_test.go +++ b/internal/git/stats/packfile_negotiation_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" ) const ( diff --git a/internal/git/stats/reference_discovery.go b/internal/git/stats/reference_discovery.go index 7f373b2ee1..92984290fa 100644 --- a/internal/git/stats/reference_discovery.go +++ b/internal/git/stats/reference_discovery.go @@ -7,8 +7,8 @@ import ( "strings" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/pktline" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" ) // Reference as used by the reference discovery protocol diff --git a/internal/git/stats/reference_discovery_test.go b/internal/git/stats/reference_discovery_test.go index 7b3a1eca49..2ef153464b 100644 --- a/internal/git/stats/reference_discovery_test.go +++ b/internal/git/stats/reference_discovery_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" ) func TestSingleRefParses(t *testing.T) { diff --git a/internal/git/stats/repository_info.go b/internal/git/stats/repository_info.go index 7c998bc4b8..e7eddf1be3 100644 --- a/internal/git/stats/repository_info.go +++ b/internal/git/stats/repository_info.go @@ -14,10 +14,10 @@ import ( "strings" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) const ( diff --git a/internal/git/stats/repository_info_test.go b/internal/git/stats/repository_info_test.go index 608c717492..df272ac907 100644 --- a/internal/git/stats/repository_info_test.go +++ b/internal/git/stats/repository_info_test.go @@ -13,13 +13,13 @@ import ( "github.com/sirupsen/logrus" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestRepositoryProfile(t *testing.T) { diff --git a/internal/git/stats/send_pack.go b/internal/git/stats/send_pack.go index 60b2b772db..b6af2d39b1 100644 --- a/internal/git/stats/send_pack.go +++ b/internal/git/stats/send_pack.go @@ -7,7 +7,7 @@ import ( "io" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/pktline" ) // SendPack is used to parse the response body of a git-send-pack(1) request. diff --git a/internal/git/stats/send_pack_test.go b/internal/git/stats/send_pack_test.go index 7a2b33cb27..b3a6900955 100644 --- a/internal/git/stats/send_pack_test.go +++ b/internal/git/stats/send_pack_test.go @@ -7,7 +7,7 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" ) func TestSendPack_Parse(t *testing.T) { diff --git a/internal/git/stats/testhelper_test.go b/internal/git/stats/testhelper_test.go index 14396236c4..7c8df4f93c 100644 --- a/internal/git/stats/testhelper_test.go +++ b/internal/git/stats/testhelper_test.go @@ -3,7 +3,7 @@ package stats import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/git/testhelper_test.go b/internal/git/testhelper_test.go index d1cf5577aa..c783b518c5 100644 --- a/internal/git/testhelper_test.go +++ b/internal/git/testhelper_test.go @@ -3,7 +3,7 @@ package git import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/git/trace2/manager_test.go b/internal/git/trace2/manager_test.go index 032ff3bd9a..e16728f227 100644 --- a/internal/git/trace2/manager_test.go +++ b/internal/git/trace2/manager_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) type dummyHook struct { diff --git a/internal/git/trace2/parser.go b/internal/git/trace2/parser.go index e5ecbdec74..802bebccac 100644 --- a/internal/git/trace2/parser.go +++ b/internal/git/trace2/parser.go @@ -9,8 +9,8 @@ import ( "strings" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/tracing" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/tracing" ) // Parse parses the events generated by Git Trace2 API into a tree data structure. diff --git a/internal/git/trace2/parser_test.go b/internal/git/trace2/parser_test.go index 744b84a578..b5d8f0dde1 100644 --- a/internal/git/trace2/parser_test.go +++ b/internal/git/trace2/parser_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestParser_Parse(t *testing.T) { diff --git a/internal/git/trace2/testhelper_test.go b/internal/git/trace2/testhelper_test.go index 4500d74040..582fb2bf68 100644 --- a/internal/git/trace2/testhelper_test.go +++ b/internal/git/trace2/testhelper_test.go @@ -3,7 +3,7 @@ package trace2 import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/git/trace2hooks/log_exporter.go b/internal/git/trace2hooks/log_exporter.go index c1fa639838..c17a223a5a 100644 --- a/internal/git/trace2hooks/log_exporter.go +++ b/internal/git/trace2hooks/log_exporter.go @@ -5,8 +5,8 @@ import ( "encoding/json" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/trace2" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/trace2" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" "golang.org/x/time/rate" ) diff --git a/internal/git/trace2hooks/log_exporter_test.go b/internal/git/trace2hooks/log_exporter_test.go index c7e3818260..3b9ec0bc6d 100644 --- a/internal/git/trace2hooks/log_exporter_test.go +++ b/internal/git/trace2hooks/log_exporter_test.go @@ -10,8 +10,8 @@ import ( "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/trace2" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/trace2" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" "golang.org/x/time/rate" ) diff --git a/internal/git/trace2hooks/packobjects_metrics.go b/internal/git/trace2hooks/packobjects_metrics.go index f9fd5515e9..e8da8f5310 100644 --- a/internal/git/trace2hooks/packobjects_metrics.go +++ b/internal/git/trace2hooks/packobjects_metrics.go @@ -5,8 +5,8 @@ import ( "strconv" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/trace2" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/trace2" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) var statsIntData = map[string]string{ diff --git a/internal/git/trace2hooks/packobjects_metrics_ext_test.go b/internal/git/trace2hooks/packobjects_metrics_ext_test.go index 011f5f15e0..fa2c1f6b10 100644 --- a/internal/git/trace2hooks/packobjects_metrics_ext_test.go +++ b/internal/git/trace2hooks/packobjects_metrics_ext_test.go @@ -7,16 +7,16 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/trace2" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/trace2hooks" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/trace2" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/trace2hooks" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestPackObjectsMetrics(t *testing.T) { diff --git a/internal/git/trace2hooks/packobjects_metrics_test.go b/internal/git/trace2hooks/packobjects_metrics_test.go index 6acf8fd0ba..8874172246 100644 --- a/internal/git/trace2hooks/packobjects_metrics_test.go +++ b/internal/git/trace2hooks/packobjects_metrics_test.go @@ -5,9 +5,9 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/trace2" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/trace2" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestPackObjectsMetrics_Handle(t *testing.T) { diff --git a/internal/git/trace2hooks/testhelper_test.go b/internal/git/trace2hooks/testhelper_test.go index 772af35433..54cf0cdcc1 100644 --- a/internal/git/trace2hooks/testhelper_test.go +++ b/internal/git/trace2hooks/testhelper_test.go @@ -3,7 +3,7 @@ package trace2hooks import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/git/trace2hooks/trace_helper_test.go b/internal/git/trace2hooks/trace_helper_test.go index 2677119909..bf7e6afc07 100644 --- a/internal/git/trace2hooks/trace_helper_test.go +++ b/internal/git/trace2hooks/trace_helper_test.go @@ -3,7 +3,7 @@ package trace2hooks import ( "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/trace2" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/trace2" ) func createExampleTrace(startTime time.Time) *trace2.Trace { diff --git a/internal/git/trace2hooks/tracingexporter.go b/internal/git/trace2hooks/tracingexporter.go index c797212398..c3029586c0 100644 --- a/internal/git/trace2hooks/tracingexporter.go +++ b/internal/git/trace2hooks/tracingexporter.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/opentracing/opentracing-go" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/trace2" - "gitlab.com/gitlab-org/gitaly/v16/internal/tracing" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/trace2" + "gitlab.com/gitlab-org/gitaly/v17/internal/tracing" ) // NewTracingExporter initializes TracingExporter, which is a hook to convert Trace2 events to diff --git a/internal/git/trace2hooks/tracingexporter_test.go b/internal/git/trace2hooks/tracingexporter_test.go index 0c7ab5a916..53296b5969 100644 --- a/internal/git/trace2hooks/tracingexporter_test.go +++ b/internal/git/trace2hooks/tracingexporter_test.go @@ -6,9 +6,9 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/trace2" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/tracing" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/trace2" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/tracing" ) func TestTracingExporter_Handle(t *testing.T) { diff --git a/internal/git/trailerparser/testhelper_test.go b/internal/git/trailerparser/testhelper_test.go index b26271c1ae..05634daea1 100644 --- a/internal/git/trailerparser/testhelper_test.go +++ b/internal/git/trailerparser/testhelper_test.go @@ -3,7 +3,7 @@ package trailerparser import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/git/trailerparser/trailerparser.go b/internal/git/trailerparser/trailerparser.go index 6ae75be71d..9fc23a214e 100644 --- a/internal/git/trailerparser/trailerparser.go +++ b/internal/git/trailerparser/trailerparser.go @@ -3,7 +3,7 @@ package trailerparser import ( "bytes" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) const ( diff --git a/internal/git/tree_entry.go b/internal/git/tree_entry.go index 3dcec05625..bec7a605c7 100644 --- a/internal/git/tree_entry.go +++ b/internal/git/tree_entry.go @@ -5,7 +5,7 @@ import ( "path/filepath" "strconv" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // NewTreeEntry is a helper to construct a gitalypb.TreeEntry from the provided parameters. diff --git a/internal/git/updateref/testhelper_test.go b/internal/git/updateref/testhelper_test.go index bd3c3117a5..4a699bddc3 100644 --- a/internal/git/updateref/testhelper_test.go +++ b/internal/git/updateref/testhelper_test.go @@ -3,7 +3,7 @@ package updateref import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/git/updateref/updateref.go b/internal/git/updateref/updateref.go index 06caf7ccb2..88d38de9b3 100644 --- a/internal/git/updateref/updateref.go +++ b/internal/git/updateref/updateref.go @@ -7,10 +7,10 @@ import ( "errors" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" ) var ( diff --git a/internal/git/updateref/updateref_test.go b/internal/git/updateref/updateref_test.go index 6edae338f1..3d0e0b1f2d 100644 --- a/internal/git/updateref/updateref_test.go +++ b/internal/git/updateref/updateref_test.go @@ -12,14 +12,14 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func setupUpdater(tb testing.TB, ctx context.Context) (config.Cfg, gittest.RepositoryPathExecutor, string, *Updater) { diff --git a/internal/gitaly/config/cgroups/cgroups.go b/internal/gitaly/config/cgroups/cgroups.go index 90865a308c..c8b2f71c8b 100644 --- a/internal/gitaly/config/cgroups/cgroups.go +++ b/internal/gitaly/config/cgroups/cgroups.go @@ -1,7 +1,7 @@ package cgroups import ( - "gitlab.com/gitlab-org/gitaly/v16/internal/errors/cfgerror" + "gitlab.com/gitlab-org/gitaly/v17/internal/errors/cfgerror" ) // Config is a struct for cgroups config diff --git a/internal/gitaly/config/cgroups/cgroups_test.go b/internal/gitaly/config/cgroups/cgroups_test.go index 5527415eac..4e9adc6424 100644 --- a/internal/gitaly/config/cgroups/cgroups_test.go +++ b/internal/gitaly/config/cgroups/cgroups_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/errors/cfgerror" + "gitlab.com/gitlab-org/gitaly/v17/internal/errors/cfgerror" ) func TestFallbackToOldVersion(t *testing.T) { diff --git a/internal/gitaly/config/cgroups/testhelper_test.go b/internal/gitaly/config/cgroups/testhelper_test.go index 2eabe65103..ee0cd67e66 100644 --- a/internal/gitaly/config/cgroups/testhelper_test.go +++ b/internal/gitaly/config/cgroups/testhelper_test.go @@ -3,7 +3,7 @@ package cgroups import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/config/config.go b/internal/gitaly/config/config.go index f047733fc5..dd1dd21fb3 100644 --- a/internal/gitaly/config/config.go +++ b/internal/gitaly/config/config.go @@ -19,14 +19,14 @@ import ( "github.com/google/uuid" "github.com/pelletier/go-toml/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/errors/cfgerror" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/cgroups" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/sentry" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/duration" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/errors/cfgerror" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/cgroups" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/prometheus" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/sentry" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/duration" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) const ( diff --git a/internal/gitaly/config/config_test.go b/internal/gitaly/config/config_test.go index d1ea9ae253..98752a0330 100644 --- a/internal/gitaly/config/config_test.go +++ b/internal/gitaly/config/config_test.go @@ -14,14 +14,14 @@ import ( "github.com/pelletier/go-toml/v2" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/errors/cfgerror" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/cgroups" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/sentry" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/duration" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/errors/cfgerror" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/cgroups" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/prometheus" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/sentry" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/duration" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestBinaryPath(t *testing.T) { diff --git a/internal/gitaly/config/locator.go b/internal/gitaly/config/locator.go index 449b0244d9..70ffa8a33e 100644 --- a/internal/gitaly/config/locator.go +++ b/internal/gitaly/config/locator.go @@ -6,8 +6,8 @@ import ( "os" "path/filepath" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" ) const ( diff --git a/internal/gitaly/config/locator_test.go b/internal/gitaly/config/locator_test.go index 07d95f9e12..7b5afc98ba 100644 --- a/internal/gitaly/config/locator_test.go +++ b/internal/gitaly/config/locator_test.go @@ -7,16 +7,16 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/setup" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/setup" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestConfigLocator_GetRepoPath(t *testing.T) { diff --git a/internal/gitaly/config/prometheus/config.go b/internal/gitaly/config/prometheus/config.go index 499ebc7d6a..2cfa7b0c8b 100644 --- a/internal/gitaly/config/prometheus/config.go +++ b/internal/gitaly/config/prometheus/config.go @@ -7,9 +7,9 @@ import ( grpcprometheus "github.com/grpc-ecosystem/go-grpc-prometheus" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/errors/cfgerror" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/duration" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/errors/cfgerror" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/duration" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) // Config contains additional configuration data for prometheus diff --git a/internal/gitaly/config/prometheus/config_test.go b/internal/gitaly/config/prometheus/config_test.go index 1b8bce1a50..e84b870c76 100644 --- a/internal/gitaly/config/prometheus/config_test.go +++ b/internal/gitaly/config/prometheus/config_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/errors/cfgerror" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/duration" + "gitlab.com/gitlab-org/gitaly/v17/internal/errors/cfgerror" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/duration" ) func TestConfig_Validate(t *testing.T) { diff --git a/internal/gitaly/config/prometheus/testhelper_test.go b/internal/gitaly/config/prometheus/testhelper_test.go index 9653a830e5..a9dfa81241 100644 --- a/internal/gitaly/config/prometheus/testhelper_test.go +++ b/internal/gitaly/config/prometheus/testhelper_test.go @@ -3,7 +3,7 @@ package prometheus import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/config/sentry/sentry.go b/internal/gitaly/config/sentry/sentry.go index 40a27d4a15..dc2b02ab48 100644 --- a/internal/gitaly/config/sentry/sentry.go +++ b/internal/gitaly/config/sentry/sentry.go @@ -4,8 +4,8 @@ import ( "fmt" sentry "github.com/getsentry/sentry-go" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/panichandler" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/middleware/panichandler" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) // Config contains configuration for sentry diff --git a/internal/gitaly/config/temp_dir.go b/internal/gitaly/config/temp_dir.go index 59b0a49ad6..29003a92d1 100644 --- a/internal/gitaly/config/temp_dir.go +++ b/internal/gitaly/config/temp_dir.go @@ -9,7 +9,7 @@ import ( "strings" "syscall" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) // PruneOldGitalyProcessDirectories removes leftover temporary directories that belonged to processes that diff --git a/internal/gitaly/config/temp_dir_test.go b/internal/gitaly/config/temp_dir_test.go index a451cc692a..a2d30640aa 100644 --- a/internal/gitaly/config/temp_dir_test.go +++ b/internal/gitaly/config/temp_dir_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestPruneOldGitalyProcessDirectories(t *testing.T) { diff --git a/internal/gitaly/config/testhelper_test.go b/internal/gitaly/config/testhelper_test.go index fba4fa2c61..a4f7d39e58 100644 --- a/internal/gitaly/config/testhelper_test.go +++ b/internal/gitaly/config/testhelper_test.go @@ -3,7 +3,7 @@ package config import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/diff/diff.go b/internal/gitaly/diff/diff.go index 5b2d4bd7f0..e1c7914d6f 100644 --- a/internal/gitaly/diff/diff.go +++ b/internal/gitaly/diff/diff.go @@ -10,9 +10,9 @@ import ( "regexp" "strconv" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" ) // Diff represents a single parsed diff entry diff --git a/internal/gitaly/diff/diff_test.go b/internal/gitaly/diff/diff_test.go index cf7f7dbd69..f2085d9b8f 100644 --- a/internal/gitaly/diff/diff_test.go +++ b/internal/gitaly/diff/diff_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" ) var ( diff --git a/internal/gitaly/diff/testhelper_test.go b/internal/gitaly/diff/testhelper_test.go index 053cf6df00..d3482a6888 100644 --- a/internal/gitaly/diff/testhelper_test.go +++ b/internal/gitaly/diff/testhelper_test.go @@ -3,7 +3,7 @@ package diff import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/gitalyclient/receive_pack.go b/internal/gitaly/gitalyclient/receive_pack.go index 0610f9e103..b8f883cbf2 100644 --- a/internal/gitaly/gitalyclient/receive_pack.go +++ b/internal/gitaly/gitalyclient/receive_pack.go @@ -4,9 +4,9 @@ import ( "context" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/stream" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/stream" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" "google.golang.org/grpc" ) diff --git a/internal/gitaly/gitalyclient/upload_archive.go b/internal/gitaly/gitalyclient/upload_archive.go index 03e883d028..7347b5f4a4 100644 --- a/internal/gitaly/gitalyclient/upload_archive.go +++ b/internal/gitaly/gitalyclient/upload_archive.go @@ -5,9 +5,9 @@ import ( "fmt" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/stream" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/stream" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" "google.golang.org/grpc" ) diff --git a/internal/gitaly/gitalyclient/upload_pack.go b/internal/gitaly/gitalyclient/upload_pack.go index ca8b2f710c..6f080ec566 100644 --- a/internal/gitaly/gitalyclient/upload_pack.go +++ b/internal/gitaly/gitalyclient/upload_pack.go @@ -4,9 +4,9 @@ import ( "context" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/sidechannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/stream" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/sidechannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/stream" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" ) diff --git a/internal/gitaly/hook/check.go b/internal/gitaly/hook/check.go index 76825d9410..9e6bc7af55 100644 --- a/internal/gitaly/hook/check.go +++ b/internal/gitaly/hook/check.go @@ -3,7 +3,7 @@ package hook import ( "context" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitlab" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitlab" ) //nolint:revive // This is unintentionally missing documentation. diff --git a/internal/gitaly/hook/custom.go b/internal/gitaly/hook/custom.go index e1403cf151..2cdd96d898 100644 --- a/internal/gitaly/hook/custom.go +++ b/internal/gitaly/hook/custom.go @@ -9,11 +9,11 @@ import ( "path/filepath" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/env" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/env" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "golang.org/x/sys/unix" ) diff --git a/internal/gitaly/hook/custom_test.go b/internal/gitaly/hook/custom_test.go index cd38e7ea01..594310387d 100644 --- a/internal/gitaly/hook/custom_test.go +++ b/internal/gitaly/hook/custom_test.go @@ -11,14 +11,14 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // printAllScript is a bash script that prints out stdin, the arguments, diff --git a/internal/gitaly/hook/manager.go b/internal/gitaly/hook/manager.go index 6c694a0bc9..6972a3298a 100644 --- a/internal/gitaly/hook/manager.go +++ b/internal/gitaly/hook/manager.go @@ -4,14 +4,14 @@ import ( "context" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitlab" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitlab" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // ReferenceTransactionState is the state of the Git reference transaction. It reflects the first diff --git a/internal/gitaly/hook/manager_mock.go b/internal/gitaly/hook/manager_mock.go index 205cab91ab..a003a8c99a 100644 --- a/internal/gitaly/hook/manager_mock.go +++ b/internal/gitaly/hook/manager_mock.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // MockManager mocks the Manager interface for Git hooks (e.g. pre-receive, post-receive) diff --git a/internal/gitaly/hook/postreceive.go b/internal/gitaly/hook/postreceive.go index 23f3ff571f..0bc1080c9f 100644 --- a/internal/gitaly/hook/postreceive.go +++ b/internal/gitaly/hook/postreceive.go @@ -9,11 +9,11 @@ import ( "math" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitlab" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitlab" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) const ( diff --git a/internal/gitaly/hook/postreceive_test.go b/internal/gitaly/hook/postreceive_test.go index f6cd89b992..b9e2705545 100644 --- a/internal/gitaly/hook/postreceive_test.go +++ b/internal/gitaly/hook/postreceive_test.go @@ -10,22 +10,22 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/quarantine" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitlab" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/quarantine" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitlab" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestPrintAlert(t *testing.T) { diff --git a/internal/gitaly/hook/prereceive.go b/internal/gitaly/hook/prereceive.go index bf638e7b78..74d8fbdaa9 100644 --- a/internal/gitaly/hook/prereceive.go +++ b/internal/gitaly/hook/prereceive.go @@ -9,11 +9,11 @@ import ( "path/filepath" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitlab" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/env" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitlab" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/env" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // NotAllowedError is needed to report internal API errors that diff --git a/internal/gitaly/hook/prereceive_test.go b/internal/gitaly/hook/prereceive_test.go index 66e407607f..c966c79d97 100644 --- a/internal/gitaly/hook/prereceive_test.go +++ b/internal/gitaly/hook/prereceive_test.go @@ -9,23 +9,23 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/quarantine" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitlab" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/quarantine" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitlab" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestPrereceive_customHooks(t *testing.T) { diff --git a/internal/gitaly/hook/procreceive_handler.go b/internal/gitaly/hook/procreceive_handler.go index a9c078bec9..c620a8e289 100644 --- a/internal/gitaly/hook/procreceive_handler.go +++ b/internal/gitaly/hook/procreceive_handler.go @@ -6,10 +6,10 @@ import ( "io" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/pktline" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" ) type procReceiveHandler struct { diff --git a/internal/gitaly/hook/procreceive_handler_test.go b/internal/gitaly/hook/procreceive_handler_test.go index 1cdef1c1d2..4ba729fc7e 100644 --- a/internal/gitaly/hook/procreceive_handler_test.go +++ b/internal/gitaly/hook/procreceive_handler_test.go @@ -9,12 +9,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/pktline" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestProcReceiveHandler(t *testing.T) { diff --git a/internal/gitaly/hook/procreceive_registry.go b/internal/gitaly/hook/procreceive_registry.go index d5aa569bc8..241062f05a 100644 --- a/internal/gitaly/hook/procreceive_registry.go +++ b/internal/gitaly/hook/procreceive_registry.go @@ -5,8 +5,8 @@ import ( "fmt" "sync" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" ) // ReferenceUpdate denotes a single reference update to be made. diff --git a/internal/gitaly/hook/procreceive_registry_test.go b/internal/gitaly/hook/procreceive_registry_test.go index dcca8ceb16..24138b3dc1 100644 --- a/internal/gitaly/hook/procreceive_registry_test.go +++ b/internal/gitaly/hook/procreceive_registry_test.go @@ -9,13 +9,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/pktline" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestProcReceiveRegistry(t *testing.T) { diff --git a/internal/gitaly/hook/receivepack/receive_pack.go b/internal/gitaly/hook/receivepack/receive_pack.go index e8b4b43e59..85d4357322 100644 --- a/internal/gitaly/hook/receivepack/receive_pack.go +++ b/internal/gitaly/hook/receivepack/receive_pack.go @@ -7,17 +7,17 @@ import ( "io" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // RegisterProcReceiveHook is intended for use by the receive-pack RPC handlers when transactions diff --git a/internal/gitaly/hook/receivepack/receive_pack_test.go b/internal/gitaly/hook/receivepack/receive_pack_test.go index 8fc759ce5f..92f601dd9d 100644 --- a/internal/gitaly/hook/receivepack/receive_pack_test.go +++ b/internal/gitaly/hook/receivepack/receive_pack_test.go @@ -10,17 +10,17 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/pktline" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestRegisterProcReceiveHook(t *testing.T) { diff --git a/internal/gitaly/hook/receivepack/testhelper_test.go b/internal/gitaly/hook/receivepack/testhelper_test.go index a6f8a3ea78..d825d3a0f0 100644 --- a/internal/gitaly/hook/receivepack/testhelper_test.go +++ b/internal/gitaly/hook/receivepack/testhelper_test.go @@ -3,7 +3,7 @@ package receivepack import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/hook/referencetransaction.go b/internal/gitaly/hook/referencetransaction.go index 58d3b8c4e8..073345ba6e 100644 --- a/internal/gitaly/hook/referencetransaction.go +++ b/internal/gitaly/hook/referencetransaction.go @@ -9,10 +9,10 @@ import ( "io" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" ) // ReferenceTransactionHook captures all reference updates taking place in the diff --git a/internal/gitaly/hook/sidechannel.go b/internal/gitaly/hook/sidechannel.go index 7b894f7899..11a577d0cf 100644 --- a/internal/gitaly/hook/sidechannel.go +++ b/internal/gitaly/hook/sidechannel.go @@ -11,9 +11,9 @@ import ( "path/filepath" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - gitaly_metadata "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + gitaly_metadata "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" "google.golang.org/grpc/metadata" ) diff --git a/internal/gitaly/hook/sidechannel_test.go b/internal/gitaly/hook/sidechannel_test.go index a11a7aa80c..5393ef4b1b 100644 --- a/internal/gitaly/hook/sidechannel_test.go +++ b/internal/gitaly/hook/sidechannel_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" grpc_metadata "google.golang.org/grpc/metadata" ) diff --git a/internal/gitaly/hook/testhelper_test.go b/internal/gitaly/hook/testhelper_test.go index c6b80c636d..f8adc0d0a4 100644 --- a/internal/gitaly/hook/testhelper_test.go +++ b/internal/gitaly/hook/testhelper_test.go @@ -10,13 +10,13 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/hook/transactions.go b/internal/gitaly/hook/transactions.go index 19610b297b..fa22b7a09a 100644 --- a/internal/gitaly/hook/transactions.go +++ b/internal/gitaly/hook/transactions.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" ) func isPrimary(payload gitcmd.HooksPayload) bool { diff --git a/internal/gitaly/hook/transactions_test.go b/internal/gitaly/hook/transactions_test.go index 19e3461e8c..d36731e64b 100644 --- a/internal/gitaly/hook/transactions_test.go +++ b/internal/gitaly/hook/transactions_test.go @@ -9,18 +9,18 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitlab" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitlab" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" ) func TestHookManager_stopCalled(t *testing.T) { diff --git a/internal/gitaly/hook/update.go b/internal/gitaly/hook/update.go index ee61df4224..16be33bedd 100644 --- a/internal/gitaly/hook/update.go +++ b/internal/gitaly/hook/update.go @@ -5,10 +5,10 @@ import ( "fmt" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) //nolint:revive // This is unintentionally missing documentation. diff --git a/internal/gitaly/hook/update_test.go b/internal/gitaly/hook/update_test.go index 4287d27168..5b0b86085e 100644 --- a/internal/gitaly/hook/update_test.go +++ b/internal/gitaly/hook/update_test.go @@ -7,21 +7,21 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/quarantine" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitlab" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/quarantine" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitlab" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestUpdate_customHooks(t *testing.T) { diff --git a/internal/gitaly/hook/updateref/testhelper_test.go b/internal/gitaly/hook/updateref/testhelper_test.go index d52247f7f8..0774536c8b 100644 --- a/internal/gitaly/hook/updateref/testhelper_test.go +++ b/internal/gitaly/hook/updateref/testhelper_test.go @@ -3,7 +3,7 @@ package updateref_test import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/hook/updateref/update_with_hooks.go b/internal/gitaly/hook/updateref/update_with_hooks.go index 6e8256efad..15bd07dd06 100644 --- a/internal/gitaly/hook/updateref/update_with_hooks.go +++ b/internal/gitaly/hook/updateref/update_with_hooks.go @@ -7,19 +7,19 @@ import ( "fmt" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/quarantine" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/quarantine" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // UpdaterWithHooks updates a ref with Git hooks. diff --git a/internal/gitaly/hook/updateref/update_with_hooks_test.go b/internal/gitaly/hook/updateref/update_with_hooks_test.go index 72b743c672..b3eb3c3ad9 100644 --- a/internal/gitaly/hook/updateref/update_with_hooks_test.go +++ b/internal/gitaly/hook/updateref/update_with_hooks_test.go @@ -9,22 +9,22 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/quarantine" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - hookservice "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/quarantine" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + hookservice "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" ) diff --git a/internal/gitaly/linguist/file_instance.go b/internal/gitaly/linguist/file_instance.go index c2d94c08a4..cd09740d33 100644 --- a/internal/gitaly/linguist/file_instance.go +++ b/internal/gitaly/linguist/file_instance.go @@ -5,8 +5,8 @@ import ( "io" "github.com/go-enry/go-enry/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitattributes" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitpipe" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitattributes" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitpipe" ) const ( diff --git a/internal/gitaly/linguist/language_stats.go b/internal/gitaly/linguist/language_stats.go index 1b432b6d1c..b8bb84f6e4 100644 --- a/internal/gitaly/linguist/language_stats.go +++ b/internal/gitaly/linguist/language_stats.go @@ -9,9 +9,9 @@ import ( "path/filepath" "sync" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" ) const ( diff --git a/internal/gitaly/linguist/language_stats_test.go b/internal/gitaly/linguist/language_stats_test.go index c93adffc39..8256920385 100644 --- a/internal/gitaly/linguist/language_stats_test.go +++ b/internal/gitaly/linguist/language_stats_test.go @@ -9,12 +9,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestInitLanguageStats(t *testing.T) { diff --git a/internal/gitaly/linguist/linguist.go b/internal/gitaly/linguist/linguist.go index 168e9f7685..ac4cdb909d 100644 --- a/internal/gitaly/linguist/linguist.go +++ b/internal/gitaly/linguist/linguist.go @@ -7,15 +7,15 @@ import ( "io" "github.com/go-enry/go-enry/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitattributes" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitpipe" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitattributes" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitpipe" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) // ByteCountPerLanguage represents a counter value (bytes) per language. diff --git a/internal/gitaly/linguist/linguist_test.go b/internal/gitaly/linguist/linguist_test.go index f1e755a2d4..60c84ceab9 100644 --- a/internal/gitaly/linguist/linguist_test.go +++ b/internal/gitaly/linguist/linguist_test.go @@ -8,17 +8,17 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestInstance_Stats(t *testing.T) { diff --git a/internal/gitaly/linguist/testhelper_test.go b/internal/gitaly/linguist/testhelper_test.go index 199d589a38..a6920e12d3 100644 --- a/internal/gitaly/linguist/testhelper_test.go +++ b/internal/gitaly/linguist/testhelper_test.go @@ -3,7 +3,7 @@ package linguist import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/maintenance/daily.go b/internal/gitaly/maintenance/daily.go index 9fee61c66f..478f96dea3 100644 --- a/internal/gitaly/maintenance/daily.go +++ b/internal/gitaly/maintenance/daily.go @@ -4,9 +4,9 @@ import ( "context" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/dontpanic" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/dontpanic" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) // StoragesJob runs a job on storages. The string slice param indicates which diff --git a/internal/gitaly/maintenance/daily_test.go b/internal/gitaly/maintenance/daily_test.go index 6ae906c57f..019d70b2ad 100644 --- a/internal/gitaly/maintenance/daily_test.go +++ b/internal/gitaly/maintenance/daily_test.go @@ -6,10 +6,10 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/duration" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/duration" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestStartDaily(t *testing.T) { diff --git a/internal/gitaly/maintenance/optimize.go b/internal/gitaly/maintenance/optimize.go index 05a9d5f84f..630894f038 100644 --- a/internal/gitaly/maintenance/optimize.go +++ b/internal/gitaly/maintenance/optimize.go @@ -9,11 +9,11 @@ import ( "path/filepath" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // WorkerFunc is a function that does a unit of work meant to run in the background diff --git a/internal/gitaly/maintenance/optimize_test.go b/internal/gitaly/maintenance/optimize_test.go index bf6fa1250a..301aac5301 100644 --- a/internal/gitaly/maintenance/optimize_test.go +++ b/internal/gitaly/maintenance/optimize_test.go @@ -6,19 +6,19 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - housekeepingmgr "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping/manager" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + housekeepingmgr "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping/manager" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) type mockOptimizer struct { diff --git a/internal/gitaly/maintenance/randomwalker_test.go b/internal/gitaly/maintenance/randomwalker_test.go index cb88c143bd..ce89395f42 100644 --- a/internal/gitaly/maintenance/randomwalker_test.go +++ b/internal/gitaly/maintenance/randomwalker_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestRandomWalk(t *testing.T) { diff --git a/internal/gitaly/maintenance/testhelper_test.go b/internal/gitaly/maintenance/testhelper_test.go index c6832ae057..7cc2f24dad 100644 --- a/internal/gitaly/maintenance/testhelper_test.go +++ b/internal/gitaly/maintenance/testhelper_test.go @@ -3,7 +3,7 @@ package maintenance import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/rangediff/range_diff.go b/internal/gitaly/rangediff/range_diff.go index 8867217784..fc6cab0f6d 100644 --- a/internal/gitaly/rangediff/range_diff.go +++ b/internal/gitaly/rangediff/range_diff.go @@ -7,7 +7,7 @@ import ( "io" "regexp" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) const ( diff --git a/internal/gitaly/rangediff/range_diff_test.go b/internal/gitaly/rangediff/range_diff_test.go index 280edb3a56..d7f231a113 100644 --- a/internal/gitaly/rangediff/range_diff_test.go +++ b/internal/gitaly/rangediff/range_diff_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestRangeDiffParserOneLineEqual(t *testing.T) { diff --git a/internal/gitaly/rangediff/testhelper_test.go b/internal/gitaly/rangediff/testhelper_test.go index 5f5af15055..4bc246f52f 100644 --- a/internal/gitaly/rangediff/testhelper_test.go +++ b/internal/gitaly/rangediff/testhelper_test.go @@ -3,7 +3,7 @@ package rangediff import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/repoutil/create.go b/internal/gitaly/repoutil/create.go index bf8aeb0ac0..856b494831 100644 --- a/internal/gitaly/repoutil/create.go +++ b/internal/gitaly/repoutil/create.go @@ -12,23 +12,23 @@ import ( "runtime/trace" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping" - housekeepingcfg "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/counter" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/safe" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/tempdir" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping" + housekeepingcfg "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/counter" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/safe" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/tempdir" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) type createConfig struct { diff --git a/internal/gitaly/repoutil/create_test.go b/internal/gitaly/repoutil/create_test.go index 698ef79280..de090bd729 100644 --- a/internal/gitaly/repoutil/create_test.go +++ b/internal/gitaly/repoutil/create_test.go @@ -12,24 +12,24 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/counter" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/safe" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/counter" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/safe" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/peer" ) diff --git a/internal/gitaly/repoutil/custom_hooks.go b/internal/gitaly/repoutil/custom_hooks.go index 39448676fe..3541d8af97 100644 --- a/internal/gitaly/repoutil/custom_hooks.go +++ b/internal/gitaly/repoutil/custom_hooks.go @@ -12,17 +12,17 @@ import ( "path/filepath" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/archive" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/safe" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/tempdir" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/internal/archive" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/safe" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/tempdir" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" ) // CustomHooksDir is the directory in which the custom hooks are stored in the repository. diff --git a/internal/gitaly/repoutil/custom_hooks_test.go b/internal/gitaly/repoutil/custom_hooks_test.go index a915553c3a..97af675152 100644 --- a/internal/gitaly/repoutil/custom_hooks_test.go +++ b/internal/gitaly/repoutil/custom_hooks_test.go @@ -16,15 +16,15 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/archive" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/internal/archive" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" "google.golang.org/grpc/peer" ) diff --git a/internal/gitaly/repoutil/lock.go b/internal/gitaly/repoutil/lock.go index 71cab6ca80..7bb381ea92 100644 --- a/internal/gitaly/repoutil/lock.go +++ b/internal/gitaly/repoutil/lock.go @@ -5,11 +5,11 @@ import ( "os" "path/filepath" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/safe" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/safe" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" ) // Lock attempts to lock the entire repository directory such that only one diff --git a/internal/gitaly/repoutil/lock_test.go b/internal/gitaly/repoutil/lock_test.go index f87538c5a9..ddb4fd72fe 100644 --- a/internal/gitaly/repoutil/lock_test.go +++ b/internal/gitaly/repoutil/lock_test.go @@ -4,13 +4,13 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/safe" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/safe" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestLock(t *testing.T) { diff --git a/internal/gitaly/repoutil/remove.go b/internal/gitaly/repoutil/remove.go index d74429e722..9772e7bfbf 100644 --- a/internal/gitaly/repoutil/remove.go +++ b/internal/gitaly/repoutil/remove.go @@ -7,15 +7,15 @@ import ( "os" "path/filepath" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/counter" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/safe" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/counter" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/safe" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" ) // Remove will remove a repository in a race-free way with proper transactional semantics. diff --git a/internal/gitaly/repoutil/remove_test.go b/internal/gitaly/repoutil/remove_test.go index 417bd9014b..f68531bea0 100644 --- a/internal/gitaly/repoutil/remove_test.go +++ b/internal/gitaly/repoutil/remove_test.go @@ -6,15 +6,15 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/counter" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/counter" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestRemove(t *testing.T) { diff --git a/internal/gitaly/repoutil/testhelper_test.go b/internal/gitaly/repoutil/testhelper_test.go index 15c915dc3c..27d90bd909 100644 --- a/internal/gitaly/repoutil/testhelper_test.go +++ b/internal/gitaly/repoutil/testhelper_test.go @@ -3,7 +3,7 @@ package repoutil import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/server/auth/auth.go b/internal/gitaly/server/auth/auth.go index bf7843c64a..11357266ee 100644 --- a/internal/gitaly/server/auth/auth.go +++ b/internal/gitaly/server/auth/auth.go @@ -7,8 +7,8 @@ import ( grpcmwauth "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/auth" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - gitalyauth "gitlab.com/gitlab-org/gitaly/v16/auth" - gitalycfgauth "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/auth" + gitalyauth "gitlab.com/gitlab-org/gitaly/v17/auth" + gitalycfgauth "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/auth" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/health/grpc_health_v1" diff --git a/internal/gitaly/server/auth_test.go b/internal/gitaly/server/auth_test.go index cf914c5992..3e53aed3eb 100644 --- a/internal/gitaly/server/auth_test.go +++ b/internal/gitaly/server/auth_test.go @@ -11,27 +11,27 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - gitalyauth "gitlab.com/gitlab-org/gitaly/v16/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/cache" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/server" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/setup" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitlab" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/limithandler" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + gitalyauth "gitlab.com/gitlab-org/gitaly/v17/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/cache" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/server" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/setup" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitlab" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/middleware/limithandler" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/credentials" diff --git a/internal/gitaly/server/server.go b/internal/gitaly/server/server.go index 3c28d64f06..542a6bb584 100644 --- a/internal/gitaly/server/server.go +++ b/internal/gitaly/server/server.go @@ -8,22 +8,22 @@ import ( grpcmwlogrus "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/selector" grpcprometheus "github.com/grpc-ecosystem/go-grpc-prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/server/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/grpcstats" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/listenmux" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/cache" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/customfieldshandler" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/loghandler" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/panichandler" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/requestinfohandler" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/sentryhandler" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/statushandler" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - gitalylog "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/server/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/grpcstats" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/listenmux" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/middleware/cache" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/middleware/customfieldshandler" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/middleware/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/middleware/loghandler" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/middleware/panichandler" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/middleware/requestinfohandler" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/middleware/sentryhandler" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/middleware/statushandler" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + gitalylog "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" grpccorrelation "gitlab.com/gitlab-org/labkit/correlation/grpc" grpctracing "gitlab.com/gitlab-org/labkit/tracing/grpc" "google.golang.org/grpc" diff --git a/internal/gitaly/server/server_factory.go b/internal/gitaly/server/server_factory.go index b23ae840aa..39faf538da 100644 --- a/internal/gitaly/server/server_factory.go +++ b/internal/gitaly/server/server_factory.go @@ -3,11 +3,11 @@ package server import ( "sync" - "gitlab.com/gitlab-org/gitaly/v16/internal/cache" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/limithandler" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/cache" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/middleware/limithandler" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" "google.golang.org/grpc" ) diff --git a/internal/gitaly/server/server_factory_test.go b/internal/gitaly/server/server_factory_test.go index c6e27d3721..a4b0af265f 100644 --- a/internal/gitaly/server/server_factory_test.go +++ b/internal/gitaly/server/server_factory_test.go @@ -10,13 +10,13 @@ import ( "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/bootstrap/starter" - "gitlab.com/gitlab-org/gitaly/v16/internal/cache" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/bootstrap/starter" + "gitlab.com/gitlab-org/gitaly/v17/internal/cache" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" "golang.org/x/sync/errgroup" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/internal/gitaly/server/testhelper_test.go b/internal/gitaly/server/testhelper_test.go index 7846a01f9d..ced620b383 100644 --- a/internal/gitaly/server/testhelper_test.go +++ b/internal/gitaly/server/testhelper_test.go @@ -3,7 +3,7 @@ package server import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/service/analysis/check_generated.go b/internal/gitaly/service/analysis/check_generated.go index becb87ab13..a43bd792b0 100644 --- a/internal/gitaly/service/analysis/check_generated.go +++ b/internal/gitaly/service/analysis/check_generated.go @@ -6,10 +6,10 @@ import ( "io" "github.com/go-enry/go-enry/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "golang.org/x/sync/errgroup" "google.golang.org/protobuf/proto" ) diff --git a/internal/gitaly/service/analysis/check_generated_test.go b/internal/gitaly/service/analysis/check_generated_test.go index bdc88070be..dc24f8cfd1 100644 --- a/internal/gitaly/service/analysis/check_generated_test.go +++ b/internal/gitaly/service/analysis/check_generated_test.go @@ -6,14 +6,14 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/repository" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/repository" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) diff --git a/internal/gitaly/service/analysis/server.go b/internal/gitaly/service/analysis/server.go index 1884bcc5d0..81f6bda03c 100644 --- a/internal/gitaly/service/analysis/server.go +++ b/internal/gitaly/service/analysis/server.go @@ -1,12 +1,12 @@ package analysis import ( - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) type server struct { diff --git a/internal/gitaly/service/analysis/testhelper_test.go b/internal/gitaly/service/analysis/testhelper_test.go index 4b3cbd7dda..05ce239e1a 100644 --- a/internal/gitaly/service/analysis/testhelper_test.go +++ b/internal/gitaly/service/analysis/testhelper_test.go @@ -3,7 +3,7 @@ package analysis import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/service/blob/blobs.go b/internal/gitaly/service/blob/blobs.go index 3065ec0946..8654b7c777 100644 --- a/internal/gitaly/service/blob/blobs.go +++ b/internal/gitaly/service/blob/blobs.go @@ -5,15 +5,15 @@ import ( "errors" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitpipe" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitpipe" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" "google.golang.org/protobuf/proto" ) diff --git a/internal/gitaly/service/blob/blobs_test.go b/internal/gitaly/service/blob/blobs_test.go index 690539c0b5..e8bfcc1d53 100644 --- a/internal/gitaly/service/blob/blobs_test.go +++ b/internal/gitaly/service/blob/blobs_test.go @@ -8,13 +8,13 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/quarantine" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/quarantine" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/metadata" "google.golang.org/protobuf/proto" ) diff --git a/internal/gitaly/service/blob/get_blob.go b/internal/gitaly/service/blob/get_blob.go index 69ea397e8e..d7d78f99f7 100644 --- a/internal/gitaly/service/blob/get_blob.go +++ b/internal/gitaly/service/blob/get_blob.go @@ -5,12 +5,12 @@ import ( "errors" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) func (s *server) GetBlob(in *gitalypb.GetBlobRequest, stream gitalypb.BlobService_GetBlobServer) error { diff --git a/internal/gitaly/service/blob/get_blob_test.go b/internal/gitaly/service/blob/get_blob_test.go index 453cc2340c..ce6699a60b 100644 --- a/internal/gitaly/service/blob/get_blob_test.go +++ b/internal/gitaly/service/blob/get_blob_test.go @@ -7,12 +7,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) func TestGetBlob_successful(t *testing.T) { diff --git a/internal/gitaly/service/blob/get_blobs.go b/internal/gitaly/service/blob/get_blobs.go index 7251323c30..094faa393b 100644 --- a/internal/gitaly/service/blob/get_blobs.go +++ b/internal/gitaly/service/blob/get_blobs.go @@ -6,12 +6,12 @@ import ( "errors" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) var treeEntryToObjectType = map[gitalypb.TreeEntry_EntryType]gitalypb.ObjectType{ diff --git a/internal/gitaly/service/blob/get_blobs_test.go b/internal/gitaly/service/blob/get_blobs_test.go index 2020ab431f..0cf6c518de 100644 --- a/internal/gitaly/service/blob/get_blobs_test.go +++ b/internal/gitaly/service/blob/get_blobs_test.go @@ -6,12 +6,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestGetBlobs(t *testing.T) { diff --git a/internal/gitaly/service/blob/lfs_pointers.go b/internal/gitaly/service/blob/lfs_pointers.go index 9a5abb940f..f8243a5371 100644 --- a/internal/gitaly/service/blob/lfs_pointers.go +++ b/internal/gitaly/service/blob/lfs_pointers.go @@ -6,13 +6,13 @@ import ( "fmt" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitpipe" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitpipe" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/proto" ) diff --git a/internal/gitaly/service/blob/lfs_pointers_test.go b/internal/gitaly/service/blob/lfs_pointers_test.go index 687d371c23..43bd3676ed 100644 --- a/internal/gitaly/service/blob/lfs_pointers_test.go +++ b/internal/gitaly/service/blob/lfs_pointers_test.go @@ -11,19 +11,19 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/quarantine" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/quarantine" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/metadata" ) diff --git a/internal/gitaly/service/blob/server.go b/internal/gitaly/service/blob/server.go index 109592eae0..13577df43b 100644 --- a/internal/gitaly/service/blob/server.go +++ b/internal/gitaly/service/blob/server.go @@ -1,12 +1,12 @@ package blob import ( - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) type server struct { diff --git a/internal/gitaly/service/blob/testhelper_test.go b/internal/gitaly/service/blob/testhelper_test.go index dab65e125f..6861800bff 100644 --- a/internal/gitaly/service/blob/testhelper_test.go +++ b/internal/gitaly/service/blob/testhelper_test.go @@ -5,13 +5,13 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/repository" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/repository" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) diff --git a/internal/gitaly/service/cleanup/apply_bfg_object_map_stream.go b/internal/gitaly/service/cleanup/apply_bfg_object_map_stream.go index 8523d78e4c..28f6a4c472 100644 --- a/internal/gitaly/service/cleanup/apply_bfg_object_map_stream.go +++ b/internal/gitaly/service/cleanup/apply_bfg_object_map_stream.go @@ -5,11 +5,11 @@ import ( "errors" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" "google.golang.org/protobuf/proto" ) diff --git a/internal/gitaly/service/cleanup/apply_bfg_object_map_stream_test.go b/internal/gitaly/service/cleanup/apply_bfg_object_map_stream_test.go index e467b24f03..88f14d1014 100644 --- a/internal/gitaly/service/cleanup/apply_bfg_object_map_stream_test.go +++ b/internal/gitaly/service/cleanup/apply_bfg_object_map_stream_test.go @@ -10,13 +10,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestApplyBfgObjectMapStreamSuccess(t *testing.T) { diff --git a/internal/gitaly/service/cleanup/cleaner.go b/internal/gitaly/service/cleanup/cleaner.go index 129ecb8e34..9ed37058f0 100644 --- a/internal/gitaly/service/cleanup/cleaner.go +++ b/internal/gitaly/service/cleanup/cleaner.go @@ -7,10 +7,10 @@ import ( "io" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) // forEachFunc can be called for every entry in the filter-repo or BFG object diff --git a/internal/gitaly/service/cleanup/notifier.go b/internal/gitaly/service/cleanup/notifier.go index 0a436e630d..df7b814d7b 100644 --- a/internal/gitaly/service/cleanup/notifier.go +++ b/internal/gitaly/service/cleanup/notifier.go @@ -3,11 +3,11 @@ package cleanup import ( "context" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // notifier sends messages stating that an OID has been rewritten, looking diff --git a/internal/gitaly/service/cleanup/rewrite_history.go b/internal/gitaly/service/cleanup/rewrite_history.go index 16bf818cfe..08c982de52 100644 --- a/internal/gitaly/service/cleanup/rewrite_history.go +++ b/internal/gitaly/service/cleanup/rewrite_history.go @@ -11,12 +11,12 @@ import ( "os/exec" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/tempdir" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/tempdir" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // RewriteHistory uses git-filter-repo(1) to remove specified blobs from commit history and diff --git a/internal/gitaly/service/cleanup/rewrite_history_test.go b/internal/gitaly/service/cleanup/rewrite_history_test.go index b5d7eac900..a2db417328 100644 --- a/internal/gitaly/service/cleanup/rewrite_history_test.go +++ b/internal/gitaly/service/cleanup/rewrite_history_test.go @@ -5,13 +5,13 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestRewriteHistory(t *testing.T) { diff --git a/internal/gitaly/service/cleanup/server.go b/internal/gitaly/service/cleanup/server.go index 2dbc5a30fb..9aff7c9490 100644 --- a/internal/gitaly/service/cleanup/server.go +++ b/internal/gitaly/service/cleanup/server.go @@ -1,14 +1,14 @@ package cleanup import ( - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) type server struct { diff --git a/internal/gitaly/service/cleanup/testhelper_test.go b/internal/gitaly/service/cleanup/testhelper_test.go index 8dd085f22b..a48da77e5d 100644 --- a/internal/gitaly/service/cleanup/testhelper_test.go +++ b/internal/gitaly/service/cleanup/testhelper_test.go @@ -4,16 +4,16 @@ import ( "context" "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - hookservice "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/objectpool" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/repository" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + hookservice "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/objectpool" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/repository" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) diff --git a/internal/gitaly/service/commit/check_objects_exist.go b/internal/gitaly/service/commit/check_objects_exist.go index e5ad7ab8a9..53bbdb16b2 100644 --- a/internal/gitaly/service/commit/check_objects_exist.go +++ b/internal/gitaly/service/commit/check_objects_exist.go @@ -5,11 +5,11 @@ import ( "errors" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/proto" ) diff --git a/internal/gitaly/service/commit/check_objects_exist_test.go b/internal/gitaly/service/commit/check_objects_exist_test.go index 5380285dd0..51ab74f53a 100644 --- a/internal/gitaly/service/commit/check_objects_exist_test.go +++ b/internal/gitaly/service/commit/check_objects_exist_test.go @@ -6,11 +6,11 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/commit/commit_messages.go b/internal/gitaly/service/commit/commit_messages.go index afd90e2ff5..4337d32cc8 100644 --- a/internal/gitaly/service/commit/commit_messages.go +++ b/internal/gitaly/service/commit/commit_messages.go @@ -6,12 +6,12 @@ import ( "fmt" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) func (s *server) GetCommitMessages(request *gitalypb.GetCommitMessagesRequest, stream gitalypb.CommitService_GetCommitMessagesServer) error { diff --git a/internal/gitaly/service/commit/commit_messages_test.go b/internal/gitaly/service/commit/commit_messages_test.go index 7dd10e3055..c2d4f78baa 100644 --- a/internal/gitaly/service/commit/commit_messages_test.go +++ b/internal/gitaly/service/commit/commit_messages_test.go @@ -7,12 +7,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestSuccessfulGetCommitMessagesRequest(t *testing.T) { diff --git a/internal/gitaly/service/commit/commits_by_message.go b/internal/gitaly/service/commit/commits_by_message.go index 44a9d13a9c..271c4c572c 100644 --- a/internal/gitaly/service/commit/commits_by_message.go +++ b/internal/gitaly/service/commit/commits_by_message.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/proto" ) diff --git a/internal/gitaly/service/commit/commits_by_message_test.go b/internal/gitaly/service/commit/commits_by_message_test.go index ae27696b4a..e7b976b0fb 100644 --- a/internal/gitaly/service/commit/commits_by_message_test.go +++ b/internal/gitaly/service/commit/commits_by_message_test.go @@ -6,12 +6,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/commit/commits_helper.go b/internal/gitaly/service/commit/commits_helper.go index 1225311617..214f72cabf 100644 --- a/internal/gitaly/service/commit/commits_helper.go +++ b/internal/gitaly/service/commit/commits_helper.go @@ -3,11 +3,11 @@ package commit import ( "context" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - gitlog "gitlab.com/gitlab-org/gitaly/v16/internal/git/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + gitlog "gitlab.com/gitlab-org/gitaly/v17/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) sendCommits( diff --git a/internal/gitaly/service/commit/commits_sender.go b/internal/gitaly/service/commit/commits_sender.go index c74238fcfa..7658b77a48 100644 --- a/internal/gitaly/service/commit/commits_sender.go +++ b/internal/gitaly/service/commit/commits_sender.go @@ -1,7 +1,7 @@ package commit import ( - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/proto" ) diff --git a/internal/gitaly/service/commit/count_commits.go b/internal/gitaly/service/commit/count_commits.go index 10bbfa3a59..1c4e858f5c 100644 --- a/internal/gitaly/service/commit/count_commits.go +++ b/internal/gitaly/service/commit/count_commits.go @@ -8,11 +8,11 @@ import ( "strconv" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) CountCommits(ctx context.Context, in *gitalypb.CountCommitsRequest) (*gitalypb.CountCommitsResponse, error) { diff --git a/internal/gitaly/service/commit/count_commits_test.go b/internal/gitaly/service/commit/count_commits_test.go index 6ebf8cb787..12cb5cf789 100644 --- a/internal/gitaly/service/commit/count_commits_test.go +++ b/internal/gitaly/service/commit/count_commits_test.go @@ -4,11 +4,11 @@ import ( "testing" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/timestamppb" diff --git a/internal/gitaly/service/commit/count_diverging_commits.go b/internal/gitaly/service/commit/count_diverging_commits.go index ffea9b2d84..eaed050423 100644 --- a/internal/gitaly/service/commit/count_diverging_commits.go +++ b/internal/gitaly/service/commit/count_diverging_commits.go @@ -8,9 +8,9 @@ import ( "strconv" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // CountDivergingCommits counts the diverging commits between from and to. Important to note that when --max-count is applied, the counts are not guaranteed to be diff --git a/internal/gitaly/service/commit/count_diverging_commits_test.go b/internal/gitaly/service/commit/count_diverging_commits_test.go index 07260ad9c5..d270b4072d 100644 --- a/internal/gitaly/service/commit/count_diverging_commits_test.go +++ b/internal/gitaly/service/commit/count_diverging_commits_test.go @@ -7,12 +7,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/commit/filter_shas_with_signatures.go b/internal/gitaly/service/commit/filter_shas_with_signatures.go index e607893773..d464d52256 100644 --- a/internal/gitaly/service/commit/filter_shas_with_signatures.go +++ b/internal/gitaly/service/commit/filter_shas_with_signatures.go @@ -5,11 +5,11 @@ import ( "errors" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) FilterShasWithSignatures(bidi gitalypb.CommitService_FilterShasWithSignaturesServer) error { diff --git a/internal/gitaly/service/commit/filter_shas_with_signatures_test.go b/internal/gitaly/service/commit/filter_shas_with_signatures_test.go index 1f12d84ebc..4845ba0832 100644 --- a/internal/gitaly/service/commit/filter_shas_with_signatures_test.go +++ b/internal/gitaly/service/commit/filter_shas_with_signatures_test.go @@ -7,13 +7,13 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestFilterShasWithSignatures(t *testing.T) { diff --git a/internal/gitaly/service/commit/find_all_commits.go b/internal/gitaly/service/commit/find_all_commits.go index a058291f7f..a3e8ae9119 100644 --- a/internal/gitaly/service/commit/find_all_commits.go +++ b/internal/gitaly/service/commit/find_all_commits.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) FindAllCommits(in *gitalypb.FindAllCommitsRequest, stream gitalypb.CommitService_FindAllCommitsServer) error { diff --git a/internal/gitaly/service/commit/find_all_commits_test.go b/internal/gitaly/service/commit/find_all_commits_test.go index 344d104cf6..e0b89430f1 100644 --- a/internal/gitaly/service/commit/find_all_commits_test.go +++ b/internal/gitaly/service/commit/find_all_commits_test.go @@ -5,12 +5,12 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/commit/find_commit.go b/internal/gitaly/service/commit/find_commit.go index dd1db7e986..0c6c5a37dd 100644 --- a/internal/gitaly/service/commit/find_commit.go +++ b/internal/gitaly/service/commit/find_commit.go @@ -4,11 +4,11 @@ import ( "context" "errors" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func validateFindCommitRequest(ctx context.Context, locator storage.Locator, in *gitalypb.FindCommitRequest) error { diff --git a/internal/gitaly/service/commit/find_commit_test.go b/internal/gitaly/service/commit/find_commit_test.go index 5c1dc305e0..b4839cb48e 100644 --- a/internal/gitaly/service/commit/find_commit_test.go +++ b/internal/gitaly/service/commit/find_commit_test.go @@ -6,15 +6,15 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "golang.org/x/text/encoding/charmap" "google.golang.org/grpc/metadata" ) diff --git a/internal/gitaly/service/commit/find_commits.go b/internal/gitaly/service/commit/find_commits.go index 6cfe5d49d5..ca59b1f996 100644 --- a/internal/gitaly/service/commit/find_commits.go +++ b/internal/gitaly/service/commit/find_commits.go @@ -11,15 +11,15 @@ import ( "strconv" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/trailerparser" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/trailerparser" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) var statsPattern = regexp.MustCompile(`\s(\d+)\sfiles? changed(,\s(\d+)\sinsertions?\(\+\))?(,\s(\d+)\sdeletions?\(-\))?`) diff --git a/internal/gitaly/service/commit/find_commits_test.go b/internal/gitaly/service/commit/find_commits_test.go index 21807b28ca..e61756ad00 100644 --- a/internal/gitaly/service/commit/find_commits_test.go +++ b/internal/gitaly/service/commit/find_commits_test.go @@ -10,14 +10,14 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "golang.org/x/text/encoding/charmap" "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" diff --git a/internal/gitaly/service/commit/get_commit_signatures.go b/internal/gitaly/service/commit/get_commit_signatures.go index 87426dfa16..6909101a6b 100644 --- a/internal/gitaly/service/commit/get_commit_signatures.go +++ b/internal/gitaly/service/commit/get_commit_signatures.go @@ -6,12 +6,12 @@ import ( "fmt" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/signature" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/signature" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) func (s *server) GetCommitSignatures(request *gitalypb.GetCommitSignaturesRequest, stream gitalypb.CommitService_GetCommitSignaturesServer) error { diff --git a/internal/gitaly/service/commit/get_commit_signatures_test.go b/internal/gitaly/service/commit/get_commit_signatures_test.go index 7549e49ba8..1bb6249b13 100644 --- a/internal/gitaly/service/commit/get_commit_signatures_test.go +++ b/internal/gitaly/service/commit/get_commit_signatures_test.go @@ -8,17 +8,17 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/commit/get_tree_entries.go b/internal/gitaly/service/commit/get_tree_entries.go index 8112db4597..bac21b6612 100644 --- a/internal/gitaly/service/commit/get_tree_entries.go +++ b/internal/gitaly/service/commit/get_tree_entries.go @@ -9,14 +9,14 @@ import ( "path/filepath" "sort" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/proto" ) diff --git a/internal/gitaly/service/commit/get_tree_entries_test.go b/internal/gitaly/service/commit/get_tree_entries_test.go index bf8437114f..1923c8876a 100644 --- a/internal/gitaly/service/commit/get_tree_entries_test.go +++ b/internal/gitaly/service/commit/get_tree_entries_test.go @@ -8,14 +8,14 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" spb "google.golang.org/genproto/googleapis/rpc/status" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/internal/gitaly/service/commit/isancestor.go b/internal/gitaly/service/commit/isancestor.go index 129225492e..b3943c9534 100644 --- a/internal/gitaly/service/commit/isancestor.go +++ b/internal/gitaly/service/commit/isancestor.go @@ -4,11 +4,11 @@ import ( "context" "errors" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func validateCommitIsAncestorRequest(ctx context.Context, locator storage.Locator, in *gitalypb.CommitIsAncestorRequest) error { diff --git a/internal/gitaly/service/commit/isancestor_test.go b/internal/gitaly/service/commit/isancestor_test.go index d30171046c..ac3825d9a7 100644 --- a/internal/gitaly/service/commit/isancestor_test.go +++ b/internal/gitaly/service/commit/isancestor_test.go @@ -4,12 +4,12 @@ import ( "path/filepath" "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" diff --git a/internal/gitaly/service/commit/languages.go b/internal/gitaly/service/commit/languages.go index 19253f0cfb..7398137ad3 100644 --- a/internal/gitaly/service/commit/languages.go +++ b/internal/gitaly/service/commit/languages.go @@ -9,12 +9,12 @@ import ( "sort" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/linguist" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/linguist" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) var errAmbigRef = errors.New("ambiguous reference") diff --git a/internal/gitaly/service/commit/languages_test.go b/internal/gitaly/service/commit/languages_test.go index 8a9d1c9df1..ad9009a271 100644 --- a/internal/gitaly/service/commit/languages_test.go +++ b/internal/gitaly/service/commit/languages_test.go @@ -3,13 +3,13 @@ package commit import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) const ( diff --git a/internal/gitaly/service/commit/last_commit_for_path.go b/internal/gitaly/service/commit/last_commit_for_path.go index ad1e08ac09..a544bc73ec 100644 --- a/internal/gitaly/service/commit/last_commit_for_path.go +++ b/internal/gitaly/service/commit/last_commit_for_path.go @@ -5,12 +5,12 @@ import ( "errors" "path/filepath" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) LastCommitForPath(ctx context.Context, in *gitalypb.LastCommitForPathRequest) (*gitalypb.LastCommitForPathResponse, error) { diff --git a/internal/gitaly/service/commit/last_commit_for_path_test.go b/internal/gitaly/service/commit/last_commit_for_path_test.go index b3423a0eb9..28a79049b0 100644 --- a/internal/gitaly/service/commit/last_commit_for_path_test.go +++ b/internal/gitaly/service/commit/last_commit_for_path_test.go @@ -3,12 +3,12 @@ package commit import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestLastCommitForPath(t *testing.T) { diff --git a/internal/gitaly/service/commit/list_all_commits.go b/internal/gitaly/service/commit/list_all_commits.go index cfdcc15f82..e4acb997fb 100644 --- a/internal/gitaly/service/commit/list_all_commits.go +++ b/internal/gitaly/service/commit/list_all_commits.go @@ -3,13 +3,13 @@ package commit import ( "context" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitpipe" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitpipe" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func verifyListAllCommitsRequest(ctx context.Context, locator storage.Locator, request *gitalypb.ListAllCommitsRequest) error { diff --git a/internal/gitaly/service/commit/list_all_commits_test.go b/internal/gitaly/service/commit/list_all_commits_test.go index 9acbcc408d..48d6dfeb6e 100644 --- a/internal/gitaly/service/commit/list_all_commits_test.go +++ b/internal/gitaly/service/commit/list_all_commits_test.go @@ -9,15 +9,15 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/metadata" ) diff --git a/internal/gitaly/service/commit/list_commits.go b/internal/gitaly/service/commit/list_commits.go index 0c393b7fbf..8ae8b137de 100644 --- a/internal/gitaly/service/commit/list_commits.go +++ b/internal/gitaly/service/commit/list_commits.go @@ -4,13 +4,13 @@ import ( "context" "errors" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitpipe" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitpipe" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func verifyListCommitsRequest(ctx context.Context, locator storage.Locator, request *gitalypb.ListCommitsRequest) error { diff --git a/internal/gitaly/service/commit/list_commits_by_oid.go b/internal/gitaly/service/commit/list_commits_by_oid.go index 7ce6397b3d..8afe910695 100644 --- a/internal/gitaly/service/commit/list_commits_by_oid.go +++ b/internal/gitaly/service/commit/list_commits_by_oid.go @@ -5,11 +5,11 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/proto" ) diff --git a/internal/gitaly/service/commit/list_commits_by_oid_test.go b/internal/gitaly/service/commit/list_commits_by_oid_test.go index 4668954377..d0b915bd38 100644 --- a/internal/gitaly/service/commit/list_commits_by_oid_test.go +++ b/internal/gitaly/service/commit/list_commits_by_oid_test.go @@ -7,11 +7,11 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestListCommitsByOid(t *testing.T) { diff --git a/internal/gitaly/service/commit/list_commits_by_ref_name.go b/internal/gitaly/service/commit/list_commits_by_ref_name.go index 2a5bb702fa..4d06b81897 100644 --- a/internal/gitaly/service/commit/list_commits_by_ref_name.go +++ b/internal/gitaly/service/commit/list_commits_by_ref_name.go @@ -3,11 +3,11 @@ package commit import ( "errors" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/proto" ) diff --git a/internal/gitaly/service/commit/list_commits_by_ref_name_test.go b/internal/gitaly/service/commit/list_commits_by_ref_name_test.go index df81369854..28cc743443 100644 --- a/internal/gitaly/service/commit/list_commits_by_ref_name_test.go +++ b/internal/gitaly/service/commit/list_commits_by_ref_name_test.go @@ -8,12 +8,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestListCommitsByRefName(t *testing.T) { diff --git a/internal/gitaly/service/commit/list_commits_test.go b/internal/gitaly/service/commit/list_commits_test.go index f1b43d13dc..86c91d823f 100644 --- a/internal/gitaly/service/commit/list_commits_test.go +++ b/internal/gitaly/service/commit/list_commits_test.go @@ -5,12 +5,12 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/internal/gitaly/service/commit/list_files.go b/internal/gitaly/service/commit/list_files.go index 40f7a9405b..52f8d61e75 100644 --- a/internal/gitaly/service/commit/list_files.go +++ b/internal/gitaly/service/commit/list_files.go @@ -6,14 +6,14 @@ import ( "fmt" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/proto" ) diff --git a/internal/gitaly/service/commit/list_files_test.go b/internal/gitaly/service/commit/list_files_test.go index b616727e76..93f45f0cf5 100644 --- a/internal/gitaly/service/commit/list_files_test.go +++ b/internal/gitaly/service/commit/list_files_test.go @@ -4,12 +4,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestListFiles(t *testing.T) { diff --git a/internal/gitaly/service/commit/list_last_commits_for_tree.go b/internal/gitaly/service/commit/list_last_commits_for_tree.go index 40f612bd99..2c4346cec6 100644 --- a/internal/gitaly/service/commit/list_last_commits_for_tree.go +++ b/internal/gitaly/service/commit/list_last_commits_for_tree.go @@ -7,14 +7,14 @@ import ( "io" "sort" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) var maxNumStatBatchSize = 10 diff --git a/internal/gitaly/service/commit/list_last_commits_for_tree_test.go b/internal/gitaly/service/commit/list_last_commits_for_tree_test.go index f42eca89a5..1ae67552eb 100644 --- a/internal/gitaly/service/commit/list_last_commits_for_tree_test.go +++ b/internal/gitaly/service/commit/list_last_commits_for_tree_test.go @@ -6,13 +6,13 @@ import ( "unicode/utf8" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestListLastCommitsForTree(t *testing.T) { diff --git a/internal/gitaly/service/commit/raw_blame.go b/internal/gitaly/service/commit/raw_blame.go index ed53cf14ce..f8c90f4d83 100644 --- a/internal/gitaly/service/commit/raw_blame.go +++ b/internal/gitaly/service/commit/raw_blame.go @@ -10,14 +10,14 @@ import ( "strconv" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) var ( diff --git a/internal/gitaly/service/commit/raw_blame_test.go b/internal/gitaly/service/commit/raw_blame_test.go index 08c572a6e2..6720fff1b1 100644 --- a/internal/gitaly/service/commit/raw_blame_test.go +++ b/internal/gitaly/service/commit/raw_blame_test.go @@ -7,12 +7,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" spb "google.golang.org/genproto/googleapis/rpc/status" "google.golang.org/protobuf/testing/protocmp" ) diff --git a/internal/gitaly/service/commit/server.go b/internal/gitaly/service/commit/server.go index b8ec1f3b1e..09d8f7b61d 100644 --- a/internal/gitaly/service/commit/server.go +++ b/internal/gitaly/service/commit/server.go @@ -1,14 +1,14 @@ package commit import ( - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) type server struct { diff --git a/internal/gitaly/service/commit/stats.go b/internal/gitaly/service/commit/stats.go index ebc9f34683..294a996045 100644 --- a/internal/gitaly/service/commit/stats.go +++ b/internal/gitaly/service/commit/stats.go @@ -7,11 +7,11 @@ import ( "strconv" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func validateCommitStatsRequest(ctx context.Context, locator storage.Locator, in *gitalypb.CommitStatsRequest) error { diff --git a/internal/gitaly/service/commit/stats_test.go b/internal/gitaly/service/commit/stats_test.go index f02ad725f6..d8a18f62cc 100644 --- a/internal/gitaly/service/commit/stats_test.go +++ b/internal/gitaly/service/commit/stats_test.go @@ -3,11 +3,11 @@ package commit import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestCommitStatsSuccess(t *testing.T) { diff --git a/internal/gitaly/service/commit/testhelper_test.go b/internal/gitaly/service/commit/testhelper_test.go index f6c08005fa..0cb2063653 100644 --- a/internal/gitaly/service/commit/testhelper_test.go +++ b/internal/gitaly/service/commit/testhelper_test.go @@ -8,17 +8,17 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/repository" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/repository" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) diff --git a/internal/gitaly/service/commit/tree_entry.go b/internal/gitaly/service/commit/tree_entry.go index 594000a516..166525e974 100644 --- a/internal/gitaly/service/commit/tree_entry.go +++ b/internal/gitaly/service/commit/tree_entry.go @@ -6,12 +6,12 @@ import ( "io" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) func sendTreeEntry( diff --git a/internal/gitaly/service/commit/tree_entry_test.go b/internal/gitaly/service/commit/tree_entry_test.go index 19e6b53580..68284c02e7 100644 --- a/internal/gitaly/service/commit/tree_entry_test.go +++ b/internal/gitaly/service/commit/tree_entry_test.go @@ -4,11 +4,11 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestTreeEntry(t *testing.T) { diff --git a/internal/gitaly/service/conflicts/list_conflict_files.go b/internal/gitaly/service/conflicts/list_conflict_files.go index 0bb926fe52..fe04adaab5 100644 --- a/internal/gitaly/service/conflicts/list_conflict_files.go +++ b/internal/gitaly/service/conflicts/list_conflict_files.go @@ -8,12 +8,12 @@ import ( "io" "unicode/utf8" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) func (s *server) ListConflictFiles(request *gitalypb.ListConflictFilesRequest, stream gitalypb.ConflictsService_ListConflictFilesServer) error { diff --git a/internal/gitaly/service/conflicts/list_conflict_files_test.go b/internal/gitaly/service/conflicts/list_conflict_files_test.go index bc38621248..e1817c3c56 100644 --- a/internal/gitaly/service/conflicts/list_conflict_files_test.go +++ b/internal/gitaly/service/conflicts/list_conflict_files_test.go @@ -8,11 +8,11 @@ import ( "strings" "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) type conflictFile struct { diff --git a/internal/gitaly/service/conflicts/resolve_conflicts.go b/internal/gitaly/service/conflicts/resolve_conflicts.go index c412efd902..3f7e4cc2b6 100644 --- a/internal/gitaly/service/conflicts/resolve_conflicts.go +++ b/internal/gitaly/service/conflicts/resolve_conflicts.go @@ -11,13 +11,13 @@ import ( "sort" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/conflict" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/remoterepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/conflict" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/remoterepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) ResolveConflicts(stream gitalypb.ConflictsService_ResolveConflictsServer) error { diff --git a/internal/gitaly/service/conflicts/resolve_conflicts_test.go b/internal/gitaly/service/conflicts/resolve_conflicts_test.go index dc4f5e15bb..52f411b29b 100644 --- a/internal/gitaly/service/conflicts/resolve_conflicts_test.go +++ b/internal/gitaly/service/conflicts/resolve_conflicts_test.go @@ -9,17 +9,17 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/metadata" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/internal/gitaly/service/conflicts/server.go b/internal/gitaly/service/conflicts/server.go index a1178a071a..777bfbd662 100644 --- a/internal/gitaly/service/conflicts/server.go +++ b/internal/gitaly/service/conflicts/server.go @@ -3,17 +3,17 @@ package conflicts import ( "context" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/quarantine" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/quarantine" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) type server struct { diff --git a/internal/gitaly/service/conflicts/testhelper_test.go b/internal/gitaly/service/conflicts/testhelper_test.go index 382c2f39af..0695e99819 100644 --- a/internal/gitaly/service/conflicts/testhelper_test.go +++ b/internal/gitaly/service/conflicts/testhelper_test.go @@ -3,17 +3,17 @@ package conflicts import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/commit" - hookservice "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/repository" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/ssh" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/commit" + hookservice "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/repository" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/ssh" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) diff --git a/internal/gitaly/service/dependencies.go b/internal/gitaly/service/dependencies.go index 800f902d5a..a9ed08537e 100644 --- a/internal/gitaly/service/dependencies.go +++ b/internal/gitaly/service/dependencies.go @@ -1,29 +1,29 @@ package service import ( - "gitlab.com/gitlab-org/gitaly/v16/internal/backup" - "gitlab.com/gitlab-org/gitaly/v16/internal/bundleuri" - "gitlab.com/gitlab-org/gitaly/v16/internal/cache" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - housekeepingmgr "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping/manager" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - gitalyhook "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/counter" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/raftmgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/migration" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitlab" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/limithandler" - "gitlab.com/gitlab-org/gitaly/v16/internal/limiter" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/streamcache" + "gitlab.com/gitlab-org/gitaly/v17/internal/backup" + "gitlab.com/gitlab-org/gitaly/v17/internal/bundleuri" + "gitlab.com/gitlab-org/gitaly/v17/internal/cache" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + housekeepingmgr "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping/manager" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + gitalyhook "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/counter" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/raftmgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/migration" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitlab" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/middleware/limithandler" + "gitlab.com/gitlab-org/gitaly/v17/internal/limiter" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/streamcache" ) // Dependencies assembles set of components required by different kinds of services. diff --git a/internal/gitaly/service/diff/commit_delta.go b/internal/gitaly/service/diff/commit_delta.go index 213763ec1b..a556c0626b 100644 --- a/internal/gitaly/service/diff/commit_delta.go +++ b/internal/gitaly/service/diff/commit_delta.go @@ -3,11 +3,11 @@ package diff import ( "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/diff" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/diff" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) CommitDelta(in *gitalypb.CommitDeltaRequest, stream gitalypb.DiffService_CommitDeltaServer) error { diff --git a/internal/gitaly/service/diff/commit_delta_test.go b/internal/gitaly/service/diff/commit_delta_test.go index 64b8ffce00..244d1c2323 100644 --- a/internal/gitaly/service/diff/commit_delta_test.go +++ b/internal/gitaly/service/diff/commit_delta_test.go @@ -6,11 +6,11 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestCommitDelta_successful(t *testing.T) { diff --git a/internal/gitaly/service/diff/commit_diff.go b/internal/gitaly/service/diff/commit_diff.go index 505ab230ad..77b9980683 100644 --- a/internal/gitaly/service/diff/commit_diff.go +++ b/internal/gitaly/service/diff/commit_diff.go @@ -3,11 +3,11 @@ package diff import ( "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/diff" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/diff" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) CommitDiff(in *gitalypb.CommitDiffRequest, stream gitalypb.DiffService_CommitDiffServer) error { diff --git a/internal/gitaly/service/diff/commit_diff_test.go b/internal/gitaly/service/diff/commit_diff_test.go index a95f468015..e6180232b5 100644 --- a/internal/gitaly/service/diff/commit_diff_test.go +++ b/internal/gitaly/service/diff/commit_diff_test.go @@ -7,12 +7,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/diff" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/diff" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestCommitDiff(t *testing.T) { diff --git a/internal/gitaly/service/diff/diff_blobs.go b/internal/gitaly/service/diff/diff_blobs.go index bb9dfac14c..d767eb8216 100644 --- a/internal/gitaly/service/diff/diff_blobs.go +++ b/internal/gitaly/service/diff/diff_blobs.go @@ -7,14 +7,14 @@ import ( "fmt" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/quarantine" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/diff" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/quarantine" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/diff" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) DiffBlobs(request *gitalypb.DiffBlobsRequest, stream gitalypb.DiffService_DiffBlobsServer) error { diff --git a/internal/gitaly/service/diff/diff_blobs_test.go b/internal/gitaly/service/diff/diff_blobs_test.go index ed734f2cf5..fabf94c3ba 100644 --- a/internal/gitaly/service/diff/diff_blobs_test.go +++ b/internal/gitaly/service/diff/diff_blobs_test.go @@ -8,10 +8,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestDiffBlobs(t *testing.T) { diff --git a/internal/gitaly/service/diff/find_changed_paths.go b/internal/gitaly/service/diff/find_changed_paths.go index 830f5698a1..f0fc336055 100644 --- a/internal/gitaly/service/diff/find_changed_paths.go +++ b/internal/gitaly/service/diff/find_changed_paths.go @@ -10,12 +10,12 @@ import ( "strconv" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/proto" ) diff --git a/internal/gitaly/service/diff/find_changed_paths_test.go b/internal/gitaly/service/diff/find_changed_paths_test.go index ce48979626..019d624fc2 100644 --- a/internal/gitaly/service/diff/find_changed_paths_test.go +++ b/internal/gitaly/service/diff/find_changed_paths_test.go @@ -6,11 +6,11 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) type commitRequest struct { diff --git a/internal/gitaly/service/diff/numstat.go b/internal/gitaly/service/diff/numstat.go index dc4ad9633e..9f010f71fc 100644 --- a/internal/gitaly/service/diff/numstat.go +++ b/internal/gitaly/service/diff/numstat.go @@ -4,10 +4,10 @@ import ( "errors" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/diff" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/diff" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) var maxNumStatBatchSize = 1000 diff --git a/internal/gitaly/service/diff/numstat_test.go b/internal/gitaly/service/diff/numstat_test.go index 45703981aa..0a3663f53c 100644 --- a/internal/gitaly/service/diff/numstat_test.go +++ b/internal/gitaly/service/diff/numstat_test.go @@ -6,11 +6,11 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestDiffStats_successful(t *testing.T) { diff --git a/internal/gitaly/service/diff/patch_id.go b/internal/gitaly/service/diff/patch_id.go index f280291566..fda89e95a4 100644 --- a/internal/gitaly/service/diff/patch_id.go +++ b/internal/gitaly/service/diff/patch_id.go @@ -5,11 +5,11 @@ import ( "errors" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) GetPatchID(ctx context.Context, in *gitalypb.GetPatchIDRequest) (*gitalypb.GetPatchIDResponse, error) { diff --git a/internal/gitaly/service/diff/patch_id_test.go b/internal/gitaly/service/diff/patch_id_test.go index 0daecc444b..43570ea812 100644 --- a/internal/gitaly/service/diff/patch_id_test.go +++ b/internal/gitaly/service/diff/patch_id_test.go @@ -7,12 +7,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestGetPatchID(t *testing.T) { diff --git a/internal/gitaly/service/diff/range_diff.go b/internal/gitaly/service/diff/range_diff.go index 04b0a69fe5..2b26755bef 100644 --- a/internal/gitaly/service/diff/range_diff.go +++ b/internal/gitaly/service/diff/range_diff.go @@ -6,12 +6,12 @@ import ( "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" log "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/rangediff" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/rangediff" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) RangeDiff(in *gitalypb.RangeDiffRequest, stream gitalypb.DiffService_RangeDiffServer) error { diff --git a/internal/gitaly/service/diff/range_diff_test.go b/internal/gitaly/service/diff/range_diff_test.go index 9c5024553d..1b97f88abb 100644 --- a/internal/gitaly/service/diff/range_diff_test.go +++ b/internal/gitaly/service/diff/range_diff_test.go @@ -12,12 +12,12 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/rangediff" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/rangediff" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestRangeDiff_successful(t *testing.T) { diff --git a/internal/gitaly/service/diff/raw.go b/internal/gitaly/service/diff/raw.go index 6951222ca7..aaa320883b 100644 --- a/internal/gitaly/service/diff/raw.go +++ b/internal/gitaly/service/diff/raw.go @@ -5,10 +5,10 @@ import ( "context" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) func (s *server) RawDiff(in *gitalypb.RawDiffRequest, stream gitalypb.DiffService_RawDiffServer) error { diff --git a/internal/gitaly/service/diff/raw_range_diff.go b/internal/gitaly/service/diff/raw_range_diff.go index c4eb6492d2..7ea34f6465 100644 --- a/internal/gitaly/service/diff/raw_range_diff.go +++ b/internal/gitaly/service/diff/raw_range_diff.go @@ -7,12 +7,12 @@ import ( "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" log "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) func (s *server) RawRangeDiff(in *gitalypb.RawRangeDiffRequest, stream gitalypb.DiffService_RawRangeDiffServer) error { diff --git a/internal/gitaly/service/diff/raw_range_diff_test.go b/internal/gitaly/service/diff/raw_range_diff_test.go index 8c7bc40e80..8ac4b66fd4 100644 --- a/internal/gitaly/service/diff/raw_range_diff_test.go +++ b/internal/gitaly/service/diff/raw_range_diff_test.go @@ -7,12 +7,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) func TestRawRawRangeDiff_successful(t *testing.T) { diff --git a/internal/gitaly/service/diff/raw_test.go b/internal/gitaly/service/diff/raw_test.go index 43ef42b733..018f9f214f 100644 --- a/internal/gitaly/service/diff/raw_test.go +++ b/internal/gitaly/service/diff/raw_test.go @@ -6,12 +6,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) func TestRawDiff_successful(t *testing.T) { diff --git a/internal/gitaly/service/diff/server.go b/internal/gitaly/service/diff/server.go index e5c01afc80..f299c552fb 100644 --- a/internal/gitaly/service/diff/server.go +++ b/internal/gitaly/service/diff/server.go @@ -1,13 +1,13 @@ package diff import ( - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) const msgSizeThreshold = 5 * 1024 diff --git a/internal/gitaly/service/diff/testhelper_test.go b/internal/gitaly/service/diff/testhelper_test.go index 7aa383966d..7a933b095b 100644 --- a/internal/gitaly/service/diff/testhelper_test.go +++ b/internal/gitaly/service/diff/testhelper_test.go @@ -4,13 +4,13 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/repository" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/repository" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) diff --git a/internal/gitaly/service/diff/utils.go b/internal/gitaly/service/diff/utils.go index b93c01f1f2..231643ca7b 100644 --- a/internal/gitaly/service/diff/utils.go +++ b/internal/gitaly/service/diff/utils.go @@ -5,12 +5,12 @@ import ( "errors" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/diff" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/diff" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) type requestWithLeftRightCommitIDs interface { diff --git a/internal/gitaly/service/hook/pack_objects.go b/internal/gitaly/service/hook/pack_objects.go index 9672890ab9..2d858f10c9 100644 --- a/internal/gitaly/service/hook/pack_objects.go +++ b/internal/gitaly/service/hook/pack_objects.go @@ -17,15 +17,15 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/pktline" - gitalyhook "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/stream" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/pktline" + gitalyhook "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/stream" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/encoding/protojson" ) diff --git a/internal/gitaly/service/hook/pack_objects_test.go b/internal/gitaly/service/hook/pack_objects_test.go index 694cf5707f..8eebe3828b 100644 --- a/internal/gitaly/service/hook/pack_objects_test.go +++ b/internal/gitaly/service/hook/pack_objects_test.go @@ -17,21 +17,21 @@ import ( "github.com/prometheus/client_golang/prometheus/testutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/pktline" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - hookPkg "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/limiter" - "gitlab.com/gitlab-org/gitaly/v16/internal/streamcache" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + hookPkg "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/limiter" + "gitlab.com/gitlab-org/gitaly/v17/internal/streamcache" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/hook/post_receive.go b/internal/gitaly/service/hook/post_receive.go index 8ad8154774..35f9899f34 100644 --- a/internal/gitaly/service/hook/post_receive.go +++ b/internal/gitaly/service/hook/post_receive.go @@ -7,10 +7,10 @@ import ( "os/exec" "sync" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) func postReceiveHookResponse(stream gitalypb.HookService_PostReceiveHookServer, code int32, stderr string) error { diff --git a/internal/gitaly/service/hook/post_receive_test.go b/internal/gitaly/service/hook/post_receive_test.go index 5ed1144a59..0ba3b9bcf8 100644 --- a/internal/gitaly/service/hook/post_receive_test.go +++ b/internal/gitaly/service/hook/post_receive_test.go @@ -9,22 +9,22 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitlab" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/prometheus" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitlab" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) func TestPostReceiveInvalidArgument(t *testing.T) { diff --git a/internal/gitaly/service/hook/pre_receive.go b/internal/gitaly/service/hook/pre_receive.go index 4062546dc2..515d67df53 100644 --- a/internal/gitaly/service/hook/pre_receive.go +++ b/internal/gitaly/service/hook/pre_receive.go @@ -7,10 +7,10 @@ import ( "os/exec" "sync" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) func (s *server) PreReceiveHook(stream gitalypb.HookService_PreReceiveHookServer) error { diff --git a/internal/gitaly/service/hook/pre_receive_test.go b/internal/gitaly/service/hook/pre_receive_test.go index b0d50c11a8..76b0b3449e 100644 --- a/internal/gitaly/service/hook/pre_receive_test.go +++ b/internal/gitaly/service/hook/pre_receive_test.go @@ -12,23 +12,23 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitlab" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/prometheus" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitlab" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" "google.golang.org/grpc/metadata" ) diff --git a/internal/gitaly/service/hook/proc_receive.go b/internal/gitaly/service/hook/proc_receive.go index 9e8906479f..4786a7e71b 100644 --- a/internal/gitaly/service/hook/proc_receive.go +++ b/internal/gitaly/service/hook/proc_receive.go @@ -4,10 +4,10 @@ import ( "fmt" "sync" - gitalyhook "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + gitalyhook "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) func sendProcReceiveHookResponse(stream gitalypb.HookService_ProcReceiveHookServer, code int32, stderr string) error { diff --git a/internal/gitaly/service/hook/proc_receive_test.go b/internal/gitaly/service/hook/proc_receive_test.go index e08d6531d0..9e8610e503 100644 --- a/internal/gitaly/service/hook/proc_receive_test.go +++ b/internal/gitaly/service/hook/proc_receive_test.go @@ -8,17 +8,17 @@ import ( "testing" "github.com/stretchr/testify/assert" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/pktline" - gitalyhook "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/pktline" + gitalyhook "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestProcReceiveHook(t *testing.T) { diff --git a/internal/gitaly/service/hook/reference_transaction.go b/internal/gitaly/service/hook/reference_transaction.go index 410e3b0a89..7d9a3a5968 100644 --- a/internal/gitaly/service/hook/reference_transaction.go +++ b/internal/gitaly/service/hook/reference_transaction.go @@ -4,12 +4,12 @@ import ( "context" "errors" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) func validateReferenceTransactionHookRequest(ctx context.Context, locator storage.Locator, in *gitalypb.ReferenceTransactionHookRequest) error { diff --git a/internal/gitaly/service/hook/reference_transaction_test.go b/internal/gitaly/service/hook/reference_transaction_test.go index 486bc9f780..29bca5f173 100644 --- a/internal/gitaly/service/hook/reference_transaction_test.go +++ b/internal/gitaly/service/hook/reference_transaction_test.go @@ -8,18 +8,18 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) diff --git a/internal/gitaly/service/hook/server.go b/internal/gitaly/service/hook/server.go index 26f3ee5f02..a55df2881b 100644 --- a/internal/gitaly/service/hook/server.go +++ b/internal/gitaly/service/hook/server.go @@ -4,15 +4,15 @@ import ( "context" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - gitalyhook "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/limiter" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/streamcache" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + gitalyhook "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/limiter" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/streamcache" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) type server struct { diff --git a/internal/gitaly/service/hook/testhelper_test.go b/internal/gitaly/service/hook/testhelper_test.go index da46b90fd9..2ca134483c 100644 --- a/internal/gitaly/service/hook/testhelper_test.go +++ b/internal/gitaly/service/hook/testhelper_test.go @@ -3,16 +3,16 @@ package hook import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - gitalyhook "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/repository" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + gitalyhook "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/repository" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) diff --git a/internal/gitaly/service/hook/update.go b/internal/gitaly/service/hook/update.go index 9147d12acb..86b7636007 100644 --- a/internal/gitaly/service/hook/update.go +++ b/internal/gitaly/service/hook/update.go @@ -6,10 +6,10 @@ import ( "os/exec" "sync" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) func validateUpdateHookRequest(ctx context.Context, locator storage.Locator, in *gitalypb.UpdateHookRequest) error { diff --git a/internal/gitaly/service/hook/update_test.go b/internal/gitaly/service/hook/update_test.go index 1a9226bce4..e83156d1e2 100644 --- a/internal/gitaly/service/hook/update_test.go +++ b/internal/gitaly/service/hook/update_test.go @@ -10,15 +10,15 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestUpdateInvalidArgument(t *testing.T) { diff --git a/internal/gitaly/service/internalgitaly/server.go b/internal/gitaly/service/internalgitaly/server.go index a275ae252c..7aa41c6769 100644 --- a/internal/gitaly/service/internalgitaly/server.go +++ b/internal/gitaly/service/internalgitaly/server.go @@ -1,11 +1,11 @@ package internalgitaly import ( - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) type server struct { diff --git a/internal/gitaly/service/internalgitaly/testhelper_test.go b/internal/gitaly/service/internalgitaly/testhelper_test.go index 995360d811..48d02f7019 100644 --- a/internal/gitaly/service/internalgitaly/testhelper_test.go +++ b/internal/gitaly/service/internalgitaly/testhelper_test.go @@ -4,11 +4,11 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) diff --git a/internal/gitaly/service/internalgitaly/walkrepos.go b/internal/gitaly/service/internalgitaly/walkrepos.go index e0e90fe9a9..d416186050 100644 --- a/internal/gitaly/service/internalgitaly/walkrepos.go +++ b/internal/gitaly/service/internalgitaly/walkrepos.go @@ -3,9 +3,9 @@ package internalgitaly import ( "io/fs" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/walk" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/walk" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/internal/gitaly/service/internalgitaly/walkrepos_test.go b/internal/gitaly/service/internalgitaly/walkrepos_test.go index c67a18c921..71768df131 100644 --- a/internal/gitaly/service/internalgitaly/walkrepos_test.go +++ b/internal/gitaly/service/internalgitaly/walkrepos_test.go @@ -10,14 +10,14 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) type serverWrapper struct { diff --git a/internal/gitaly/service/objectpool/alternates.go b/internal/gitaly/service/objectpool/alternates.go index 34c2b6d8c3..5a66b95087 100644 --- a/internal/gitaly/service/objectpool/alternates.go +++ b/internal/gitaly/service/objectpool/alternates.go @@ -4,10 +4,10 @@ import ( "context" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/objectpool" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/objectpool" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // DisconnectGitAlternates is a slightly dangerous RPC. It optimistically hard-links all alternate diff --git a/internal/gitaly/service/objectpool/alternates_test.go b/internal/gitaly/service/objectpool/alternates_test.go index e4443cd6ea..0a4a8818ca 100644 --- a/internal/gitaly/service/objectpool/alternates_test.go +++ b/internal/gitaly/service/objectpool/alternates_test.go @@ -5,13 +5,13 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestDisconnectGitAlternates(t *testing.T) { diff --git a/internal/gitaly/service/objectpool/create.go b/internal/gitaly/service/objectpool/create.go index bcec11a9a8..0082061e82 100644 --- a/internal/gitaly/service/objectpool/create.go +++ b/internal/gitaly/service/objectpool/create.go @@ -3,11 +3,11 @@ package objectpool import ( "context" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/objectpool" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/repoutil" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/objectpool" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/repoutil" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // errMissingOriginRepository is returned when the request is missing the diff --git a/internal/gitaly/service/objectpool/create_test.go b/internal/gitaly/service/objectpool/create_test.go index a8e82f790f..16ff0d50e1 100644 --- a/internal/gitaly/service/objectpool/create_test.go +++ b/internal/gitaly/service/objectpool/create_test.go @@ -8,22 +8,22 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - housekeepingmgr "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping/manager" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/objectpool" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/transactiontest" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + housekeepingmgr "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping/manager" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/objectpool" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/transactiontest" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestCreate(t *testing.T) { diff --git a/internal/gitaly/service/objectpool/delete.go b/internal/gitaly/service/objectpool/delete.go index e7bc8b31b1..92b5b8a47f 100644 --- a/internal/gitaly/service/objectpool/delete.go +++ b/internal/gitaly/service/objectpool/delete.go @@ -5,11 +5,11 @@ import ( "errors" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/objectpool" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/repoutil" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/objectpool" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/repoutil" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) DeleteObjectPool(ctx context.Context, in *gitalypb.DeleteObjectPoolRequest) (*gitalypb.DeleteObjectPoolResponse, error) { diff --git a/internal/gitaly/service/objectpool/delete_test.go b/internal/gitaly/service/objectpool/delete_test.go index d9a0b2769d..3915b4e448 100644 --- a/internal/gitaly/service/objectpool/delete_test.go +++ b/internal/gitaly/service/objectpool/delete_test.go @@ -8,12 +8,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/objectpool/fetch_into_object_pool.go b/internal/gitaly/service/objectpool/fetch_into_object_pool.go index e2445394a4..49e95b10c6 100644 --- a/internal/gitaly/service/objectpool/fetch_into_object_pool.go +++ b/internal/gitaly/service/objectpool/fetch_into_object_pool.go @@ -5,12 +5,12 @@ import ( "errors" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/objectpool" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/objectpool" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) FetchIntoObjectPool(ctx context.Context, req *gitalypb.FetchIntoObjectPoolRequest) (*gitalypb.FetchIntoObjectPoolResponse, error) { diff --git a/internal/gitaly/service/objectpool/fetch_into_object_pool_test.go b/internal/gitaly/service/objectpool/fetch_into_object_pool_test.go index 145edb0e80..e2414b9430 100644 --- a/internal/gitaly/service/objectpool/fetch_into_object_pool_test.go +++ b/internal/gitaly/service/objectpool/fetch_into_object_pool_test.go @@ -11,19 +11,19 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/credentials/insecure" diff --git a/internal/gitaly/service/objectpool/get.go b/internal/gitaly/service/objectpool/get.go index 4ae326fffc..3a9e2ab1cb 100644 --- a/internal/gitaly/service/objectpool/get.go +++ b/internal/gitaly/service/objectpool/get.go @@ -4,10 +4,10 @@ import ( "context" "errors" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/objectpool" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/objectpool" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) GetObjectPool(ctx context.Context, in *gitalypb.GetObjectPoolRequest) (*gitalypb.GetObjectPoolResponse, error) { diff --git a/internal/gitaly/service/objectpool/get_test.go b/internal/gitaly/service/objectpool/get_test.go index 5b2dfc9c17..6e48eb76df 100644 --- a/internal/gitaly/service/objectpool/get_test.go +++ b/internal/gitaly/service/objectpool/get_test.go @@ -6,12 +6,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestGetObjectPoolSuccess(t *testing.T) { diff --git a/internal/gitaly/service/objectpool/link.go b/internal/gitaly/service/objectpool/link.go index 236ab6906c..b86d2c04dc 100644 --- a/internal/gitaly/service/objectpool/link.go +++ b/internal/gitaly/service/objectpool/link.go @@ -3,8 +3,8 @@ package objectpool import ( "context" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) LinkRepositoryToObjectPool(ctx context.Context, req *gitalypb.LinkRepositoryToObjectPoolRequest) (*gitalypb.LinkRepositoryToObjectPoolResponse, error) { diff --git a/internal/gitaly/service/objectpool/link_test.go b/internal/gitaly/service/objectpool/link_test.go index 76a53a7804..8cfd2da6af 100644 --- a/internal/gitaly/service/objectpool/link_test.go +++ b/internal/gitaly/service/objectpool/link_test.go @@ -6,16 +6,16 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestCompleteForkCreationFlow(t *testing.T) { diff --git a/internal/gitaly/service/objectpool/server.go b/internal/gitaly/service/objectpool/server.go index 0ebaf184d1..aa03690f10 100644 --- a/internal/gitaly/service/objectpool/server.go +++ b/internal/gitaly/service/objectpool/server.go @@ -1,17 +1,17 @@ package objectpool import ( - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - housekeepingmgr "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping/manager" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/counter" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/migration" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + housekeepingmgr "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping/manager" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/counter" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/migration" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) type server struct { diff --git a/internal/gitaly/service/objectpool/testhelper_test.go b/internal/gitaly/service/objectpool/testhelper_test.go index e608278bbf..b3a7736583 100644 --- a/internal/gitaly/service/objectpool/testhelper_test.go +++ b/internal/gitaly/service/objectpool/testhelper_test.go @@ -5,24 +5,24 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - housekeepingmgr "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping/manager" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/objectpool" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/commit" - hookservice "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/repository" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/ssh" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/transactiontest" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + housekeepingmgr "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping/manager" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/objectpool" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/commit" + hookservice "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/repository" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/ssh" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/transactiontest" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" ) diff --git a/internal/gitaly/service/objectpool/util.go b/internal/gitaly/service/objectpool/util.go index 3770a57cc8..44b5a07231 100644 --- a/internal/gitaly/service/objectpool/util.go +++ b/internal/gitaly/service/objectpool/util.go @@ -4,9 +4,9 @@ import ( "context" "errors" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/objectpool" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/objectpool" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) var ( diff --git a/internal/gitaly/service/operations/apply_patch.go b/internal/gitaly/service/operations/apply_patch.go index 196acd4f75..1e618409ea 100644 --- a/internal/gitaly/service/operations/apply_patch.go +++ b/internal/gitaly/service/operations/apply_patch.go @@ -9,15 +9,15 @@ import ( "path/filepath" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) var errNoDefaultBranch = errors.New("no default branch") diff --git a/internal/gitaly/service/operations/apply_patch_test.go b/internal/gitaly/service/operations/apply_patch_test.go index 7427a6a80a..4a9347aa21 100644 --- a/internal/gitaly/service/operations/apply_patch_test.go +++ b/internal/gitaly/service/operations/apply_patch_test.go @@ -9,19 +9,19 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/peer" "google.golang.org/grpc/status" diff --git a/internal/gitaly/service/operations/cherry_pick.go b/internal/gitaly/service/operations/cherry_pick.go index dbd12c8116..dfdb40be65 100644 --- a/internal/gitaly/service/operations/cherry_pick.go +++ b/internal/gitaly/service/operations/cherry_pick.go @@ -7,11 +7,11 @@ import ( "strings" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // UserCherryPick tries to perform a cherry-pick of a given commit onto a diff --git a/internal/gitaly/service/operations/cherry_pick_test.go b/internal/gitaly/service/operations/cherry_pick_test.go index 5b963ad352..1c72f11e0f 100644 --- a/internal/gitaly/service/operations/cherry_pick_test.go +++ b/internal/gitaly/service/operations/cherry_pick_test.go @@ -8,19 +8,19 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/signature" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/signature" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/timestamppb" diff --git a/internal/gitaly/service/operations/commit_files.go b/internal/gitaly/service/operations/commit_files.go index 8e29c6717b..8250087839 100644 --- a/internal/gitaly/service/operations/commit_files.go +++ b/internal/gitaly/service/operations/commit_files.go @@ -10,15 +10,15 @@ import ( "path/filepath" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/remoterepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/remoterepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // unknownIndexError is an unspecified error that was produced by performing an invalid operation on the index. diff --git a/internal/gitaly/service/operations/commit_files_test.go b/internal/gitaly/service/operations/commit_files_test.go index e4f7dcf568..19d1d15c8e 100644 --- a/internal/gitaly/service/operations/commit_files_test.go +++ b/internal/gitaly/service/operations/commit_files_test.go @@ -13,19 +13,19 @@ import ( "github.com/ProtonMail/go-crypto/openpgp" "github.com/ProtonMail/go-crypto/openpgp/packet" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/signature" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/signature" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/metadata" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/internal/gitaly/service/operations/ff_branch.go b/internal/gitaly/service/operations/ff_branch.go index e78c8c5e00..592b5e3d2b 100644 --- a/internal/gitaly/service/operations/ff_branch.go +++ b/internal/gitaly/service/operations/ff_branch.go @@ -5,11 +5,11 @@ import ( "errors" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // UserFFBranch tries to perform a fast-forward merge of a given commit into the given branch. diff --git a/internal/gitaly/service/operations/ff_branch_test.go b/internal/gitaly/service/operations/ff_branch_test.go index 4885347545..3ca4f92a9a 100644 --- a/internal/gitaly/service/operations/ff_branch_test.go +++ b/internal/gitaly/service/operations/ff_branch_test.go @@ -5,13 +5,13 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb/testproto" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb/testproto" ) func TestUserFFBranch(t *testing.T) { diff --git a/internal/gitaly/service/operations/merge_branch.go b/internal/gitaly/service/operations/merge_branch.go index d8066d1257..6fc4df9e96 100644 --- a/internal/gitaly/service/operations/merge_branch.go +++ b/internal/gitaly/service/operations/merge_branch.go @@ -5,14 +5,14 @@ import ( "errors" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/conflict/refdb" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/conflict/refdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // UserMergeBranch is a two stage streaming RPC that will merge two commits together and diff --git a/internal/gitaly/service/operations/merge_branch_test.go b/internal/gitaly/service/operations/merge_branch_test.go index efb709d035..571d7a0201 100644 --- a/internal/gitaly/service/operations/merge_branch_test.go +++ b/internal/gitaly/service/operations/merge_branch_test.go @@ -13,24 +13,24 @@ import ( "github.com/ProtonMail/go-crypto/openpgp" "github.com/ProtonMail/go-crypto/openpgp/packet" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitlab" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/signature" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb/testproto" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitlab" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/signature" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb/testproto" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/internal/gitaly/service/operations/merge_to_ref.go b/internal/gitaly/service/operations/merge_to_ref.go index 3b01b3d645..ef17710358 100644 --- a/internal/gitaly/service/operations/merge_to_ref.go +++ b/internal/gitaly/service/operations/merge_to_ref.go @@ -6,11 +6,11 @@ import ( "fmt" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // UserMergeToRef overwrites the given TargetRef to point to either Branch or diff --git a/internal/gitaly/service/operations/merge_to_ref_test.go b/internal/gitaly/service/operations/merge_to_ref_test.go index 486ebc7736..770833d0a3 100644 --- a/internal/gitaly/service/operations/merge_to_ref_test.go +++ b/internal/gitaly/service/operations/merge_to_ref_test.go @@ -6,13 +6,13 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/internal/gitaly/service/operations/merge_utils.go b/internal/gitaly/service/operations/merge_utils.go index 77c6c9c2a0..501f6c0d52 100644 --- a/internal/gitaly/service/operations/merge_utils.go +++ b/internal/gitaly/service/operations/merge_utils.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" ) func (s *Server) merge( diff --git a/internal/gitaly/service/operations/rebase_confirmable.go b/internal/gitaly/service/operations/rebase_confirmable.go index 0f4a1d0301..d4a19a3814 100644 --- a/internal/gitaly/service/operations/rebase_confirmable.go +++ b/internal/gitaly/service/operations/rebase_confirmable.go @@ -6,12 +6,12 @@ import ( "fmt" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // UserRebaseConfirmable rebases the given remote branch to the target branch. diff --git a/internal/gitaly/service/operations/rebase_confirmable_test.go b/internal/gitaly/service/operations/rebase_confirmable_test.go index f405506091..b4984282da 100644 --- a/internal/gitaly/service/operations/rebase_confirmable_test.go +++ b/internal/gitaly/service/operations/rebase_confirmable_test.go @@ -7,19 +7,19 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/timestamppb" diff --git a/internal/gitaly/service/operations/rebase_to_ref.go b/internal/gitaly/service/operations/rebase_to_ref.go index ddb8fde176..87619760d4 100644 --- a/internal/gitaly/service/operations/rebase_to_ref.go +++ b/internal/gitaly/service/operations/rebase_to_ref.go @@ -4,10 +4,10 @@ import ( "context" "errors" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // UserRebaseToRef overwrites the given TargetRef with the result of rebasing diff --git a/internal/gitaly/service/operations/rebase_to_ref_test.go b/internal/gitaly/service/operations/rebase_to_ref_test.go index 6362c6e1a6..84be3554e9 100644 --- a/internal/gitaly/service/operations/rebase_to_ref_test.go +++ b/internal/gitaly/service/operations/rebase_to_ref_test.go @@ -7,14 +7,14 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/internal/gitaly/service/operations/revert.go b/internal/gitaly/service/operations/revert.go index 760e625eb7..69575be259 100644 --- a/internal/gitaly/service/operations/revert.go +++ b/internal/gitaly/service/operations/revert.go @@ -5,13 +5,13 @@ import ( "errors" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/remoterepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/remoterepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) //nolint:revive // This is unintentionally missing documentation. diff --git a/internal/gitaly/service/operations/revert_test.go b/internal/gitaly/service/operations/revert_test.go index b1bf1a7303..69cbd83d8b 100644 --- a/internal/gitaly/service/operations/revert_test.go +++ b/internal/gitaly/service/operations/revert_test.go @@ -7,18 +7,18 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/signature" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/signature" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/timestamppb" diff --git a/internal/gitaly/service/operations/server.go b/internal/gitaly/service/operations/server.go index 2842fb3aa8..ecf3e5fe9e 100644 --- a/internal/gitaly/service/operations/server.go +++ b/internal/gitaly/service/operations/server.go @@ -3,19 +3,19 @@ package operations import ( "context" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/quarantine" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/quarantine" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) //nolint:revive // This is unintentionally missing documentation. diff --git a/internal/gitaly/service/operations/squash.go b/internal/gitaly/service/operations/squash.go index afd80cd6c8..29e9af0f8f 100644 --- a/internal/gitaly/service/operations/squash.go +++ b/internal/gitaly/service/operations/squash.go @@ -6,13 +6,13 @@ import ( "strings" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // UserSquash collapses a range of commits identified via a start and end revision into a single diff --git a/internal/gitaly/service/operations/squash_test.go b/internal/gitaly/service/operations/squash_test.go index 327f445bb1..84224ce03d 100644 --- a/internal/gitaly/service/operations/squash_test.go +++ b/internal/gitaly/service/operations/squash_test.go @@ -8,22 +8,22 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/signature" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/signature" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/timestamppb" diff --git a/internal/gitaly/service/operations/submodules.go b/internal/gitaly/service/operations/submodules.go index cdf9cfce26..5ee01580c2 100644 --- a/internal/gitaly/service/operations/submodules.go +++ b/internal/gitaly/service/operations/submodules.go @@ -6,12 +6,12 @@ import ( "fmt" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // Error strings present in the legacy Ruby implementation. diff --git a/internal/gitaly/service/operations/submodules_test.go b/internal/gitaly/service/operations/submodules_test.go index ae14396a77..82dd0da45e 100644 --- a/internal/gitaly/service/operations/submodules_test.go +++ b/internal/gitaly/service/operations/submodules_test.go @@ -8,14 +8,14 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestUserUpdateSubmodule(t *testing.T) { diff --git a/internal/gitaly/service/operations/tags.go b/internal/gitaly/service/operations/tags.go index 604299bc24..5782133746 100644 --- a/internal/gitaly/service/operations/tags.go +++ b/internal/gitaly/service/operations/tags.go @@ -7,14 +7,14 @@ import ( "fmt" "regexp" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func validateUserDeleteTagRequest(ctx context.Context, locator storage.Locator, in *gitalypb.UserDeleteTagRequest) error { diff --git a/internal/gitaly/service/operations/tags_test.go b/internal/gitaly/service/operations/tags_test.go index d1e2390ee4..45f4d016c5 100644 --- a/internal/gitaly/service/operations/tags_test.go +++ b/internal/gitaly/service/operations/tags_test.go @@ -8,19 +8,19 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/internal/gitaly/service/operations/testhelper_test.go b/internal/gitaly/service/operations/testhelper_test.go index a7037dd9f1..3915c1f63c 100644 --- a/internal/gitaly/service/operations/testhelper_test.go +++ b/internal/gitaly/service/operations/testhelper_test.go @@ -5,22 +5,22 @@ import ( "testing" "github.com/stretchr/testify/require" - gitalyauth "gitlab.com/gitlab-org/gitaly/v16/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/blob" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/commit" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/ref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/repository" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/ssh" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitlab" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + gitalyauth "gitlab.com/gitlab-org/gitaly/v17/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/blob" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/commit" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/ref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/repository" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/ssh" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitlab" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" "google.golang.org/protobuf/proto" diff --git a/internal/gitaly/service/operations/update_with_hooks.go b/internal/gitaly/service/operations/update_with_hooks.go index 73df5e1532..bb8de316b3 100644 --- a/internal/gitaly/service/operations/update_with_hooks.go +++ b/internal/gitaly/service/operations/update_with_hooks.go @@ -3,9 +3,9 @@ package operations import ( "context" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/quarantine" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/quarantine" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *Server) updateReferenceWithHooks( diff --git a/internal/gitaly/service/operations/user_create_branch.go b/internal/gitaly/service/operations/user_create_branch.go index 5210f44549..9951c03ad4 100644 --- a/internal/gitaly/service/operations/user_create_branch.go +++ b/internal/gitaly/service/operations/user_create_branch.go @@ -5,11 +5,11 @@ import ( "errors" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func validateUserCreateBranchRequest(ctx context.Context, locator storage.Locator, in *gitalypb.UserCreateBranchRequest) error { diff --git a/internal/gitaly/service/operations/user_create_branch_test.go b/internal/gitaly/service/operations/user_create_branch_test.go index 74e4dee909..585bb8a837 100644 --- a/internal/gitaly/service/operations/user_create_branch_test.go +++ b/internal/gitaly/service/operations/user_create_branch_test.go @@ -4,20 +4,20 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/internal/gitaly/service/operations/user_delete_branch.go b/internal/gitaly/service/operations/user_delete_branch.go index 9d18783183..286d0bafaf 100644 --- a/internal/gitaly/service/operations/user_delete_branch.go +++ b/internal/gitaly/service/operations/user_delete_branch.go @@ -5,12 +5,12 @@ import ( "errors" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func validateUserDeleteBranchRequest(ctx context.Context, locator storage.Locator, in *gitalypb.UserDeleteBranchRequest) error { diff --git a/internal/gitaly/service/operations/user_delete_branch_test.go b/internal/gitaly/service/operations/user_delete_branch_test.go index ae1fceb175..e383672d85 100644 --- a/internal/gitaly/service/operations/user_delete_branch_test.go +++ b/internal/gitaly/service/operations/user_delete_branch_test.go @@ -8,22 +8,22 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitlab" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb/testproto" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitlab" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb/testproto" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/internal/gitaly/service/operations/user_update_branch.go b/internal/gitaly/service/operations/user_update_branch.go index 08bc7db1a0..eb7547ef7e 100644 --- a/internal/gitaly/service/operations/user_update_branch.go +++ b/internal/gitaly/service/operations/user_update_branch.go @@ -5,11 +5,11 @@ import ( "errors" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func validateUserUpdateBranchGo(ctx context.Context, locator storage.Locator, req *gitalypb.UserUpdateBranchRequest) error { diff --git a/internal/gitaly/service/operations/user_update_branch_test.go b/internal/gitaly/service/operations/user_update_branch_test.go index 4b111f5ccd..1e2e132533 100644 --- a/internal/gitaly/service/operations/user_update_branch_test.go +++ b/internal/gitaly/service/operations/user_update_branch_test.go @@ -4,12 +4,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestUserUpdateBranch(t *testing.T) { diff --git a/internal/gitaly/service/operations/utils.go b/internal/gitaly/service/operations/utils.go index bd23451985..9464268f72 100644 --- a/internal/gitaly/service/operations/utils.go +++ b/internal/gitaly/service/operations/utils.go @@ -5,10 +5,10 @@ import ( "errors" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) type cherryPickOrRevertRequest interface { diff --git a/internal/gitaly/service/partition/backup_partition.go b/internal/gitaly/service/partition/backup_partition.go index ee7b0826f9..4854bed75e 100644 --- a/internal/gitaly/service/partition/backup_partition.go +++ b/internal/gitaly/service/partition/backup_partition.go @@ -10,12 +10,12 @@ import ( "path/filepath" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/archive" - "gitlab.com/gitlab-org/gitaly/v16/internal/backup" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/archive" + "gitlab.com/gitlab-org/gitaly/v17/internal/backup" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/encoding/protodelim" ) diff --git a/internal/gitaly/service/partition/backup_partition_test.go b/internal/gitaly/service/partition/backup_partition_test.go index 564180929a..6161663b48 100644 --- a/internal/gitaly/service/partition/backup_partition_test.go +++ b/internal/gitaly/service/partition/backup_partition_test.go @@ -12,17 +12,17 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/archive" - "gitlab.com/gitlab-org/gitaly/v16/internal/backup" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/partition" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/archive" + "gitlab.com/gitlab-org/gitaly/v17/internal/backup" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/partition" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/encoding/protodelim" ) diff --git a/internal/gitaly/service/partition/list_partitions.go b/internal/gitaly/service/partition/list_partitions.go index bf2457e237..30a2afe262 100644 --- a/internal/gitaly/service/partition/list_partitions.go +++ b/internal/gitaly/service/partition/list_partitions.go @@ -7,9 +7,9 @@ import ( "fmt" "strconv" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) const invalidPartitionID = storage.PartitionID(0) diff --git a/internal/gitaly/service/partition/list_partitions_test.go b/internal/gitaly/service/partition/list_partitions_test.go index e34605c2d5..5b46cc0c9d 100644 --- a/internal/gitaly/service/partition/list_partitions_test.go +++ b/internal/gitaly/service/partition/list_partitions_test.go @@ -6,12 +6,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestListPartitions(t *testing.T) { diff --git a/internal/gitaly/service/partition/server.go b/internal/gitaly/service/partition/server.go index 65dd2b8871..f7a8e231d5 100644 --- a/internal/gitaly/service/partition/server.go +++ b/internal/gitaly/service/partition/server.go @@ -1,12 +1,12 @@ package partition import ( - "gitlab.com/gitlab-org/gitaly/v16/internal/backup" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/backup" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) type server struct { diff --git a/internal/gitaly/service/partition/testhelper_test.go b/internal/gitaly/service/partition/testhelper_test.go index e020b7e695..1ebfb7cf9d 100644 --- a/internal/gitaly/service/partition/testhelper_test.go +++ b/internal/gitaly/service/partition/testhelper_test.go @@ -4,13 +4,13 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/setup" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/setup" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/service/raft/send_message.go b/internal/gitaly/service/raft/send_message.go index 4dd561dec7..6032279aa4 100644 --- a/internal/gitaly/service/raft/send_message.go +++ b/internal/gitaly/service/raft/send_message.go @@ -4,8 +4,8 @@ import ( "errors" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // SendMessage is a gRPC method for sending a Raft message across nodes. diff --git a/internal/gitaly/service/raft/send_message_test.go b/internal/gitaly/service/raft/send_message_test.go index 3575662707..f81edb8e03 100644 --- a/internal/gitaly/service/raft/send_message_test.go +++ b/internal/gitaly/service/raft/send_message_test.go @@ -5,13 +5,13 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "go.etcd.io/etcd/raft/v3/raftpb" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/internal/gitaly/service/raft/server.go b/internal/gitaly/service/raft/server.go index 8763c735af..fd473fb8bf 100644 --- a/internal/gitaly/service/raft/server.go +++ b/internal/gitaly/service/raft/server.go @@ -1,11 +1,11 @@ package raft import ( - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/raftmgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/raftmgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // Server is a gRPC server for the Raft service. diff --git a/internal/gitaly/service/raft/testhelper_test.go b/internal/gitaly/service/raft/testhelper_test.go index d19eb4461e..553b56a2aa 100644 --- a/internal/gitaly/service/raft/testhelper_test.go +++ b/internal/gitaly/service/raft/testhelper_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" "go.etcd.io/etcd/raft/v3/raftpb" ) diff --git a/internal/gitaly/service/ref/branches.go b/internal/gitaly/service/ref/branches.go index a236125155..3cc522c6b2 100644 --- a/internal/gitaly/service/ref/branches.go +++ b/internal/gitaly/service/ref/branches.go @@ -4,9 +4,9 @@ import ( "context" "errors" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) FindBranch(ctx context.Context, req *gitalypb.FindBranchRequest) (*gitalypb.FindBranchResponse, error) { diff --git a/internal/gitaly/service/ref/branches_test.go b/internal/gitaly/service/ref/branches_test.go index fefbbf6ae6..a96542e31c 100644 --- a/internal/gitaly/service/ref/branches_test.go +++ b/internal/gitaly/service/ref/branches_test.go @@ -4,13 +4,13 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/ref/delete_refs.go b/internal/gitaly/service/ref/delete_refs.go index cdda858970..e05b888010 100644 --- a/internal/gitaly/service/ref/delete_refs.go +++ b/internal/gitaly/service/ref/delete_refs.go @@ -6,15 +6,15 @@ import ( "fmt" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) DeleteRefs(ctx context.Context, in *gitalypb.DeleteRefsRequest) (_ *gitalypb.DeleteRefsResponse, returnedErr error) { diff --git a/internal/gitaly/service/ref/delete_refs_test.go b/internal/gitaly/service/ref/delete_refs_test.go index 2cf7c803a5..3e6382fb6f 100644 --- a/internal/gitaly/service/ref/delete_refs_test.go +++ b/internal/gitaly/service/ref/delete_refs_test.go @@ -4,22 +4,22 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - hookservice "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/repository" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + hookservice "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/repository" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/internal/gitaly/service/ref/find_all_branches.go b/internal/gitaly/service/ref/find_all_branches.go index 77cbc3db70..9c4f2f5a16 100644 --- a/internal/gitaly/service/ref/find_all_branches.go +++ b/internal/gitaly/service/ref/find_all_branches.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) FindAllBranches(in *gitalypb.FindAllBranchesRequest, stream gitalypb.RefService_FindAllBranchesServer) error { diff --git a/internal/gitaly/service/ref/find_all_branches_test.go b/internal/gitaly/service/ref/find_all_branches_test.go index ebe9b82fdd..e8cbfe7001 100644 --- a/internal/gitaly/service/ref/find_all_branches_test.go +++ b/internal/gitaly/service/ref/find_all_branches_test.go @@ -5,12 +5,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestFindAllBranches(t *testing.T) { diff --git a/internal/gitaly/service/ref/find_all_remote_branches.go b/internal/gitaly/service/ref/find_all_remote_branches.go index 772e112ba8..3a7b5a17ef 100644 --- a/internal/gitaly/service/ref/find_all_remote_branches.go +++ b/internal/gitaly/service/ref/find_all_remote_branches.go @@ -6,10 +6,10 @@ import ( "fmt" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) FindAllRemoteBranches(req *gitalypb.FindAllRemoteBranchesRequest, stream gitalypb.RefService_FindAllRemoteBranchesServer) error { diff --git a/internal/gitaly/service/ref/find_all_remote_branches_test.go b/internal/gitaly/service/ref/find_all_remote_branches_test.go index f556457517..2e78a3a0e9 100644 --- a/internal/gitaly/service/ref/find_all_remote_branches_test.go +++ b/internal/gitaly/service/ref/find_all_remote_branches_test.go @@ -4,12 +4,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestFindAllRemoteBranches(t *testing.T) { diff --git a/internal/gitaly/service/ref/find_all_tags.go b/internal/gitaly/service/ref/find_all_tags.go index c85d4a62ec..035f57995e 100644 --- a/internal/gitaly/service/ref/find_all_tags.go +++ b/internal/gitaly/service/ref/find_all_tags.go @@ -7,12 +7,12 @@ import ( "fmt" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitpipe" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitpipe" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/proto" ) diff --git a/internal/gitaly/service/ref/find_all_tags_test.go b/internal/gitaly/service/ref/find_all_tags_test.go index 362c9d14b6..0847c34adf 100644 --- a/internal/gitaly/service/ref/find_all_tags_test.go +++ b/internal/gitaly/service/ref/find_all_tags_test.go @@ -10,15 +10,15 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/internal/gitaly/service/ref/find_default_branch_name.go b/internal/gitaly/service/ref/find_default_branch_name.go index 97b1997307..b418ca8e96 100644 --- a/internal/gitaly/service/ref/find_default_branch_name.go +++ b/internal/gitaly/service/ref/find_default_branch_name.go @@ -3,8 +3,8 @@ package ref import ( "context" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // FindDefaultBranchName returns the default branch name for the given repository diff --git a/internal/gitaly/service/ref/find_default_branch_name_test.go b/internal/gitaly/service/ref/find_default_branch_name_test.go index 17c2fbe632..0dffc847ee 100644 --- a/internal/gitaly/service/ref/find_default_branch_name_test.go +++ b/internal/gitaly/service/ref/find_default_branch_name_test.go @@ -4,13 +4,13 @@ import ( "context" "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestFindDefaultBranchName(t *testing.T) { diff --git a/internal/gitaly/service/ref/find_local_branches.go b/internal/gitaly/service/ref/find_local_branches.go index 875a7c66f0..9573199666 100644 --- a/internal/gitaly/service/ref/find_local_branches.go +++ b/internal/gitaly/service/ref/find_local_branches.go @@ -4,10 +4,10 @@ import ( "errors" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/lines" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/lines" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // FindLocalBranches creates a stream of branches for all local branches in the given repository diff --git a/internal/gitaly/service/ref/find_local_branches_test.go b/internal/gitaly/service/ref/find_local_branches_test.go index 1d89cfe6ab..3be5b71115 100644 --- a/internal/gitaly/service/ref/find_local_branches_test.go +++ b/internal/gitaly/service/ref/find_local_branches_test.go @@ -7,13 +7,13 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestFindLocalBranches(t *testing.T) { diff --git a/internal/gitaly/service/ref/find_refs_by_oid.go b/internal/gitaly/service/ref/find_refs_by_oid.go index d957f5f0c0..69e2473492 100644 --- a/internal/gitaly/service/ref/find_refs_by_oid.go +++ b/internal/gitaly/service/ref/find_refs_by_oid.go @@ -5,10 +5,10 @@ import ( "errors" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitpipe" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitpipe" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) FindRefsByOID(ctx context.Context, in *gitalypb.FindRefsByOIDRequest) (*gitalypb.FindRefsByOIDResponse, error) { diff --git a/internal/gitaly/service/ref/find_refs_by_oid_test.go b/internal/gitaly/service/ref/find_refs_by_oid_test.go index 3b1e5b0d22..6fbf854743 100644 --- a/internal/gitaly/service/ref/find_refs_by_oid_test.go +++ b/internal/gitaly/service/ref/find_refs_by_oid_test.go @@ -8,11 +8,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/ref/find_tag.go b/internal/gitaly/service/ref/find_tag.go index ccfbfb5612..b52c67da83 100644 --- a/internal/gitaly/service/ref/find_tag.go +++ b/internal/gitaly/service/ref/find_tag.go @@ -7,11 +7,11 @@ import ( "fmt" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) FindTag(ctx context.Context, in *gitalypb.FindTagRequest) (*gitalypb.FindTagResponse, error) { diff --git a/internal/gitaly/service/ref/find_tag_test.go b/internal/gitaly/service/ref/find_tag_test.go index 64385eca09..21eb1f2494 100644 --- a/internal/gitaly/service/ref/find_tag_test.go +++ b/internal/gitaly/service/ref/find_tag_test.go @@ -7,13 +7,13 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/internal/gitaly/service/ref/list_refs.go b/internal/gitaly/service/ref/list_refs.go index dfacf47701..5e7f5e0ec5 100644 --- a/internal/gitaly/service/ref/list_refs.go +++ b/internal/gitaly/service/ref/list_refs.go @@ -6,12 +6,12 @@ import ( "fmt" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/lines" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/lines" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) ListRefs(in *gitalypb.ListRefsRequest, stream gitalypb.RefService_ListRefsServer) error { diff --git a/internal/gitaly/service/ref/list_refs_test.go b/internal/gitaly/service/ref/list_refs_test.go index bffdb0986a..3190466016 100644 --- a/internal/gitaly/service/ref/list_refs_test.go +++ b/internal/gitaly/service/ref/list_refs_test.go @@ -7,12 +7,12 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/ref/refexists.go b/internal/gitaly/service/ref/refexists.go index 33dfeb2310..7c2ecf05e5 100644 --- a/internal/gitaly/service/ref/refexists.go +++ b/internal/gitaly/service/ref/refexists.go @@ -4,10 +4,10 @@ import ( "context" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // RefExists returns true if the given reference exists. The ref must start with the string `ref/` diff --git a/internal/gitaly/service/ref/refexists_test.go b/internal/gitaly/service/ref/refexists_test.go index da99c62f70..0215bf0404 100644 --- a/internal/gitaly/service/ref/refexists_test.go +++ b/internal/gitaly/service/ref/refexists_test.go @@ -3,12 +3,12 @@ package ref import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestRefExists(t *testing.T) { diff --git a/internal/gitaly/service/ref/refnames_containing.go b/internal/gitaly/service/ref/refnames_containing.go index 148ff46be2..f88a6961c0 100644 --- a/internal/gitaly/service/ref/refnames_containing.go +++ b/internal/gitaly/service/ref/refnames_containing.go @@ -6,10 +6,10 @@ import ( "fmt" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/wrapperspb" ) diff --git a/internal/gitaly/service/ref/refnames_containing_test.go b/internal/gitaly/service/ref/refnames_containing_test.go index b392750f10..62fcb4e5d6 100644 --- a/internal/gitaly/service/ref/refnames_containing_test.go +++ b/internal/gitaly/service/ref/refnames_containing_test.go @@ -4,12 +4,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestListTagNamesContainingCommit(t *testing.T) { diff --git a/internal/gitaly/service/ref/server.go b/internal/gitaly/service/ref/server.go index 9b3fc60348..98941546c5 100644 --- a/internal/gitaly/service/ref/server.go +++ b/internal/gitaly/service/ref/server.go @@ -1,13 +1,13 @@ package ref import ( - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) type server struct { diff --git a/internal/gitaly/service/ref/tag_messages.go b/internal/gitaly/service/ref/tag_messages.go index 5526a85141..d15565176e 100644 --- a/internal/gitaly/service/ref/tag_messages.go +++ b/internal/gitaly/service/ref/tag_messages.go @@ -6,12 +6,12 @@ import ( "fmt" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) func (s *server) GetTagMessages(request *gitalypb.GetTagMessagesRequest, stream gitalypb.RefService_GetTagMessagesServer) error { diff --git a/internal/gitaly/service/ref/tag_messages_test.go b/internal/gitaly/service/ref/tag_messages_test.go index e5864ae9ba..9d30dbc0e6 100644 --- a/internal/gitaly/service/ref/tag_messages_test.go +++ b/internal/gitaly/service/ref/tag_messages_test.go @@ -7,12 +7,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestSuccessfulGetTagMessagesRequest(t *testing.T) { diff --git a/internal/gitaly/service/ref/tag_signatures.go b/internal/gitaly/service/ref/tag_signatures.go index 13a3cbc5b4..c4888cee05 100644 --- a/internal/gitaly/service/ref/tag_signatures.go +++ b/internal/gitaly/service/ref/tag_signatures.go @@ -5,13 +5,13 @@ import ( "errors" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitpipe" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitpipe" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/proto" ) diff --git a/internal/gitaly/service/ref/tag_signatures_test.go b/internal/gitaly/service/ref/tag_signatures_test.go index 37b19de5b6..2c6e1143df 100644 --- a/internal/gitaly/service/ref/tag_signatures_test.go +++ b/internal/gitaly/service/ref/tag_signatures_test.go @@ -6,13 +6,13 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/ref/testhelper_test.go b/internal/gitaly/service/ref/testhelper_test.go index 430939c795..9ac2a7eb9b 100644 --- a/internal/gitaly/service/ref/testhelper_test.go +++ b/internal/gitaly/service/ref/testhelper_test.go @@ -5,18 +5,18 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - hookservice "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/repository" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/lines" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + hookservice "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/repository" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/lines" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) diff --git a/internal/gitaly/service/ref/update_references.go b/internal/gitaly/service/ref/update_references.go index bb84674a4c..34e42862ec 100644 --- a/internal/gitaly/service/ref/update_references.go +++ b/internal/gitaly/service/ref/update_references.go @@ -5,10 +5,10 @@ import ( "fmt" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // UpdateReferences updates a set of references atomically. It allows for reference creations, deletions and updates in diff --git a/internal/gitaly/service/ref/update_references_test.go b/internal/gitaly/service/ref/update_references_test.go index 8d4768000f..2f0436badd 100644 --- a/internal/gitaly/service/ref/update_references_test.go +++ b/internal/gitaly/service/ref/update_references_test.go @@ -5,15 +5,15 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb/testproto" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb/testproto" ) func TestUpdateReferences(t *testing.T) { diff --git a/internal/gitaly/service/ref/util.go b/internal/gitaly/service/ref/util.go index e0a080235d..21bd250b1e 100644 --- a/internal/gitaly/service/ref/util.go +++ b/internal/gitaly/service/ref/util.go @@ -10,12 +10,12 @@ import ( "strings" "syscall" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/lines" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/lines" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) var localBranchFormatFields = []string{"%(refname)", "%(objectname)"} diff --git a/internal/gitaly/service/remote/find_remote_repository.go b/internal/gitaly/service/remote/find_remote_repository.go index 40e73125d2..1ff1587d4e 100644 --- a/internal/gitaly/service/remote/find_remote_repository.go +++ b/internal/gitaly/service/remote/find_remote_repository.go @@ -4,10 +4,10 @@ import ( "bytes" "context" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) FindRemoteRepository(ctx context.Context, req *gitalypb.FindRemoteRepositoryRequest) (*gitalypb.FindRemoteRepositoryResponse, error) { diff --git a/internal/gitaly/service/remote/find_remote_repository_test.go b/internal/gitaly/service/remote/find_remote_repository_test.go index ea0eebe91a..9f28c61cdd 100644 --- a/internal/gitaly/service/remote/find_remote_repository_test.go +++ b/internal/gitaly/service/remote/find_remote_repository_test.go @@ -7,10 +7,10 @@ import ( "path/filepath" "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestFindRemoteRepository(t *testing.T) { diff --git a/internal/gitaly/service/remote/find_remote_root_ref.go b/internal/gitaly/service/remote/find_remote_root_ref.go index a16650b020..9350f24bb4 100644 --- a/internal/gitaly/service/remote/find_remote_root_ref.go +++ b/internal/gitaly/service/remote/find_remote_root_ref.go @@ -6,10 +6,10 @@ import ( "fmt" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) const headPrefix = "HEAD branch: " diff --git a/internal/gitaly/service/remote/find_remote_root_ref_test.go b/internal/gitaly/service/remote/find_remote_root_ref_test.go index c7b65702d4..7231743143 100644 --- a/internal/gitaly/service/remote/find_remote_root_ref_test.go +++ b/internal/gitaly/service/remote/find_remote_root_ref_test.go @@ -7,14 +7,14 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/remote/server.go b/internal/gitaly/service/remote/server.go index 0c2f25b307..cfa4b71928 100644 --- a/internal/gitaly/service/remote/server.go +++ b/internal/gitaly/service/remote/server.go @@ -1,15 +1,15 @@ package remote import ( - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) type server struct { diff --git a/internal/gitaly/service/remote/testhelper_test.go b/internal/gitaly/service/remote/testhelper_test.go index 75a1dc1dd4..54eed03b62 100644 --- a/internal/gitaly/service/remote/testhelper_test.go +++ b/internal/gitaly/service/remote/testhelper_test.go @@ -4,13 +4,13 @@ import ( "context" "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/repository" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/repository" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) diff --git a/internal/gitaly/service/remote/update_remote_mirror.go b/internal/gitaly/service/remote/update_remote_mirror.go index bfb4ba4493..6e51371197 100644 --- a/internal/gitaly/service/remote/update_remote_mirror.go +++ b/internal/gitaly/service/remote/update_remote_mirror.go @@ -8,13 +8,13 @@ import ( "regexp" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) const ( diff --git a/internal/gitaly/service/remote/update_remote_mirror_test.go b/internal/gitaly/service/remote/update_remote_mirror_test.go index 836e3d4880..8fb83cc47d 100644 --- a/internal/gitaly/service/remote/update_remote_mirror_test.go +++ b/internal/gitaly/service/remote/update_remote_mirror_test.go @@ -8,21 +8,21 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - repositorysvc "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/repository" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + repositorysvc "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/repository" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/repository/archive.go b/internal/gitaly/service/repository/archive.go index 50ae891744..13a6fad156 100644 --- a/internal/gitaly/service/repository/archive.go +++ b/internal/gitaly/service/repository/archive.go @@ -9,15 +9,15 @@ import ( "os" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/smudge" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/smudge" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" "google.golang.org/protobuf/proto" ) diff --git a/internal/gitaly/service/repository/archive_test.go b/internal/gitaly/service/repository/archive_test.go index cb6e7952a6..7c2a55d1a3 100644 --- a/internal/gitaly/service/repository/archive_test.go +++ b/internal/gitaly/service/repository/archive_test.go @@ -13,20 +13,20 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/smudge" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitlab" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/smudge" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitlab" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" "gitlab.com/gitlab-org/labkit/correlation" ) diff --git a/internal/gitaly/service/repository/backup_repository.go b/internal/gitaly/service/repository/backup_repository.go index 3ac8b135b2..f9f526541b 100644 --- a/internal/gitaly/service/repository/backup_repository.go +++ b/internal/gitaly/service/repository/backup_repository.go @@ -5,10 +5,10 @@ import ( "errors" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/backup" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/backup" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // BackupRepository creates a full or incremental backup streamed directly to object-storage. diff --git a/internal/gitaly/service/repository/backup_repository_test.go b/internal/gitaly/service/repository/backup_repository_test.go index aea0da26b6..80ef3abd92 100644 --- a/internal/gitaly/service/repository/backup_repository_test.go +++ b/internal/gitaly/service/repository/backup_repository_test.go @@ -8,15 +8,15 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/backup" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/backup" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestServerBackupRepository(t *testing.T) { diff --git a/internal/gitaly/service/repository/bundle_uri.go b/internal/gitaly/service/repository/bundle_uri.go index fdc22ebf01..bc33d40c83 100644 --- a/internal/gitaly/service/repository/bundle_uri.go +++ b/internal/gitaly/service/repository/bundle_uri.go @@ -3,8 +3,8 @@ package repository import ( "context" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // GenerateBundleURI generates a bundle on the server for bundle-URI use. diff --git a/internal/gitaly/service/repository/bundle_uri_test.go b/internal/gitaly/service/repository/bundle_uri_test.go index 8edaa96844..963de47c67 100644 --- a/internal/gitaly/service/repository/bundle_uri_test.go +++ b/internal/gitaly/service/repository/bundle_uri_test.go @@ -7,14 +7,14 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/bundleuri" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/bundleuri" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestServer_GenerateBundleURI(t *testing.T) { diff --git a/internal/gitaly/service/repository/calculate_checksum.go b/internal/gitaly/service/repository/calculate_checksum.go index 7623a761aa..013bbc4747 100644 --- a/internal/gitaly/service/repository/calculate_checksum.go +++ b/internal/gitaly/service/repository/calculate_checksum.go @@ -7,10 +7,10 @@ import ( "encoding/hex" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) CalculateChecksum(ctx context.Context, in *gitalypb.CalculateChecksumRequest) (*gitalypb.CalculateChecksumResponse, error) { diff --git a/internal/gitaly/service/repository/calculate_checksum_test.go b/internal/gitaly/service/repository/calculate_checksum_test.go index 9505687f3b..1e14cd0f94 100644 --- a/internal/gitaly/service/repository/calculate_checksum_test.go +++ b/internal/gitaly/service/repository/calculate_checksum_test.go @@ -10,13 +10,13 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/repository/config.go b/internal/gitaly/service/repository/config.go index f1ce785cff..670a71c6bb 100644 --- a/internal/gitaly/service/repository/config.go +++ b/internal/gitaly/service/repository/config.go @@ -5,10 +5,10 @@ import ( "os" "path/filepath" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) // GetConfig reads the repository's gitconfig file and returns its contents. diff --git a/internal/gitaly/service/repository/config_test.go b/internal/gitaly/service/repository/config_test.go index cbd58c01e6..1b9747421d 100644 --- a/internal/gitaly/service/repository/config_test.go +++ b/internal/gitaly/service/repository/config_test.go @@ -9,13 +9,13 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/repository/create_bundle.go b/internal/gitaly/service/repository/create_bundle.go index d3d89a5970..071ca159b3 100644 --- a/internal/gitaly/service/repository/create_bundle.go +++ b/internal/gitaly/service/repository/create_bundle.go @@ -1,10 +1,10 @@ package repository import ( - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) func (s *server) CreateBundle(req *gitalypb.CreateBundleRequest, stream gitalypb.RepositoryService_CreateBundleServer) error { diff --git a/internal/gitaly/service/repository/create_bundle_from_ref_list.go b/internal/gitaly/service/repository/create_bundle_from_ref_list.go index f5b13b6a1a..b192b4f52d 100644 --- a/internal/gitaly/service/repository/create_bundle_from_ref_list.go +++ b/internal/gitaly/service/repository/create_bundle_from_ref_list.go @@ -4,11 +4,11 @@ import ( "bytes" "errors" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) func (s *server) CreateBundleFromRefList(stream gitalypb.RepositoryService_CreateBundleFromRefListServer) error { diff --git a/internal/gitaly/service/repository/create_bundle_from_ref_list_test.go b/internal/gitaly/service/repository/create_bundle_from_ref_list_test.go index cccded0f9d..1e1475f3f6 100644 --- a/internal/gitaly/service/repository/create_bundle_from_ref_list_test.go +++ b/internal/gitaly/service/repository/create_bundle_from_ref_list_test.go @@ -9,14 +9,14 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/repository/create_bundle_test.go b/internal/gitaly/service/repository/create_bundle_test.go index ae00d685b7..1137f0b4d0 100644 --- a/internal/gitaly/service/repository/create_bundle_test.go +++ b/internal/gitaly/service/repository/create_bundle_test.go @@ -8,15 +8,15 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) func TestCreateBundle_successful(t *testing.T) { diff --git a/internal/gitaly/service/repository/create_fork.go b/internal/gitaly/service/repository/create_fork.go index 779455278b..85cba53675 100644 --- a/internal/gitaly/service/repository/create_fork.go +++ b/internal/gitaly/service/repository/create_fork.go @@ -5,13 +5,13 @@ import ( "fmt" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/repoutil" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/repoutil" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) CreateFork(ctx context.Context, req *gitalypb.CreateForkRequest) (*gitalypb.CreateForkResponse, error) { diff --git a/internal/gitaly/service/repository/create_fork_test.go b/internal/gitaly/service/repository/create_fork_test.go index 2b58184f8d..b90c5e01f1 100644 --- a/internal/gitaly/service/repository/create_fork_test.go +++ b/internal/gitaly/service/repository/create_fork_test.go @@ -7,16 +7,16 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - gitalyx509 "gitlab.com/gitlab-org/gitaly/v16/internal/x509" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + gitalyx509 "gitlab.com/gitlab-org/gitaly/v17/internal/x509" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestCreateFork_successful(t *testing.T) { diff --git a/internal/gitaly/service/repository/create_repository.go b/internal/gitaly/service/repository/create_repository.go index 896dfed077..17e174e681 100644 --- a/internal/gitaly/service/repository/create_repository.go +++ b/internal/gitaly/service/repository/create_repository.go @@ -3,11 +3,11 @@ package repository import ( "context" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/repoutil" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/repoutil" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) CreateRepository(ctx context.Context, req *gitalypb.CreateRepositoryRequest) (*gitalypb.CreateRepositoryResponse, error) { diff --git a/internal/gitaly/service/repository/create_repository_from_bundle.go b/internal/gitaly/service/repository/create_repository_from_bundle.go index 0306d13d6c..6c529c10f8 100644 --- a/internal/gitaly/service/repository/create_repository_from_bundle.go +++ b/internal/gitaly/service/repository/create_repository_from_bundle.go @@ -1,11 +1,11 @@ package repository import ( - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/repoutil" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/repoutil" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) // CreateRepositoryFromBundle creates a Git repository at the specified storage and path, if it does diff --git a/internal/gitaly/service/repository/create_repository_from_bundle_test.go b/internal/gitaly/service/repository/create_repository_from_bundle_test.go index 9aac6b5e33..7e1ab5b372 100644 --- a/internal/gitaly/service/repository/create_repository_from_bundle_test.go +++ b/internal/gitaly/service/repository/create_repository_from_bundle_test.go @@ -8,20 +8,20 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/repository/create_repository_from_snapshot.go b/internal/gitaly/service/repository/create_repository_from_snapshot.go index ae6f56a240..1664a4361a 100644 --- a/internal/gitaly/service/repository/create_repository_from_snapshot.go +++ b/internal/gitaly/service/repository/create_repository_from_snapshot.go @@ -8,11 +8,11 @@ import ( "net/url" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/repoutil" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/repoutil" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "gitlab.com/gitlab-org/labkit/correlation" "gitlab.com/gitlab-org/labkit/tracing" ) diff --git a/internal/gitaly/service/repository/create_repository_from_snapshot_test.go b/internal/gitaly/service/repository/create_repository_from_snapshot_test.go index 08bb062c18..2cef76e89d 100644 --- a/internal/gitaly/service/repository/create_repository_from_snapshot_test.go +++ b/internal/gitaly/service/repository/create_repository_from_snapshot_test.go @@ -14,14 +14,14 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/archive" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/archive" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/repository/create_repository_from_url.go b/internal/gitaly/service/repository/create_repository_from_url.go index 38f2618491..d6db1e3185 100644 --- a/internal/gitaly/service/repository/create_repository_from_url.go +++ b/internal/gitaly/service/repository/create_repository_from_url.go @@ -8,14 +8,14 @@ import ( "net/url" "regexp" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/repoutil" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/repoutil" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) var remoteNotFoundRegex = regexp.MustCompile(`fatal: repository '.*' not found`) diff --git a/internal/gitaly/service/repository/create_repository_from_url_test.go b/internal/gitaly/service/repository/create_repository_from_url_test.go index d15bfac473..c1d82db688 100644 --- a/internal/gitaly/service/repository/create_repository_from_url_test.go +++ b/internal/gitaly/service/repository/create_repository_from_url_test.go @@ -11,16 +11,16 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/repository/create_repository_test.go b/internal/gitaly/service/repository/create_repository_test.go index 0ec992b531..36af256300 100644 --- a/internal/gitaly/service/repository/create_repository_test.go +++ b/internal/gitaly/service/repository/create_repository_test.go @@ -7,19 +7,19 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "golang.org/x/sys/unix" ) diff --git a/internal/gitaly/service/repository/fast_export.go b/internal/gitaly/service/repository/fast_export.go index 4997cb2657..920d729cfb 100644 --- a/internal/gitaly/service/repository/fast_export.go +++ b/internal/gitaly/service/repository/fast_export.go @@ -5,11 +5,11 @@ import ( "errors" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) func (s *server) FastExport( diff --git a/internal/gitaly/service/repository/fast_export_test.go b/internal/gitaly/service/repository/fast_export_test.go index f430116f7a..8b2efb5fe3 100644 --- a/internal/gitaly/service/repository/fast_export_test.go +++ b/internal/gitaly/service/repository/fast_export_test.go @@ -6,9 +6,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestFastExport(t *testing.T) { diff --git a/internal/gitaly/service/repository/fetch.go b/internal/gitaly/service/repository/fetch.go index 56a5d663df..b33aae89ea 100644 --- a/internal/gitaly/service/repository/fetch.go +++ b/internal/gitaly/service/repository/fetch.go @@ -4,12 +4,12 @@ import ( "context" "errors" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/remoterepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/remoterepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func validateFetchSourceBranchRequest(ctx context.Context, locator storage.Locator, in *gitalypb.FetchSourceBranchRequest) error { diff --git a/internal/gitaly/service/repository/fetch_bundle.go b/internal/gitaly/service/repository/fetch_bundle.go index fbe60eadc1..430f618d6a 100644 --- a/internal/gitaly/service/repository/fetch_bundle.go +++ b/internal/gitaly/service/repository/fetch_bundle.go @@ -1,10 +1,10 @@ package repository import ( - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) func (s *server) FetchBundle(stream gitalypb.RepositoryService_FetchBundleServer) error { diff --git a/internal/gitaly/service/repository/fetch_bundle_test.go b/internal/gitaly/service/repository/fetch_bundle_test.go index c39f37b919..3c748da8b7 100644 --- a/internal/gitaly/service/repository/fetch_bundle_test.go +++ b/internal/gitaly/service/repository/fetch_bundle_test.go @@ -9,17 +9,17 @@ import ( "github.com/google/go-cmp/cmp" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) func TestServer_FetchBundle_success(t *testing.T) { diff --git a/internal/gitaly/service/repository/fetch_remote.go b/internal/gitaly/service/repository/fetch_remote.go index bf50ffd893..a0af3d84ec 100644 --- a/internal/gitaly/service/repository/fetch_remote.go +++ b/internal/gitaly/service/repository/fetch_remote.go @@ -7,13 +7,13 @@ import ( "strings" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/quarantine" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/quarantine" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) var changeTypes = map[gitcmd.RefUpdateType]bool{ diff --git a/internal/gitaly/service/repository/fetch_remote_test.go b/internal/gitaly/service/repository/fetch_remote_test.go index d38d3968da..4f719dba4b 100644 --- a/internal/gitaly/service/repository/fetch_remote_test.go +++ b/internal/gitaly/service/repository/fetch_remote_test.go @@ -10,20 +10,20 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) const ( diff --git a/internal/gitaly/service/repository/fetch_test.go b/internal/gitaly/service/repository/fetch_test.go index b7106154f3..23535e21db 100644 --- a/internal/gitaly/service/repository/fetch_test.go +++ b/internal/gitaly/service/repository/fetch_test.go @@ -5,17 +5,17 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestFetchSourceBranch(t *testing.T) { diff --git a/internal/gitaly/service/repository/file_attributes.go b/internal/gitaly/service/repository/file_attributes.go index 27ab187cdf..5e96223d5b 100644 --- a/internal/gitaly/service/repository/file_attributes.go +++ b/internal/gitaly/service/repository/file_attributes.go @@ -4,11 +4,11 @@ import ( "context" "errors" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitattributes" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitattributes" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) GetFileAttributes(ctx context.Context, in *gitalypb.GetFileAttributesRequest) (*gitalypb.GetFileAttributesResponse, error) { diff --git a/internal/gitaly/service/repository/file_attributes_test.go b/internal/gitaly/service/repository/file_attributes_test.go index f553bb43d4..997aa0c8da 100644 --- a/internal/gitaly/service/repository/file_attributes_test.go +++ b/internal/gitaly/service/repository/file_attributes_test.go @@ -3,10 +3,10 @@ package repository import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestGetFileAttributes(t *testing.T) { diff --git a/internal/gitaly/service/repository/fsck.go b/internal/gitaly/service/repository/fsck.go index a1ca0ba2a4..4355fe0df1 100644 --- a/internal/gitaly/service/repository/fsck.go +++ b/internal/gitaly/service/repository/fsck.go @@ -4,9 +4,9 @@ import ( "context" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) Fsck(ctx context.Context, req *gitalypb.FsckRequest) (*gitalypb.FsckResponse, error) { diff --git a/internal/gitaly/service/repository/fsck_test.go b/internal/gitaly/service/repository/fsck_test.go index 712fafe215..a84137d956 100644 --- a/internal/gitaly/service/repository/fsck_test.go +++ b/internal/gitaly/service/repository/fsck_test.go @@ -7,12 +7,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestFsck(t *testing.T) { diff --git a/internal/gitaly/service/repository/get_custom_hooks.go b/internal/gitaly/service/repository/get_custom_hooks.go index 6ee490ed48..5d25e134e2 100644 --- a/internal/gitaly/service/repository/get_custom_hooks.go +++ b/internal/gitaly/service/repository/get_custom_hooks.go @@ -3,10 +3,10 @@ package repository import ( "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/repoutil" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/repoutil" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) // GetCustomHooks fetches the git hooks for a repository. The hooks are sent in diff --git a/internal/gitaly/service/repository/get_custom_hooks_test.go b/internal/gitaly/service/repository/get_custom_hooks_test.go index e14a040d98..df198cb3e5 100644 --- a/internal/gitaly/service/repository/get_custom_hooks_test.go +++ b/internal/gitaly/service/repository/get_custom_hooks_test.go @@ -11,15 +11,15 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/archive" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/repoutil" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/archive" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/repoutil" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) func TestGetCustomHooks_successful(t *testing.T) { diff --git a/internal/gitaly/service/repository/has_local_branches.go b/internal/gitaly/service/repository/has_local_branches.go index e43f43015e..256ea2d0bb 100644 --- a/internal/gitaly/service/repository/has_local_branches.go +++ b/internal/gitaly/service/repository/has_local_branches.go @@ -3,8 +3,8 @@ package repository import ( "context" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) HasLocalBranches(ctx context.Context, in *gitalypb.HasLocalBranchesRequest) (*gitalypb.HasLocalBranchesResponse, error) { diff --git a/internal/gitaly/service/repository/has_local_branches_test.go b/internal/gitaly/service/repository/has_local_branches_test.go index b9eb49db6c..888ddb56dd 100644 --- a/internal/gitaly/service/repository/has_local_branches_test.go +++ b/internal/gitaly/service/repository/has_local_branches_test.go @@ -4,11 +4,11 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestHasLocalBranches_successful(t *testing.T) { diff --git a/internal/gitaly/service/repository/info_attributes.go b/internal/gitaly/service/repository/info_attributes.go index 31a85409be..e51cbe6d11 100644 --- a/internal/gitaly/service/repository/info_attributes.go +++ b/internal/gitaly/service/repository/info_attributes.go @@ -6,10 +6,10 @@ import ( "io" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) func (s *server) GetInfoAttributes(in *gitalypb.GetInfoAttributesRequest, stream gitalypb.RepositoryService_GetInfoAttributesServer) (returnedErr error) { diff --git a/internal/gitaly/service/repository/info_attributes_test.go b/internal/gitaly/service/repository/info_attributes_test.go index 7ad21dd1fb..84bcf527ee 100644 --- a/internal/gitaly/service/repository/info_attributes_test.go +++ b/internal/gitaly/service/repository/info_attributes_test.go @@ -5,12 +5,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) func TestGetInfoAttributesExisting(t *testing.T) { diff --git a/internal/gitaly/service/repository/license.go b/internal/gitaly/service/repository/license.go index efff64ea69..85a1f69a47 100644 --- a/internal/gitaly/service/repository/license.go +++ b/internal/gitaly/service/repository/license.go @@ -13,13 +13,13 @@ import ( "github.com/go-enry/go-license-detector/v4/licensedb" "github.com/go-enry/go-license-detector/v4/licensedb/api" "github.com/go-enry/go-license-detector/v4/licensedb/filer" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/tracing" - "gitlab.com/gitlab-org/gitaly/v16/internal/unarycache" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/tracing" + "gitlab.com/gitlab-org/gitaly/v17/internal/unarycache" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // The `github.com/go-enry/go-license-detector` package uses https://spdx.org/licenses/ diff --git a/internal/gitaly/service/repository/license_test.go b/internal/gitaly/service/repository/license_test.go index bc9138a4eb..bb45f28faa 100644 --- a/internal/gitaly/service/repository/license_test.go +++ b/internal/gitaly/service/repository/license_test.go @@ -5,13 +5,13 @@ import ( "github.com/go-enry/go-license-detector/v4/licensedb" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) const ( diff --git a/internal/gitaly/service/repository/merge_base.go b/internal/gitaly/service/repository/merge_base.go index 570383d9dc..02a93cbc67 100644 --- a/internal/gitaly/service/repository/merge_base.go +++ b/internal/gitaly/service/repository/merge_base.go @@ -4,10 +4,10 @@ import ( "context" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) FindMergeBase(ctx context.Context, req *gitalypb.FindMergeBaseRequest) (*gitalypb.FindMergeBaseResponse, error) { diff --git a/internal/gitaly/service/repository/merge_base_test.go b/internal/gitaly/service/repository/merge_base_test.go index 9d436c9dd6..1b26832ef4 100644 --- a/internal/gitaly/service/repository/merge_base_test.go +++ b/internal/gitaly/service/repository/merge_base_test.go @@ -3,11 +3,11 @@ package repository import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestFindMergeBase(t *testing.T) { diff --git a/internal/gitaly/service/repository/object_format.go b/internal/gitaly/service/repository/object_format.go index cb6b8bcc65..ced2d31fcf 100644 --- a/internal/gitaly/service/repository/object_format.go +++ b/internal/gitaly/service/repository/object_format.go @@ -3,8 +3,8 @@ package repository import ( "context" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // ObjectFormat determines the object format of the Git repository. diff --git a/internal/gitaly/service/repository/object_format_test.go b/internal/gitaly/service/repository/object_format_test.go index 27308a8b33..8713799a6a 100644 --- a/internal/gitaly/service/repository/object_format_test.go +++ b/internal/gitaly/service/repository/object_format_test.go @@ -7,12 +7,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestObjectFormat(t *testing.T) { diff --git a/internal/gitaly/service/repository/objects_size.go b/internal/gitaly/service/repository/objects_size.go index e636172abb..b83ab93443 100644 --- a/internal/gitaly/service/repository/objects_size.go +++ b/internal/gitaly/service/repository/objects_size.go @@ -9,10 +9,10 @@ import ( "strconv" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // revisionNotFoundRegexp is used to parse the standard error of git-rev-list(1) in order to figure out whether the diff --git a/internal/gitaly/service/repository/objects_size_test.go b/internal/gitaly/service/repository/objects_size_test.go index 9ddeb1c19a..0c0da8236e 100644 --- a/internal/gitaly/service/repository/objects_size_test.go +++ b/internal/gitaly/service/repository/objects_size_test.go @@ -7,13 +7,13 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestObjectsSize(t *testing.T) { diff --git a/internal/gitaly/service/repository/optimize.go b/internal/gitaly/service/repository/optimize.go index 8424e2be89..49c53bd618 100644 --- a/internal/gitaly/service/repository/optimize.go +++ b/internal/gitaly/service/repository/optimize.go @@ -3,11 +3,11 @@ package repository import ( "context" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping" - housekeepingmgr "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping/manager" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping" + housekeepingmgr "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping/manager" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) OptimizeRepository(ctx context.Context, in *gitalypb.OptimizeRepositoryRequest) (*gitalypb.OptimizeRepositoryResponse, error) { diff --git a/internal/gitaly/service/repository/optimize_test.go b/internal/gitaly/service/repository/optimize_test.go index 74a3e296ed..6fc3cb95fa 100644 --- a/internal/gitaly/service/repository/optimize_test.go +++ b/internal/gitaly/service/repository/optimize_test.go @@ -11,19 +11,19 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping" - housekeepingmgr "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping/manager" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/transactiontest" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping" + housekeepingmgr "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping/manager" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/transactiontest" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestOptimizeRepository(t *testing.T) { diff --git a/internal/gitaly/service/repository/prune_unreachable_objects.go b/internal/gitaly/service/repository/prune_unreachable_objects.go index 5937c39f72..4cf8fd7327 100644 --- a/internal/gitaly/service/repository/prune_unreachable_objects.go +++ b/internal/gitaly/service/repository/prune_unreachable_objects.go @@ -5,12 +5,12 @@ import ( "fmt" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping" - housekeepingcfg "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping" + housekeepingcfg "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // PruneUnreachableObjects prunes objects which aren't reachable from any of its references. To diff --git a/internal/gitaly/service/repository/prune_unreachable_objects_test.go b/internal/gitaly/service/repository/prune_unreachable_objects_test.go index aee53f7043..16cd5459b8 100644 --- a/internal/gitaly/service/repository/prune_unreachable_objects_test.go +++ b/internal/gitaly/service/repository/prune_unreachable_objects_test.go @@ -7,14 +7,14 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestPruneUnreachableObjects(t *testing.T) { diff --git a/internal/gitaly/service/repository/raw_changes.go b/internal/gitaly/service/repository/raw_changes.go index 353999b3d3..20956925a7 100644 --- a/internal/gitaly/service/repository/raw_changes.go +++ b/internal/gitaly/service/repository/raw_changes.go @@ -8,13 +8,13 @@ import ( "regexp" "strconv" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/rawdiff" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/rawdiff" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/proto" ) diff --git a/internal/gitaly/service/repository/raw_changes_test.go b/internal/gitaly/service/repository/raw_changes_test.go index 0bcae3e9b9..6ac9cdc551 100644 --- a/internal/gitaly/service/repository/raw_changes_test.go +++ b/internal/gitaly/service/repository/raw_changes_test.go @@ -8,11 +8,11 @@ import ( "unicode/utf8" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestGetRawChanges(t *testing.T) { diff --git a/internal/gitaly/service/repository/redirecting_test_server_test.go b/internal/gitaly/service/repository/redirecting_test_server_test.go index dd01e6a12e..9eb079bd54 100644 --- a/internal/gitaly/service/repository/redirecting_test_server_test.go +++ b/internal/gitaly/service/repository/redirecting_test_server_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) const redirectURL = "/redirect_url" diff --git a/internal/gitaly/service/repository/remove.go b/internal/gitaly/service/repository/remove.go index 89fa1081cd..39b90dfb98 100644 --- a/internal/gitaly/service/repository/remove.go +++ b/internal/gitaly/service/repository/remove.go @@ -3,10 +3,10 @@ package repository import ( "context" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/repoutil" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/repoutil" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) RemoveRepository(ctx context.Context, in *gitalypb.RemoveRepositoryRequest) (*gitalypb.RemoveRepositoryResponse, error) { diff --git a/internal/gitaly/service/repository/remove_test.go b/internal/gitaly/service/repository/remove_test.go index 23cedbc97e..4699ea63dd 100644 --- a/internal/gitaly/service/repository/remove_test.go +++ b/internal/gitaly/service/repository/remove_test.go @@ -5,13 +5,13 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestRemoveRepository(t *testing.T) { diff --git a/internal/gitaly/service/repository/replicate.go b/internal/gitaly/service/repository/replicate.go index 3fd7484dfb..b248533f0c 100644 --- a/internal/gitaly/service/repository/replicate.go +++ b/internal/gitaly/service/repository/replicate.go @@ -10,22 +10,22 @@ import ( "path/filepath" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/remoterepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/repoutil" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/safe" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/tempdir" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/remoterepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/repoutil" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/safe" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/tempdir" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/internal/gitaly/service/repository/replicate_test.go b/internal/gitaly/service/repository/replicate_test.go index 3f601d0b7a..c394acc886 100644 --- a/internal/gitaly/service/repository/replicate_test.go +++ b/internal/gitaly/service/repository/replicate_test.go @@ -14,26 +14,26 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - gitalyhook "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/repoutil" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + gitalyhook "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/repoutil" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/status" "google.golang.org/protobuf/proto" diff --git a/internal/gitaly/service/repository/repository_exists.go b/internal/gitaly/service/repository/repository_exists.go index 284e2eed74..a682a62f9e 100644 --- a/internal/gitaly/service/repository/repository_exists.go +++ b/internal/gitaly/service/repository/repository_exists.go @@ -4,8 +4,8 @@ import ( "context" "errors" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) RepositoryExists(ctx context.Context, in *gitalypb.RepositoryExistsRequest) (*gitalypb.RepositoryExistsResponse, error) { diff --git a/internal/gitaly/service/repository/repository_exists_test.go b/internal/gitaly/service/repository/repository_exists_test.go index d7cf082043..86a1de9629 100644 --- a/internal/gitaly/service/repository/repository_exists_test.go +++ b/internal/gitaly/service/repository/repository_exists_test.go @@ -5,12 +5,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestRepositoryExists(t *testing.T) { diff --git a/internal/gitaly/service/repository/repository_info.go b/internal/gitaly/service/repository/repository_info.go index ed9484aace..7ae7916026 100644 --- a/internal/gitaly/service/repository/repository_info.go +++ b/internal/gitaly/service/repository/repository_info.go @@ -4,10 +4,10 @@ import ( "context" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) RepositoryInfo( diff --git a/internal/gitaly/service/repository/repository_info_test.go b/internal/gitaly/service/repository/repository_info_test.go index 82d2a5f5cb..a895545f22 100644 --- a/internal/gitaly/service/repository/repository_info_test.go +++ b/internal/gitaly/service/repository/repository_info_test.go @@ -10,13 +10,13 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestRepositoryInfo(t *testing.T) { diff --git a/internal/gitaly/service/repository/restore_repository.go b/internal/gitaly/service/repository/restore_repository.go index 1ff6347102..e24fd9fdd6 100644 --- a/internal/gitaly/service/repository/restore_repository.go +++ b/internal/gitaly/service/repository/restore_repository.go @@ -5,10 +5,10 @@ import ( "errors" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/backup" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/backup" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) RestoreRepository(ctx context.Context, in *gitalypb.RestoreRepositoryRequest) (*gitalypb.RestoreRepositoryResponse, error) { diff --git a/internal/gitaly/service/repository/restore_repository_test.go b/internal/gitaly/service/repository/restore_repository_test.go index 90faef013a..2b311099bb 100644 --- a/internal/gitaly/service/repository/restore_repository_test.go +++ b/internal/gitaly/service/repository/restore_repository_test.go @@ -5,14 +5,14 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/backup" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/backup" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestRestoreRepository(t *testing.T) { diff --git a/internal/gitaly/service/repository/search_files.go b/internal/gitaly/service/repository/search_files.go index 76b29b8d8e..53bcbc13b4 100644 --- a/internal/gitaly/service/repository/search_files.go +++ b/internal/gitaly/service/repository/search_files.go @@ -9,14 +9,14 @@ import ( "io" "regexp" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) const ( diff --git a/internal/gitaly/service/repository/search_files_test.go b/internal/gitaly/service/repository/search_files_test.go index 21998acb83..e0332d01fa 100644 --- a/internal/gitaly/service/repository/search_files_test.go +++ b/internal/gitaly/service/repository/search_files_test.go @@ -8,11 +8,11 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestSearchFilesByContent(t *testing.T) { diff --git a/internal/gitaly/service/repository/server.go b/internal/gitaly/service/repository/server.go index b26e3fb814..113995a424 100644 --- a/internal/gitaly/service/repository/server.go +++ b/internal/gitaly/service/repository/server.go @@ -3,25 +3,25 @@ package repository import ( "context" - "gitlab.com/gitlab-org/gitaly/v16/internal/backup" - "gitlab.com/gitlab-org/gitaly/v16/internal/bundleuri" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - housekeepingmgr "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping/manager" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/quarantine" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/counter" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/migration" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/unarycache" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/backup" + "gitlab.com/gitlab-org/gitaly/v17/internal/bundleuri" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + housekeepingmgr "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping/manager" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/quarantine" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/counter" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/migration" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/unarycache" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) type server struct { diff --git a/internal/gitaly/service/repository/server_test.go b/internal/gitaly/service/repository/server_test.go index 8cbcb1296c..56412382c7 100644 --- a/internal/gitaly/service/repository/server_test.go +++ b/internal/gitaly/service/repository/server_test.go @@ -4,9 +4,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" "google.golang.org/grpc/metadata" ) diff --git a/internal/gitaly/service/repository/set_custom_hooks.go b/internal/gitaly/service/repository/set_custom_hooks.go index e96fa210eb..c39654c8c6 100644 --- a/internal/gitaly/service/repository/set_custom_hooks.go +++ b/internal/gitaly/service/repository/set_custom_hooks.go @@ -1,10 +1,10 @@ package repository import ( - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/repoutil" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/repoutil" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) // SetCustomHooks sets the git hooks for a repository. The hooks are sent in a diff --git a/internal/gitaly/service/repository/set_custom_hooks_test.go b/internal/gitaly/service/repository/set_custom_hooks_test.go index 4295ccf23f..bbf65ebf06 100644 --- a/internal/gitaly/service/repository/set_custom_hooks_test.go +++ b/internal/gitaly/service/repository/set_custom_hooks_test.go @@ -11,21 +11,21 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/archive" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/repoutil" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/archive" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/repoutil" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" "google.golang.org/grpc/codes" ) diff --git a/internal/gitaly/service/repository/size.go b/internal/gitaly/service/repository/size.go index 94a2c01865..633d0e62e1 100644 --- a/internal/gitaly/service/repository/size.go +++ b/internal/gitaly/service/repository/size.go @@ -8,8 +8,8 @@ import ( "os" "path/filepath" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // RepositorySize returns the size of the specified repository in kibibytes. By default, this diff --git a/internal/gitaly/service/repository/size_test.go b/internal/gitaly/service/repository/size_test.go index 4ae283c167..e557cbd811 100644 --- a/internal/gitaly/service/repository/size_test.go +++ b/internal/gitaly/service/repository/size_test.go @@ -8,16 +8,16 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/quarantine" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/quarantine" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/metadata" "google.golang.org/protobuf/proto" ) diff --git a/internal/gitaly/service/repository/snapshot.go b/internal/gitaly/service/repository/snapshot.go index 5b4a118e5f..44e5c45eea 100644 --- a/internal/gitaly/service/repository/snapshot.go +++ b/internal/gitaly/service/repository/snapshot.go @@ -3,10 +3,10 @@ package repository import ( "errors" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) func (s *server) GetSnapshot(in *gitalypb.GetSnapshotRequest, stream gitalypb.RepositoryService_GetSnapshotServer) error { diff --git a/internal/gitaly/service/repository/snapshot_test.go b/internal/gitaly/service/repository/snapshot_test.go index 4c4c226f8c..2230f90377 100644 --- a/internal/gitaly/service/repository/snapshot_test.go +++ b/internal/gitaly/service/repository/snapshot_test.go @@ -13,15 +13,15 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/archive" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/archive" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) func TestGetSnapshot(t *testing.T) { diff --git a/internal/gitaly/service/repository/testhelper_test.go b/internal/gitaly/service/repository/testhelper_test.go index 39b618ce59..66acd05f69 100644 --- a/internal/gitaly/service/repository/testhelper_test.go +++ b/internal/gitaly/service/repository/testhelper_test.go @@ -6,21 +6,21 @@ import ( "github.com/sirupsen/logrus" "github.com/stretchr/testify/require" - gitalyauth "gitlab.com/gitlab-org/gitaly/v16/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/commit" - hookservice "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/objectpool" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/ref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/remote" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/ssh" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + gitalyauth "gitlab.com/gitlab-org/gitaly/v17/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/commit" + hookservice "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/objectpool" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/ref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/remote" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/ssh" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" ) diff --git a/internal/gitaly/service/repository/util.go b/internal/gitaly/service/repository/util.go index 916e06beeb..b4d68f8c4c 100644 --- a/internal/gitaly/service/repository/util.go +++ b/internal/gitaly/service/repository/util.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" ) func (s *server) removeOriginInRepo(ctx context.Context, repository gitcmd.RepositoryExecutor) error { diff --git a/internal/gitaly/service/repository/write_ref.go b/internal/gitaly/service/repository/write_ref.go index 73362d25eb..82db15f6b0 100644 --- a/internal/gitaly/service/repository/write_ref.go +++ b/internal/gitaly/service/repository/write_ref.go @@ -6,12 +6,12 @@ import ( "errors" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) WriteRef(ctx context.Context, req *gitalypb.WriteRefRequest) (*gitalypb.WriteRefResponse, error) { diff --git a/internal/gitaly/service/repository/write_ref_test.go b/internal/gitaly/service/repository/write_ref_test.go index 08c5f41768..bf270d8d0b 100644 --- a/internal/gitaly/service/repository/write_ref_test.go +++ b/internal/gitaly/service/repository/write_ref_test.go @@ -6,18 +6,18 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestWriteRef(t *testing.T) { diff --git a/internal/gitaly/service/server/disk_stats.go b/internal/gitaly/service/server/disk_stats.go index 7efc0db375..8d5892cf7c 100644 --- a/internal/gitaly/service/server/disk_stats.go +++ b/internal/gitaly/service/server/disk_stats.go @@ -3,7 +3,7 @@ package server import ( "context" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) DiskStatistics(ctx context.Context, _ *gitalypb.DiskStatisticsRequest) (*gitalypb.DiskStatisticsResponse, error) { diff --git a/internal/gitaly/service/server/disk_stats_test.go b/internal/gitaly/service/server/disk_stats_test.go index 0e0668b1f5..a6f05eacab 100644 --- a/internal/gitaly/service/server/disk_stats_test.go +++ b/internal/gitaly/service/server/disk_stats_test.go @@ -6,9 +6,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "golang.org/x/sys/unix" ) diff --git a/internal/gitaly/service/server/info.go b/internal/gitaly/service/server/info.go index 4df03409bf..6f02f7e312 100644 --- a/internal/gitaly/service/server/info.go +++ b/internal/gitaly/service/server/info.go @@ -4,12 +4,12 @@ import ( "context" "os" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mdfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode/permission" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/fstype" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/version" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mdfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode/permission" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/fstype" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/version" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) ServerInfo(ctx context.Context, in *gitalypb.ServerInfoRequest) (*gitalypb.ServerInfoResponse, error) { diff --git a/internal/gitaly/service/server/info_test.go b/internal/gitaly/service/server/info_test.go index 1f215b2e2a..40f1ba40af 100644 --- a/internal/gitaly/service/server/info_test.go +++ b/internal/gitaly/service/server/info_test.go @@ -5,17 +5,17 @@ import ( "testing" "github.com/stretchr/testify/require" - gitalyauth "gitlab.com/gitlab-org/gitaly/v16/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mdfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/internal/version" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + gitalyauth "gitlab.com/gitlab-org/gitaly/v17/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mdfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/version" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/credentials/insecure" diff --git a/internal/gitaly/service/server/readiness.go b/internal/gitaly/service/server/readiness.go index 60cb12bdb7..a532244d38 100644 --- a/internal/gitaly/service/server/readiness.go +++ b/internal/gitaly/service/server/readiness.go @@ -3,7 +3,7 @@ package server import ( "context" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // ReadinessCheck is a stub that does nothing but exists to support single interface for gitaly diff --git a/internal/gitaly/service/server/server.go b/internal/gitaly/service/server/server.go index 0400a6c4e7..a4ea9f908b 100644 --- a/internal/gitaly/service/server/server.go +++ b/internal/gitaly/service/server/server.go @@ -1,11 +1,11 @@ package server import ( - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) type server struct { diff --git a/internal/gitaly/service/server/signature.go b/internal/gitaly/service/server/signature.go index dc38cb8f47..efddb764c3 100644 --- a/internal/gitaly/service/server/signature.go +++ b/internal/gitaly/service/server/signature.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/signature" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/signature" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // ServerSignature reponds with PublicKey used by Gitaly for commit signature diff --git a/internal/gitaly/service/server/signature_test.go b/internal/gitaly/service/server/signature_test.go index 01947762ec..7c4b0c5f6a 100644 --- a/internal/gitaly/service/server/signature_test.go +++ b/internal/gitaly/service/server/signature_test.go @@ -6,10 +6,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestServerSignature(t *testing.T) { diff --git a/internal/gitaly/service/server/storage_status_openbsd.go b/internal/gitaly/service/server/storage_status_openbsd.go index e7ff40a6a4..15363ee900 100644 --- a/internal/gitaly/service/server/storage_status_openbsd.go +++ b/internal/gitaly/service/server/storage_status_openbsd.go @@ -1,8 +1,8 @@ package server import ( - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "golang.org/x/sys/unix" ) diff --git a/internal/gitaly/service/server/storage_status_unix.go b/internal/gitaly/service/server/storage_status_unix.go index 7f33adec80..1bfbe6e5a5 100644 --- a/internal/gitaly/service/server/storage_status_unix.go +++ b/internal/gitaly/service/server/storage_status_unix.go @@ -3,8 +3,8 @@ package server import ( - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "golang.org/x/sys/unix" ) diff --git a/internal/gitaly/service/server/testhelper_test.go b/internal/gitaly/service/server/testhelper_test.go index 7846a01f9d..ced620b383 100644 --- a/internal/gitaly/service/server/testhelper_test.go +++ b/internal/gitaly/service/server/testhelper_test.go @@ -3,7 +3,7 @@ package server import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/service/setup/register.go b/internal/gitaly/service/setup/register.go index 732cb31d8b..af54f10cba 100644 --- a/internal/gitaly/service/setup/register.go +++ b/internal/gitaly/service/setup/register.go @@ -4,27 +4,27 @@ import ( grpcprometheus "github.com/grpc-ecosystem/go-grpc-prometheus" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/server/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/analysis" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/blob" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/cleanup" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/commit" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/conflicts" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/diff" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/internalgitaly" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/objectpool" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/operations" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/partition" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/raft" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/ref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/remote" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/repository" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/server" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/smarthttp" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/ssh" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/server/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/analysis" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/blob" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/cleanup" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/commit" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/conflicts" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/diff" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/internalgitaly" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/objectpool" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/operations" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/partition" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/raft" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/ref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/remote" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/repository" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/server" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/smarthttp" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/ssh" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/health" healthpb "google.golang.org/grpc/health/grpc_health_v1" diff --git a/internal/gitaly/service/smarthttp/cache.go b/internal/gitaly/service/smarthttp/cache.go index 154261bbc4..7efba27075 100644 --- a/internal/gitaly/service/smarthttp/cache.go +++ b/internal/gitaly/service/smarthttp/cache.go @@ -8,11 +8,11 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "gitlab.com/gitlab-org/gitaly/v16/internal/cache" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/cache" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/proto" ) diff --git a/internal/gitaly/service/smarthttp/inforefs.go b/internal/gitaly/service/smarthttp/inforefs.go index fb49ae14f6..8a7f0ef859 100644 --- a/internal/gitaly/service/smarthttp/inforefs.go +++ b/internal/gitaly/service/smarthttp/inforefs.go @@ -5,14 +5,14 @@ import ( "fmt" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/bundleuri" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/pktline" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/bundleuri" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) const ( diff --git a/internal/gitaly/service/smarthttp/inforefs_test.go b/internal/gitaly/service/smarthttp/inforefs_test.go index aa8f54c195..2158a5996c 100644 --- a/internal/gitaly/service/smarthttp/inforefs_test.go +++ b/internal/gitaly/service/smarthttp/inforefs_test.go @@ -14,22 +14,22 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/bundleuri" - "gitlab.com/gitlab-org/gitaly/v16/internal/cache" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/bundleuri" + "gitlab.com/gitlab-org/gitaly/v17/internal/cache" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" "google.golang.org/grpc/codes" "google.golang.org/protobuf/proto" ) diff --git a/internal/gitaly/service/smarthttp/receive_pack.go b/internal/gitaly/service/smarthttp/receive_pack.go index c6a2e9b406..1702cd020a 100644 --- a/internal/gitaly/service/smarthttp/receive_pack.go +++ b/internal/gitaly/service/smarthttp/receive_pack.go @@ -5,16 +5,16 @@ import ( "errors" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook/receivepack" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook/receivepack" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) func (s *server) PostReceivePack(stream gitalypb.SmartHTTPService_PostReceivePackServer) error { diff --git a/internal/gitaly/service/smarthttp/receive_pack_test.go b/internal/gitaly/service/smarthttp/receive_pack_test.go index 0a7824394f..d13913fe79 100644 --- a/internal/gitaly/service/smarthttp/receive_pack_test.go +++ b/internal/gitaly/service/smarthttp/receive_pack_test.go @@ -12,27 +12,27 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/pktline" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - gitalyhook "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitlab" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + gitalyhook "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitlab" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" "google.golang.org/grpc" ) diff --git a/internal/gitaly/service/smarthttp/server.go b/internal/gitaly/service/smarthttp/server.go index d68e548f5e..a608da8cf9 100644 --- a/internal/gitaly/service/smarthttp/server.go +++ b/internal/gitaly/service/smarthttp/server.go @@ -2,18 +2,18 @@ package smarthttp import ( "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/backup" - "gitlab.com/gitlab-org/gitaly/v16/internal/bundleuri" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/backup" + "gitlab.com/gitlab-org/gitaly/v17/internal/bundleuri" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) type server struct { diff --git a/internal/gitaly/service/smarthttp/testhelper_test.go b/internal/gitaly/service/smarthttp/testhelper_test.go index 251fdacb81..93dbcaa806 100644 --- a/internal/gitaly/service/smarthttp/testhelper_test.go +++ b/internal/gitaly/service/smarthttp/testhelper_test.go @@ -5,18 +5,18 @@ import ( "testing" "github.com/stretchr/testify/require" - gitalyauth "gitlab.com/gitlab-org/gitaly/v16/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/commit" - hookservice "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/objectpool" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/repository" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + gitalyauth "gitlab.com/gitlab-org/gitaly/v17/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/commit" + hookservice "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/objectpool" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/repository" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) diff --git a/internal/gitaly/service/smarthttp/upload_pack.go b/internal/gitaly/service/smarthttp/upload_pack.go index b10527cb5a..670d1cb88d 100644 --- a/internal/gitaly/service/smarthttp/upload_pack.go +++ b/internal/gitaly/service/smarthttp/upload_pack.go @@ -7,13 +7,13 @@ import ( "fmt" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/bundleuri" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/sidechannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/bundleuri" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/sidechannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) PostUploadPackWithSidechannel(ctx context.Context, req *gitalypb.PostUploadPackWithSidechannelRequest) (*gitalypb.PostUploadPackWithSidechannelResponse, error) { diff --git a/internal/gitaly/service/smarthttp/upload_pack_test.go b/internal/gitaly/service/smarthttp/upload_pack_test.go index 8fab391132..5e437dbe51 100644 --- a/internal/gitaly/service/smarthttp/upload_pack_test.go +++ b/internal/gitaly/service/smarthttp/upload_pack_test.go @@ -17,23 +17,23 @@ import ( promtest "github.com/prometheus/client_golang/prometheus/testutil" "github.com/sirupsen/logrus" "github.com/stretchr/testify/require" - gitalyauth "gitlab.com/gitlab-org/gitaly/v16/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/bundleuri" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/pktline" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/sidechannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/streamcache" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + gitalyauth "gitlab.com/gitlab-org/gitaly/v17/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/bundleuri" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/sidechannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/streamcache" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) diff --git a/internal/gitaly/service/ssh/receive_pack.go b/internal/gitaly/service/ssh/receive_pack.go index 7386a75d6d..91977790e0 100644 --- a/internal/gitaly/service/ssh/receive_pack.go +++ b/internal/gitaly/service/ssh/receive_pack.go @@ -9,17 +9,17 @@ import ( "strings" "sync" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook/receivepack" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook/receivepack" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) func (s *server) SSHReceivePack(stream gitalypb.SSHService_SSHReceivePackServer) error { diff --git a/internal/gitaly/service/ssh/receive_pack_test.go b/internal/gitaly/service/ssh/receive_pack_test.go index 5f2a309f28..3023688c48 100644 --- a/internal/gitaly/service/ssh/receive_pack_test.go +++ b/internal/gitaly/service/ssh/receive_pack_test.go @@ -13,27 +13,27 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitlab" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitlab" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" "google.golang.org/protobuf/encoding/protojson" ) diff --git a/internal/gitaly/service/ssh/server.go b/internal/gitaly/service/ssh/server.go index a420a83e49..04f0ae71e3 100644 --- a/internal/gitaly/service/ssh/server.go +++ b/internal/gitaly/service/ssh/server.go @@ -2,19 +2,19 @@ package ssh import ( "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/backup" - "gitlab.com/gitlab-org/gitaly/v16/internal/bundleuri" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/backup" + "gitlab.com/gitlab-org/gitaly/v17/internal/bundleuri" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) type server struct { diff --git a/internal/gitaly/service/ssh/testhelper_test.go b/internal/gitaly/service/ssh/testhelper_test.go index b513377e15..6c6c27b3e7 100644 --- a/internal/gitaly/service/ssh/testhelper_test.go +++ b/internal/gitaly/service/ssh/testhelper_test.go @@ -5,15 +5,15 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - hookservice "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/objectpool" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/repository" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/sidechannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + hookservice "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/objectpool" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/repository" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/sidechannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) diff --git a/internal/gitaly/service/ssh/upload_archive.go b/internal/gitaly/service/ssh/upload_archive.go index 6f352b5b69..704bdfcc8d 100644 --- a/internal/gitaly/service/ssh/upload_archive.go +++ b/internal/gitaly/service/ssh/upload_archive.go @@ -6,13 +6,13 @@ import ( "fmt" "sync" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/pktline" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/streamio" ) func (s *server) SSHUploadArchive(stream gitalypb.SSHService_SSHUploadArchiveServer) error { diff --git a/internal/gitaly/service/ssh/upload_archive_test.go b/internal/gitaly/service/ssh/upload_archive_test.go index d60d30d321..58b7de2d51 100644 --- a/internal/gitaly/service/ssh/upload_archive_test.go +++ b/internal/gitaly/service/ssh/upload_archive_test.go @@ -6,14 +6,14 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/encoding/protojson" ) diff --git a/internal/gitaly/service/ssh/upload_command.go b/internal/gitaly/service/ssh/upload_command.go index 68d2af2ca2..a171782a12 100644 --- a/internal/gitaly/service/ssh/upload_command.go +++ b/internal/gitaly/service/ssh/upload_command.go @@ -6,11 +6,11 @@ import ( "io" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/pktline" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" ) // runUploadCommand runs an uploading command like git-upload-pack(1) or git-upload-archive(1). It serves multiple diff --git a/internal/gitaly/service/ssh/upload_pack.go b/internal/gitaly/service/ssh/upload_pack.go index ace512ce45..ffeeab6f8d 100644 --- a/internal/gitaly/service/ssh/upload_pack.go +++ b/internal/gitaly/service/ssh/upload_pack.go @@ -6,15 +6,15 @@ import ( "io" "sync" - "gitlab.com/gitlab-org/gitaly/v16/internal/bundleuri" - "gitlab.com/gitlab-org/gitaly/v16/internal/command" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/pktline" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/sidechannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/stream" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/bundleuri" + "gitlab.com/gitlab-org/gitaly/v17/internal/command" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/sidechannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/stream" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func (s *server) sshUploadPack(ctx context.Context, req *gitalypb.SSHUploadPackWithSidechannelRequest, stdin io.Reader, stdout, stderr io.Writer) (negotiation *stats.PackfileNegotiation, _ int, _ error) { diff --git a/internal/gitaly/service/ssh/upload_pack_test.go b/internal/gitaly/service/ssh/upload_pack_test.go index db750f5d65..fd824a118a 100644 --- a/internal/gitaly/service/ssh/upload_pack_test.go +++ b/internal/gitaly/service/ssh/upload_pack_test.go @@ -15,24 +15,24 @@ import ( "github.com/prometheus/client_golang/prometheus" promtest "github.com/prometheus/client_golang/prometheus/testutil" "github.com/stretchr/testify/require" - gitalyauth "gitlab.com/gitlab-org/gitaly/v16/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/sidechannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/streamcache" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + gitalyauth "gitlab.com/gitlab-org/gitaly/v17/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/sidechannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/streamcache" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" "google.golang.org/protobuf/encoding/protojson" diff --git a/internal/gitaly/storage/context_test.go b/internal/gitaly/storage/context_test.go index 8c2be7e44a..7c07bdd0e2 100644 --- a/internal/gitaly/storage/context_test.go +++ b/internal/gitaly/storage/context_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" "google.golang.org/grpc/metadata" ) diff --git a/internal/gitaly/storage/counter/counter.go b/internal/gitaly/storage/counter/counter.go index 75d4406038..55510e3576 100644 --- a/internal/gitaly/storage/counter/counter.go +++ b/internal/gitaly/storage/counter/counter.go @@ -10,11 +10,11 @@ import ( "time" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/dontpanic" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/walk" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/dontpanic" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/walk" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) // RepositoryCounter provides metrics with a count of repositories present diff --git a/internal/gitaly/storage/counter/counter_test.go b/internal/gitaly/storage/counter/counter_test.go index b66839957f..f9b7434081 100644 --- a/internal/gitaly/storage/counter/counter_test.go +++ b/internal/gitaly/storage/counter/counter_test.go @@ -6,12 +6,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) type metric struct { diff --git a/internal/gitaly/storage/counter/testhelper_test.go b/internal/gitaly/storage/counter/testhelper_test.go index ba7d60cbea..0bd98074ac 100644 --- a/internal/gitaly/storage/counter/testhelper_test.go +++ b/internal/gitaly/storage/counter/testhelper_test.go @@ -3,7 +3,7 @@ package counter import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/storage/fs.go b/internal/gitaly/storage/fs.go index 53656522c0..4ce42356aa 100644 --- a/internal/gitaly/storage/fs.go +++ b/internal/gitaly/storage/fs.go @@ -8,8 +8,8 @@ import ( "path/filepath" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" ) type noopFS struct { diff --git a/internal/gitaly/storage/fs_test.go b/internal/gitaly/storage/fs_test.go index be259b34da..df2e590640 100644 --- a/internal/gitaly/storage/fs_test.go +++ b/internal/gitaly/storage/fs_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) type operations []any diff --git a/internal/gitaly/storage/gitstorage/alternates.go b/internal/gitaly/storage/gitstorage/alternates.go index 3d9d966883..f87989c1c4 100644 --- a/internal/gitaly/storage/gitstorage/alternates.go +++ b/internal/gitaly/storage/gitstorage/alternates.go @@ -5,7 +5,7 @@ import ( "fmt" "io/fs" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" ) var ( diff --git a/internal/gitaly/storage/keyvalue/badger.go b/internal/gitaly/storage/keyvalue/badger.go index 4ea127c423..ee9164072c 100644 --- a/internal/gitaly/storage/keyvalue/badger.go +++ b/internal/gitaly/storage/keyvalue/badger.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/dgraph-io/badger/v4" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) // NewBadgerStore returns a new Store backed by a Badger database at the given path. diff --git a/internal/gitaly/storage/keyvalue/databasemgr/db.go b/internal/gitaly/storage/keyvalue/databasemgr/db.go index 783383b9ab..77d4d716bf 100644 --- a/internal/gitaly/storage/keyvalue/databasemgr/db.go +++ b/internal/gitaly/storage/keyvalue/databasemgr/db.go @@ -9,12 +9,12 @@ import ( "path/filepath" "github.com/dgraph-io/badger/v4" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/safe" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/safe" ) // Configure the garbage collection discard ratio at 0.5. This means the value log is garbage diff --git a/internal/gitaly/storage/keyvalue/databasemgr/db_test.go b/internal/gitaly/storage/keyvalue/databasemgr/db_test.go index 1d1f779af1..aada24c657 100644 --- a/internal/gitaly/storage/keyvalue/databasemgr/db_test.go +++ b/internal/gitaly/storage/keyvalue/databasemgr/db_test.go @@ -9,11 +9,11 @@ import ( "github.com/dgraph-io/badger/v4" "github.com/sirupsen/logrus" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) type dbWrapper struct { diff --git a/internal/gitaly/storage/keyvalue/databasemgr/testhelper_test.go b/internal/gitaly/storage/keyvalue/databasemgr/testhelper_test.go index 2aa3b12c6c..de0f58bd86 100644 --- a/internal/gitaly/storage/keyvalue/databasemgr/testhelper_test.go +++ b/internal/gitaly/storage/keyvalue/databasemgr/testhelper_test.go @@ -3,7 +3,7 @@ package databasemgr import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/storage/keyvalue/prefixed_test.go b/internal/gitaly/storage/keyvalue/prefixed_test.go index 7065cd2762..583f5f5052 100644 --- a/internal/gitaly/storage/keyvalue/prefixed_test.go +++ b/internal/gitaly/storage/keyvalue/prefixed_test.go @@ -6,7 +6,7 @@ import ( "github.com/dgraph-io/badger/v4" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestPrefixedTransactioner(t *testing.T) { diff --git a/internal/gitaly/storage/keyvalue/recorder_test.go b/internal/gitaly/storage/keyvalue/recorder_test.go index c4e017a1df..c7aa1ea30c 100644 --- a/internal/gitaly/storage/keyvalue/recorder_test.go +++ b/internal/gitaly/storage/keyvalue/recorder_test.go @@ -5,7 +5,7 @@ import ( "github.com/dgraph-io/badger/v4" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestRecordingReadWriter(t *testing.T) { diff --git a/internal/gitaly/storage/keyvalue/testhelper_test.go b/internal/gitaly/storage/keyvalue/testhelper_test.go index 05ebcb8ac9..f7058ef81f 100644 --- a/internal/gitaly/storage/keyvalue/testhelper_test.go +++ b/internal/gitaly/storage/keyvalue/testhelper_test.go @@ -3,7 +3,7 @@ package keyvalue import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/storage/locator.go b/internal/gitaly/storage/locator.go index 20dbe54db8..80bfb296a0 100644 --- a/internal/gitaly/storage/locator.go +++ b/internal/gitaly/storage/locator.go @@ -10,7 +10,7 @@ import ( "path/filepath" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" ) // NewStorageNotFoundError returns a new error wrapping ErrStorageNotFound with an InvalidArgument diff --git a/internal/gitaly/storage/locator_test.go b/internal/gitaly/storage/locator_test.go index ccc0bce481..a4e8dd58e6 100644 --- a/internal/gitaly/storage/locator_test.go +++ b/internal/gitaly/storage/locator_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestRepoPathEqual(t *testing.T) { diff --git a/internal/gitaly/storage/lsn.go b/internal/gitaly/storage/lsn.go index 8a350a08ca..0829098c3b 100644 --- a/internal/gitaly/storage/lsn.go +++ b/internal/gitaly/storage/lsn.go @@ -5,7 +5,7 @@ import ( "math" "strconv" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // lsnFormatBase is the base used when formatting an LSN as a string. diff --git a/internal/gitaly/storage/mdfile/metadata.go b/internal/gitaly/storage/mdfile/metadata.go index 0da46518f4..fe9019c24e 100644 --- a/internal/gitaly/storage/mdfile/metadata.go +++ b/internal/gitaly/storage/mdfile/metadata.go @@ -8,7 +8,7 @@ import ( "path/filepath" "github.com/google/uuid" - "gitlab.com/gitlab-org/gitaly/v16/internal/safe" + "gitlab.com/gitlab-org/gitaly/v17/internal/safe" ) const ( diff --git a/internal/gitaly/storage/mdfile/metadata_test.go b/internal/gitaly/storage/mdfile/metadata_test.go index e2d8951cfd..cf9f2aca88 100644 --- a/internal/gitaly/storage/mdfile/metadata_test.go +++ b/internal/gitaly/storage/mdfile/metadata_test.go @@ -8,7 +8,7 @@ import ( "github.com/google/uuid" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func readFilesystemID(t *testing.T, path string) string { diff --git a/internal/gitaly/storage/mdfile/testhelper_test.go b/internal/gitaly/storage/mdfile/testhelper_test.go index 161daea9ee..971508cc1a 100644 --- a/internal/gitaly/storage/mdfile/testhelper_test.go +++ b/internal/gitaly/storage/mdfile/testhelper_test.go @@ -3,7 +3,7 @@ package mdfile import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/storage/mode/mode.go b/internal/gitaly/storage/mode/mode.go index a220622db5..a52b38b603 100644 --- a/internal/gitaly/storage/mode/mode.go +++ b/internal/gitaly/storage/mode/mode.go @@ -5,7 +5,7 @@ package mode import ( "io/fs" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode/permission" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode/permission" ) const ( diff --git a/internal/gitaly/storage/mode/mode_test.go b/internal/gitaly/storage/mode/mode_test.go index 8e1962021a..3078755a4f 100644 --- a/internal/gitaly/storage/mode/mode_test.go +++ b/internal/gitaly/storage/mode/mode_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" ) func TestDirectory(t *testing.T) { diff --git a/internal/gitaly/storage/mode/permission/permission_test.go b/internal/gitaly/storage/mode/permission/permission_test.go index c666d7fce6..29c30c4cc6 100644 --- a/internal/gitaly/storage/mode/permission/permission_test.go +++ b/internal/gitaly/storage/mode/permission/permission_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode/permission" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode/permission" ) func TestOwnerRead(t *testing.T) { diff --git a/internal/gitaly/storage/mode/permission/testhelper_test.go b/internal/gitaly/storage/mode/permission/testhelper_test.go index a84b083c0b..c420b98412 100644 --- a/internal/gitaly/storage/mode/permission/testhelper_test.go +++ b/internal/gitaly/storage/mode/permission/testhelper_test.go @@ -3,7 +3,7 @@ package permission_test import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/storage/mode/testhelper_test.go b/internal/gitaly/storage/mode/testhelper_test.go index 1465ac3fee..3eb5890bd1 100644 --- a/internal/gitaly/storage/mode/testhelper_test.go +++ b/internal/gitaly/storage/mode/testhelper_test.go @@ -3,7 +3,7 @@ package mode_test import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/storage/node/manager.go b/internal/gitaly/storage/node/manager.go index 892789b9f2..c45e85a12e 100644 --- a/internal/gitaly/storage/node/manager.go +++ b/internal/gitaly/storage/node/manager.go @@ -4,8 +4,8 @@ import ( "fmt" "sync" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" ) // StorageFactory is responsible for instantiating a Storage. diff --git a/internal/gitaly/storage/node/manager_test.go b/internal/gitaly/storage/node/manager_test.go index 2cd8d34341..6b60720736 100644 --- a/internal/gitaly/storage/node/manager_test.go +++ b/internal/gitaly/storage/node/manager_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) type StorageFactoryFunc func(storageName, storagePath string) (Storage, error) diff --git a/internal/gitaly/storage/node/testhelper_test.go b/internal/gitaly/storage/node/testhelper_test.go index 1a4c2d1903..38e40f84b3 100644 --- a/internal/gitaly/storage/node/testhelper_test.go +++ b/internal/gitaly/storage/node/testhelper_test.go @@ -3,7 +3,7 @@ package node import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/storage/raftmgr/entry_recorder.go b/internal/gitaly/storage/raftmgr/entry_recorder.go index 570e2aacbe..497648f60e 100644 --- a/internal/gitaly/storage/raftmgr/entry_recorder.go +++ b/internal/gitaly/storage/raftmgr/entry_recorder.go @@ -4,8 +4,8 @@ import ( "slices" "sync" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/proto" ) diff --git a/internal/gitaly/storage/raftmgr/entry_recorder_test.go b/internal/gitaly/storage/raftmgr/entry_recorder_test.go index 6e1d35c60a..0dea0e6209 100644 --- a/internal/gitaly/storage/raftmgr/entry_recorder_test.go +++ b/internal/gitaly/storage/raftmgr/entry_recorder_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestLogEntryRecorder(t *testing.T) { diff --git a/internal/gitaly/storage/raftmgr/event_registry.go b/internal/gitaly/storage/raftmgr/event_registry.go index 468a95dc70..46dd97b205 100644 --- a/internal/gitaly/storage/raftmgr/event_registry.go +++ b/internal/gitaly/storage/raftmgr/event_registry.go @@ -4,7 +4,7 @@ import ( "fmt" "sync" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" ) // ErrObsoleted is returned when an event associated with a LSN is shadowed by another one with higher term. That event diff --git a/internal/gitaly/storage/raftmgr/event_registry_test.go b/internal/gitaly/storage/raftmgr/event_registry_test.go index 8c55f65a57..1bca9cf37f 100644 --- a/internal/gitaly/storage/raftmgr/event_registry_test.go +++ b/internal/gitaly/storage/raftmgr/event_registry_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" ) func TestRegistry_Untrack(t *testing.T) { diff --git a/internal/gitaly/storage/raftmgr/grpc_transport.go b/internal/gitaly/storage/raftmgr/grpc_transport.go index 1ef949464a..57e5fa465b 100644 --- a/internal/gitaly/storage/raftmgr/grpc_transport.go +++ b/internal/gitaly/storage/raftmgr/grpc_transport.go @@ -11,13 +11,13 @@ import ( "path/filepath" "sync" - "gitlab.com/gitlab-org/gitaly/v16/internal/archive" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/archive" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "go.etcd.io/etcd/raft/v3/raftpb" "golang.org/x/sync/errgroup" "google.golang.org/grpc/codes" diff --git a/internal/gitaly/storage/raftmgr/grpc_transport_test.go b/internal/gitaly/storage/raftmgr/grpc_transport_test.go index c78c727c7d..f5eec89b96 100644 --- a/internal/gitaly/storage/raftmgr/grpc_transport_test.go +++ b/internal/gitaly/storage/raftmgr/grpc_transport_test.go @@ -10,15 +10,15 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - logger "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + logger "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "go.etcd.io/etcd/raft/v3/raftpb" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/internal/gitaly/storage/raftmgr/logger.go b/internal/gitaly/storage/raftmgr/logger.go index 710721981e..a8f2b30366 100644 --- a/internal/gitaly/storage/raftmgr/logger.go +++ b/internal/gitaly/storage/raftmgr/logger.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) // raftLogger is a wrapper around the log.Logger interface to diff --git a/internal/gitaly/storage/raftmgr/logger_test.go b/internal/gitaly/storage/raftmgr/logger_test.go index 0bac85f370..989f2de936 100644 --- a/internal/gitaly/storage/raftmgr/logger_test.go +++ b/internal/gitaly/storage/raftmgr/logger_test.go @@ -5,7 +5,7 @@ import ( "github.com/sirupsen/logrus" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestRaftLogger(t *testing.T) { diff --git a/internal/gitaly/storage/raftmgr/manager.go b/internal/gitaly/storage/raftmgr/manager.go index 64769fdb9a..0f691c2f55 100644 --- a/internal/gitaly/storage/raftmgr/manager.go +++ b/internal/gitaly/storage/raftmgr/manager.go @@ -3,7 +3,7 @@ package raftmgr import ( "context" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" "go.etcd.io/etcd/raft/v3/raftpb" ) diff --git a/internal/gitaly/storage/raftmgr/storage.go b/internal/gitaly/storage/raftmgr/storage.go index f7772dd452..611759ad07 100644 --- a/internal/gitaly/storage/raftmgr/storage.go +++ b/internal/gitaly/storage/raftmgr/storage.go @@ -9,13 +9,13 @@ import ( "sync" "github.com/dgraph-io/badger/v4" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/wal" - "gitlab.com/gitlab-org/gitaly/v16/internal/safe" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/wal" + "gitlab.com/gitlab-org/gitaly/v17/internal/safe" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "go.etcd.io/etcd/raft/v3" "go.etcd.io/etcd/raft/v3/raftpb" ) diff --git a/internal/gitaly/storage/raftmgr/storage_test.go b/internal/gitaly/storage/raftmgr/storage_test.go index 9322bfa098..9f4ed6c859 100644 --- a/internal/gitaly/storage/raftmgr/storage_test.go +++ b/internal/gitaly/storage/raftmgr/storage_test.go @@ -7,16 +7,16 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue/databasemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/wal" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue/databasemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/wal" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "go.etcd.io/etcd/raft/v3" "go.etcd.io/etcd/raft/v3/raftpb" ) diff --git a/internal/gitaly/storage/raftmgr/testhelper_test.go b/internal/gitaly/storage/raftmgr/testhelper_test.go index c6c4a4694c..eb78f30d99 100644 --- a/internal/gitaly/storage/raftmgr/testhelper_test.go +++ b/internal/gitaly/storage/raftmgr/testhelper_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - logger "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + logger "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" "go.etcd.io/etcd/raft/v3/raftpb" ) diff --git a/internal/gitaly/storage/repository_path_test.go b/internal/gitaly/storage/repository_path_test.go index aa9b4de808..785590d823 100644 --- a/internal/gitaly/storage/repository_path_test.go +++ b/internal/gitaly/storage/repository_path_test.go @@ -4,9 +4,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestDeriveReplicaPath(t *testing.T) { diff --git a/internal/gitaly/storage/servers.go b/internal/gitaly/storage/servers.go index cee5278c76..b7526344bf 100644 --- a/internal/gitaly/storage/servers.go +++ b/internal/gitaly/storage/servers.go @@ -7,7 +7,7 @@ import ( "errors" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/env" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/env" "google.golang.org/grpc/metadata" ) diff --git a/internal/gitaly/storage/servers_test.go b/internal/gitaly/storage/servers_test.go index bb737e0fbf..50719904aa 100644 --- a/internal/gitaly/storage/servers_test.go +++ b/internal/gitaly/storage/servers_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" "google.golang.org/grpc/metadata" ) diff --git a/internal/gitaly/storage/set_directory_mode_test.go b/internal/gitaly/storage/set_directory_mode_test.go index 66b2acbdce..a2ca96858b 100644 --- a/internal/gitaly/storage/set_directory_mode_test.go +++ b/internal/gitaly/storage/set_directory_mode_test.go @@ -7,9 +7,9 @@ import ( "testing/fstest" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode/permission" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode/permission" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestSetDirectoryMode(t *testing.T) { diff --git a/internal/gitaly/storage/storage.go b/internal/gitaly/storage/storage.go index aa8b5d628e..3c9e22909e 100644 --- a/internal/gitaly/storage/storage.go +++ b/internal/gitaly/storage/storage.go @@ -13,10 +13,10 @@ import ( "context" "errors" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - housekeepingcfg "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + housekeepingcfg "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) var ( diff --git a/internal/gitaly/storage/storagemgr/factory.go b/internal/gitaly/storage/storagemgr/factory.go index b6f2f9c66d..1630bcae12 100644 --- a/internal/gitaly/storage/storagemgr/factory.go +++ b/internal/gitaly/storage/storagemgr/factory.go @@ -1,9 +1,9 @@ package storagemgr import ( - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue/databasemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/node" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue/databasemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/node" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) // Factory is a factory type that can instantiate new storages. diff --git a/internal/gitaly/storage/storagemgr/metrics.go b/internal/gitaly/storage/storagemgr/metrics.go index bfae820851..0f4a073f71 100644 --- a/internal/gitaly/storage/storagemgr/metrics.go +++ b/internal/gitaly/storage/storagemgr/metrics.go @@ -2,7 +2,7 @@ package storagemgr import ( "github.com/prometheus/client_golang/prometheus" - gitalycfgprom "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/prometheus" + gitalycfgprom "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/prometheus" ) // Metrics contains the unscoped collected by StorageManager. diff --git a/internal/gitaly/storage/storagemgr/middleware.go b/internal/gitaly/storage/storagemgr/middleware.go index 5b41895807..5de61f7417 100644 --- a/internal/gitaly/storage/storagemgr/middleware.go +++ b/internal/gitaly/storage/storagemgr/middleware.go @@ -5,13 +5,13 @@ import ( "errors" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/tracing" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/tracing" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/health/grpc_health_v1" "google.golang.org/protobuf/proto" diff --git a/internal/gitaly/storage/storagemgr/middleware_ext_test.go b/internal/gitaly/storage/storagemgr/middleware_ext_test.go index 86467d0d7f..70c5047c7f 100644 --- a/internal/gitaly/storage/storagemgr/middleware_ext_test.go +++ b/internal/gitaly/storage/storagemgr/middleware_ext_test.go @@ -5,17 +5,17 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/setup" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/setup" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestMiddleware_partitioning_hint(t *testing.T) { diff --git a/internal/gitaly/storage/storagemgr/middleware_recovery.go b/internal/gitaly/storage/storagemgr/middleware_recovery.go index b9275a1740..00c9180d17 100644 --- a/internal/gitaly/storage/storagemgr/middleware_recovery.go +++ b/internal/gitaly/storage/storagemgr/middleware_recovery.go @@ -8,9 +8,9 @@ import ( "os" "sync" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue/databasemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue/databasemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" "google.golang.org/grpc" "google.golang.org/protobuf/proto" ) diff --git a/internal/gitaly/storage/storagemgr/middleware_recovery_test.go b/internal/gitaly/storage/storagemgr/middleware_recovery_test.go index 1e1888b7e3..5f68acdb04 100644 --- a/internal/gitaly/storage/storagemgr/middleware_recovery_test.go +++ b/internal/gitaly/storage/storagemgr/middleware_recovery_test.go @@ -9,17 +9,17 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue/databasemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/node" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue/databasemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/node" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/health/grpc_health_v1" "google.golang.org/protobuf/proto" diff --git a/internal/gitaly/storage/storagemgr/middleware_test.go b/internal/gitaly/storage/storagemgr/middleware_test.go index 39a6843a02..af1e8f6148 100644 --- a/internal/gitaly/storage/storagemgr/middleware_test.go +++ b/internal/gitaly/storage/storagemgr/middleware_test.go @@ -10,17 +10,17 @@ import ( "github.com/sirupsen/logrus/hooks/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/health/grpc_health_v1" diff --git a/internal/gitaly/storage/storagemgr/partition/apply_operations.go b/internal/gitaly/storage/storagemgr/partition/apply_operations.go index a531f804c5..d63f558366 100644 --- a/internal/gitaly/storage/storagemgr/partition/apply_operations.go +++ b/internal/gitaly/storage/storagemgr/partition/apply_operations.go @@ -8,8 +8,8 @@ import ( "os" "path/filepath" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // applyOperations applies the operations from the log entry to the storage. diff --git a/internal/gitaly/storage/storagemgr/partition/apply_operations_test.go b/internal/gitaly/storage/storagemgr/partition/apply_operations_test.go index 434b7cae6c..4cd3c29a72 100644 --- a/internal/gitaly/storage/storagemgr/partition/apply_operations_test.go +++ b/internal/gitaly/storage/storagemgr/partition/apply_operations_test.go @@ -8,12 +8,12 @@ import ( "testing/fstest" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/fsrecorder" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/wal" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/fsrecorder" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/wal" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestApplyOperations(t *testing.T) { diff --git a/internal/gitaly/storage/storagemgr/partition/check_objects.go b/internal/gitaly/storage/storagemgr/partition/check_objects.go index 0b8ec729b0..25dea65d8f 100644 --- a/internal/gitaly/storage/storagemgr/partition/check_objects.go +++ b/internal/gitaly/storage/storagemgr/partition/check_objects.go @@ -9,10 +9,10 @@ import ( "runtime/trace" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" ) func checkObjects(ctx context.Context, repository *localrepo.Repo, revisions []git.Revision, callback func(revision git.Revision, objectID git.ObjectID) error) (returnedErr error) { diff --git a/internal/gitaly/storage/storagemgr/partition/conflict/fshistory/errors.go b/internal/gitaly/storage/storagemgr/partition/conflict/fshistory/errors.go index 45255f45ba..75923cc966 100644 --- a/internal/gitaly/storage/storagemgr/partition/conflict/fshistory/errors.go +++ b/internal/gitaly/storage/storagemgr/partition/conflict/fshistory/errors.go @@ -1,8 +1,8 @@ package fshistory import ( - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" ) // ReadWriteConflictError is returned when transaction performed a read on an diff --git a/internal/gitaly/storage/storagemgr/partition/conflict/fshistory/history.go b/internal/gitaly/storage/storagemgr/partition/conflict/fshistory/history.go index 87e1ddbf6b..6941ff86e1 100644 --- a/internal/gitaly/storage/storagemgr/partition/conflict/fshistory/history.go +++ b/internal/gitaly/storage/storagemgr/partition/conflict/fshistory/history.go @@ -1,7 +1,7 @@ package fshistory import ( - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" ) // Transaction collects changes against a History. diff --git a/internal/gitaly/storage/storagemgr/partition/conflict/fshistory/history_test.go b/internal/gitaly/storage/storagemgr/partition/conflict/fshistory/history_test.go index c58a667a39..3e5839a3ae 100644 --- a/internal/gitaly/storage/storagemgr/partition/conflict/fshistory/history_test.go +++ b/internal/gitaly/storage/storagemgr/partition/conflict/fshistory/history_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" ) func TestHistory(t *testing.T) { diff --git a/internal/gitaly/storage/storagemgr/partition/conflict/fshistory/testhelper_test.go b/internal/gitaly/storage/storagemgr/partition/conflict/fshistory/testhelper_test.go index 13fcf535f5..6ab937aac1 100644 --- a/internal/gitaly/storage/storagemgr/partition/conflict/fshistory/testhelper_test.go +++ b/internal/gitaly/storage/storagemgr/partition/conflict/fshistory/testhelper_test.go @@ -3,7 +3,7 @@ package fshistory import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/storage/storagemgr/partition/conflict/fshistory/tree.go b/internal/gitaly/storage/storagemgr/partition/conflict/fshistory/tree.go index b4e8d01e83..35e3a1d38c 100644 --- a/internal/gitaly/storage/storagemgr/partition/conflict/fshistory/tree.go +++ b/internal/gitaly/storage/storagemgr/partition/conflict/fshistory/tree.go @@ -5,7 +5,7 @@ import ( "path/filepath" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" ) // children contains child nodes of a node keyed by their diff --git a/internal/gitaly/storage/storagemgr/partition/conflict/manager.go b/internal/gitaly/storage/storagemgr/partition/conflict/manager.go index b5981aa672..1cfb4ac9e2 100644 --- a/internal/gitaly/storage/storagemgr/partition/conflict/manager.go +++ b/internal/gitaly/storage/storagemgr/partition/conflict/manager.go @@ -4,10 +4,10 @@ import ( "context" "runtime/trace" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/conflict/refdb/historymgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/conflict/refdb/historymgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" ) // ErrRepositoryConcurrentlyDeleted is returned when the repository was concurrently deleted by diff --git a/internal/gitaly/storage/storagemgr/partition/conflict/manager_test.go b/internal/gitaly/storage/storagemgr/partition/conflict/manager_test.go index a5760db8da..09a18d434b 100644 --- a/internal/gitaly/storage/storagemgr/partition/conflict/manager_test.go +++ b/internal/gitaly/storage/storagemgr/partition/conflict/manager_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestManager(t *testing.T) { diff --git a/internal/gitaly/storage/storagemgr/partition/conflict/refdb/errors.go b/internal/gitaly/storage/storagemgr/partition/conflict/refdb/errors.go index f21c4a4c0a..280af8a0e9 100644 --- a/internal/gitaly/storage/storagemgr/partition/conflict/refdb/errors.go +++ b/internal/gitaly/storage/storagemgr/partition/conflict/refdb/errors.go @@ -1,8 +1,8 @@ package refdb import ( - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" ) // ChildReferencesExistError is raised when attempting to create a reference diff --git a/internal/gitaly/storage/storagemgr/partition/conflict/refdb/history.go b/internal/gitaly/storage/storagemgr/partition/conflict/refdb/history.go index 3980e6ef88..8ca8670da5 100644 --- a/internal/gitaly/storage/storagemgr/partition/conflict/refdb/history.go +++ b/internal/gitaly/storage/storagemgr/partition/conflict/refdb/history.go @@ -1,8 +1,8 @@ package refdb import ( - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" ) // Transaction appends updates to a History. The updates are only applied if diff --git a/internal/gitaly/storage/storagemgr/partition/conflict/refdb/history_test.go b/internal/gitaly/storage/storagemgr/partition/conflict/refdb/history_test.go index 27b46fda53..c8e5d280d6 100644 --- a/internal/gitaly/storage/storagemgr/partition/conflict/refdb/history_test.go +++ b/internal/gitaly/storage/storagemgr/partition/conflict/refdb/history_test.go @@ -4,9 +4,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" ) func TestTree(t *testing.T) { diff --git a/internal/gitaly/storage/storagemgr/partition/conflict/refdb/historymgr/manager.go b/internal/gitaly/storage/storagemgr/partition/conflict/refdb/historymgr/manager.go index 024c91248d..9321fb16a0 100644 --- a/internal/gitaly/storage/storagemgr/partition/conflict/refdb/historymgr/manager.go +++ b/internal/gitaly/storage/storagemgr/partition/conflict/refdb/historymgr/manager.go @@ -4,9 +4,9 @@ import ( "context" "runtime/trace" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/conflict/refdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/conflict/refdb" ) // Transaction performs an atomic update against a repository's history under a single LSN. diff --git a/internal/gitaly/storage/storagemgr/partition/conflict/refdb/historymgr/manager_test.go b/internal/gitaly/storage/storagemgr/partition/conflict/refdb/historymgr/manager_test.go index d670af70f8..5396ae0aa2 100644 --- a/internal/gitaly/storage/storagemgr/partition/conflict/refdb/historymgr/manager_test.go +++ b/internal/gitaly/storage/storagemgr/partition/conflict/refdb/historymgr/manager_test.go @@ -4,9 +4,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" ) func TestManager(t *testing.T) { diff --git a/internal/gitaly/storage/storagemgr/partition/conflict/refdb/historymgr/testhelper_test.go b/internal/gitaly/storage/storagemgr/partition/conflict/refdb/historymgr/testhelper_test.go index 481f8cac35..6027d2f245 100644 --- a/internal/gitaly/storage/storagemgr/partition/conflict/refdb/historymgr/testhelper_test.go +++ b/internal/gitaly/storage/storagemgr/partition/conflict/refdb/historymgr/testhelper_test.go @@ -3,7 +3,7 @@ package historymgr import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/storage/storagemgr/partition/conflict/refdb/testhelper_test.go b/internal/gitaly/storage/storagemgr/partition/conflict/refdb/testhelper_test.go index 12e7104f01..43e2e68d6d 100644 --- a/internal/gitaly/storage/storagemgr/partition/conflict/refdb/testhelper_test.go +++ b/internal/gitaly/storage/storagemgr/partition/conflict/refdb/testhelper_test.go @@ -3,7 +3,7 @@ package refdb import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/storage/storagemgr/partition/conflict/refdb/tree.go b/internal/gitaly/storage/storagemgr/partition/conflict/refdb/tree.go index 61a155fdfc..7507911a4e 100644 --- a/internal/gitaly/storage/storagemgr/partition/conflict/refdb/tree.go +++ b/internal/gitaly/storage/storagemgr/partition/conflict/refdb/tree.go @@ -4,7 +4,7 @@ import ( "path/filepath" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" ) // children contains child nodes of a node keyed by their diff --git a/internal/gitaly/storage/storagemgr/partition/conflict/testhelper_test.go b/internal/gitaly/storage/storagemgr/partition/conflict/testhelper_test.go index 2de131e4b1..24a105ee81 100644 --- a/internal/gitaly/storage/storagemgr/partition/conflict/testhelper_test.go +++ b/internal/gitaly/storage/storagemgr/partition/conflict/testhelper_test.go @@ -3,7 +3,7 @@ package conflict import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/storage/storagemgr/partition/factory.go b/internal/gitaly/storage/storagemgr/partition/factory.go index 82a9280897..db45c51cbb 100644 --- a/internal/gitaly/storage/storagemgr/partition/factory.go +++ b/internal/gitaly/storage/storagemgr/partition/factory.go @@ -4,13 +4,13 @@ import ( "context" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/log" - logger "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/log" + logger "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) // Factory is factory type that can create new partitions. diff --git a/internal/gitaly/storage/storagemgr/partition/fsrecorder/fs.go b/internal/gitaly/storage/storagemgr/partition/fsrecorder/fs.go index 38c650dcdc..49d5cbc780 100644 --- a/internal/gitaly/storage/storagemgr/partition/fsrecorder/fs.go +++ b/internal/gitaly/storage/storagemgr/partition/fsrecorder/fs.go @@ -5,7 +5,7 @@ import ( "path/filepath" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" ) func newPathEscapesRootError(path string) error { diff --git a/internal/gitaly/storage/storagemgr/partition/fsrecorder/testhelper_test.go b/internal/gitaly/storage/storagemgr/partition/fsrecorder/testhelper_test.go index 6428b047e9..0b276b08b3 100644 --- a/internal/gitaly/storage/storagemgr/partition/fsrecorder/testhelper_test.go +++ b/internal/gitaly/storage/storagemgr/partition/fsrecorder/testhelper_test.go @@ -3,7 +3,7 @@ package fsrecorder import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/storage/storagemgr/partition/log/log_manager.go b/internal/gitaly/storage/storagemgr/partition/log/log_manager.go index ceda60647a..fd6a42d566 100644 --- a/internal/gitaly/storage/storagemgr/partition/log/log_manager.go +++ b/internal/gitaly/storage/storagemgr/partition/log/log_manager.go @@ -10,9 +10,9 @@ import ( "runtime/trace" "sync" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/safe" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/safe" ) // ErrLogEntryNotAppended is returned by CompareAndAppendLogEntry if the expected LSN diff --git a/internal/gitaly/storage/storagemgr/partition/log/log_manager_test.go b/internal/gitaly/storage/storagemgr/partition/log/log_manager_test.go index aae61b65b0..32b3335401 100644 --- a/internal/gitaly/storage/storagemgr/partition/log/log_manager_test.go +++ b/internal/gitaly/storage/storagemgr/partition/log/log_manager_test.go @@ -9,9 +9,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func setupEntryFiles(t *testing.T, files map[string][]byte) string { diff --git a/internal/gitaly/storage/storagemgr/partition/log/positions.go b/internal/gitaly/storage/storagemgr/partition/log/positions.go index 842f80188d..3d16528e83 100644 --- a/internal/gitaly/storage/storagemgr/partition/log/positions.go +++ b/internal/gitaly/storage/storagemgr/partition/log/positions.go @@ -5,7 +5,7 @@ import ( "fmt" "sync/atomic" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" ) var ( diff --git a/internal/gitaly/storage/storagemgr/partition/log/positions_test.go b/internal/gitaly/storage/storagemgr/partition/log/positions_test.go index e26457779a..85d8eeafe9 100644 --- a/internal/gitaly/storage/storagemgr/partition/log/positions_test.go +++ b/internal/gitaly/storage/storagemgr/partition/log/positions_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" ) func TestPositionTracker(t *testing.T) { diff --git a/internal/gitaly/storage/storagemgr/partition/log/testhelper_test.go b/internal/gitaly/storage/storagemgr/partition/log/testhelper_test.go index 62ab82a853..3ad871786a 100644 --- a/internal/gitaly/storage/storagemgr/partition/log/testhelper_test.go +++ b/internal/gitaly/storage/storagemgr/partition/log/testhelper_test.go @@ -3,7 +3,7 @@ package log import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/storage/storagemgr/partition/metrics.go b/internal/gitaly/storage/storagemgr/partition/metrics.go index 738221b1a4..c088be38ed 100644 --- a/internal/gitaly/storage/storagemgr/partition/metrics.go +++ b/internal/gitaly/storage/storagemgr/partition/metrics.go @@ -2,8 +2,8 @@ package partition import ( "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/snapshot" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/snapshot" ) // Metrics contains the metrics collected across all TransactionManagers. diff --git a/internal/gitaly/storage/storagemgr/partition/migration/dryrun.go b/internal/gitaly/storage/storagemgr/partition/migration/dryrun.go index 6ecc23ff7d..c4faa49fb0 100644 --- a/internal/gitaly/storage/storagemgr/partition/migration/dryrun.go +++ b/internal/gitaly/storage/storagemgr/partition/migration/dryrun.go @@ -4,10 +4,10 @@ import ( "context" "sync" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) // dryRunTransaction stubs the actual transaction to ensure that the `Commit()` diff --git a/internal/gitaly/storage/storagemgr/partition/migration/dryrun_test.go b/internal/gitaly/storage/storagemgr/partition/migration/dryrun_test.go index 2485065d45..1d29d6f738 100644 --- a/internal/gitaly/storage/storagemgr/partition/migration/dryrun_test.go +++ b/internal/gitaly/storage/storagemgr/partition/migration/dryrun_test.go @@ -8,19 +8,19 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestDryRunPartition(t *testing.T) { diff --git a/internal/gitaly/storage/storagemgr/partition/migration/factory.go b/internal/gitaly/storage/storagemgr/partition/migration/factory.go index 5e1381334b..c38cf290c9 100644 --- a/internal/gitaly/storage/storagemgr/partition/migration/factory.go +++ b/internal/gitaly/storage/storagemgr/partition/migration/factory.go @@ -1,10 +1,10 @@ package migration import ( - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) // migrationFactory defines a partition factory that wraps another partition factory. diff --git a/internal/gitaly/storage/storagemgr/partition/migration/manager.go b/internal/gitaly/storage/storagemgr/partition/migration/manager.go index 59e543eab2..e70640870a 100644 --- a/internal/gitaly/storage/storagemgr/partition/migration/manager.go +++ b/internal/gitaly/storage/storagemgr/partition/migration/manager.go @@ -12,10 +12,10 @@ import ( "github.com/dgraph-io/badger/v4" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" "google.golang.org/grpc/metadata" ) diff --git a/internal/gitaly/storage/storagemgr/partition/migration/manager_test.go b/internal/gitaly/storage/storagemgr/partition/migration/manager_test.go index 92429d21f9..2f81d16963 100644 --- a/internal/gitaly/storage/storagemgr/partition/migration/manager_test.go +++ b/internal/gitaly/storage/storagemgr/partition/migration/manager_test.go @@ -11,18 +11,18 @@ import ( "github.com/dgraph-io/badger/v4" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" "google.golang.org/grpc/metadata" ) diff --git a/internal/gitaly/storage/storagemgr/partition/migration/migration.go b/internal/gitaly/storage/storagemgr/partition/migration/migration.go index 4bac6e39c0..b7040dd6d3 100644 --- a/internal/gitaly/storage/storagemgr/partition/migration/migration.go +++ b/internal/gitaly/storage/storagemgr/partition/migration/migration.go @@ -6,7 +6,7 @@ import ( "errors" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" ) // errInvalidMigration is returned if a migration being run is improperly configured. diff --git a/internal/gitaly/storage/storagemgr/partition/migration/migration_test.go b/internal/gitaly/storage/storagemgr/partition/migration/migration_test.go index 191ff6f79c..c24d1667b7 100644 --- a/internal/gitaly/storage/storagemgr/partition/migration/migration_test.go +++ b/internal/gitaly/storage/storagemgr/partition/migration/migration_test.go @@ -7,10 +7,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestMigration_Run(t *testing.T) { diff --git a/internal/gitaly/storage/storagemgr/partition/migration/state.go b/internal/gitaly/storage/storagemgr/partition/migration/state.go index 9d3baaa16e..a3e5b87a25 100644 --- a/internal/gitaly/storage/storagemgr/partition/migration/state.go +++ b/internal/gitaly/storage/storagemgr/partition/migration/state.go @@ -3,7 +3,7 @@ package migration import ( "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" ) // StateManager is used to manipulate the stored state of migrations. diff --git a/internal/gitaly/storage/storagemgr/partition/migration/testhelper_test.go b/internal/gitaly/storage/storagemgr/partition/migration/testhelper_test.go index 7dc4e175bb..30146625b4 100644 --- a/internal/gitaly/storage/storagemgr/partition/migration/testhelper_test.go +++ b/internal/gitaly/storage/storagemgr/partition/migration/testhelper_test.go @@ -3,7 +3,7 @@ package migration import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/storage/storagemgr/partition/migration/xxxx_reftable_migration.go b/internal/gitaly/storage/storagemgr/partition/migration/xxxx_reftable_migration.go index f189b774fe..f15674b096 100644 --- a/internal/gitaly/storage/storagemgr/partition/migration/xxxx_reftable_migration.go +++ b/internal/gitaly/storage/storagemgr/partition/migration/xxxx_reftable_migration.go @@ -8,12 +8,12 @@ import ( "fmt" "path/filepath" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // NewReftableMigration provides a new reftable migration. diff --git a/internal/gitaly/storage/storagemgr/partition/migration/xxxx_reftable_migration_test.go b/internal/gitaly/storage/storagemgr/partition/migration/xxxx_reftable_migration_test.go index ca15cbc647..947c5b6b77 100644 --- a/internal/gitaly/storage/storagemgr/partition/migration/xxxx_reftable_migration_test.go +++ b/internal/gitaly/storage/storagemgr/partition/migration/xxxx_reftable_migration_test.go @@ -8,20 +8,20 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestReftableMigration(t *testing.T) { diff --git a/internal/gitaly/storage/storagemgr/partition/snapshot/manager.go b/internal/gitaly/storage/storagemgr/partition/snapshot/manager.go index 33cddf4aff..3183314442 100644 --- a/internal/gitaly/storage/storagemgr/partition/snapshot/manager.go +++ b/internal/gitaly/storage/storagemgr/partition/snapshot/manager.go @@ -14,8 +14,8 @@ import ( "time" lru "github.com/hashicorp/golang-lru/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" "golang.org/x/sync/errgroup" ) diff --git a/internal/gitaly/storage/storagemgr/partition/snapshot/manager_test.go b/internal/gitaly/storage/storagemgr/partition/snapshot/manager_test.go index 8d1d9ca8fa..6e6c1d0369 100644 --- a/internal/gitaly/storage/storagemgr/partition/snapshot/manager_test.go +++ b/internal/gitaly/storage/storagemgr/partition/snapshot/manager_test.go @@ -9,8 +9,8 @@ import ( "testing/fstest" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" "golang.org/x/sync/errgroup" ) diff --git a/internal/gitaly/storage/storagemgr/partition/snapshot/snapshot.go b/internal/gitaly/storage/storagemgr/partition/snapshot/snapshot.go index 132c50ee11..e0162f9918 100644 --- a/internal/gitaly/storage/storagemgr/partition/snapshot/snapshot.go +++ b/internal/gitaly/storage/storagemgr/partition/snapshot/snapshot.go @@ -10,11 +10,11 @@ import ( "strings" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/gitstorage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode/permission" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/gitstorage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode/permission" ) // ModeReadOnlyDirectory is the mode given to directories in read-only snapshots. diff --git a/internal/gitaly/storage/storagemgr/partition/snapshot/testhelper_test.go b/internal/gitaly/storage/storagemgr/partition/snapshot/testhelper_test.go index ea9059a820..1bd334cb50 100644 --- a/internal/gitaly/storage/storagemgr/partition/snapshot/testhelper_test.go +++ b/internal/gitaly/storage/storagemgr/partition/snapshot/testhelper_test.go @@ -3,7 +3,7 @@ package snapshot import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/storage/storagemgr/partition/testhelper_test.go b/internal/gitaly/storage/storagemgr/partition/testhelper_test.go index 24671dad1f..7ea5062d7d 100644 --- a/internal/gitaly/storage/storagemgr/partition/testhelper_test.go +++ b/internal/gitaly/storage/storagemgr/partition/testhelper_test.go @@ -19,26 +19,26 @@ import ( io_prometheus_client "github.com/prometheus/client_model/go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping" - housekeepingcfg "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/objectpool" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/packfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/repoutil" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/counter" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping" + housekeepingcfg "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/objectpool" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/packfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/repoutil" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/counter" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/proto" ) diff --git a/internal/gitaly/storage/storagemgr/partition/transaction_manager.go b/internal/gitaly/storage/storagemgr/partition/transaction_manager.go index 8095d363d7..9f6a833660 100644 --- a/internal/gitaly/storage/storagemgr/partition/transaction_manager.go +++ b/internal/gitaly/storage/storagemgr/partition/transaction_manager.go @@ -22,28 +22,28 @@ import ( "github.com/dgraph-io/badger/v4" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping" - housekeepingcfg "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/conflict" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/conflict/fshistory" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/fsrecorder" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/snapshot" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/wal" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/wal/reftree" - logging "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/safe" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/tracing" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping" + housekeepingcfg "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/conflict" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/conflict/fshistory" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/fsrecorder" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/snapshot" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/wal" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/wal/reftree" + logging "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/safe" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/tracing" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "gitlab.com/gitlab-org/labkit/correlation" "golang.org/x/sync/errgroup" "google.golang.org/protobuf/proto" diff --git a/internal/gitaly/storage/storagemgr/partition/transaction_manager_alternate_test.go b/internal/gitaly/storage/storagemgr/partition/transaction_manager_alternate_test.go index 26d8c1d333..41fb8b3ac2 100644 --- a/internal/gitaly/storage/storagemgr/partition/transaction_manager_alternate_test.go +++ b/internal/gitaly/storage/storagemgr/partition/transaction_manager_alternate_test.go @@ -5,14 +5,14 @@ import ( "path/filepath" "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - housekeepingcfg "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/conflict/fshistory" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + housekeepingcfg "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/conflict/fshistory" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func generateAlternateTests(t *testing.T, setup testTransactionSetup) []transactionTestCase { diff --git a/internal/gitaly/storage/storagemgr/partition/transaction_manager_consumer_test.go b/internal/gitaly/storage/storagemgr/partition/transaction_manager_consumer_test.go index e29c0d51cf..0288e51585 100644 --- a/internal/gitaly/storage/storagemgr/partition/transaction_manager_consumer_test.go +++ b/internal/gitaly/storage/storagemgr/partition/transaction_manager_consumer_test.go @@ -4,11 +4,11 @@ import ( "context" "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func generateConsumerTests(t *testing.T, setup testTransactionSetup) []transactionTestCase { diff --git a/internal/gitaly/storage/storagemgr/partition/transaction_manager_default_branch_test.go b/internal/gitaly/storage/storagemgr/partition/transaction_manager_default_branch_test.go index 9b1ac217ca..ae8e474a52 100644 --- a/internal/gitaly/storage/storagemgr/partition/transaction_manager_default_branch_test.go +++ b/internal/gitaly/storage/storagemgr/partition/transaction_manager_default_branch_test.go @@ -3,9 +3,9 @@ package partition import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" ) func generateDefaultBranchTests(t *testing.T, setup testTransactionSetup) []transactionTestCase { diff --git a/internal/gitaly/storage/storagemgr/partition/transaction_manager_hook_test.go b/internal/gitaly/storage/storagemgr/partition/transaction_manager_hook_test.go index 529afda61d..034ab54cd7 100644 --- a/internal/gitaly/storage/storagemgr/partition/transaction_manager_hook_test.go +++ b/internal/gitaly/storage/storagemgr/partition/transaction_manager_hook_test.go @@ -4,12 +4,12 @@ import ( "sync" "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/conflict/refdb" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/conflict/refdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) // hookFunc is a function that is executed at a specific point. It gets a hookContext that allows it to diff --git a/internal/gitaly/storage/storagemgr/partition/transaction_manager_housekeeping_test.go b/internal/gitaly/storage/storagemgr/partition/transaction_manager_housekeeping_test.go index 42f413f69c..4599b883b6 100644 --- a/internal/gitaly/storage/storagemgr/partition/transaction_manager_housekeeping_test.go +++ b/internal/gitaly/storage/storagemgr/partition/transaction_manager_housekeeping_test.go @@ -8,15 +8,15 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - housekeepingcfg "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/conflict/fshistory" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + housekeepingcfg "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/conflict/fshistory" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func generateHousekeepingPackRefsTests(t *testing.T, ctx context.Context, testPartitionID storage.PartitionID, relativePath string) []transactionTestCase { diff --git a/internal/gitaly/storage/storagemgr/partition/transaction_manager_key_value_test.go b/internal/gitaly/storage/storagemgr/partition/transaction_manager_key_value_test.go index d798d5ef10..2775b3704d 100644 --- a/internal/gitaly/storage/storagemgr/partition/transaction_manager_key_value_test.go +++ b/internal/gitaly/storage/storagemgr/partition/transaction_manager_key_value_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/dgraph-io/badger/v4" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" ) func generateKeyValueTests(t *testing.T, setup testTransactionSetup) []transactionTestCase { diff --git a/internal/gitaly/storage/storagemgr/partition/transaction_manager_refs_test.go b/internal/gitaly/storage/storagemgr/partition/transaction_manager_refs_test.go index a2b35437a1..b1b0364118 100644 --- a/internal/gitaly/storage/storagemgr/partition/transaction_manager_refs_test.go +++ b/internal/gitaly/storage/storagemgr/partition/transaction_manager_refs_test.go @@ -4,16 +4,16 @@ import ( "path/filepath" "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - housekeepingcfg "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/conflict/fshistory" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/conflict/refdb" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + housekeepingcfg "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/conflict/fshistory" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/conflict/refdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func generateModifyReferencesTests(t *testing.T, setup testTransactionSetup) []transactionTestCase { diff --git a/internal/gitaly/storage/storagemgr/partition/transaction_manager_repo_test.go b/internal/gitaly/storage/storagemgr/partition/transaction_manager_repo_test.go index ee1c32cd97..a3b94520c2 100644 --- a/internal/gitaly/storage/storagemgr/partition/transaction_manager_repo_test.go +++ b/internal/gitaly/storage/storagemgr/partition/transaction_manager_repo_test.go @@ -4,14 +4,14 @@ import ( "path/filepath" "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/conflict" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/conflict/fshistory" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/snapshot" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/conflict" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/conflict/fshistory" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/snapshot" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func generateCreateRepositoryTests(t *testing.T, setup testTransactionSetup) []transactionTestCase { diff --git a/internal/gitaly/storage/storagemgr/partition/transaction_manager_test.go b/internal/gitaly/storage/storagemgr/partition/transaction_manager_test.go index 7f2c97bb10..747a1b01f1 100644 --- a/internal/gitaly/storage/storagemgr/partition/transaction_manager_test.go +++ b/internal/gitaly/storage/storagemgr/partition/transaction_manager_test.go @@ -19,21 +19,21 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/conflict/refdb" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/wal" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/conflict/refdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/wal" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/proto" ) diff --git a/internal/gitaly/storage/storagemgr/partition_assigner.go b/internal/gitaly/storage/storagemgr/partition_assigner.go index 3075aa7bd7..76dd4241f4 100644 --- a/internal/gitaly/storage/storagemgr/partition_assigner.go +++ b/internal/gitaly/storage/storagemgr/partition_assigner.go @@ -9,9 +9,9 @@ import ( "sync" "github.com/dgraph-io/badger/v4" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/gitstorage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/gitstorage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue" ) // ErrRepositoriesAreInDifferentPartitions is returned when attempting to begin a transaction spanning diff --git a/internal/gitaly/storage/storagemgr/partition_assigner_test.go b/internal/gitaly/storage/storagemgr/partition_assigner_test.go index 1aa9a3e449..efca68f638 100644 --- a/internal/gitaly/storage/storagemgr/partition_assigner_test.go +++ b/internal/gitaly/storage/storagemgr/partition_assigner_test.go @@ -11,14 +11,14 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/stats" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/gitstorage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/stats" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/gitstorage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) type partitionAssignments map[string]storage.PartitionID diff --git a/internal/gitaly/storage/storagemgr/partition_manager.go b/internal/gitaly/storage/storagemgr/partition_manager.go index 0bae0b40d5..ebbaca234a 100644 --- a/internal/gitaly/storage/storagemgr/partition_manager.go +++ b/internal/gitaly/storage/storagemgr/partition_manager.go @@ -16,14 +16,14 @@ import ( "github.com/dgraph-io/badger/v4" lru "github.com/hashicorp/golang-lru/v2" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue/databasemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/safe" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue/databasemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/safe" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" ) // DefaultMaxInactivePartitions is the default number of inactive partitions to keep on standby. diff --git a/internal/gitaly/storage/storagemgr/partition_manager_test.go b/internal/gitaly/storage/storagemgr/partition_manager_test.go index a7cba96ab9..23f2bf7a8f 100644 --- a/internal/gitaly/storage/storagemgr/partition_manager_test.go +++ b/internal/gitaly/storage/storagemgr/partition_manager_test.go @@ -14,18 +14,18 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue/databasemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/snapshot" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue/databasemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/snapshot" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) type mockPartitionFactory struct { diff --git a/internal/gitaly/storage/storagemgr/testhelper_test.go b/internal/gitaly/storage/storagemgr/testhelper_test.go index 27945408e8..465fa1388c 100644 --- a/internal/gitaly/storage/storagemgr/testhelper_test.go +++ b/internal/gitaly/storage/storagemgr/testhelper_test.go @@ -3,7 +3,7 @@ package storagemgr import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/storage/storagemgr/transaction_registry.go b/internal/gitaly/storage/storagemgr/transaction_registry.go index d46ff6875e..464aa53ba0 100644 --- a/internal/gitaly/storage/storagemgr/transaction_registry.go +++ b/internal/gitaly/storage/storagemgr/transaction_registry.go @@ -4,7 +4,7 @@ import ( "errors" "sync" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" ) var errTransactionNotFound = errors.New("transaction not found") diff --git a/internal/gitaly/storage/storagemgr/transaction_registry_test.go b/internal/gitaly/storage/storagemgr/transaction_registry_test.go index 9996e745b2..b4fbf8fc81 100644 --- a/internal/gitaly/storage/storagemgr/transaction_registry_test.go +++ b/internal/gitaly/storage/storagemgr/transaction_registry_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" ) func TestTransactionRegistry(t *testing.T) { diff --git a/internal/gitaly/storage/sync_test.go b/internal/gitaly/storage/sync_test.go index ce312686ae..7ef99e99bf 100644 --- a/internal/gitaly/storage/sync_test.go +++ b/internal/gitaly/storage/sync_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestNeedsSync(t *testing.T) { diff --git a/internal/gitaly/storage/testhelper_test.go b/internal/gitaly/storage/testhelper_test.go index 54497d21e9..6cc71382b5 100644 --- a/internal/gitaly/storage/testhelper_test.go +++ b/internal/gitaly/storage/testhelper_test.go @@ -3,7 +3,7 @@ package storage import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/storage/wal/entry.go b/internal/gitaly/storage/wal/entry.go index addd72b03f..1fe55954d6 100644 --- a/internal/gitaly/storage/wal/entry.go +++ b/internal/gitaly/storage/wal/entry.go @@ -7,9 +7,9 @@ import ( "path/filepath" "strconv" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // Entry represents a write-ahead log entry. diff --git a/internal/gitaly/storage/wal/entry_test.go b/internal/gitaly/storage/wal/entry_test.go index f5b4d1080e..fcab6697fe 100644 --- a/internal/gitaly/storage/wal/entry_test.go +++ b/internal/gitaly/storage/wal/entry_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func setupTestDirectory(t *testing.T, path string) { diff --git a/internal/gitaly/storage/wal/get_inode_test.go b/internal/gitaly/storage/wal/get_inode_test.go index b2f4cc7760..d6bc63b3c1 100644 --- a/internal/gitaly/storage/wal/get_inode_test.go +++ b/internal/gitaly/storage/wal/get_inode_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" ) func TestGetInode(t *testing.T) { diff --git a/internal/gitaly/storage/wal/manifest.go b/internal/gitaly/storage/wal/manifest.go index 4a5592d0c7..e83af88af4 100644 --- a/internal/gitaly/storage/wal/manifest.go +++ b/internal/gitaly/storage/wal/manifest.go @@ -6,8 +6,8 @@ import ( "os" "path/filepath" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/proto" ) diff --git a/internal/gitaly/storage/wal/manifest_test.go b/internal/gitaly/storage/wal/manifest_test.go index f9e0f52fd9..b405036d0b 100644 --- a/internal/gitaly/storage/wal/manifest_test.go +++ b/internal/gitaly/storage/wal/manifest_test.go @@ -6,9 +6,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestManifest(t *testing.T) { diff --git a/internal/gitaly/storage/wal/operations.go b/internal/gitaly/storage/wal/operations.go index 233809cfa5..6c430942f0 100644 --- a/internal/gitaly/storage/wal/operations.go +++ b/internal/gitaly/storage/wal/operations.go @@ -1,8 +1,8 @@ package wal import ( - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // operations is a helper type around []*gitalypb.LogEntry_Operation. diff --git a/internal/gitaly/storage/wal/operations_test.go b/internal/gitaly/storage/wal/operations_test.go index fbcd839829..d25666a228 100644 --- a/internal/gitaly/storage/wal/operations_test.go +++ b/internal/gitaly/storage/wal/operations_test.go @@ -3,9 +3,9 @@ package wal import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestOperations(t *testing.T) { diff --git a/internal/gitaly/storage/wal/reference_recorder.go b/internal/gitaly/storage/wal/reference_recorder.go index 1d1a0fa057..b9bc92abb9 100644 --- a/internal/gitaly/storage/wal/reference_recorder.go +++ b/internal/gitaly/storage/wal/reference_recorder.go @@ -9,8 +9,8 @@ import ( "path/filepath" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/wal/reftree" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/wal/reftree" ) // ReferenceRecorder records the file system operations performed by reference transactions. diff --git a/internal/gitaly/storage/wal/reference_recorder_test.go b/internal/gitaly/storage/wal/reference_recorder_test.go index 5fdb1fb438..4b8ab5f174 100644 --- a/internal/gitaly/storage/wal/reference_recorder_test.go +++ b/internal/gitaly/storage/wal/reference_recorder_test.go @@ -8,12 +8,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestRecorderRecordReferenceUpdates(t *testing.T) { diff --git a/internal/gitaly/storage/wal/reftree/testhelper_test.go b/internal/gitaly/storage/wal/reftree/testhelper_test.go index 57da058029..1e2b708cc8 100644 --- a/internal/gitaly/storage/wal/reftree/testhelper_test.go +++ b/internal/gitaly/storage/wal/reftree/testhelper_test.go @@ -3,7 +3,7 @@ package reftree import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/storage/wal/testhelper_test.go b/internal/gitaly/storage/wal/testhelper_test.go index 9197f21ba7..b4cc462ca8 100644 --- a/internal/gitaly/storage/wal/testhelper_test.go +++ b/internal/gitaly/storage/wal/testhelper_test.go @@ -3,7 +3,7 @@ package wal import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/storage/walk/testhelper_test.go b/internal/gitaly/storage/walk/testhelper_test.go index d5ac33bf57..55326173e7 100644 --- a/internal/gitaly/storage/walk/testhelper_test.go +++ b/internal/gitaly/storage/walk/testhelper_test.go @@ -3,7 +3,7 @@ package walk import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/storage/walk/walk.go b/internal/gitaly/storage/walk/walk.go index c85e893387..7243f0f24b 100644 --- a/internal/gitaly/storage/walk/walk.go +++ b/internal/gitaly/storage/walk/walk.go @@ -6,10 +6,10 @@ import ( "os" "path/filepath" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // FindRepositories finds all repositories in a storage and provides their information to the caller-provided action. diff --git a/internal/gitaly/storage/walk/walk_test.go b/internal/gitaly/storage/walk/walk_test.go index 5d7139da80..77a0042ca8 100644 --- a/internal/gitaly/storage/walk/walk_test.go +++ b/internal/gitaly/storage/walk/walk_test.go @@ -7,11 +7,11 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestWalkStorage(t *testing.T) { diff --git a/internal/gitaly/transaction/manager.go b/internal/gitaly/transaction/manager.go index e25d5cb546..aed6b69790 100644 --- a/internal/gitaly/transaction/manager.go +++ b/internal/gitaly/transaction/manager.go @@ -7,13 +7,13 @@ import ( "time" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) const ( diff --git a/internal/gitaly/transaction/manager_test.go b/internal/gitaly/transaction/manager_test.go index c37257ee5e..980fc8b9ce 100644 --- a/internal/gitaly/transaction/manager_test.go +++ b/internal/gitaly/transaction/manager_test.go @@ -7,14 +7,14 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/internal/gitaly/transaction/mock.go b/internal/gitaly/transaction/mock.go index 18e16edde6..19ebd04a86 100644 --- a/internal/gitaly/transaction/mock.go +++ b/internal/gitaly/transaction/mock.go @@ -5,8 +5,8 @@ import ( "errors" "sync" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" ) // MockManager is a mock Manager for use in tests. diff --git a/internal/gitaly/transaction/testhelper_test.go b/internal/gitaly/transaction/testhelper_test.go index 12a16c0e92..165d4dbb89 100644 --- a/internal/gitaly/transaction/testhelper_test.go +++ b/internal/gitaly/transaction/testhelper_test.go @@ -3,7 +3,7 @@ package transaction import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitaly/transaction/voting.go b/internal/gitaly/transaction/voting.go index d515afe90a..b018bd32f0 100644 --- a/internal/gitaly/transaction/voting.go +++ b/internal/gitaly/transaction/voting.go @@ -7,9 +7,9 @@ import ( "io" "os" - "gitlab.com/gitlab-org/gitaly/v16/internal/safe" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/internal/safe" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" ) // RunOnContext runs the given function if the context identifies a transaction. diff --git a/internal/gitaly/transaction/voting_test.go b/internal/gitaly/transaction/voting_test.go index e06c7a61e6..c0a64bd6bf 100644 --- a/internal/gitaly/transaction/voting_test.go +++ b/internal/gitaly/transaction/voting_test.go @@ -8,12 +8,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/safe" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/safe" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" "google.golang.org/grpc/peer" ) diff --git a/internal/gitlab/client/gitlabnet.go b/internal/gitlab/client/gitlabnet.go index 085eee7f9e..383b9bfaed 100644 --- a/internal/gitlab/client/gitlabnet.go +++ b/internal/gitlab/client/gitlabnet.go @@ -11,7 +11,7 @@ import ( "time" "github.com/golang-jwt/jwt/v5" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" "gitlab.com/gitlab-org/labkit/correlation" ) diff --git a/internal/gitlab/client/gitlabnet_test.go b/internal/gitlab/client/gitlabnet_test.go index 8a61a3931b..c73fd2ea4e 100644 --- a/internal/gitlab/client/gitlabnet_test.go +++ b/internal/gitlab/client/gitlabnet_test.go @@ -10,7 +10,7 @@ import ( "github.com/golang-jwt/jwt/v5" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" "gitlab.com/gitlab-org/labkit/correlation" ) diff --git a/internal/gitlab/client/testhelper_test.go b/internal/gitlab/client/testhelper_test.go index 137104d4d8..cacb27732a 100644 --- a/internal/gitlab/client/testhelper_test.go +++ b/internal/gitlab/client/testhelper_test.go @@ -3,7 +3,7 @@ package client import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/gitlab/http_client.go b/internal/gitlab/http_client.go index a574705861..ebbdd0010a 100644 --- a/internal/gitlab/http_client.go +++ b/internal/gitlab/http_client.go @@ -13,12 +13,12 @@ import ( "strings" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - gitalycfgprom "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitlab/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/prometheus/metrics" - "gitlab.com/gitlab-org/gitaly/v16/internal/version" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + gitalycfgprom "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/prometheus" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitlab/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/prometheus/metrics" + "gitlab.com/gitlab-org/gitaly/v17/internal/version" ) var glIDRegex = regexp.MustCompile(`\A[0-9]+\z`) diff --git a/internal/gitlab/http_client_test.go b/internal/gitlab/http_client_test.go index 7d3d6bf157..611ded8359 100644 --- a/internal/gitlab/http_client_test.go +++ b/internal/gitlab/http_client_test.go @@ -9,13 +9,13 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/promtest" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/prometheus" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/promtest" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/proto" ) diff --git a/internal/gitlab/test_server.go b/internal/gitlab/test_server.go index 81845ccf0e..fb42f7c9e2 100644 --- a/internal/gitlab/test_server.go +++ b/internal/gitlab/test_server.go @@ -16,8 +16,8 @@ import ( "github.com/golang-jwt/jwt/v5" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) var changeLineRegex = regexp.MustCompile("^[a-f0-9]{40} [a-f0-9]{40} refs/[^ ]+$") diff --git a/internal/gitlab/testhelper_test.go b/internal/gitlab/testhelper_test.go index ef9a1141dc..ce2c260844 100644 --- a/internal/gitlab/testhelper_test.go +++ b/internal/gitlab/testhelper_test.go @@ -3,7 +3,7 @@ package gitlab import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/grpc/backchannel/backchannel.go b/internal/grpc/backchannel/backchannel.go index fc5ad9269e..d75fb2ba3e 100644 --- a/internal/grpc/backchannel/backchannel.go +++ b/internal/grpc/backchannel/backchannel.go @@ -34,7 +34,7 @@ import ( "sync" "github.com/hashicorp/yamux" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) type yamuxLogWrapper struct { diff --git a/internal/grpc/backchannel/backchannel_example_test.go b/internal/grpc/backchannel/backchannel_example_test.go index b28bb68cf1..daecd3cc47 100644 --- a/internal/grpc/backchannel/backchannel_example_test.go +++ b/internal/grpc/backchannel/backchannel_example_test.go @@ -7,10 +7,10 @@ import ( "net" "os" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/listenmux" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/listenmux" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) diff --git a/internal/grpc/backchannel/backchannel_test.go b/internal/grpc/backchannel/backchannel_test.go index 28d4ab71e8..77d81df433 100644 --- a/internal/grpc/backchannel/backchannel_test.go +++ b/internal/grpc/backchannel/backchannel_test.go @@ -12,9 +12,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/listenmux" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/listenmux" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/credentials/insecure" diff --git a/internal/grpc/backchannel/client.go b/internal/grpc/backchannel/client.go index d3c5c7fc2c..60dda15297 100644 --- a/internal/grpc/backchannel/client.go +++ b/internal/grpc/backchannel/client.go @@ -7,7 +7,7 @@ import ( "time" "github.com/hashicorp/yamux" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" "google.golang.org/grpc/credentials" ) diff --git a/internal/grpc/backchannel/server.go b/internal/grpc/backchannel/server.go index 4eeb99701f..a9586fadb4 100644 --- a/internal/grpc/backchannel/server.go +++ b/internal/grpc/backchannel/server.go @@ -8,7 +8,7 @@ import ( "net" "github.com/hashicorp/yamux" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" "google.golang.org/grpc" "google.golang.org/grpc/credentials" "google.golang.org/grpc/credentials/insecure" diff --git a/internal/grpc/backchannel/testhelper_test.go b/internal/grpc/backchannel/testhelper_test.go index c2ba27cbb2..f658051829 100644 --- a/internal/grpc/backchannel/testhelper_test.go +++ b/internal/grpc/backchannel/testhelper_test.go @@ -3,7 +3,7 @@ package backchannel import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/grpc/client/dial.go b/internal/grpc/client/dial.go index 4aad0e23cc..c8291c8cad 100644 --- a/internal/grpc/client/dial.go +++ b/internal/grpc/client/dial.go @@ -8,10 +8,10 @@ import ( "net/url" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/dnsresolver" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - gitalyx509 "gitlab.com/gitlab-org/gitaly/v16/internal/x509" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/dnsresolver" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + gitalyx509 "gitlab.com/gitlab-org/gitaly/v17/internal/x509" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" grpccorrelation "gitlab.com/gitlab-org/labkit/correlation/grpc" grpctracing "gitlab.com/gitlab-org/labkit/tracing/grpc" "google.golang.org/grpc" diff --git a/internal/grpc/client/dial_ext_test.go b/internal/grpc/client/dial_ext_test.go index 2be6d3e01f..fca4f4ee4a 100644 --- a/internal/grpc/client/dial_ext_test.go +++ b/internal/grpc/client/dial_ext_test.go @@ -7,14 +7,14 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/repository" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/repository" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/internal/grpc/client/dial_test.go b/internal/grpc/client/dial_test.go index 39636f213b..790a5743ab 100644 --- a/internal/grpc/client/dial_test.go +++ b/internal/grpc/client/dial_test.go @@ -7,10 +7,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/listenmux" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/listenmux" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/credentials/insecure" diff --git a/internal/grpc/client/pool.go b/internal/grpc/client/pool.go index a79112dc8c..2389cf386a 100644 --- a/internal/grpc/client/pool.go +++ b/internal/grpc/client/pool.go @@ -6,7 +6,7 @@ import ( "fmt" "sync" - gitalyauth "gitlab.com/gitlab-org/gitaly/v16/auth" + gitalyauth "gitlab.com/gitlab-org/gitaly/v17/auth" "google.golang.org/grpc" ) diff --git a/internal/grpc/client/testhelper_test.go b/internal/grpc/client/testhelper_test.go index 137104d4d8..cacb27732a 100644 --- a/internal/grpc/client/testhelper_test.go +++ b/internal/grpc/client/testhelper_test.go @@ -3,7 +3,7 @@ package client import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/grpc/dnsresolver/builder.go b/internal/grpc/dnsresolver/builder.go index 69a7d2346e..69d40349d3 100644 --- a/internal/grpc/dnsresolver/builder.go +++ b/internal/grpc/dnsresolver/builder.go @@ -5,9 +5,9 @@ import ( "strings" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/backoff" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/backoff" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" "google.golang.org/grpc/resolver" ) diff --git a/internal/grpc/dnsresolver/builder_test.go b/internal/grpc/dnsresolver/builder_test.go index 0d283cb64f..2b696a99db 100644 --- a/internal/grpc/dnsresolver/builder_test.go +++ b/internal/grpc/dnsresolver/builder_test.go @@ -8,7 +8,7 @@ import ( "github.com/miekg/dns" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" "google.golang.org/grpc/resolver" ) diff --git a/internal/grpc/dnsresolver/resolver.go b/internal/grpc/dnsresolver/resolver.go index df21fb1980..fb6372f8df 100644 --- a/internal/grpc/dnsresolver/resolver.go +++ b/internal/grpc/dnsresolver/resolver.go @@ -7,9 +7,9 @@ import ( "sync" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/backoff" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/backoff" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" "google.golang.org/grpc/resolver" ) diff --git a/internal/grpc/dnsresolver/resolver_test.go b/internal/grpc/dnsresolver/resolver_test.go index 1cbef27d9b..505b8ca9cf 100644 --- a/internal/grpc/dnsresolver/resolver_test.go +++ b/internal/grpc/dnsresolver/resolver_test.go @@ -10,9 +10,9 @@ import ( "github.com/miekg/dns" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/backoff" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/backoff" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" grpccorrelation "gitlab.com/gitlab-org/labkit/correlation/grpc" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" diff --git a/internal/grpc/dnsresolver/target.go b/internal/grpc/dnsresolver/target.go index 0e1ac3f8ac..73a40d7248 100644 --- a/internal/grpc/dnsresolver/target.go +++ b/internal/grpc/dnsresolver/target.go @@ -6,7 +6,7 @@ import ( "net/url" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" ) // ValidateURL validates Gitaly address URL having dns scheme. The URL follows three forms: diff --git a/internal/grpc/dnsresolver/target_test.go b/internal/grpc/dnsresolver/target_test.go index 36ad9bf493..dba1d08fd3 100644 --- a/internal/grpc/dnsresolver/target_test.go +++ b/internal/grpc/dnsresolver/target_test.go @@ -7,8 +7,8 @@ import ( "github.com/miekg/dns" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestFindDNSLookup_default(t *testing.T) { diff --git a/internal/grpc/dnsresolver/testhelper_test.go b/internal/grpc/dnsresolver/testhelper_test.go index 3abd3d6453..cf0615333d 100644 --- a/internal/grpc/dnsresolver/testhelper_test.go +++ b/internal/grpc/dnsresolver/testhelper_test.go @@ -9,7 +9,7 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" "google.golang.org/grpc/resolver" "google.golang.org/grpc/serviceconfig" ) diff --git a/internal/grpc/grpcstats/stats.go b/internal/grpc/grpcstats/stats.go index 09fed704f3..d41fb18418 100644 --- a/internal/grpc/grpcstats/stats.go +++ b/internal/grpc/grpcstats/stats.go @@ -3,7 +3,7 @@ package grpcstats import ( "context" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" "google.golang.org/grpc/stats" ) diff --git a/internal/grpc/grpcstats/stats_test.go b/internal/grpc/grpcstats/stats_test.go index 04a393737d..73747fd75f 100644 --- a/internal/grpc/grpcstats/stats_test.go +++ b/internal/grpc/grpcstats/stats_test.go @@ -12,10 +12,10 @@ import ( grpcmwlogrus "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/loghandler" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/middleware/loghandler" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" "google.golang.org/grpc" "google.golang.org/grpc/interop/grpc_testing" "google.golang.org/grpc/stats" diff --git a/internal/grpc/grpcstats/testhelper_test.go b/internal/grpc/grpcstats/testhelper_test.go index d0b298d5f8..b571e579b8 100644 --- a/internal/grpc/grpcstats/testhelper_test.go +++ b/internal/grpc/grpcstats/testhelper_test.go @@ -3,7 +3,7 @@ package grpcstats import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/grpc/listenmux/mux_test.go b/internal/grpc/listenmux/mux_test.go index 66a855d47d..9c5e9b8615 100644 --- a/internal/grpc/listenmux/mux_test.go +++ b/internal/grpc/listenmux/mux_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" "google.golang.org/grpc" "google.golang.org/grpc/credentials" "google.golang.org/grpc/credentials/insecure" diff --git a/internal/grpc/listenmux/testhelper_test.go b/internal/grpc/listenmux/testhelper_test.go index 3cd68209c1..30edc05693 100644 --- a/internal/grpc/listenmux/testhelper_test.go +++ b/internal/grpc/listenmux/testhelper_test.go @@ -3,7 +3,7 @@ package listenmux import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/grpc/metadata/metadata_test.go b/internal/grpc/metadata/metadata_test.go index ca079929d3..70786434ff 100644 --- a/internal/grpc/metadata/metadata_test.go +++ b/internal/grpc/metadata/metadata_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestOutgoingToIncoming(t *testing.T) { diff --git a/internal/grpc/metadata/testhelper_test.go b/internal/grpc/metadata/testhelper_test.go index bfb3939032..89cc339cad 100644 --- a/internal/grpc/metadata/testhelper_test.go +++ b/internal/grpc/metadata/testhelper_test.go @@ -3,7 +3,7 @@ package metadata import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/grpc/middleware/cache/cache.go b/internal/grpc/middleware/cache/cache.go index 10c51a79fd..7c049cbacf 100644 --- a/internal/grpc/middleware/cache/cache.go +++ b/internal/grpc/middleware/cache/cache.go @@ -6,9 +6,9 @@ import ( "strings" "sync" - diskcache "gitlab.com/gitlab-org/gitaly/v16/internal/cache" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + diskcache "gitlab.com/gitlab-org/gitaly/v17/internal/cache" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" "google.golang.org/grpc" "google.golang.org/protobuf/proto" ) diff --git a/internal/grpc/middleware/cache/cache_test.go b/internal/grpc/middleware/cache/cache_test.go index e911fd85d8..022e8a657c 100644 --- a/internal/grpc/middleware/cache/cache_test.go +++ b/internal/grpc/middleware/cache/cache_test.go @@ -8,10 +8,10 @@ import ( "testing" "github.com/stretchr/testify/require" - diskcache "gitlab.com/gitlab-org/gitaly/v16/internal/cache" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + diskcache "gitlab.com/gitlab-org/gitaly/v17/internal/cache" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/health/grpc_health_v1" diff --git a/internal/grpc/middleware/cache/prometheus.go b/internal/grpc/middleware/cache/prometheus.go index 261e460459..40f0ceb8ec 100644 --- a/internal/grpc/middleware/cache/prometheus.go +++ b/internal/grpc/middleware/cache/prometheus.go @@ -3,7 +3,7 @@ package cache import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" ) var ( diff --git a/internal/grpc/middleware/cache/testhelper_test.go b/internal/grpc/middleware/cache/testhelper_test.go index 6c55da37a0..dced38bf56 100644 --- a/internal/grpc/middleware/cache/testhelper_test.go +++ b/internal/grpc/middleware/cache/testhelper_test.go @@ -3,7 +3,7 @@ package cache import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/grpc/middleware/customfieldshandler/customfields_handler.go b/internal/grpc/middleware/customfieldshandler/customfields_handler.go index fafb09ba2d..ad64cd9296 100644 --- a/internal/grpc/middleware/customfieldshandler/customfields_handler.go +++ b/internal/grpc/middleware/customfieldshandler/customfields_handler.go @@ -4,7 +4,7 @@ import ( "context" grpcmw "github.com/grpc-ecosystem/go-grpc-middleware" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" "google.golang.org/grpc" ) diff --git a/internal/grpc/middleware/customfieldshandler/customfields_handler_test.go b/internal/grpc/middleware/customfieldshandler/customfields_handler_test.go index 1ad7cdc319..7ffcac551b 100644 --- a/internal/grpc/middleware/customfieldshandler/customfields_handler_test.go +++ b/internal/grpc/middleware/customfieldshandler/customfields_handler_test.go @@ -9,19 +9,19 @@ import ( grpcmwlogrus "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/ref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/loghandler" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/ref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/middleware/loghandler" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/test/bufconn" diff --git a/internal/grpc/middleware/customfieldshandler/testhelper_test.go b/internal/grpc/middleware/customfieldshandler/testhelper_test.go index 16e038e4eb..247060934e 100644 --- a/internal/grpc/middleware/customfieldshandler/testhelper_test.go +++ b/internal/grpc/middleware/customfieldshandler/testhelper_test.go @@ -3,7 +3,7 @@ package customfieldshandler import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/grpc/middleware/featureflag/featureflag_handler.go b/internal/grpc/middleware/featureflag/featureflag_handler.go index 893cb79ce7..501ea09246 100644 --- a/internal/grpc/middleware/featureflag/featureflag_handler.go +++ b/internal/grpc/middleware/featureflag/featureflag_handler.go @@ -5,8 +5,8 @@ import ( "sort" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) // FieldsProducer adds feature_flags logging fields to gRPC logs. Only enabled flags are available. diff --git a/internal/grpc/middleware/featureflag/featureflag_handler_test.go b/internal/grpc/middleware/featureflag/featureflag_handler_test.go index 29cbc02e25..a4f6ae6279 100644 --- a/internal/grpc/middleware/featureflag/featureflag_handler_test.go +++ b/internal/grpc/middleware/featureflag/featureflag_handler_test.go @@ -7,10 +7,10 @@ import ( grpcmwlogrus "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/loghandler" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/middleware/loghandler" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/interop/grpc_testing" diff --git a/internal/grpc/middleware/featureflag/testhelper_test.go b/internal/grpc/middleware/featureflag/testhelper_test.go index 3b7d116384..064f394a69 100644 --- a/internal/grpc/middleware/featureflag/testhelper_test.go +++ b/internal/grpc/middleware/featureflag/testhelper_test.go @@ -3,7 +3,7 @@ package featureflag import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/grpc/middleware/limithandler/middleware.go b/internal/grpc/middleware/limithandler/middleware.go index 64d36ffe3b..4178300231 100644 --- a/internal/grpc/middleware/limithandler/middleware.go +++ b/internal/grpc/middleware/limithandler/middleware.go @@ -7,10 +7,10 @@ import ( "time" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/requestinfohandler" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/limiter" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/middleware/requestinfohandler" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/limiter" "google.golang.org/grpc" ) diff --git a/internal/grpc/middleware/limithandler/middleware_test.go b/internal/grpc/middleware/limithandler/middleware_test.go index e26e21e957..b8853927d0 100644 --- a/internal/grpc/middleware/limithandler/middleware_test.go +++ b/internal/grpc/middleware/limithandler/middleware_test.go @@ -11,13 +11,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/limithandler" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/duration" - "gitlab.com/gitlab-org/gitaly/v16/internal/limiter" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/middleware/limithandler" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/duration" + "gitlab.com/gitlab-org/gitaly/v17/internal/limiter" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/credentials/insecure" diff --git a/internal/grpc/middleware/limithandler/testhelper_test.go b/internal/grpc/middleware/limithandler/testhelper_test.go index a217688fd5..77e4abd9fa 100644 --- a/internal/grpc/middleware/limithandler/testhelper_test.go +++ b/internal/grpc/middleware/limithandler/testhelper_test.go @@ -10,7 +10,7 @@ import ( "github.com/prometheus/client_golang/prometheus" dto "github.com/prometheus/client_model/go" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" "google.golang.org/grpc/interop/grpc_testing" ) diff --git a/internal/grpc/middleware/loghandler/loghandler.go b/internal/grpc/middleware/loghandler/loghandler.go index f1d66ad19d..e0e08f1aab 100644 --- a/internal/grpc/middleware/loghandler/loghandler.go +++ b/internal/grpc/middleware/loghandler/loghandler.go @@ -5,7 +5,7 @@ import ( grpcmwlogrus "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" "github.com/sirupsen/logrus" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/stats" diff --git a/internal/grpc/middleware/loghandler/loghandler_test.go b/internal/grpc/middleware/loghandler/loghandler_test.go index 8ce7a1251d..276267ce62 100644 --- a/internal/grpc/middleware/loghandler/loghandler_test.go +++ b/internal/grpc/middleware/loghandler/loghandler_test.go @@ -10,7 +10,7 @@ import ( "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/stats" diff --git a/internal/grpc/middleware/loghandler/testhelper_test.go b/internal/grpc/middleware/loghandler/testhelper_test.go index 6776efe8d2..33cc37acbc 100644 --- a/internal/grpc/middleware/loghandler/testhelper_test.go +++ b/internal/grpc/middleware/loghandler/testhelper_test.go @@ -3,7 +3,7 @@ package loghandler import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/grpc/middleware/panichandler/panic_handler.go b/internal/grpc/middleware/panichandler/panic_handler.go index 92d4627643..110fdc8ff6 100644 --- a/internal/grpc/middleware/panichandler/panic_handler.go +++ b/internal/grpc/middleware/panichandler/panic_handler.go @@ -4,7 +4,7 @@ import ( "context" "runtime/debug" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/internal/grpc/middleware/requestinfohandler/requestinfohandler.go b/internal/grpc/middleware/requestinfohandler/requestinfohandler.go index d560ca1cd6..0d1dc9b1fa 100644 --- a/internal/grpc/middleware/requestinfohandler/requestinfohandler.go +++ b/internal/grpc/middleware/requestinfohandler/requestinfohandler.go @@ -9,10 +9,10 @@ import ( grpcprometheus "github.com/grpc-ecosystem/go-grpc-prometheus" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - gitalyauth "gitlab.com/gitlab-org/gitaly/v16/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + gitalyauth "gitlab.com/gitlab-org/gitaly/v17/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "gitlab.com/gitlab-org/labkit/correlation" "google.golang.org/grpc" "google.golang.org/grpc/metadata" diff --git a/internal/grpc/middleware/requestinfohandler/requestinfohandler_test.go b/internal/grpc/middleware/requestinfohandler/requestinfohandler_test.go index 2b72eb4c0e..8ce94d6672 100644 --- a/internal/grpc/middleware/requestinfohandler/requestinfohandler_test.go +++ b/internal/grpc/middleware/requestinfohandler/requestinfohandler_test.go @@ -12,10 +12,10 @@ import ( grpcmwtags "github.com/grpc-ecosystem/go-grpc-middleware/tags" "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/logging" "github.com/stretchr/testify/require" - gitalylog "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + gitalylog "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "gitlab.com/gitlab-org/labkit/correlation" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" diff --git a/internal/grpc/middleware/requestinfohandler/testhelper_test.go b/internal/grpc/middleware/requestinfohandler/testhelper_test.go index 464eca43dc..5d53befef4 100644 --- a/internal/grpc/middleware/requestinfohandler/testhelper_test.go +++ b/internal/grpc/middleware/requestinfohandler/testhelper_test.go @@ -3,7 +3,7 @@ package requestinfohandler import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/grpc/middleware/sentryhandler/sentryhandler.go b/internal/grpc/middleware/sentryhandler/sentryhandler.go index 2ac1ef2cfe..d578a7e36b 100644 --- a/internal/grpc/middleware/sentryhandler/sentryhandler.go +++ b/internal/grpc/middleware/sentryhandler/sentryhandler.go @@ -10,8 +10,8 @@ import ( sentry "github.com/getsentry/sentry-go" grpcmw "github.com/grpc-ecosystem/go-grpc-middleware/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/requestinfohandler" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/middleware/requestinfohandler" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" "google.golang.org/grpc" "google.golang.org/grpc/codes" ) diff --git a/internal/grpc/middleware/sentryhandler/sentryhandler_test.go b/internal/grpc/middleware/sentryhandler/sentryhandler_test.go index 61d67ed106..5f920f7e8f 100644 --- a/internal/grpc/middleware/sentryhandler/sentryhandler_test.go +++ b/internal/grpc/middleware/sentryhandler/sentryhandler_test.go @@ -9,8 +9,8 @@ import ( sentry "github.com/getsentry/sentry-go" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/credentials/insecure" diff --git a/internal/grpc/middleware/sentryhandler/testhelper_test.go b/internal/grpc/middleware/sentryhandler/testhelper_test.go index d9287d14e2..50f65121a6 100644 --- a/internal/grpc/middleware/sentryhandler/testhelper_test.go +++ b/internal/grpc/middleware/sentryhandler/testhelper_test.go @@ -3,7 +3,7 @@ package sentryhandler import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/grpc/middleware/statushandler/statushandler.go b/internal/grpc/middleware/statushandler/statushandler.go index 339d849e70..fe19ba5c88 100644 --- a/internal/grpc/middleware/statushandler/statushandler.go +++ b/internal/grpc/middleware/statushandler/statushandler.go @@ -4,7 +4,7 @@ import ( "context" "errors" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" "google.golang.org/grpc" "google.golang.org/grpc/codes" ) diff --git a/internal/grpc/middleware/statushandler/statushandler_test.go b/internal/grpc/middleware/statushandler/statushandler_test.go index 8ea38d2d35..ddc913278d 100644 --- a/internal/grpc/middleware/statushandler/statushandler_test.go +++ b/internal/grpc/middleware/statushandler/statushandler_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/interop/stress/grpc_testing" diff --git a/internal/grpc/middleware/statushandler/testhelper_test.go b/internal/grpc/middleware/statushandler/testhelper_test.go index 3437d6df2a..4e82ca2801 100644 --- a/internal/grpc/middleware/statushandler/testhelper_test.go +++ b/internal/grpc/middleware/statushandler/testhelper_test.go @@ -3,7 +3,7 @@ package statushandler import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/grpc/protoregistry/method_info.go b/internal/grpc/protoregistry/method_info.go index 837b826b8b..14c4954aa4 100644 --- a/internal/grpc/protoregistry/method_info.go +++ b/internal/grpc/protoregistry/method_info.go @@ -6,9 +6,9 @@ import ( "strconv" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/protoutil" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/protoutil" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/reflect/protopath" "google.golang.org/protobuf/reflect/protorange" diff --git a/internal/grpc/protoregistry/method_info_test.go b/internal/grpc/protoregistry/method_info_test.go index 8619c4248a..f588a40342 100644 --- a/internal/grpc/protoregistry/method_info_test.go +++ b/internal/grpc/protoregistry/method_info_test.go @@ -6,9 +6,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/reflect/protoreflect" ) diff --git a/internal/grpc/protoregistry/registry.go b/internal/grpc/protoregistry/registry.go index 0f205a891d..1963958815 100644 --- a/internal/grpc/protoregistry/registry.go +++ b/internal/grpc/protoregistry/registry.go @@ -3,8 +3,8 @@ package protoregistry import ( "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/protoutil" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/protoutil" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/reflect/protodesc" protoreg "google.golang.org/protobuf/reflect/protoregistry" "google.golang.org/protobuf/types/descriptorpb" diff --git a/internal/grpc/protoregistry/testhelper_test.go b/internal/grpc/protoregistry/testhelper_test.go index 07f146a30d..59c5cb2019 100644 --- a/internal/grpc/protoregistry/testhelper_test.go +++ b/internal/grpc/protoregistry/testhelper_test.go @@ -3,7 +3,7 @@ package protoregistry import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/grpc/proxy/handler.go b/internal/grpc/proxy/handler.go index 1a67d3c0f2..2725c6d9ea 100644 --- a/internal/grpc/proxy/handler.go +++ b/internal/grpc/proxy/handler.go @@ -9,7 +9,7 @@ import ( "fmt" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/sentryhandler" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/middleware/sentryhandler" "golang.org/x/sync/errgroup" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/internal/grpc/proxy/handler_ext_test.go b/internal/grpc/proxy/handler_ext_test.go index ed99af19a0..79c7d87ba9 100644 --- a/internal/grpc/proxy/handler_ext_test.go +++ b/internal/grpc/proxy/handler_ext_test.go @@ -18,11 +18,11 @@ import ( "github.com/getsentry/sentry-go" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/proxy" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/proxy" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/credentials/insecure" diff --git a/internal/grpc/proxy/peeker_test.go b/internal/grpc/proxy/peeker_test.go index aea17bba21..45e3f326a0 100644 --- a/internal/grpc/proxy/peeker_test.go +++ b/internal/grpc/proxy/peeker_test.go @@ -6,9 +6,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/proxy" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/proxy" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" "google.golang.org/grpc/interop/grpc_testing" "google.golang.org/protobuf/proto" ) diff --git a/internal/grpc/proxy/proxy_test_testhelper_test.go b/internal/grpc/proxy/proxy_test_testhelper_test.go index 3fef99bda1..1d164991ba 100644 --- a/internal/grpc/proxy/proxy_test_testhelper_test.go +++ b/internal/grpc/proxy/proxy_test_testhelper_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/sentryhandler" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/proxy" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/middleware/sentryhandler" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/proxy" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/interop/grpc_testing" diff --git a/internal/grpc/proxy/testhelper_test.go b/internal/grpc/proxy/testhelper_test.go index 458219da2c..9bd10ed95f 100644 --- a/internal/grpc/proxy/testhelper_test.go +++ b/internal/grpc/proxy/testhelper_test.go @@ -3,7 +3,7 @@ package proxy import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/grpc/sidechannel/conn.go b/internal/grpc/sidechannel/conn.go index 7e8830bd8e..658c9d9f70 100644 --- a/internal/grpc/sidechannel/conn.go +++ b/internal/grpc/sidechannel/conn.go @@ -6,10 +6,10 @@ import ( "io" "net" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/pktline" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/streamio" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/streamio" "google.golang.org/grpc" ) diff --git a/internal/grpc/sidechannel/proxy.go b/internal/grpc/sidechannel/proxy.go index 06e0b38ffa..b7cea3cb29 100644 --- a/internal/grpc/sidechannel/proxy.go +++ b/internal/grpc/sidechannel/proxy.go @@ -6,8 +6,8 @@ import ( "fmt" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" "google.golang.org/grpc" grpcMetadata "google.golang.org/grpc/metadata" ) diff --git a/internal/grpc/sidechannel/proxy_test.go b/internal/grpc/sidechannel/proxy_test.go index 38fdf2dbbd..d0fd6a9442 100644 --- a/internal/grpc/sidechannel/proxy_test.go +++ b/internal/grpc/sidechannel/proxy_test.go @@ -10,12 +10,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/listenmux" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/listenmux" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" healthpb "google.golang.org/grpc/health/grpc_health_v1" diff --git a/internal/grpc/sidechannel/registry_test.go b/internal/grpc/sidechannel/registry_test.go index a0b55c2ac0..892b7e0beb 100644 --- a/internal/grpc/sidechannel/registry_test.go +++ b/internal/grpc/sidechannel/registry_test.go @@ -11,7 +11,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestRegistry(t *testing.T) { diff --git a/internal/grpc/sidechannel/sidechannel.go b/internal/grpc/sidechannel/sidechannel.go index 083bc9304d..871af513d5 100644 --- a/internal/grpc/sidechannel/sidechannel.go +++ b/internal/grpc/sidechannel/sidechannel.go @@ -9,11 +9,11 @@ import ( "strconv" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/listenmux" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/tracing" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/listenmux" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/tracing" "google.golang.org/grpc" "google.golang.org/grpc/credentials" "google.golang.org/grpc/credentials/insecure" diff --git a/internal/grpc/sidechannel/sidechannel_test.go b/internal/grpc/sidechannel/sidechannel_test.go index ea096f9da6..398a3837a3 100644 --- a/internal/grpc/sidechannel/sidechannel_test.go +++ b/internal/grpc/sidechannel/sidechannel_test.go @@ -10,9 +10,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/listenmux" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/listenmux" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" healthpb "google.golang.org/grpc/health/grpc_health_v1" diff --git a/internal/grpc/sidechannel/testhelper_test.go b/internal/grpc/sidechannel/testhelper_test.go index 746f17eba1..da020b1c47 100644 --- a/internal/grpc/sidechannel/testhelper_test.go +++ b/internal/grpc/sidechannel/testhelper_test.go @@ -3,7 +3,7 @@ package sidechannel import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/helper/chunk/chunker_test.go b/internal/helper/chunk/chunker_test.go index 75e2883497..df84c8e8bd 100644 --- a/internal/helper/chunk/chunker_test.go +++ b/internal/helper/chunk/chunker_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/interop/grpc_testing" diff --git a/internal/helper/chunk/testhelper_test.go b/internal/helper/chunk/testhelper_test.go index e81d92db68..1f83340a1f 100644 --- a/internal/helper/chunk/testhelper_test.go +++ b/internal/helper/chunk/testhelper_test.go @@ -3,7 +3,7 @@ package chunk import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/helper/duration/testhelper_test.go b/internal/helper/duration/testhelper_test.go index a0d9e8f7f8..e6b694dd12 100644 --- a/internal/helper/duration/testhelper_test.go +++ b/internal/helper/duration/testhelper_test.go @@ -3,7 +3,7 @@ package duration import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/helper/env/env_test.go b/internal/helper/env/env_test.go index 9984cf38f0..ff123eee34 100644 --- a/internal/helper/env/env_test.go +++ b/internal/helper/env/env_test.go @@ -7,8 +7,8 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/env" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/env" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestGetBool(t *testing.T) { diff --git a/internal/helper/env/testhelper_test.go b/internal/helper/env/testhelper_test.go index 5fb46d8dc9..ee523566b7 100644 --- a/internal/helper/env/testhelper_test.go +++ b/internal/helper/env/testhelper_test.go @@ -3,7 +3,7 @@ package env_test import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/helper/fstype/testhelper_test.go b/internal/helper/fstype/testhelper_test.go index 10ba5c1a8c..8f555f9b0c 100644 --- a/internal/helper/fstype/testhelper_test.go +++ b/internal/helper/fstype/testhelper_test.go @@ -3,7 +3,7 @@ package fstype import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/helper/lines/testhelper_test.go b/internal/helper/lines/testhelper_test.go index c1230a7615..49cbc44ac9 100644 --- a/internal/helper/lines/testhelper_test.go +++ b/internal/helper/lines/testhelper_test.go @@ -3,7 +3,7 @@ package lines import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/helper/perm/fix_permissions.go b/internal/helper/perm/fix_permissions.go index f949b95e47..7cfa09bf97 100644 --- a/internal/helper/perm/fix_permissions.go +++ b/internal/helper/perm/fix_permissions.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" ) // FixDirectoryPermissions does a recursive directory walk to look for diff --git a/internal/helper/perm/perm_test.go b/internal/helper/perm/perm_test.go index 283d768ff2..34e0ddaf72 100644 --- a/internal/helper/perm/perm_test.go +++ b/internal/helper/perm/perm_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/perm" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/perm" ) func TestUmaskMask(t *testing.T) { diff --git a/internal/helper/perm/testhelper_test.go b/internal/helper/perm/testhelper_test.go index 011814ee8c..f239279b37 100644 --- a/internal/helper/perm/testhelper_test.go +++ b/internal/helper/perm/testhelper_test.go @@ -3,7 +3,7 @@ package perm_test import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/helper/testhelper_test.go b/internal/helper/testhelper_test.go index c57af0dad2..7322f05501 100644 --- a/internal/helper/testhelper_test.go +++ b/internal/helper/testhelper_test.go @@ -3,7 +3,7 @@ package helper import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/helper/text/chomp_test.go b/internal/helper/text/chomp_test.go index 5d707bbeb7..c67193c9f0 100644 --- a/internal/helper/text/chomp_test.go +++ b/internal/helper/text/chomp_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" ) func TestChompBytes(t *testing.T) { diff --git a/internal/helper/text/testhelper_test.go b/internal/helper/text/testhelper_test.go index 6483830f20..426606d64f 100644 --- a/internal/helper/text/testhelper_test.go +++ b/internal/helper/text/testhelper_test.go @@ -3,7 +3,7 @@ package text_test import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/kernel/testhelper_test.go b/internal/kernel/testhelper_test.go index 25357f06fa..f8e6ea35db 100644 --- a/internal/kernel/testhelper_test.go +++ b/internal/kernel/testhelper_test.go @@ -3,7 +3,7 @@ package kernel import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/kernel/version.go b/internal/kernel/version.go index 9617cadffb..53330c30de 100644 --- a/internal/kernel/version.go +++ b/internal/kernel/version.go @@ -6,7 +6,7 @@ import ( "strconv" "sync" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" ) // Version models a kernel version. diff --git a/internal/kernel/version_test.go b/internal/kernel/version_test.go index 7c3da043ac..e2c9e19ef3 100644 --- a/internal/kernel/version_test.go +++ b/internal/kernel/version_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" ) func TestIsAtLeast(t *testing.T) { diff --git a/internal/limiter/adaptive_calculator.go b/internal/limiter/adaptive_calculator.go index 38d3e0ba85..3351b8a737 100644 --- a/internal/limiter/adaptive_calculator.go +++ b/internal/limiter/adaptive_calculator.go @@ -10,8 +10,8 @@ import ( "time" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) const ( diff --git a/internal/limiter/adaptive_calculator_test.go b/internal/limiter/adaptive_calculator_test.go index 97b81d3a49..ca66ca0764 100644 --- a/internal/limiter/adaptive_calculator_test.go +++ b/internal/limiter/adaptive_calculator_test.go @@ -10,8 +10,8 @@ import ( "github.com/sirupsen/logrus" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestAdaptiveCalculator_alreadyStarted(t *testing.T) { diff --git a/internal/limiter/concurrency_limiter.go b/internal/limiter/concurrency_limiter.go index 38110d05a7..fdff8a497f 100644 --- a/internal/limiter/concurrency_limiter.go +++ b/internal/limiter/concurrency_limiter.go @@ -7,10 +7,10 @@ import ( "sync" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/tracing" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/tracing" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/types/known/durationpb" ) diff --git a/internal/limiter/concurrency_limiter_test.go b/internal/limiter/concurrency_limiter_test.go index aa11adbdd0..14cec2460d 100644 --- a/internal/limiter/concurrency_limiter_test.go +++ b/internal/limiter/concurrency_limiter_test.go @@ -11,9 +11,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/codes" "google.golang.org/protobuf/types/known/durationpb" ) diff --git a/internal/limiter/monitor.go b/internal/limiter/monitor.go index 9230525d86..8ec1793e1c 100644 --- a/internal/limiter/monitor.go +++ b/internal/limiter/monitor.go @@ -6,7 +6,7 @@ import ( "time" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) // ConcurrencyMonitor allows the concurrency monitor to be observed. diff --git a/internal/limiter/monitor_test.go b/internal/limiter/monitor_test.go index deff19cace..14b3f12e3e 100644 --- a/internal/limiter/monitor_test.go +++ b/internal/limiter/monitor_test.go @@ -6,9 +6,9 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/require" - promconfig "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + promconfig "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/prometheus" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestNewPerRPCPromMonitor(t *testing.T) { diff --git a/internal/limiter/rate_limiter.go b/internal/limiter/rate_limiter.go index 73e0e5b6a2..9a0f547bc8 100644 --- a/internal/limiter/rate_limiter.go +++ b/internal/limiter/rate_limiter.go @@ -7,10 +7,10 @@ import ( "time" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/tracing" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/tracing" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "golang.org/x/time/rate" "google.golang.org/protobuf/types/known/durationpb" ) diff --git a/internal/limiter/rate_limiter_test.go b/internal/limiter/rate_limiter_test.go index 5a39a694ce..a229845d6d 100644 --- a/internal/limiter/rate_limiter_test.go +++ b/internal/limiter/rate_limiter_test.go @@ -5,8 +5,8 @@ import ( "time" "github.com/stretchr/testify/assert" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestRateLimiter_pruneUnusedLimiters(t *testing.T) { diff --git a/internal/limiter/resizable_semaphore_test.go b/internal/limiter/resizable_semaphore_test.go index f7593012e0..b0fcebb008 100644 --- a/internal/limiter/resizable_semaphore_test.go +++ b/internal/limiter/resizable_semaphore_test.go @@ -9,7 +9,7 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestResizableSemaphore_New(t *testing.T) { diff --git a/internal/limiter/testhelper_test.go b/internal/limiter/testhelper_test.go index 419ba21582..205d37640c 100644 --- a/internal/limiter/testhelper_test.go +++ b/internal/limiter/testhelper_test.go @@ -3,7 +3,7 @@ package limiter import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/limiter/watchers/cgroup_cpu_watcher.go b/internal/limiter/watchers/cgroup_cpu_watcher.go index 30f5c84541..de63951bba 100644 --- a/internal/limiter/watchers/cgroup_cpu_watcher.go +++ b/internal/limiter/watchers/cgroup_cpu_watcher.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/cgroups" - "gitlab.com/gitlab-org/gitaly/v16/internal/limiter" + "gitlab.com/gitlab-org/gitaly/v17/internal/cgroups" + "gitlab.com/gitlab-org/gitaly/v17/internal/limiter" ) const ( diff --git a/internal/limiter/watchers/cgroup_cpu_watcher_test.go b/internal/limiter/watchers/cgroup_cpu_watcher_test.go index 8b007b399e..5e9c29a43a 100644 --- a/internal/limiter/watchers/cgroup_cpu_watcher_test.go +++ b/internal/limiter/watchers/cgroup_cpu_watcher_test.go @@ -6,9 +6,9 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/cgroups" - "gitlab.com/gitlab-org/gitaly/v16/internal/limiter" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/cgroups" + "gitlab.com/gitlab-org/gitaly/v17/internal/limiter" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestCgroupCPUWatcher_Name(t *testing.T) { diff --git a/internal/limiter/watchers/cgroup_memory_watcher.go b/internal/limiter/watchers/cgroup_memory_watcher.go index ab686ba120..d30d8b6293 100644 --- a/internal/limiter/watchers/cgroup_memory_watcher.go +++ b/internal/limiter/watchers/cgroup_memory_watcher.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/cgroups" - "gitlab.com/gitlab-org/gitaly/v16/internal/limiter" + "gitlab.com/gitlab-org/gitaly/v17/internal/cgroups" + "gitlab.com/gitlab-org/gitaly/v17/internal/limiter" ) const ( diff --git a/internal/limiter/watchers/cgroup_memory_watcher_test.go b/internal/limiter/watchers/cgroup_memory_watcher_test.go index ccc2df3a0c..54841b71d9 100644 --- a/internal/limiter/watchers/cgroup_memory_watcher_test.go +++ b/internal/limiter/watchers/cgroup_memory_watcher_test.go @@ -5,9 +5,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/cgroups" - "gitlab.com/gitlab-org/gitaly/v16/internal/limiter" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/cgroups" + "gitlab.com/gitlab-org/gitaly/v17/internal/limiter" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestCgroupMemoryWatcher_Name(t *testing.T) { diff --git a/internal/limiter/watchers/testhelper_test.go b/internal/limiter/watchers/testhelper_test.go index bb4613acc9..075a096757 100644 --- a/internal/limiter/watchers/testhelper_test.go +++ b/internal/limiter/watchers/testhelper_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/cgroups" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/cgroups" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) type testCgroupManager struct { diff --git a/internal/log/customfields_test.go b/internal/log/customfields_test.go index 8d14a38eb0..2b49af93cc 100644 --- a/internal/log/customfields_test.go +++ b/internal/log/customfields_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestStatsFromContext_BackgroundContext(t *testing.T) { diff --git a/internal/log/matcher.go b/internal/log/matcher.go index 2a46196e6c..c58ef0ded0 100644 --- a/internal/log/matcher.go +++ b/internal/log/matcher.go @@ -5,7 +5,7 @@ import ( "regexp" "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/env" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/env" ) const ( diff --git a/internal/log/testhelper_test.go b/internal/log/testhelper_test.go index b4c6298c66..31d8e505b5 100644 --- a/internal/log/testhelper_test.go +++ b/internal/log/testhelper_test.go @@ -3,7 +3,7 @@ package log_test import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/offloading/options.go b/internal/offloading/options.go index 6398fd2843..ff931aadba 100644 --- a/internal/offloading/options.go +++ b/internal/offloading/options.go @@ -4,7 +4,7 @@ import ( "math/rand" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/backoff" + "gitlab.com/gitlab-org/gitaly/v17/internal/backoff" ) var ( diff --git a/internal/offloading/sink.go b/internal/offloading/sink.go index 8ea3a17407..9aa185ae8f 100644 --- a/internal/offloading/sink.go +++ b/internal/offloading/sink.go @@ -9,7 +9,7 @@ import ( "path/filepath" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/backoff" + "gitlab.com/gitlab-org/gitaly/v17/internal/backoff" "gocloud.dev/blob" "golang.org/x/sync/errgroup" diff --git a/internal/offloading/sink_test.go b/internal/offloading/sink_test.go index 4593c26c5c..7993a29c1a 100644 --- a/internal/offloading/sink_test.go +++ b/internal/offloading/sink_test.go @@ -10,9 +10,9 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/backoff" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/backoff" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" "gocloud.dev/blob" "gocloud.dev/gcerrors" ) diff --git a/internal/offloading/testhelper_test.go b/internal/offloading/testhelper_test.go index 911b7f1184..66421c06ee 100644 --- a/internal/offloading/testhelper_test.go +++ b/internal/offloading/testhelper_test.go @@ -3,7 +3,7 @@ package offloading import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/praefect/auth_test.go b/internal/praefect/auth_test.go index ed9e2e7410..8365d50a05 100644 --- a/internal/praefect/auth_test.go +++ b/internal/praefect/auth_test.go @@ -7,17 +7,17 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - gitalyauth "gitlab.com/gitlab-org/gitaly/v16/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/transactions" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/promtest" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + gitalyauth "gitlab.com/gitlab-org/gitaly/v17/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/transactions" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/promtest" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/credentials/insecure" diff --git a/internal/praefect/config/config.go b/internal/praefect/config/config.go index 3a4621d40b..742bc0cf83 100644 --- a/internal/praefect/config/config.go +++ b/internal/praefect/config/config.go @@ -14,13 +14,13 @@ import ( "github.com/hashicorp/yamux" "github.com/pelletier/go-toml/v2" promclient "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/errors/cfgerror" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/sentry" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/duration" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/errors/cfgerror" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/prometheus" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/sentry" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/duration" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) // ElectionStrategy is a Praefect primary election strategy. diff --git a/internal/praefect/config/config_test.go b/internal/praefect/config/config_test.go index 6a16fb8fd8..f9bdcab52d 100644 --- a/internal/praefect/config/config_test.go +++ b/internal/praefect/config/config_test.go @@ -12,14 +12,14 @@ import ( "github.com/pelletier/go-toml/v2" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/errors/cfgerror" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/sentry" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/duration" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/errors/cfgerror" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/prometheus" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/sentry" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/duration" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestConfigValidation(t *testing.T) { diff --git a/internal/praefect/config/node.go b/internal/praefect/config/node.go index 9f99055d32..e902ed1225 100644 --- a/internal/praefect/config/node.go +++ b/internal/praefect/config/node.go @@ -4,7 +4,7 @@ import ( "encoding/json" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/errors/cfgerror" + "gitlab.com/gitlab-org/gitaly/v17/internal/errors/cfgerror" ) // Node describes an address that serves a storage diff --git a/internal/praefect/config/node_test.go b/internal/praefect/config/node_test.go index c472e60c5c..e385be12c0 100644 --- a/internal/praefect/config/node_test.go +++ b/internal/praefect/config/node_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/errors/cfgerror" + "gitlab.com/gitlab-org/gitaly/v17/internal/errors/cfgerror" ) func TestNode_MarshalJSON(t *testing.T) { diff --git a/internal/praefect/config/testhelper_test.go b/internal/praefect/config/testhelper_test.go index fba4fa2c61..a4f7d39e58 100644 --- a/internal/praefect/config/testhelper_test.go +++ b/internal/praefect/config/testhelper_test.go @@ -3,7 +3,7 @@ package config import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/praefect/coordinator.go b/internal/praefect/coordinator.go index f5868e4e33..a9979fe7bf 100644 --- a/internal/praefect/coordinator.go +++ b/internal/praefect/coordinator.go @@ -8,20 +8,20 @@ import ( "time" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/proxy" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/metrics" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/transactions" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/proxy" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/metrics" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/transactions" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "gitlab.com/gitlab-org/labkit/correlation" "golang.org/x/sync/errgroup" grpc_metadata "google.golang.org/grpc/metadata" diff --git a/internal/praefect/coordinator_pg_test.go b/internal/praefect/coordinator_pg_test.go index 6b2294e33d..fa4ed30014 100644 --- a/internal/praefect/coordinator_pg_test.go +++ b/internal/praefect/coordinator_pg_test.go @@ -10,16 +10,16 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/transactions" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/transactions" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc/peer" "google.golang.org/protobuf/proto" ) diff --git a/internal/praefect/coordinator_test.go b/internal/praefect/coordinator_test.go index 88ab9dbad5..a00353e903 100644 --- a/internal/praefect/coordinator_test.go +++ b/internal/praefect/coordinator_test.go @@ -14,31 +14,31 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/cache" - "gitlab.com/gitlab-org/gitaly/v16/internal/datastructure" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - gconfig "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/repository" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - gitaly_metadata "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/proxy" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/transactions" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/promtest" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/cache" + "gitlab.com/gitlab-org/gitaly/v17/internal/datastructure" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + gconfig "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/repository" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + gitaly_metadata "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/proxy" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/transactions" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/promtest" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "gitlab.com/gitlab-org/labkit/correlation" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/internal/praefect/datastore/assignment.go b/internal/praefect/datastore/assignment.go index 6d1aecd536..6467ece6ed 100644 --- a/internal/praefect/datastore/assignment.go +++ b/internal/praefect/datastore/assignment.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/glsql" ) // InvalidArgumentError tags the error as being caused by an invalid argument. diff --git a/internal/praefect/datastore/assignment_test.go b/internal/praefect/datastore/assignment_test.go index 22da8f5821..1e39a4d08a 100644 --- a/internal/praefect/datastore/assignment_test.go +++ b/internal/praefect/datastore/assignment_test.go @@ -6,9 +6,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/glsql" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" ) func TestAssignmentStore_GetHostAssignments(t *testing.T) { diff --git a/internal/praefect/datastore/collector.go b/internal/praefect/datastore/collector.go index 328ce8960d..f905d18207 100644 --- a/internal/praefect/datastore/collector.go +++ b/internal/praefect/datastore/collector.go @@ -6,8 +6,8 @@ import ( "time" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/glsql" ) var ( diff --git a/internal/praefect/datastore/collector_test.go b/internal/praefect/datastore/collector_test.go index 47f84f0760..52eb2e0581 100644 --- a/internal/praefect/datastore/collector_test.go +++ b/internal/praefect/datastore/collector_test.go @@ -11,9 +11,9 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" ) func TestRepositoryStoreCollector(t *testing.T) { diff --git a/internal/praefect/datastore/glsql/postgres.go b/internal/praefect/datastore/glsql/postgres.go index 06e69c4af8..57678be46e 100644 --- a/internal/praefect/datastore/glsql/postgres.go +++ b/internal/praefect/datastore/glsql/postgres.go @@ -13,8 +13,8 @@ import ( "github.com/jackc/pgx/v5/pgtype" "github.com/jackc/pgx/v5/stdlib" migrate "github.com/rubenv/sql-migrate" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/migrations" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/migrations" ) // OpenDB returns connection pool to the database. diff --git a/internal/praefect/datastore/glsql/postgres_test.go b/internal/praefect/datastore/glsql/postgres_test.go index 37db4f04b0..53035a4d54 100644 --- a/internal/praefect/datastore/glsql/postgres_test.go +++ b/internal/praefect/datastore/glsql/postgres_test.go @@ -11,11 +11,11 @@ import ( migrate "github.com/rubenv/sql-migrate" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/glsql" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/migrations" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/migrations" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" ) func TestOpenDB(t *testing.T) { diff --git a/internal/praefect/datastore/glsql/testhelper_test.go b/internal/praefect/datastore/glsql/testhelper_test.go index cf0831c63c..87f6a06559 100644 --- a/internal/praefect/datastore/glsql/testhelper_test.go +++ b/internal/praefect/datastore/glsql/testhelper_test.go @@ -3,7 +3,7 @@ package glsql import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/praefect/datastore/listener.go b/internal/praefect/datastore/listener.go index b6face6b9d..3d467f36dd 100644 --- a/internal/praefect/datastore/listener.go +++ b/internal/praefect/datastore/listener.go @@ -9,10 +9,10 @@ import ( "github.com/jackc/pgx/v5" promclient "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/glsql" ) const ( diff --git a/internal/praefect/datastore/listener_test.go b/internal/praefect/datastore/listener_test.go index 20d1c6518d..da763ed413 100644 --- a/internal/praefect/datastore/listener_test.go +++ b/internal/praefect/datastore/listener_test.go @@ -13,11 +13,11 @@ import ( "github.com/jackc/pgx/v5/pgconn" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/glsql" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" ) func TestNewListener(t *testing.T) { diff --git a/internal/praefect/datastore/memory.go b/internal/praefect/datastore/memory.go index 45a84da721..ab1df82258 100644 --- a/internal/praefect/datastore/memory.go +++ b/internal/praefect/datastore/memory.go @@ -9,7 +9,7 @@ import ( "sync" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" ) var errDeadAckedAsFailed = errors.New("job acknowledged as failed with no attempts left, should be 'dead'") diff --git a/internal/praefect/datastore/memory_test.go b/internal/praefect/datastore/memory_test.go index 426b89d273..7075cf2978 100644 --- a/internal/praefect/datastore/memory_test.go +++ b/internal/praefect/datastore/memory_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMemoryReplicationEventQueue(t *testing.T) { diff --git a/internal/praefect/datastore/postgres.go b/internal/praefect/datastore/postgres.go index a5cdcea2ba..10f8c357b7 100644 --- a/internal/praefect/datastore/postgres.go +++ b/internal/praefect/datastore/postgres.go @@ -7,9 +7,9 @@ import ( "time" migrate "github.com/rubenv/sql-migrate" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/glsql" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/migrations" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/migrations" ) // MigrationStatusRow represents an entry in the schema migrations table. diff --git a/internal/praefect/datastore/postgres_test.go b/internal/praefect/datastore/postgres_test.go index 9032b29420..f150a9dee0 100644 --- a/internal/praefect/datastore/postgres_test.go +++ b/internal/praefect/datastore/postgres_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" ) func TestMigrateStatus(t *testing.T) { diff --git a/internal/praefect/datastore/queue.go b/internal/praefect/datastore/queue.go index 9865ea744f..473fbf0832 100644 --- a/internal/praefect/datastore/queue.go +++ b/internal/praefect/datastore/queue.go @@ -9,7 +9,7 @@ import ( "fmt" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/glsql" ) // CorrelationIDKey is the key that is used to store the correlation ID for a specific replication job as part of the diff --git a/internal/praefect/datastore/queue_bm_test.go b/internal/praefect/datastore/queue_bm_test.go index 6785434eb0..54b4c9678d 100644 --- a/internal/praefect/datastore/queue_bm_test.go +++ b/internal/praefect/datastore/queue_bm_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" ) func BenchmarkPostgresReplicationEventQueue_Acknowledge(b *testing.B) { diff --git a/internal/praefect/datastore/queue_test.go b/internal/praefect/datastore/queue_test.go index 7c07cf72e9..db9e898af3 100644 --- a/internal/praefect/datastore/queue_test.go +++ b/internal/praefect/datastore/queue_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" ) func TestPostgresReplicationEventQueue_DeleteReplicaUniqueIndex(t *testing.T) { diff --git a/internal/praefect/datastore/repository_store.go b/internal/praefect/datastore/repository_store.go index 5925bece40..94542d5e50 100644 --- a/internal/praefect/datastore/repository_store.go +++ b/internal/praefect/datastore/repository_store.go @@ -9,8 +9,8 @@ import ( "strings" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/datastructure" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v17/internal/datastructure" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/glsql" ) type storages map[string][]string diff --git a/internal/praefect/datastore/repository_store_bm_test.go b/internal/praefect/datastore/repository_store_bm_test.go index f53be74d64..b7461ddc11 100644 --- a/internal/praefect/datastore/repository_store_bm_test.go +++ b/internal/praefect/datastore/repository_store_bm_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" ) // The test setup takes a lot of time, so it is better to run each sub-benchmark separately with limit on number of repeats. diff --git a/internal/praefect/datastore/repository_store_mock.go b/internal/praefect/datastore/repository_store_mock.go index 4a43505988..19a613cc9f 100644 --- a/internal/praefect/datastore/repository_store_mock.go +++ b/internal/praefect/datastore/repository_store_mock.go @@ -3,7 +3,7 @@ package datastore import ( "context" - "gitlab.com/gitlab-org/gitaly/v16/internal/datastructure" + "gitlab.com/gitlab-org/gitaly/v17/internal/datastructure" ) // MockRepositoryStore allows for mocking a RepositoryStore by parametrizing its behavior. All methods diff --git a/internal/praefect/datastore/repository_store_test.go b/internal/praefect/datastore/repository_store_test.go index 577ffc0e7e..f018055c21 100644 --- a/internal/praefect/datastore/repository_store_test.go +++ b/internal/praefect/datastore/repository_store_test.go @@ -8,9 +8,9 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/glsql" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" ) // repositoryRecord represents Praefect's records related to a repository. diff --git a/internal/praefect/datastore/storage_cleanup.go b/internal/praefect/datastore/storage_cleanup.go index bd5e2f64d5..a7f6207462 100644 --- a/internal/praefect/datastore/storage_cleanup.go +++ b/internal/praefect/datastore/storage_cleanup.go @@ -7,7 +7,7 @@ import ( "fmt" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" ) // ClusterPath represents path on the cluster to the storage. diff --git a/internal/praefect/datastore/storage_cleanup_test.go b/internal/praefect/datastore/storage_cleanup_test.go index 2b0b52381b..691cb02b3e 100644 --- a/internal/praefect/datastore/storage_cleanup_test.go +++ b/internal/praefect/datastore/storage_cleanup_test.go @@ -6,8 +6,8 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" ) func TestStorageCleanup_Populate(t *testing.T) { diff --git a/internal/praefect/datastore/storage_provider.go b/internal/praefect/datastore/storage_provider.go index 18eeed5377..a9f1933030 100644 --- a/internal/praefect/datastore/storage_provider.go +++ b/internal/praefect/datastore/storage_provider.go @@ -10,9 +10,9 @@ import ( lru "github.com/hashicorp/golang-lru/v2" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/datastructure" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v17/internal/datastructure" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/glsql" ) // ConsistentStoragesGetter returns storages which contain the latest generation of a repository. diff --git a/internal/praefect/datastore/storage_provider_test.go b/internal/praefect/datastore/storage_provider_test.go index 92be00ca6e..fa5c8513c3 100644 --- a/internal/praefect/datastore/storage_provider_test.go +++ b/internal/praefect/datastore/storage_provider_test.go @@ -11,11 +11,11 @@ import ( "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/datastructure" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/glsql" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/datastructure" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" ) func TestCachingStorageProvider_GetSyncedNodes(t *testing.T) { diff --git a/internal/praefect/datastore/testhelper_test.go b/internal/praefect/datastore/testhelper_test.go index 1a47b041a7..f57b74ba94 100644 --- a/internal/praefect/datastore/testhelper_test.go +++ b/internal/praefect/datastore/testhelper_test.go @@ -3,7 +3,7 @@ package datastore import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/praefect/delete_object_pool.go b/internal/praefect/delete_object_pool.go index a1ff485f2c..666f39a29c 100644 --- a/internal/praefect/delete_object_pool.go +++ b/internal/praefect/delete_object_pool.go @@ -4,13 +4,13 @@ import ( "context" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/objectpool" - objectpoolsvc "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/objectpool" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/objectpool" + objectpoolsvc "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/objectpool" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/protobuf/proto" ) diff --git a/internal/praefect/delete_object_pool_test.go b/internal/praefect/delete_object_pool_test.go index b38b6792ad..e10728e481 100644 --- a/internal/praefect/delete_object_pool_test.go +++ b/internal/praefect/delete_object_pool_test.go @@ -6,12 +6,12 @@ import ( grpcmwlogrus "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) diff --git a/internal/praefect/dependencies.go b/internal/praefect/dependencies.go index 4dd0091bc8..a07eb39ccc 100644 --- a/internal/praefect/dependencies.go +++ b/internal/praefect/dependencies.go @@ -1,14 +1,14 @@ package praefect import ( - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/proxy" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/transactions" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/proxy" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/transactions" ) // Dependencies consolidates Praefect service dependencies for injection. diff --git a/internal/praefect/get_object_pool.go b/internal/praefect/get_object_pool.go index 64df9857fc..0c3b783d82 100644 --- a/internal/praefect/get_object_pool.go +++ b/internal/praefect/get_object_pool.go @@ -6,11 +6,11 @@ import ( "path/filepath" "strconv" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" ) diff --git a/internal/praefect/get_object_pool_test.go b/internal/praefect/get_object_pool_test.go index 989f96e0cb..e1560220fc 100644 --- a/internal/praefect/get_object_pool_test.go +++ b/internal/praefect/get_object_pool_test.go @@ -8,20 +8,20 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/setup" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/proxy" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/setup" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/proxy" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) diff --git a/internal/praefect/helper_test.go b/internal/praefect/helper_test.go index ca797ec67f..72cf2351ce 100644 --- a/internal/praefect/helper_test.go +++ b/internal/praefect/helper_test.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/nodes" ) // generates a praefect configuration with the specified number of backend diff --git a/internal/praefect/info_service_test.go b/internal/praefect/info_service_test.go index 04676a691f..8989f0d0d7 100644 --- a/internal/praefect/info_service_test.go +++ b/internal/praefect/info_service_test.go @@ -5,23 +5,23 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - gconfig "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/repository" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/sidechannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/service/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/transactions" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + gconfig "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/repository" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/sidechannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/service/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/transactions" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" ) diff --git a/internal/praefect/metrics/prometheus.go b/internal/praefect/metrics/prometheus.go index a411babd88..fe18d66609 100644 --- a/internal/praefect/metrics/prometheus.go +++ b/internal/praefect/metrics/prometheus.go @@ -5,9 +5,9 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - gitalycfgprom "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/prometheus/metrics" + gitalycfgprom "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/prometheus" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/prometheus/metrics" ) // RegisterReplicationDelay creates and registers a prometheus histogram diff --git a/internal/praefect/metrics/prometheus_test.go b/internal/praefect/metrics/prometheus_test.go index 99250c6ff4..47c250d082 100644 --- a/internal/praefect/metrics/prometheus_test.go +++ b/internal/praefect/metrics/prometheus_test.go @@ -5,8 +5,8 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/require" - gitalycfgprom "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" + gitalycfgprom "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/prometheus" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" ) func TestRegisterReplicationDelay(t *testing.T) { diff --git a/internal/praefect/metrics/testhelper_test.go b/internal/praefect/metrics/testhelper_test.go index 843d467d47..f97357bfe1 100644 --- a/internal/praefect/metrics/testhelper_test.go +++ b/internal/praefect/metrics/testhelper_test.go @@ -3,7 +3,7 @@ package metrics import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/praefect/middleware/errorhandler.go b/internal/praefect/middleware/errorhandler.go index 738f9c1edd..9eb0bdfba2 100644 --- a/internal/praefect/middleware/errorhandler.go +++ b/internal/praefect/middleware/errorhandler.go @@ -6,8 +6,8 @@ import ( "fmt" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes/tracker" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/nodes/tracker" "google.golang.org/grpc" ) diff --git a/internal/praefect/middleware/errorhandler_test.go b/internal/praefect/middleware/errorhandler_test.go index 1cc7ab7c93..83bf39bbe1 100644 --- a/internal/praefect/middleware/errorhandler_test.go +++ b/internal/praefect/middleware/errorhandler_test.go @@ -8,14 +8,14 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/proxy" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes/tracker" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/proxy" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/nodes/tracker" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) diff --git a/internal/praefect/middleware/methodtype.go b/internal/praefect/middleware/methodtype.go index 78c9637b7f..5b0e7c7d5d 100644 --- a/internal/praefect/middleware/methodtype.go +++ b/internal/praefect/middleware/methodtype.go @@ -3,9 +3,9 @@ package middleware import ( "context" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/metrics" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/metrics" "google.golang.org/grpc" ) diff --git a/internal/praefect/middleware/testhelper_test.go b/internal/praefect/middleware/testhelper_test.go index 06fab764ad..a90bc017c1 100644 --- a/internal/praefect/middleware/testhelper_test.go +++ b/internal/praefect/middleware/testhelper_test.go @@ -3,7 +3,7 @@ package middleware import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/praefect/node.go b/internal/praefect/node.go index 6a91b4aa73..bffee98d83 100644 --- a/internal/praefect/node.go +++ b/internal/praefect/node.go @@ -4,13 +4,13 @@ import ( "context" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/sidechannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes/tracker" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/sidechannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/nodes/tracker" "google.golang.org/grpc" "google.golang.org/grpc/health/grpc_health_v1" ) diff --git a/internal/praefect/node_test.go b/internal/praefect/node_test.go index 364318f026..e9bc94897b 100644 --- a/internal/praefect/node_test.go +++ b/internal/praefect/node_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/health" diff --git a/internal/praefect/nodes/disabled_elector.go b/internal/praefect/nodes/disabled_elector.go index 1e01864ede..97dafe60ff 100644 --- a/internal/praefect/nodes/disabled_elector.go +++ b/internal/praefect/nodes/disabled_elector.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/metrics" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/metrics" ) // newDisabledElector returns a stub that always returns the same shard where the diff --git a/internal/praefect/nodes/health_manager.go b/internal/praefect/nodes/health_manager.go index f0a4fc221d..454de48c1b 100644 --- a/internal/praefect/nodes/health_manager.go +++ b/internal/praefect/nodes/health_manager.go @@ -7,9 +7,9 @@ import ( "sync/atomic" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/glsql" "gitlab.com/gitlab-org/labkit/correlation" "google.golang.org/grpc/health/grpc_health_v1" ) diff --git a/internal/praefect/nodes/health_manager_test.go b/internal/praefect/nodes/health_manager_test.go index 813aae8d68..07c70e9ffe 100644 --- a/internal/praefect/nodes/health_manager_test.go +++ b/internal/praefect/nodes/health_manager_test.go @@ -7,10 +7,10 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/glsql" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" "google.golang.org/grpc" "google.golang.org/grpc/health/grpc_health_v1" ) diff --git a/internal/praefect/nodes/local_elector.go b/internal/praefect/nodes/local_elector.go index ca8636e100..4458afe0fb 100644 --- a/internal/praefect/nodes/local_elector.go +++ b/internal/praefect/nodes/local_elector.go @@ -5,8 +5,8 @@ import ( "sync" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/metrics" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/metrics" ) // localElector relies on an in-memory datastore to track the primary diff --git a/internal/praefect/nodes/local_elector_test.go b/internal/praefect/nodes/local_elector_test.go index db3ebb80be..a1a0c66b1c 100644 --- a/internal/praefect/nodes/local_elector_test.go +++ b/internal/praefect/nodes/local_elector_test.go @@ -6,9 +6,9 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/promtest" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/promtest" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) diff --git a/internal/praefect/nodes/manager.go b/internal/praefect/nodes/manager.go index 9c7e908637..4d3f878dd0 100644 --- a/internal/praefect/nodes/manager.go +++ b/internal/praefect/nodes/manager.go @@ -10,19 +10,19 @@ import ( "time" grpcprometheus "github.com/grpc-ecosystem/go-grpc-prometheus" - gitalyauth "gitlab.com/gitlab-org/gitaly/v16/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/datastructure" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/proxy" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/sidechannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/metrics" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/middleware" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes/tracker" - prommetrics "gitlab.com/gitlab-org/gitaly/v16/internal/prometheus/metrics" + gitalyauth "gitlab.com/gitlab-org/gitaly/v17/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/datastructure" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/proxy" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/sidechannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/metrics" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/middleware" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/nodes/tracker" + prommetrics "gitlab.com/gitlab-org/gitaly/v17/internal/prometheus/metrics" "google.golang.org/grpc" "google.golang.org/grpc/backoff" healthpb "google.golang.org/grpc/health/grpc_health_v1" diff --git a/internal/praefect/nodes/manager_test.go b/internal/praefect/nodes/manager_test.go index 0d29c752c8..de1256339c 100644 --- a/internal/praefect/nodes/manager_test.go +++ b/internal/praefect/nodes/manager_test.go @@ -9,13 +9,13 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/datastructure" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/promtest" + "gitlab.com/gitlab-org/gitaly/v17/internal/datastructure" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/promtest" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/health" diff --git a/internal/praefect/nodes/per_repository.go b/internal/praefect/nodes/per_repository.go index a079463036..15ba470ddd 100644 --- a/internal/praefect/nodes/per_repository.go +++ b/internal/praefect/nodes/per_repository.go @@ -6,9 +6,9 @@ import ( "errors" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/glsql" ) // ErrNoPrimary is returned if the repository does not have a primary. diff --git a/internal/praefect/nodes/per_repository_test.go b/internal/praefect/nodes/per_repository_test.go index de21adfe00..21eb9782ae 100644 --- a/internal/praefect/nodes/per_repository_test.go +++ b/internal/praefect/nodes/per_repository_test.go @@ -6,10 +6,10 @@ import ( "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" ) func TestPerRepositoryElector(t *testing.T) { diff --git a/internal/praefect/nodes/ping.go b/internal/praefect/nodes/ping.go index e6e56180f0..f4cc2c64c6 100644 --- a/internal/praefect/nodes/ping.go +++ b/internal/praefect/nodes/ping.go @@ -8,10 +8,10 @@ import ( "strings" "sync" - gitalyauth "gitlab.com/gitlab-org/gitaly/v16/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + gitalyauth "gitlab.com/gitlab-org/gitaly/v17/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/health/grpc_health_v1" ) diff --git a/internal/praefect/nodes/ping_test.go b/internal/praefect/nodes/ping_test.go index 6498ea8db2..43aec07e62 100644 --- a/internal/praefect/nodes/ping_test.go +++ b/internal/praefect/nodes/ping_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" ) func TestNewPingSet(t *testing.T) { diff --git a/internal/praefect/nodes/sql_elector.go b/internal/praefect/nodes/sql_elector.go index 8df4ed0eba..662226861b 100644 --- a/internal/praefect/nodes/sql_elector.go +++ b/internal/praefect/nodes/sql_elector.go @@ -11,10 +11,10 @@ import ( "time" "github.com/google/uuid" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/glsql" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/metrics" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/metrics" ) const ( diff --git a/internal/praefect/nodes/sql_elector_test.go b/internal/praefect/nodes/sql_elector_test.go index 135c03b84a..3777d040d9 100644 --- a/internal/praefect/nodes/sql_elector_test.go +++ b/internal/praefect/nodes/sql_elector_test.go @@ -9,15 +9,15 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/listenmux" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/glsql" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/promtest" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/listenmux" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/promtest" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/credentials/insecure" diff --git a/internal/praefect/nodes/testhelper_test.go b/internal/praefect/nodes/testhelper_test.go index 74decdf856..d89161aaaa 100644 --- a/internal/praefect/nodes/testhelper_test.go +++ b/internal/praefect/nodes/testhelper_test.go @@ -3,7 +3,7 @@ package nodes import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/praefect/nodes/tracker/errors.go b/internal/praefect/nodes/tracker/errors.go index 2b81627496..2a7f4be6ae 100644 --- a/internal/praefect/nodes/tracker/errors.go +++ b/internal/praefect/nodes/tracker/errors.go @@ -6,7 +6,7 @@ import ( "sync" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" ) // ErrorTracker allows tracking how many read/write errors have occurred, and whether or not it has diff --git a/internal/praefect/nodes/tracker/errors_test.go b/internal/praefect/nodes/tracker/errors_test.go index d276e6da65..b90cce1296 100644 --- a/internal/praefect/nodes/tracker/errors_test.go +++ b/internal/praefect/nodes/tracker/errors_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) var ( diff --git a/internal/praefect/nodes/tracker/testhelper_test.go b/internal/praefect/nodes/tracker/testhelper_test.go index aabde65539..0a6e8b78f2 100644 --- a/internal/praefect/nodes/tracker/testhelper_test.go +++ b/internal/praefect/nodes/tracker/testhelper_test.go @@ -3,7 +3,7 @@ package tracker import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/praefect/reconciler/reconciler.go b/internal/praefect/reconciler/reconciler.go index b91cc2c985..51ea64b252 100644 --- a/internal/praefect/reconciler/reconciler.go +++ b/internal/praefect/reconciler/reconciler.go @@ -5,11 +5,11 @@ import ( "fmt" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/advisorylock" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/advisorylock" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/glsql" ) const logBatchSize = 25 diff --git a/internal/praefect/reconciler/reconciler_benchmark_test.go b/internal/praefect/reconciler/reconciler_benchmark_test.go index 9372a64740..71cfdbf32a 100644 --- a/internal/praefect/reconciler/reconciler_benchmark_test.go +++ b/internal/praefect/reconciler/reconciler_benchmark_test.go @@ -6,9 +6,9 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" ) func BenchmarkReconcile(b *testing.B) { diff --git a/internal/praefect/reconciler/reconciler_test.go b/internal/praefect/reconciler/reconciler_test.go index 10b06b7093..9bbb91c421 100644 --- a/internal/praefect/reconciler/reconciler_test.go +++ b/internal/praefect/reconciler/reconciler_test.go @@ -9,12 +9,12 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" ) func TestReconciler(t *testing.T) { diff --git a/internal/praefect/reconciler/testhelper_test.go b/internal/praefect/reconciler/testhelper_test.go index d489e2e02c..7ae25d8b9a 100644 --- a/internal/praefect/reconciler/testhelper_test.go +++ b/internal/praefect/reconciler/testhelper_test.go @@ -3,7 +3,7 @@ package reconciler import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/praefect/remove_repository.go b/internal/praefect/remove_repository.go index a681a39c0d..c199bafb1b 100644 --- a/internal/praefect/remove_repository.go +++ b/internal/praefect/remove_repository.go @@ -7,11 +7,11 @@ import ( "sync" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/protobuf/proto" ) diff --git a/internal/praefect/remove_repository_test.go b/internal/praefect/remove_repository_test.go index 50792ddbc5..1036a6462e 100644 --- a/internal/praefect/remove_repository_test.go +++ b/internal/praefect/remove_repository_test.go @@ -7,20 +7,20 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/setup" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/proxy" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/setup" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/proxy" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) diff --git a/internal/praefect/replicator.go b/internal/praefect/replicator.go index 46ffca5cf3..d5efd9f515 100644 --- a/internal/praefect/replicator.go +++ b/internal/praefect/replicator.go @@ -9,15 +9,15 @@ import ( "time" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/repository" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - prommetrics "gitlab.com/gitlab-org/gitaly/v16/internal/prometheus/metrics" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/repository" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + prommetrics "gitlab.com/gitlab-org/gitaly/v17/internal/prometheus/metrics" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "gitlab.com/gitlab-org/labkit/correlation" "google.golang.org/grpc" "google.golang.org/protobuf/proto" diff --git a/internal/praefect/replicator_pg_test.go b/internal/praefect/replicator_pg_test.go index 02f59bf6ab..38dae6fb98 100644 --- a/internal/praefect/replicator_pg_test.go +++ b/internal/praefect/replicator_pg_test.go @@ -7,12 +7,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/repository" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/repository" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) diff --git a/internal/praefect/replicator_test.go b/internal/praefect/replicator_test.go index d6a551b956..b556d8a19f 100644 --- a/internal/praefect/replicator_test.go +++ b/internal/praefect/replicator_test.go @@ -11,23 +11,23 @@ import ( "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - gitalyauth "gitlab.com/gitlab-org/gitaly/v16/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - gitalycfg "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/setup" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/promtest" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + gitalyauth "gitlab.com/gitlab-org/gitaly/v17/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + gitalycfg "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/setup" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/promtest" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "gitlab.com/gitlab-org/labkit/correlation" "golang.org/x/sync/errgroup" "google.golang.org/grpc" diff --git a/internal/praefect/repocleaner/action_log.go b/internal/praefect/repocleaner/action_log.go index 91c155da8a..4e007a5e04 100644 --- a/internal/praefect/repocleaner/action_log.go +++ b/internal/praefect/repocleaner/action_log.go @@ -3,7 +3,7 @@ package repocleaner import ( "context" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) // LogWarnAction is an implementation of the Action interface that allows to log a warning message diff --git a/internal/praefect/repocleaner/action_log_test.go b/internal/praefect/repocleaner/action_log_test.go index c1e456e24f..78fc71840d 100644 --- a/internal/praefect/repocleaner/action_log_test.go +++ b/internal/praefect/repocleaner/action_log_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestLogWarnAction_Perform(t *testing.T) { diff --git a/internal/praefect/repocleaner/repository.go b/internal/praefect/repocleaner/repository.go index 8a270b3292..e33e60f07f 100644 --- a/internal/praefect/repocleaner/repository.go +++ b/internal/praefect/repocleaner/repository.go @@ -7,11 +7,11 @@ import ( "io" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // StateOwner performs check for the existence of the repositories. diff --git a/internal/praefect/repocleaner/repository_test.go b/internal/praefect/repocleaner/repository_test.go index 3d45a27c34..90370e674b 100644 --- a/internal/praefect/repocleaner/repository_test.go +++ b/internal/praefect/repocleaner/repository_test.go @@ -10,20 +10,20 @@ import ( "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/setup" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/service/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/setup" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/service/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" ) func TestRunner_Run(t *testing.T) { diff --git a/internal/praefect/repocleaner/testhelper_test.go b/internal/praefect/repocleaner/testhelper_test.go index ce01325510..4d9b309e78 100644 --- a/internal/praefect/repocleaner/testhelper_test.go +++ b/internal/praefect/repocleaner/testhelper_test.go @@ -3,7 +3,7 @@ package repocleaner import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/praefect/repository_exists.go b/internal/praefect/repository_exists.go index 3c649f9d85..8d00bb5d66 100644 --- a/internal/praefect/repository_exists.go +++ b/internal/praefect/repository_exists.go @@ -3,10 +3,10 @@ package praefect import ( "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" ) diff --git a/internal/praefect/repository_exists_test.go b/internal/praefect/repository_exists_test.go index 6c4ed1f92c..9b2068d723 100644 --- a/internal/praefect/repository_exists_test.go +++ b/internal/praefect/repository_exists_test.go @@ -7,15 +7,15 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/proxy" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/proxy" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) diff --git a/internal/praefect/router.go b/internal/praefect/router.go index 4fbbdc3c81..4e6c599544 100644 --- a/internal/praefect/router.go +++ b/internal/praefect/router.go @@ -3,7 +3,7 @@ package praefect import ( "context" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" "google.golang.org/grpc" ) diff --git a/internal/praefect/router_node_manager.go b/internal/praefect/router_node_manager.go index a65ebd023c..c86d7b4914 100644 --- a/internal/praefect/router_node_manager.go +++ b/internal/praefect/router_node_manager.go @@ -5,9 +5,9 @@ import ( "errors" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/datastructure" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v17/internal/datastructure" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/nodes" ) type nodeManagerRouter struct { diff --git a/internal/praefect/router_per_repository.go b/internal/praefect/router_per_repository.go index 8d54b579f5..eb86d63401 100644 --- a/internal/praefect/router_per_repository.go +++ b/internal/praefect/router_per_repository.go @@ -5,10 +5,10 @@ import ( "errors" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" ) diff --git a/internal/praefect/router_per_repository_test.go b/internal/praefect/router_per_repository_test.go index aeace6d027..c2330b633f 100644 --- a/internal/praefect/router_per_repository_test.go +++ b/internal/praefect/router_per_repository_test.go @@ -7,12 +7,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" "google.golang.org/grpc" "google.golang.org/grpc/metadata" ) diff --git a/internal/praefect/server.go b/internal/praefect/server.go index 766efebd70..6fe4706848 100644 --- a/internal/praefect/server.go +++ b/internal/praefect/server.go @@ -10,28 +10,28 @@ import ( grpcmwlogrus "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/selector" grpcprometheus "github.com/grpc-ecosystem/go-grpc-prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/server/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/grpcstats" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/listenmux" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/loghandler" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/panichandler" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/requestinfohandler" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/sentryhandler" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/statushandler" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/proxy" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/sidechannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/middleware" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/service/info" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/service/server" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/service/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/transactions" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/server/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/grpcstats" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/listenmux" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/middleware/loghandler" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/middleware/panichandler" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/middleware/requestinfohandler" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/middleware/sentryhandler" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/middleware/statushandler" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/proxy" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/sidechannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/middleware" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/service/info" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/service/server" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/service/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/transactions" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" grpccorrelation "gitlab.com/gitlab-org/labkit/correlation/grpc" grpctracing "gitlab.com/gitlab-org/labkit/tracing/grpc" "google.golang.org/grpc" diff --git a/internal/praefect/server_factory_test.go b/internal/praefect/server_factory_test.go index 5910de7c7a..2bb2ec9cd6 100644 --- a/internal/praefect/server_factory_test.go +++ b/internal/praefect/server_factory_test.go @@ -10,27 +10,27 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/bootstrap/starter" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - gconfig "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/setup" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/listenmux" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/sidechannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/service/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/transactions" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/promtest" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/bootstrap/starter" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + gconfig "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/setup" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/listenmux" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/sidechannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/service/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/transactions" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/promtest" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/credentials" "google.golang.org/grpc/credentials/insecure" diff --git a/internal/praefect/server_test.go b/internal/praefect/server_test.go index 70916f0dc5..d0453a6e88 100644 --- a/internal/praefect/server_test.go +++ b/internal/praefect/server_test.go @@ -16,35 +16,35 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/datastructure" - "gitlab.com/gitlab-org/gitaly/v16/internal/git" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - gconfig "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/setup" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mdfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/listenmux" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/proxy" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes/tracker" - serversvc "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/service/server" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/service/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/transactions" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/promtest" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/txinfo" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" - "gitlab.com/gitlab-org/gitaly/v16/internal/version" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/datastructure" + "gitlab.com/gitlab-org/gitaly/v17/internal/git" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + gconfig "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/setup" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mdfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/listenmux" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/proxy" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/nodes/tracker" + serversvc "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/service/server" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/service/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/transactions" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/promtest" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/txinfo" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/internal/version" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/credentials/insecure" diff --git a/internal/praefect/service/checks.go b/internal/praefect/service/checks.go index 63b7f58dcf..f8ab24e10e 100644 --- a/internal/praefect/service/checks.go +++ b/internal/praefect/service/checks.go @@ -9,11 +9,11 @@ import ( "time" migrate "github.com/rubenv/sql-migrate" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/glsql" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/migrations" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/migrations" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/nodes" ) // Severity is a type that indicates the severity of a check diff --git a/internal/praefect/service/checks_test.go b/internal/praefect/service/checks_test.go index 15b94bee09..2911e74f6f 100644 --- a/internal/praefect/service/checks_test.go +++ b/internal/praefect/service/checks_test.go @@ -14,13 +14,13 @@ import ( "github.com/google/uuid" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/migrations" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/migrations" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/health" "google.golang.org/grpc/health/grpc_health_v1" diff --git a/internal/praefect/service/info/dataloss.go b/internal/praefect/service/info/dataloss.go index b428fbaca8..001f91d461 100644 --- a/internal/praefect/service/info/dataloss.go +++ b/internal/praefect/service/info/dataloss.go @@ -1,9 +1,9 @@ package info import ( - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/chunk" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/chunk" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/proto" ) diff --git a/internal/praefect/service/info/metadata.go b/internal/praefect/service/info/metadata.go index 5db5ccdb0f..cf4be4b9aa 100644 --- a/internal/praefect/service/info/metadata.go +++ b/internal/praefect/service/info/metadata.go @@ -4,9 +4,9 @@ import ( "context" "errors" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/internal/praefect/service/info/replication_factor.go b/internal/praefect/service/info/replication_factor.go index d83a87b343..5de70681d6 100644 --- a/internal/praefect/service/info/replication_factor.go +++ b/internal/praefect/service/info/replication_factor.go @@ -5,9 +5,9 @@ import ( "errors" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) //nolint:revive // This is unintentionally missing documentation. diff --git a/internal/praefect/service/info/repositories.go b/internal/praefect/service/info/repositories.go index 7226e63920..9e48dc7ee3 100644 --- a/internal/praefect/service/info/repositories.go +++ b/internal/praefect/service/info/repositories.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "golang.org/x/sync/errgroup" ) diff --git a/internal/praefect/service/info/server.go b/internal/praefect/service/info/server.go index d3f0de4023..b236826cac 100644 --- a/internal/praefect/service/info/server.go +++ b/internal/praefect/service/info/server.go @@ -4,12 +4,12 @@ import ( "context" "errors" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // AssignmentStore is an interface for getting repository host node assignments. diff --git a/internal/praefect/service/info/verification.go b/internal/praefect/service/info/verification.go index dfa2ebead2..b6e49dd73f 100644 --- a/internal/praefect/service/info/verification.go +++ b/internal/praefect/service/info/verification.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // MarkUnverified marks replicas as unverified. See the protobuf declarations for details. diff --git a/internal/praefect/service/server/disk_stats.go b/internal/praefect/service/server/disk_stats.go index b734cbec8d..73222321b6 100644 --- a/internal/praefect/service/server/disk_stats.go +++ b/internal/praefect/service/server/disk_stats.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // DiskStatistics sends DiskStatisticsRequest to all of a praefect server's internal gitaly nodes and aggregates the diff --git a/internal/praefect/service/server/info.go b/internal/praefect/service/server/info.go index b99d2b8b30..aa21537722 100644 --- a/internal/praefect/service/server/info.go +++ b/internal/praefect/service/server/info.go @@ -5,8 +5,8 @@ import ( "sync" "github.com/google/uuid" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/metadata" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/metadata" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" ) diff --git a/internal/praefect/service/server/readiness.go b/internal/praefect/service/server/readiness.go index 16ac30b189..367e161d92 100644 --- a/internal/praefect/service/server/readiness.go +++ b/internal/praefect/service/server/readiness.go @@ -5,7 +5,7 @@ import ( "io" "sort" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // ReadinessCheck runs the set of the checks to make sure service is in operational state. diff --git a/internal/praefect/service/server/readiness_test.go b/internal/praefect/service/server/readiness_test.go index 9435fe687b..70d4eb089a 100644 --- a/internal/praefect/service/server/readiness_test.go +++ b/internal/praefect/service/server/readiness_test.go @@ -8,14 +8,14 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/setup" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/setup" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/types/known/durationpb" ) diff --git a/internal/praefect/service/server/server.go b/internal/praefect/service/server/server.go index a1bbca3730..f696d3569d 100644 --- a/internal/praefect/service/server/server.go +++ b/internal/praefect/service/server/server.go @@ -1,10 +1,10 @@ package server import ( - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/service" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/service" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // Server is a ServerService server diff --git a/internal/praefect/service/server/signature.go b/internal/praefect/service/server/signature.go index b664275e60..f2f6875850 100644 --- a/internal/praefect/service/server/signature.go +++ b/internal/praefect/service/server/signature.go @@ -5,7 +5,7 @@ import ( "context" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // ServerSignature obtains the public key from all storage nodes and diff --git a/internal/praefect/service/server/testhelper_test.go b/internal/praefect/service/server/testhelper_test.go index 282f28bc0a..89c536e36d 100644 --- a/internal/praefect/service/server/testhelper_test.go +++ b/internal/praefect/service/server/testhelper_test.go @@ -3,7 +3,7 @@ package server_test import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/praefect/service/testhelper_test.go b/internal/praefect/service/testhelper_test.go index 084c50d6cd..07b0f7758e 100644 --- a/internal/praefect/service/testhelper_test.go +++ b/internal/praefect/service/testhelper_test.go @@ -3,7 +3,7 @@ package service import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/praefect/service/transaction/server.go b/internal/praefect/service/transaction/server.go index d6e219befb..7e29592a2d 100644 --- a/internal/praefect/service/transaction/server.go +++ b/internal/praefect/service/transaction/server.go @@ -4,10 +4,10 @@ import ( "context" "errors" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/transactions" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/transactions" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) //nolint:revive // This is unintentionally missing documentation. diff --git a/internal/praefect/testhelper_test.go b/internal/praefect/testhelper_test.go index 21330d0f3c..07a4579ca6 100644 --- a/internal/praefect/testhelper_test.go +++ b/internal/praefect/testhelper_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) func TestMain(m *testing.M) { diff --git a/internal/praefect/testserver.go b/internal/praefect/testserver.go index 15bc462246..5df225450b 100644 --- a/internal/praefect/testserver.go +++ b/internal/praefect/testserver.go @@ -9,21 +9,21 @@ import ( "time" "github.com/stretchr/testify/require" - gitalycfgauth "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/server/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/proxy" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/transactions" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/promtest" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" + gitalycfgauth "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/server/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/proxy" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/transactions" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/promtest" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" correlation "gitlab.com/gitlab-org/labkit/correlation/grpc" "google.golang.org/grpc" "google.golang.org/grpc/health" diff --git a/internal/praefect/transaction_test.go b/internal/praefect/transaction_test.go index 2fd6e1dc4d..63d985fbb8 100644 --- a/internal/praefect/transaction_test.go +++ b/internal/praefect/transaction_test.go @@ -10,10 +10,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/transactions" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/transactions" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/internal/praefect/transactions/manager.go b/internal/praefect/transactions/manager.go index f3fa0c94ce..7c61e61f99 100644 --- a/internal/praefect/transactions/manager.go +++ b/internal/praefect/transactions/manager.go @@ -9,9 +9,9 @@ import ( "time" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" ) //nolint:revive // This is unintentionally missing documentation. diff --git a/internal/praefect/transactions/manager_test.go b/internal/praefect/transactions/manager_test.go index 75a00b6a48..a195fc88b7 100644 --- a/internal/praefect/transactions/manager_test.go +++ b/internal/praefect/transactions/manager_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestManager_CancelTransactionNodeVoter(t *testing.T) { diff --git a/internal/praefect/transactions/subtransaction.go b/internal/praefect/transactions/subtransaction.go index 42328c7c64..e508382697 100644 --- a/internal/praefect/transactions/subtransaction.go +++ b/internal/praefect/transactions/subtransaction.go @@ -6,7 +6,7 @@ import ( "fmt" "sync" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" ) // VoteResult represents the outcome of a transaction for a single voter. diff --git a/internal/praefect/transactions/subtransaction_test.go b/internal/praefect/transactions/subtransaction_test.go index 0a076aee8a..7b53e35198 100644 --- a/internal/praefect/transactions/subtransaction_test.go +++ b/internal/praefect/transactions/subtransaction_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" ) func TestSubtransaction_cancel(t *testing.T) { diff --git a/internal/praefect/transactions/testhelper_test.go b/internal/praefect/transactions/testhelper_test.go index cdc7934b98..6b293f81fe 100644 --- a/internal/praefect/transactions/testhelper_test.go +++ b/internal/praefect/transactions/testhelper_test.go @@ -3,7 +3,7 @@ package transactions import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/praefect/transactions/transaction.go b/internal/praefect/transactions/transaction.go index 4248723ec0..f5ae7d02b7 100644 --- a/internal/praefect/transactions/transaction.go +++ b/internal/praefect/transactions/transaction.go @@ -5,7 +5,7 @@ import ( "errors" "sync" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" ) var ( diff --git a/internal/praefect/transactions/transaction_test.go b/internal/praefect/transactions/transaction_test.go index 9d71d3fc2b..93c43f44b0 100644 --- a/internal/praefect/transactions/transaction_test.go +++ b/internal/praefect/transactions/transaction_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/transaction/voting" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/transaction/voting" ) func TestTransactionCancellationWithEmptyTransaction(t *testing.T) { diff --git a/internal/praefect/verifier.go b/internal/praefect/verifier.go index 2962e5722a..c4b254c868 100644 --- a/internal/praefect/verifier.go +++ b/internal/praefect/verifier.go @@ -8,10 +8,10 @@ import ( "time" "github.com/prometheus/client_golang/prometheus" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/glsql" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // MetadataVerifier verifies the repository metadata against the actual replicas on the diff --git a/internal/praefect/verifier_test.go b/internal/praefect/verifier_test.go index 8ee36b1cae..4734367fd2 100644 --- a/internal/praefect/verifier_test.go +++ b/internal/praefect/verifier_test.go @@ -9,26 +9,26 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - gitalyconfig "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/repository" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service/setup" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/sidechannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/glsql" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/nodes" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/service/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/transactions" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + gitalyconfig "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/repository" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service/setup" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/sidechannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/nodes" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/service/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/transactions" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testserver" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" ) diff --git a/internal/praefect/walkrepos.go b/internal/praefect/walkrepos.go index c33ae1f067..4004fba9a9 100644 --- a/internal/praefect/walkrepos.go +++ b/internal/praefect/walkrepos.go @@ -3,10 +3,10 @@ package praefect import ( "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" ) diff --git a/internal/praefect/walkrepos_test.go b/internal/praefect/walkrepos_test.go index 63301caf58..5ec56ed8b5 100644 --- a/internal/praefect/walkrepos_test.go +++ b/internal/praefect/walkrepos_test.go @@ -6,14 +6,14 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) diff --git a/internal/protoutil/extension.go b/internal/protoutil/extension.go index e56d5ec784..e25679ca00 100644 --- a/internal/protoutil/extension.go +++ b/internal/protoutil/extension.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/proto" "google.golang.org/protobuf/reflect/protoregistry" "google.golang.org/protobuf/runtime/protoimpl" diff --git a/internal/ps/testhelper_test.go b/internal/ps/testhelper_test.go index 86cb86e6d0..e5c068927f 100644 --- a/internal/ps/testhelper_test.go +++ b/internal/ps/testhelper_test.go @@ -3,7 +3,7 @@ package ps import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/safe/file_writer.go b/internal/safe/file_writer.go index ec1fb75182..7afb3f3d46 100644 --- a/internal/safe/file_writer.go +++ b/internal/safe/file_writer.go @@ -8,7 +8,7 @@ import ( "path/filepath" "sync" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" ) // ErrAlreadyDone is returned when the safe file has already been closed diff --git a/internal/safe/file_writer_test.go b/internal/safe/file_writer_test.go index 9379c9b804..460412aaa6 100644 --- a/internal/safe/file_writer_test.go +++ b/internal/safe/file_writer_test.go @@ -10,9 +10,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/safe" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/safe" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestFileWriter_successful(t *testing.T) { diff --git a/internal/safe/locking_directory.go b/internal/safe/locking_directory.go index 1a9252dd2e..aa0c5eeaac 100644 --- a/internal/safe/locking_directory.go +++ b/internal/safe/locking_directory.go @@ -7,7 +7,7 @@ import ( "os" "path/filepath" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" ) type lockingDirectoryState int diff --git a/internal/safe/locking_directory_test.go b/internal/safe/locking_directory_test.go index 36f172ece5..b58c1b8f42 100644 --- a/internal/safe/locking_directory_test.go +++ b/internal/safe/locking_directory_test.go @@ -9,9 +9,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/safe" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/safe" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestLockingDirectory(t *testing.T) { diff --git a/internal/safe/locking_file_writer.go b/internal/safe/locking_file_writer.go index 194fcd123b..348f30a472 100644 --- a/internal/safe/locking_file_writer.go +++ b/internal/safe/locking_file_writer.go @@ -7,7 +7,7 @@ import ( "io" "os" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" ) type lockingFileWriterState int diff --git a/internal/safe/locking_file_writer_test.go b/internal/safe/locking_file_writer_test.go index bfb4c8bc20..94d37cc402 100644 --- a/internal/safe/locking_file_writer_test.go +++ b/internal/safe/locking_file_writer_test.go @@ -7,11 +7,11 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/safe" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/safe" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestLockingFileWriter_lifecycle(t *testing.T) { diff --git a/internal/safe/sync_test.go b/internal/safe/sync_test.go index 734f77b835..e51c37b5af 100644 --- a/internal/safe/sync_test.go +++ b/internal/safe/sync_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) type call struct { diff --git a/internal/safe/testhelper_test.go b/internal/safe/testhelper_test.go index 56f4b40026..d6995300af 100644 --- a/internal/safe/testhelper_test.go +++ b/internal/safe/testhelper_test.go @@ -3,7 +3,7 @@ package safe import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/signature/testhelper_test.go b/internal/signature/testhelper_test.go index 52b02e6daa..c014a9a1d1 100644 --- a/internal/signature/testhelper_test.go +++ b/internal/signature/testhelper_test.go @@ -3,7 +3,7 @@ package signature import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/stream/pktline.go b/internal/stream/pktline.go index 31d9d32c11..7850abf695 100644 --- a/internal/stream/pktline.go +++ b/internal/stream/pktline.go @@ -4,7 +4,7 @@ import ( "fmt" "io" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/pktline" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/pktline" ) // Conn represents a bi-directional client side connection. diff --git a/internal/stream/std_stream.go b/internal/stream/std_stream.go index 8afa2c8d6d..34ab428168 100644 --- a/internal/stream/std_stream.go +++ b/internal/stream/std_stream.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // StdoutStderrResponse is an interface for RPC responses that need to stream stderr and stdout diff --git a/internal/streamcache/cache.go b/internal/streamcache/cache.go index 094dfec93c..6caa9ceb82 100644 --- a/internal/streamcache/cache.go +++ b/internal/streamcache/cache.go @@ -35,10 +35,10 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "gitlab.com/gitlab-org/gitaly/v16/internal/dontpanic" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/dontpanic" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) var ( diff --git a/internal/streamcache/cache_test.go b/internal/streamcache/cache_test.go index 7a97ed5ba4..b2c94505c9 100644 --- a/internal/streamcache/cache_test.go +++ b/internal/streamcache/cache_test.go @@ -16,10 +16,10 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/duration" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/duration" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func newCache(tb testing.TB, dir string) Cache { diff --git a/internal/streamcache/filestore.go b/internal/streamcache/filestore.go index 800a98a617..0a6cf0fdd0 100644 --- a/internal/streamcache/filestore.go +++ b/internal/streamcache/filestore.go @@ -12,10 +12,10 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "gitlab.com/gitlab-org/gitaly/v16/internal/dontpanic" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/perm" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/dontpanic" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/perm" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) var ( diff --git a/internal/streamcache/filestore_test.go b/internal/streamcache/filestore_test.go index 2e55bb7a6d..c2ba675edd 100644 --- a/internal/streamcache/filestore_test.go +++ b/internal/streamcache/filestore_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestFilestoreCreate(t *testing.T) { diff --git a/internal/streamcache/min_occurrences_test.go b/internal/streamcache/min_occurrences_test.go index 00bb2fcc34..7f1913c95e 100644 --- a/internal/streamcache/min_occurrences_test.go +++ b/internal/streamcache/min_occurrences_test.go @@ -8,7 +8,7 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func testNullCache() *TestLoggingCache { return &TestLoggingCache{Cache: NullCache{}} } diff --git a/internal/streamcache/pipe_test.go b/internal/streamcache/pipe_test.go index e4cff80857..73ff7a32e2 100644 --- a/internal/streamcache/pipe_test.go +++ b/internal/streamcache/pipe_test.go @@ -12,7 +12,7 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func createPipe(t *testing.T) (*pipeReader, *pipe) { diff --git a/internal/streamcache/sendfile_test.go b/internal/streamcache/sendfile_test.go index 94b9d163a1..5c19fcf3a6 100644 --- a/internal/streamcache/sendfile_test.go +++ b/internal/streamcache/sendfile_test.go @@ -12,7 +12,7 @@ import ( "testing/iotest" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) type wrappedFile struct{ f *os.File } diff --git a/internal/streamcache/testhelper_test.go b/internal/streamcache/testhelper_test.go index 79d1622b4c..7b0a0aa623 100644 --- a/internal/streamcache/testhelper_test.go +++ b/internal/streamcache/testhelper_test.go @@ -3,7 +3,7 @@ package streamcache import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/structerr/grpc_server.go b/internal/structerr/grpc_server.go index 52887ba26b..de7fd54e12 100644 --- a/internal/structerr/grpc_server.go +++ b/internal/structerr/grpc_server.go @@ -3,7 +3,7 @@ package structerr import ( "context" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) // FieldsProducer extracts metadata from err if it contains a `structerr.Error` and exposes it as diff --git a/internal/tempdir/clean.go b/internal/tempdir/clean.go index cdd957fdf3..ee222bcf72 100644 --- a/internal/tempdir/clean.go +++ b/internal/tempdir/clean.go @@ -11,11 +11,11 @@ import ( "strings" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/dontpanic" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/perm" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/dontpanic" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/perm" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) const ( diff --git a/internal/tempdir/clean_test.go b/internal/tempdir/clean_test.go index a608ad8fe0..5a3be1841a 100644 --- a/internal/tempdir/clean_test.go +++ b/internal/tempdir/clean_test.go @@ -7,12 +7,12 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestCleanSuccess(t *testing.T) { diff --git a/internal/tempdir/tempdir.go b/internal/tempdir/tempdir.go index f70c1216ce..32a3726ad6 100644 --- a/internal/tempdir/tempdir.go +++ b/internal/tempdir/tempdir.go @@ -7,10 +7,10 @@ import ( "path/filepath" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // Dir is a storage-scoped temporary directory. diff --git a/internal/tempdir/tempdir_test.go b/internal/tempdir/tempdir_test.go index bbfc191682..d10ff40047 100644 --- a/internal/tempdir/tempdir_test.go +++ b/internal/tempdir/tempdir_test.go @@ -7,11 +7,11 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestNewRepositorySuccess(t *testing.T) { diff --git a/internal/tempdir/testhelper_test.go b/internal/tempdir/testhelper_test.go index 6023ee6ec5..edabbf2eaf 100644 --- a/internal/tempdir/testhelper_test.go +++ b/internal/tempdir/testhelper_test.go @@ -3,7 +3,7 @@ package tempdir import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/testhelper/configure.go b/internal/testhelper/configure.go index 184adf7848..344a648c18 100644 --- a/internal/testhelper/configure.go +++ b/internal/testhelper/configure.go @@ -8,8 +8,8 @@ import ( "runtime" "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) var testDirectory string diff --git a/internal/testhelper/directory.go b/internal/testhelper/directory.go index 2b20cbf3f8..92422d6a5e 100644 --- a/internal/testhelper/directory.go +++ b/internal/testhelper/directory.go @@ -12,7 +12,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" ) // DirectoryEntry models an entry in a directory. diff --git a/internal/testhelper/directory_test.go b/internal/testhelper/directory_test.go index 2fa13f0f60..28ca1f9984 100644 --- a/internal/testhelper/directory_test.go +++ b/internal/testhelper/directory_test.go @@ -14,8 +14,8 @@ import ( "testing/fstest" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/archive" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/archive" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" ) type tbRecorder struct { diff --git a/internal/testhelper/featureset.go b/internal/testhelper/featureset.go index 54ad33ba7b..c5d2187644 100644 --- a/internal/testhelper/featureset.go +++ b/internal/testhelper/featureset.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" ) // FeatureSet is a representation of a set of features that should be disabled. diff --git a/internal/testhelper/featureset_test.go b/internal/testhelper/featureset_test.go index 956345adc2..a98f6fb0f3 100644 --- a/internal/testhelper/featureset_test.go +++ b/internal/testhelper/featureset_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/stretchr/testify/require" - ff "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" + ff "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" "google.golang.org/grpc/metadata" ) diff --git a/internal/testhelper/gitlabtest.go b/internal/testhelper/gitlabtest.go index 1cf948ea84..9c6f4a9236 100644 --- a/internal/testhelper/gitlabtest.go +++ b/internal/testhelper/gitlabtest.go @@ -1,7 +1,7 @@ package testhelper import ( - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/internal/testhelper/grpc.go b/internal/testhelper/grpc.go index 924feeb51b..c1aa6cff83 100644 --- a/internal/testhelper/grpc.go +++ b/internal/testhelper/grpc.go @@ -11,8 +11,8 @@ import ( "github.com/google/go-cmp/cmp/cmpopts" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb/testproto" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb/testproto" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" diff --git a/internal/testhelper/grpc_test.go b/internal/testhelper/grpc_test.go index 086ab1712c..a58d053f4b 100644 --- a/internal/testhelper/grpc_test.go +++ b/internal/testhelper/grpc_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" "google.golang.org/grpc" ) diff --git a/internal/testhelper/leakage.go b/internal/testhelper/leakage.go index 88c4806c5c..237a2c5acb 100644 --- a/internal/testhelper/leakage.go +++ b/internal/testhelper/leakage.go @@ -10,8 +10,8 @@ import ( "syscall" "time" - "gitlab.com/gitlab-org/gitaly/v16/internal/command/commandcounter" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" + "gitlab.com/gitlab-org/gitaly/v17/internal/command/commandcounter" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/text" "go.uber.org/goleak" ) diff --git a/internal/testhelper/logger.go b/internal/testhelper/logger.go index 6fdced6c75..45db325db8 100644 --- a/internal/testhelper/logger.go +++ b/internal/testhelper/logger.go @@ -7,7 +7,7 @@ import ( "github.com/sirupsen/logrus" "github.com/sirupsen/logrus/hooks/test" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" ) var ( diff --git a/internal/testhelper/testcfg/binaries.go b/internal/testhelper/testcfg/binaries.go index f9a7ebe69f..3823481d7a 100644 --- a/internal/testhelper/testcfg/binaries.go +++ b/internal/testhelper/testcfg/binaries.go @@ -10,10 +10,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/version" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/version" ) var buildOnceByName sync.Map diff --git a/internal/testhelper/testcfg/gitaly.go b/internal/testhelper/testcfg/gitaly.go index 726092838a..b12e374a19 100644 --- a/internal/testhelper/testcfg/gitaly.go +++ b/internal/testhelper/testcfg/gitaly.go @@ -8,10 +8,10 @@ import ( "github.com/pelletier/go-toml/v2" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/duration" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/duration" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) // UnconfiguredSocketPath is used to bypass config validation errors diff --git a/internal/testhelper/testcfg/metadata.go b/internal/testhelper/testcfg/metadata.go index a37a535484..c9e12bf78e 100644 --- a/internal/testhelper/testcfg/metadata.go +++ b/internal/testhelper/testcfg/metadata.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" "google.golang.org/grpc/metadata" ) diff --git a/internal/testhelper/testdb/db.go b/internal/testhelper/testdb/db.go index d0f8b74dd2..537ed9f0c6 100644 --- a/internal/testhelper/testdb/db.go +++ b/internal/testhelper/testdb/db.go @@ -17,10 +17,10 @@ import ( migrate "github.com/rubenv/sql-migrate" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/glsql" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/migrations" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/migrations" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) // TxWrapper is a simple wrapper around *sql.Tx. diff --git a/internal/testhelper/testdb/health.go b/internal/testhelper/testdb/health.go index fde8d847d8..f66950682b 100644 --- a/internal/testhelper/testdb/health.go +++ b/internal/testhelper/testdb/health.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/datastore/glsql" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/datastore/glsql" ) // SetHealthyNodes sets the healthy nodes in the database as determined by the passed in map. The healthyNodes map is keyed by diff --git a/internal/testhelper/testdb/testhelper_test.go b/internal/testhelper/testdb/testhelper_test.go index 1249320721..30c8a53a96 100644 --- a/internal/testhelper/testdb/testhelper_test.go +++ b/internal/testhelper/testdb/testhelper_test.go @@ -3,7 +3,7 @@ package testdb import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/testhelper/testhelper.go b/internal/testhelper/testhelper.go index 20f27fbc43..5bbda5b9fe 100644 --- a/internal/testhelper/testhelper.go +++ b/internal/testhelper/testhelper.go @@ -23,10 +23,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/featureflag" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/env" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper/perm" + "gitlab.com/gitlab-org/gitaly/v17/internal/featureflag" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/env" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper/perm" ) const ( diff --git a/internal/testhelper/testserver/gitaly.go b/internal/testhelper/testserver/gitaly.go index 88054eb602..10bbd2e9d9 100644 --- a/internal/testhelper/testserver/gitaly.go +++ b/internal/testhelper/testserver/gitaly.go @@ -8,44 +8,44 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - gitalyauth "gitlab.com/gitlab-org/gitaly/v16/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/backup" - "gitlab.com/gitlab-org/gitaly/v16/internal/bundleuri" - "gitlab.com/gitlab-org/gitaly/v16/internal/cache" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gitcmd" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping" - housekeepingmgr "gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping/manager" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/auth" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook/updateref" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/server" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/service" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/counter" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/keyvalue/databasemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" - nodeimpl "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/node" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/storagemgr/partition/migration" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitlab" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/limithandler" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/protoregistry" - "gitlab.com/gitlab-org/gitaly/v16/internal/helper" - "gitlab.com/gitlab-org/gitaly/v16/internal/limiter" - "gitlab.com/gitlab-org/gitaly/v16/internal/log" - praefectconfig "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/streamcache" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testdb" + gitalyauth "gitlab.com/gitlab-org/gitaly/v17/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/backup" + "gitlab.com/gitlab-org/gitaly/v17/internal/bundleuri" + "gitlab.com/gitlab-org/gitaly/v17/internal/cache" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/catfile" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gitcmd" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping" + housekeepingmgr "gitlab.com/gitlab-org/gitaly/v17/internal/git/housekeeping/manager" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config/auth" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/hook/updateref" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/server" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/service" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/counter" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/keyvalue/databasemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" + nodeimpl "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/node" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/storagemgr/partition/migration" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/transaction" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitlab" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/middleware/limithandler" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/protoregistry" + "gitlab.com/gitlab-org/gitaly/v17/internal/helper" + "gitlab.com/gitlab-org/gitaly/v17/internal/limiter" + "gitlab.com/gitlab-org/gitaly/v17/internal/log" + praefectconfig "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/streamcache" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testdb" "google.golang.org/grpc" "google.golang.org/grpc/health" healthpb "google.golang.org/grpc/health/grpc_health_v1" diff --git a/internal/testhelper/testserver/praefect.go b/internal/testhelper/testserver/praefect.go index 45d1e1a8c5..c1f395edf2 100644 --- a/internal/testhelper/testserver/praefect.go +++ b/internal/testhelper/testserver/praefect.go @@ -15,10 +15,10 @@ import ( "github.com/pelletier/go-toml/v2" "github.com/stretchr/testify/require" - gitalycfg "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/praefect/config" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + gitalycfg "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/praefect/config" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) // PraefectServer encapsulates information of a running Praefect server. diff --git a/internal/testhelper/testserver/structerr_interceptors.go b/internal/testhelper/testserver/structerr_interceptors.go index 6c4ffb4b16..2f9f355f39 100644 --- a/internal/testhelper/testserver/structerr_interceptors.go +++ b/internal/testhelper/testserver/structerr_interceptors.go @@ -4,8 +4,8 @@ import ( "context" "sort" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" "google.golang.org/grpc" ) diff --git a/internal/testhelper/testserver/structerr_interceptors_test.go b/internal/testhelper/testserver/structerr_interceptors_test.go index d763531145..babf6c0f27 100644 --- a/internal/testhelper/testserver/structerr_interceptors_test.go +++ b/internal/testhelper/testserver/structerr_interceptors_test.go @@ -9,10 +9,10 @@ import ( grpcmwlogrus "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/middleware/loghandler" - "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb/testproto" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/middleware/loghandler" + "gitlab.com/gitlab-org/gitaly/v17/internal/structerr" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb/testproto" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/credentials/insecure" diff --git a/internal/testhelper/testserver/testhelper_test.go b/internal/testhelper/testserver/testhelper_test.go index d09ca3b545..9cc638b217 100644 --- a/internal/testhelper/testserver/testhelper_test.go +++ b/internal/testhelper/testserver/testhelper_test.go @@ -3,7 +3,7 @@ package testserver import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/testhelper/transactiontest/gitaly.go b/internal/testhelper/transactiontest/gitaly.go index ee751a0ece..953a6115dc 100644 --- a/internal/testhelper/transactiontest/gitaly.go +++ b/internal/testhelper/transactiontest/gitaly.go @@ -7,7 +7,7 @@ import ( "time" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/grpc" ) diff --git a/internal/tracing/passthrough_test.go b/internal/tracing/passthrough_test.go index 31bd3a50fc..162825318f 100644 --- a/internal/tracing/passthrough_test.go +++ b/internal/tracing/passthrough_test.go @@ -10,7 +10,7 @@ import ( "github.com/opentracing/opentracing-go" "github.com/stretchr/testify/require" "github.com/uber/jaeger-client-go" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" grpctracing "gitlab.com/gitlab-org/labkit/tracing/grpc" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" diff --git a/internal/tracing/testhelper_test.go b/internal/tracing/testhelper_test.go index f940df2d15..ccee6af3ae 100644 --- a/internal/tracing/testhelper_test.go +++ b/internal/tracing/testhelper_test.go @@ -3,7 +3,7 @@ package tracing import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/tracing/tracing_test.go b/internal/tracing/tracing_test.go index 06214b31cb..1ad3638364 100644 --- a/internal/tracing/tracing_test.go +++ b/internal/tracing/tracing_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/uber/jaeger-client-go" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestCreateSpan(t *testing.T) { diff --git a/internal/transaction/txinfo/transaction.go b/internal/transaction/txinfo/transaction.go index a198b2abe1..cc3b5314de 100644 --- a/internal/transaction/txinfo/transaction.go +++ b/internal/transaction/txinfo/transaction.go @@ -7,7 +7,7 @@ import ( "errors" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/backchannel" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/backchannel" "google.golang.org/grpc/metadata" ) diff --git a/internal/transaction/voting/phase.go b/internal/transaction/voting/phase.go index 80ccf0588f..05cba92e26 100644 --- a/internal/transaction/voting/phase.go +++ b/internal/transaction/voting/phase.go @@ -3,7 +3,7 @@ package voting import ( "fmt" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" ) // Phase is the transactional phase a given vote can be cast on. diff --git a/internal/transaction/voting/testhelper_test.go b/internal/transaction/voting/testhelper_test.go index c2d50fd065..90c6be3cea 100644 --- a/internal/transaction/voting/testhelper_test.go +++ b/internal/transaction/voting/testhelper_test.go @@ -3,7 +3,7 @@ package voting import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/internal/unarycache/cache.go b/internal/unarycache/cache.go index 18c174806e..fc7fae9dd4 100644 --- a/internal/unarycache/cache.go +++ b/internal/unarycache/cache.go @@ -12,7 +12,7 @@ import ( "fmt" lru "github.com/hashicorp/golang-lru/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" ) // Generator is a function that computes a cacheable value for a repository based on the given key. diff --git a/internal/unarycache/cache_test.go b/internal/unarycache/cache_test.go index 7782a6f4a1..d190f39ca3 100644 --- a/internal/unarycache/cache_test.go +++ b/internal/unarycache/cache_test.go @@ -7,10 +7,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" - "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testcfg" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/gittest" + "gitlab.com/gitlab-org/gitaly/v17/internal/git/localrepo" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper/testcfg" ) func TestCache_GetOrCompute(t *testing.T) { diff --git a/internal/unarycache/testhelper_test.go b/internal/unarycache/testhelper_test.go index d213f51ad9..d8628b21f0 100644 --- a/internal/unarycache/testhelper_test.go +++ b/internal/unarycache/testhelper_test.go @@ -3,7 +3,7 @@ package unarycache import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/packed_binaries.go b/packed_binaries.go index 1e3a30cb3b..84b530d604 100644 --- a/packed_binaries.go +++ b/packed_binaries.go @@ -7,7 +7,7 @@ import ( "os" "path/filepath" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" "golang.org/x/sync/errgroup" ) diff --git a/packed_binaries_test.go b/packed_binaries_test.go index ff845a0e4f..ffb54991c0 100644 --- a/packed_binaries_test.go +++ b/packed_binaries_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/mode" + "gitlab.com/gitlab-org/gitaly/v17/internal/gitaly/storage/mode" ) func TestUnpackAuxiliaryBinaries_success(t *testing.T) { diff --git a/streamio/testhelper_test.go b/streamio/testhelper_test.go index 2edd01de65..7f5795246a 100644 --- a/streamio/testhelper_test.go +++ b/streamio/testhelper_test.go @@ -3,7 +3,7 @@ package streamio import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/testhelper_test.go b/testhelper_test.go index 0aa8282d5e..276c23c79a 100644 --- a/testhelper_test.go +++ b/testhelper_test.go @@ -3,7 +3,7 @@ package gitaly import ( "testing" - "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" + "gitlab.com/gitlab-org/gitaly/v17/internal/testhelper" ) func TestMain(m *testing.M) { diff --git a/tools/protoc-gen-gitaly-lint/lint.go b/tools/protoc-gen-gitaly-lint/lint.go index 5da0ff643d..db051e3dc5 100644 --- a/tools/protoc-gen-gitaly-lint/lint.go +++ b/tools/protoc-gen-gitaly-lint/lint.go @@ -4,8 +4,8 @@ import ( "errors" "fmt" - "gitlab.com/gitlab-org/gitaly/v16/internal/protoutil" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/protoutil" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/reflect/protoregistry" "google.golang.org/protobuf/types/descriptorpb" "google.golang.org/protobuf/types/pluginpb" diff --git a/tools/protoc-gen-gitaly-lint/lint_test.go b/tools/protoc-gen-gitaly-lint/lint_test.go index 607858112b..6f3ca8eb65 100644 --- a/tools/protoc-gen-gitaly-lint/lint_test.go +++ b/tools/protoc-gen-gitaly-lint/lint_test.go @@ -10,7 +10,7 @@ import ( "google.golang.org/protobuf/types/descriptorpb" "google.golang.org/protobuf/types/pluginpb" - _ "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb/testproto" + _ "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb/testproto" ) func TestLintFile(t *testing.T) { diff --git a/tools/protoc-gen-gitaly-lint/method.go b/tools/protoc-gen-gitaly-lint/method.go index a790dae62b..0762895291 100644 --- a/tools/protoc-gen-gitaly-lint/method.go +++ b/tools/protoc-gen-gitaly-lint/method.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - "gitlab.com/gitlab-org/gitaly/v16/internal/protoutil" - "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + "gitlab.com/gitlab-org/gitaly/v17/internal/protoutil" + "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" "google.golang.org/protobuf/types/descriptorpb" "google.golang.org/protobuf/types/pluginpb" ) diff --git a/tools/test-boot/main.go b/tools/test-boot/main.go index a9739b00b7..c261f31fa2 100644 --- a/tools/test-boot/main.go +++ b/tools/test-boot/main.go @@ -14,7 +14,7 @@ import ( "time" "github.com/urfave/cli/v2" - "gitlab.com/gitlab-org/gitaly/v16/internal/grpc/client" + "gitlab.com/gitlab-org/gitaly/v17/internal/grpc/client" "google.golang.org/grpc" ) -- GitLab From 86e83fb748d282564c836d6e4a5098cef1006187 Mon Sep 17 00:00:00 2001 From: James Liu Date: Thu, 27 Feb 2025 11:39:58 +1100 Subject: [PATCH 2/2] chore: Update protos to v17 --- proto/analysis.proto | 2 +- proto/blob.proto | 2 +- proto/cleanup.proto | 2 +- proto/cluster.proto | 2 +- proto/commit.proto | 4 ++-- proto/conflicts.proto | 2 +- proto/diff.proto | 2 +- proto/errors.proto | 2 +- proto/go/gitalypb/analysis.pb.go | 2 +- proto/go/gitalypb/blob.pb.go | 2 +- proto/go/gitalypb/cleanup.pb.go | 2 +- proto/go/gitalypb/cluster.pb.go | 2 +- proto/go/gitalypb/commit.pb.go | 2 +- proto/go/gitalypb/conflicts.pb.go | 2 +- proto/go/gitalypb/diff.pb.go | 2 +- proto/go/gitalypb/errors.pb.go | 2 +- proto/go/gitalypb/hook.pb.go | 2 +- proto/go/gitalypb/internal.pb.go | 2 +- proto/go/gitalypb/lint.pb.go | 2 +- proto/go/gitalypb/log.pb.go | 2 +- proto/go/gitalypb/objectpool.pb.go | 2 +- proto/go/gitalypb/operations.pb.go | 2 +- proto/go/gitalypb/packfile.pb.go | 2 +- proto/go/gitalypb/partition.pb.go | 2 +- proto/go/gitalypb/praefect.pb.go | 2 +- proto/go/gitalypb/ref.pb.go | 2 +- proto/go/gitalypb/remote.pb.go | 2 +- proto/go/gitalypb/repository.pb.go | 2 +- proto/go/gitalypb/server.pb.go | 2 +- proto/go/gitalypb/service_config.pb.go | 2 +- proto/go/gitalypb/shared.pb.go | 2 +- proto/go/gitalypb/smarthttp.pb.go | 2 +- proto/go/gitalypb/ssh.pb.go | 2 +- proto/go/gitalypb/testproto/error_metadata.pb.go | 2 +- proto/go/gitalypb/testproto/invalid.pb.go | 4 ++-- proto/go/gitalypb/testproto/valid.pb.go | 4 ++-- proto/go/gitalypb/transaction.pb.go | 2 +- proto/hook.proto | 2 +- proto/internal.proto | 2 +- proto/lint.proto | 2 +- proto/log.proto | 2 +- proto/objectpool.proto | 2 +- proto/operations.proto | 2 +- proto/packfile.proto | 2 +- proto/partition.proto | 2 +- proto/praefect.proto | 4 ++-- proto/ref.proto | 2 +- proto/remote.proto | 2 +- proto/repository.proto | 2 +- proto/server.proto | 2 +- proto/service_config.proto | 2 +- proto/shared.proto | 4 ++-- proto/smarthttp.proto | 2 +- proto/ssh.proto | 2 +- proto/testproto/error_metadata.proto | 2 +- proto/testproto/invalid.proto | 2 +- proto/testproto/valid.proto | 2 +- proto/transaction.proto | 2 +- 58 files changed, 63 insertions(+), 63 deletions(-) diff --git a/proto/analysis.proto b/proto/analysis.proto index ced5b9cb90..fde22c54fb 100644 --- a/proto/analysis.proto +++ b/proto/analysis.proto @@ -5,7 +5,7 @@ package gitaly; import "lint.proto"; import "shared.proto"; -option go_package = "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"; +option go_package = "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb"; // AnalysisService is a gRPC service providing RPCs that analyze objects in a repository. service AnalysisService { diff --git a/proto/blob.proto b/proto/blob.proto index f81ec91c66..648b3f061b 100644 --- a/proto/blob.proto +++ b/proto/blob.proto @@ -5,7 +5,7 @@ package gitaly; import "lint.proto"; import "shared.proto"; -option go_package = "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"; +option go_package = "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb"; // BlobService is a service which provides RPCs to retrieve Git blobs from a // specific repository. diff --git a/proto/cleanup.proto b/proto/cleanup.proto index 94fff3ae0f..864786c50a 100644 --- a/proto/cleanup.proto +++ b/proto/cleanup.proto @@ -5,7 +5,7 @@ package gitaly; import "lint.proto"; import "shared.proto"; -option go_package = "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"; +option go_package = "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb"; // CleanupService provides RPCs to clean up a repository's contents. service CleanupService { diff --git a/proto/cluster.proto b/proto/cluster.proto index 1a6289edb0..aa8bd151ea 100644 --- a/proto/cluster.proto +++ b/proto/cluster.proto @@ -5,7 +5,7 @@ package gitaly; import "lint.proto"; import "raftpb/raft.proto"; // Upstream go.etcd.io/etcd/raft/v3/raftpb/raft.proto -option go_package = "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"; +option go_package = "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb"; // RaftEntry encapsulates critical data for replication using etcd/raft library. // It has a request ID allowing the primary to track when the action is diff --git a/proto/commit.proto b/proto/commit.proto index b42478449f..9a7e3fb5f7 100644 --- a/proto/commit.proto +++ b/proto/commit.proto @@ -7,7 +7,7 @@ import "google/protobuf/timestamp.proto"; import "lint.proto"; import "shared.proto"; -option go_package = "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"; +option go_package = "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb"; // CommitService is a service which provides RPCs that interact with Git // commits. @@ -775,7 +775,7 @@ message RawBlameError { // actual_lines contains the actual number of lines that can be blamed in the file. uint64 actual_lines = 1; } - + // InvalidIgnoreRevsFormatError indicates that the file containing ignored // revisions has an invalid format. message InvalidIgnoreRevsFormatError { diff --git a/proto/conflicts.proto b/proto/conflicts.proto index 83e4905aa0..8280c6f187 100644 --- a/proto/conflicts.proto +++ b/proto/conflicts.proto @@ -6,7 +6,7 @@ import "google/protobuf/timestamp.proto"; import "lint.proto"; import "shared.proto"; -option go_package = "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"; +option go_package = "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb"; // ConflictsService is a service which provides RPCs to interact with conflicts // resulting from a merge. diff --git a/proto/diff.proto b/proto/diff.proto index 6c5d70c285..c7337a5617 100644 --- a/proto/diff.proto +++ b/proto/diff.proto @@ -5,7 +5,7 @@ package gitaly; import "lint.proto"; import "shared.proto"; -option go_package = "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"; +option go_package = "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb"; // DiffService is a service which provides RPCs to inspect differences // introduced between a set of commits. diff --git a/proto/errors.proto b/proto/errors.proto index 582f1377df..2f587eb707 100644 --- a/proto/errors.proto +++ b/proto/errors.proto @@ -4,7 +4,7 @@ package gitaly; import "google/protobuf/duration.proto"; -option go_package = "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"; +option go_package = "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb"; // AccessCheckError is an error returned by GitLab's `/internal/allowed` // endpoint. diff --git a/proto/go/gitalypb/analysis.pb.go b/proto/go/gitalypb/analysis.pb.go index c5f51385d7..e2a0fa84a3 100644 --- a/proto/go/gitalypb/analysis.pb.go +++ b/proto/go/gitalypb/analysis.pb.go @@ -276,7 +276,7 @@ var file_analysis_proto_rawDesc = string([]byte{ 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x06, 0xfa, 0x97, 0x28, 0x02, 0x08, 0x02, 0x28, 0x01, 0x30, 0x01, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2d, 0x6f, 0x72, 0x67, 0x2f, 0x67, 0x69, 0x74, - 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x36, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, + 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x37, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, }) diff --git a/proto/go/gitalypb/blob.pb.go b/proto/go/gitalypb/blob.pb.go index 41f56583c4..a5a46d694a 100644 --- a/proto/go/gitalypb/blob.pb.go +++ b/proto/go/gitalypb/blob.pb.go @@ -1364,7 +1364,7 @@ var file_blob_proto_rawDesc = string([]byte{ 0x46, 0x53, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x06, 0xfa, 0x97, 0x28, 0x02, 0x08, 0x02, 0x30, 0x01, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, - 0x62, 0x2d, 0x6f, 0x72, 0x67, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x36, + 0x62, 0x2d, 0x6f, 0x72, 0x67, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x37, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, }) diff --git a/proto/go/gitalypb/cleanup.pb.go b/proto/go/gitalypb/cleanup.pb.go index 86a67a4e98..cd919e0fef 100644 --- a/proto/go/gitalypb/cleanup.pb.go +++ b/proto/go/gitalypb/cleanup.pb.go @@ -348,7 +348,7 @@ var file_cleanup_proto_rawDesc = string([]byte{ 0x74, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x06, 0xfa, 0x97, 0x28, 0x02, 0x08, 0x01, 0x28, 0x01, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2d, 0x6f, 0x72, 0x67, 0x2f, - 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x36, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x37, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, }) diff --git a/proto/go/gitalypb/cluster.pb.go b/proto/go/gitalypb/cluster.pb.go index 5d93f2697e..242fe4449e 100644 --- a/proto/go/gitalypb/cluster.pb.go +++ b/proto/go/gitalypb/cluster.pb.go @@ -296,7 +296,7 @@ var file_cluster_proto_rawDesc = string([]byte{ 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x08, 0xfa, 0x97, 0x28, 0x04, 0x08, 0x01, 0x10, 0x02, 0x28, 0x01, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2d, 0x6f, 0x72, 0x67, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, - 0x2f, 0x76, 0x31, 0x36, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, + 0x2f, 0x76, 0x31, 0x37, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, }) diff --git a/proto/go/gitalypb/commit.pb.go b/proto/go/gitalypb/commit.pb.go index 5536d0a3cf..6aedcd92b9 100644 --- a/proto/go/gitalypb/commit.pb.go +++ b/proto/go/gitalypb/commit.pb.go @@ -5015,7 +5015,7 @@ var file_commit_proto_rawDesc = string([]byte{ 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x06, 0xfa, 0x97, 0x28, 0x02, 0x08, 0x02, 0x28, 0x01, 0x30, 0x01, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2d, 0x6f, 0x72, 0x67, 0x2f, 0x67, 0x69, 0x74, - 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x36, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, + 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x37, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, }) diff --git a/proto/go/gitalypb/conflicts.pb.go b/proto/go/gitalypb/conflicts.pb.go index 3b4880573f..b8102f2b35 100644 --- a/proto/go/gitalypb/conflicts.pb.go +++ b/proto/go/gitalypb/conflicts.pb.go @@ -695,7 +695,7 @@ var file_conflicts_proto_rawDesc = string([]byte{ 0x66, 0x6c, 0x69, 0x63, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x06, 0xfa, 0x97, 0x28, 0x02, 0x08, 0x01, 0x28, 0x01, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2d, 0x6f, 0x72, - 0x67, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x36, 0x2f, 0x70, 0x72, 0x6f, + 0x67, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x37, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, }) diff --git a/proto/go/gitalypb/diff.pb.go b/proto/go/gitalypb/diff.pb.go index 3ff4dab06d..1e42e9d0e8 100644 --- a/proto/go/gitalypb/diff.pb.go +++ b/proto/go/gitalypb/diff.pb.go @@ -3230,7 +3230,7 @@ var file_diff_proto_rawDesc = string([]byte{ 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x06, 0xfa, 0x97, 0x28, 0x02, 0x08, 0x02, 0x30, 0x01, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2d, 0x6f, 0x72, 0x67, 0x2f, 0x67, 0x69, 0x74, 0x61, - 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x36, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, + 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x37, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, }) diff --git a/proto/go/gitalypb/errors.pb.go b/proto/go/gitalypb/errors.pb.go index bcdd386e53..f5cbb09415 100644 --- a/proto/go/gitalypb/errors.pb.go +++ b/proto/go/gitalypb/errors.pb.go @@ -1418,7 +1418,7 @@ var file_errors_proto_rawDesc = string([]byte{ 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2d, 0x6f, 0x72, 0x67, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x76, - 0x31, 0x36, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x61, + 0x31, 0x37, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, }) diff --git a/proto/go/gitalypb/hook.pb.go b/proto/go/gitalypb/hook.pb.go index 953bff3140..3b164d0fe4 100644 --- a/proto/go/gitalypb/hook.pb.go +++ b/proto/go/gitalypb/hook.pb.go @@ -1074,7 +1074,7 @@ var file_hook_proto_rawDesc = string([]byte{ 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x06, 0xfa, 0x97, 0x28, 0x02, 0x08, 0x01, 0x28, 0x01, 0x30, 0x01, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2d, 0x6f, 0x72, 0x67, 0x2f, 0x67, - 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x36, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, + 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x37, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, }) diff --git a/proto/go/gitalypb/internal.pb.go b/proto/go/gitalypb/internal.pb.go index 6ba6c79aeb..0d46f1a331 100644 --- a/proto/go/gitalypb/internal.pb.go +++ b/proto/go/gitalypb/internal.pb.go @@ -152,7 +152,7 @@ var file_internal_proto_rawDesc = string([]byte{ 0x6f, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x08, 0xfa, 0x97, 0x28, 0x04, 0x08, 0x02, 0x10, 0x02, 0x30, 0x01, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2d, 0x6f, 0x72, 0x67, 0x2f, - 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x36, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x37, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, }) diff --git a/proto/go/gitalypb/lint.pb.go b/proto/go/gitalypb/lint.pb.go index 2e26e59a8c..64e7696b5f 100644 --- a/proto/go/gitalypb/lint.pb.go +++ b/proto/go/gitalypb/lint.pb.go @@ -352,7 +352,7 @@ var file_lint_proto_rawDesc = string([]byte{ 0x6e, 0x73, 0x18, 0xe5, 0xc8, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x70, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2d, 0x6f, 0x72, 0x67, - 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x36, 0x2f, 0x70, 0x72, 0x6f, 0x74, + 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x37, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, }) diff --git a/proto/go/gitalypb/log.pb.go b/proto/go/gitalypb/log.pb.go index 137b176af5..609e2900ac 100644 --- a/proto/go/gitalypb/log.pb.go +++ b/proto/go/gitalypb/log.pb.go @@ -977,7 +977,7 @@ var file_log_proto_rawDesc = string([]byte{ 0x75, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2d, 0x6f, 0x72, 0x67, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2f, - 0x76, 0x31, 0x36, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, + 0x76, 0x31, 0x37, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, }) diff --git a/proto/go/gitalypb/objectpool.pb.go b/proto/go/gitalypb/objectpool.pb.go index c6369d3e2e..0bce584b65 100644 --- a/proto/go/gitalypb/objectpool.pb.go +++ b/proto/go/gitalypb/objectpool.pb.go @@ -664,7 +664,7 @@ var file_objectpool_proto_rawDesc = string([]byte{ 0x65, 0x63, 0x74, 0x50, 0x6f, 0x6f, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x06, 0xfa, 0x97, 0x28, 0x02, 0x08, 0x02, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2d, 0x6f, 0x72, 0x67, - 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x36, 0x2f, 0x70, 0x72, 0x6f, 0x74, + 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x37, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, }) diff --git a/proto/go/gitalypb/operations.pb.go b/proto/go/gitalypb/operations.pb.go index 6ee63e7ee5..4b813048f0 100644 --- a/proto/go/gitalypb/operations.pb.go +++ b/proto/go/gitalypb/operations.pb.go @@ -5169,7 +5169,7 @@ var file_operations_proto_rawDesc = string([]byte{ 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x06, 0xfa, 0x97, 0x28, 0x02, 0x08, 0x01, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2d, 0x6f, 0x72, 0x67, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2f, - 0x76, 0x31, 0x36, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, + 0x76, 0x31, 0x37, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, }) diff --git a/proto/go/gitalypb/packfile.pb.go b/proto/go/gitalypb/packfile.pb.go index 0e49fbfe5b..3a6ffef545 100644 --- a/proto/go/gitalypb/packfile.pb.go +++ b/proto/go/gitalypb/packfile.pb.go @@ -152,7 +152,7 @@ var file_packfile_proto_rawDesc = string([]byte{ 0x69, 0x6c, 0x74, 0x65, 0x72, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2d, 0x6f, 0x72, 0x67, 0x2f, 0x67, 0x69, 0x74, - 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x36, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, + 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x37, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, }) diff --git a/proto/go/gitalypb/partition.pb.go b/proto/go/gitalypb/partition.pb.go index 3d0dce5d69..676c0aa836 100644 --- a/proto/go/gitalypb/partition.pb.go +++ b/proto/go/gitalypb/partition.pb.go @@ -331,7 +331,7 @@ var file_partition_proto_rawDesc = string([]byte{ 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x08, 0xfa, 0x97, 0x28, 0x04, 0x08, 0x02, 0x10, 0x02, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, - 0x62, 0x2d, 0x6f, 0x72, 0x67, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x36, + 0x62, 0x2d, 0x6f, 0x72, 0x67, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x37, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, }) diff --git a/proto/go/gitalypb/praefect.pb.go b/proto/go/gitalypb/praefect.pb.go index 76e57d63b0..9d5be1dfb4 100644 --- a/proto/go/gitalypb/praefect.pb.go +++ b/proto/go/gitalypb/praefect.pb.go @@ -1384,7 +1384,7 @@ var file_praefect_proto_rawDesc = string([]byte{ 0x74, 0x6f, 0x72, 0x79, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x1a, 0x04, 0xf0, 0x97, 0x28, 0x01, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2d, - 0x6f, 0x72, 0x67, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x36, 0x2f, 0x70, + 0x6f, 0x72, 0x67, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x37, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, }) diff --git a/proto/go/gitalypb/ref.pb.go b/proto/go/gitalypb/ref.pb.go index be0d606a1b..7332332d00 100644 --- a/proto/go/gitalypb/ref.pb.go +++ b/proto/go/gitalypb/ref.pb.go @@ -2993,7 +2993,7 @@ var file_ref_proto_rawDesc = string([]byte{ 0x44, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x06, 0xfa, 0x97, 0x28, 0x02, 0x08, 0x02, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2d, 0x6f, 0x72, 0x67, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, - 0x79, 0x2f, 0x76, 0x31, 0x36, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, + 0x79, 0x2f, 0x76, 0x31, 0x37, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, }) diff --git a/proto/go/gitalypb/remote.pb.go b/proto/go/gitalypb/remote.pb.go index e8a127effb..816f099c18 100644 --- a/proto/go/gitalypb/remote.pb.go +++ b/proto/go/gitalypb/remote.pb.go @@ -563,7 +563,7 @@ var file_remote_proto_rawDesc = string([]byte{ 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x06, 0xfa, 0x97, 0x28, 0x02, 0x08, 0x02, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2d, 0x6f, 0x72, 0x67, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2f, - 0x76, 0x31, 0x36, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, + 0x76, 0x31, 0x37, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, }) diff --git a/proto/go/gitalypb/repository.pb.go b/proto/go/gitalypb/repository.pb.go index 14177d7382..9730f39b1b 100644 --- a/proto/go/gitalypb/repository.pb.go +++ b/proto/go/gitalypb/repository.pb.go @@ -6111,7 +6111,7 @@ var file_repository_proto_rawDesc = string([]byte{ 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x06, 0xfa, 0x97, 0x28, 0x02, 0x08, 0x02, 0x30, 0x01, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2d, 0x6f, 0x72, 0x67, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, - 0x2f, 0x76, 0x31, 0x36, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, + 0x2f, 0x76, 0x31, 0x37, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, }) diff --git a/proto/go/gitalypb/server.pb.go b/proto/go/gitalypb/server.pb.go index e158bc8702..83c135da67 100644 --- a/proto/go/gitalypb/server.pb.go +++ b/proto/go/gitalypb/server.pb.go @@ -820,7 +820,7 @@ var file_server_proto_rawDesc = string([]byte{ 0x65, 0x72, 0x76, 0x65, 0x72, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x1a, 0x04, 0xf0, 0x97, 0x28, 0x01, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, - 0x62, 0x2d, 0x6f, 0x72, 0x67, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x36, + 0x62, 0x2d, 0x6f, 0x72, 0x67, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x37, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, }) diff --git a/proto/go/gitalypb/service_config.pb.go b/proto/go/gitalypb/service_config.pb.go index 9d01d10cbe..78583cf8e9 100644 --- a/proto/go/gitalypb/service_config.pb.go +++ b/proto/go/gitalypb/service_config.pb.go @@ -560,7 +560,7 @@ var file_service_config_proto_rawDesc = string([]byte{ 0x79, 0x61, 0x62, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x43, 0x6f, 0x64, 0x65, 0x73, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2d, 0x6f, 0x72, 0x67, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, - 0x2f, 0x76, 0x31, 0x36, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, + 0x2f, 0x76, 0x31, 0x37, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, }) diff --git a/proto/go/gitalypb/shared.pb.go b/proto/go/gitalypb/shared.pb.go index 730e14f699..e4351838da 100644 --- a/proto/go/gitalypb/shared.pb.go +++ b/proto/go/gitalypb/shared.pb.go @@ -1383,7 +1383,7 @@ var file_shared_proto_rawDesc = string([]byte{ 0x00, 0x12, 0x0e, 0x0a, 0x0a, 0x44, 0x45, 0x53, 0x43, 0x45, 0x4e, 0x44, 0x49, 0x4e, 0x47, 0x10, 0x01, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2d, 0x6f, 0x72, 0x67, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, - 0x79, 0x2f, 0x76, 0x31, 0x36, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, + 0x79, 0x2f, 0x76, 0x31, 0x37, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, }) diff --git a/proto/go/gitalypb/smarthttp.pb.go b/proto/go/gitalypb/smarthttp.pb.go index 1d403a229e..efc5895eaf 100644 --- a/proto/go/gitalypb/smarthttp.pb.go +++ b/proto/go/gitalypb/smarthttp.pb.go @@ -486,7 +486,7 @@ var file_smarthttp_proto_rawDesc = string([]byte{ 0x73, 0x65, 0x22, 0x06, 0xfa, 0x97, 0x28, 0x02, 0x08, 0x01, 0x28, 0x01, 0x30, 0x01, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2d, 0x6f, 0x72, 0x67, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x76, - 0x31, 0x36, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x61, + 0x31, 0x37, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, }) diff --git a/proto/go/gitalypb/ssh.pb.go b/proto/go/gitalypb/ssh.pb.go index ccf717ac8e..7de3a0efb0 100644 --- a/proto/go/gitalypb/ssh.pb.go +++ b/proto/go/gitalypb/ssh.pb.go @@ -511,7 +511,7 @@ var file_ssh_proto_rawDesc = string([]byte{ 0x64, 0x41, 0x72, 0x63, 0x68, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x06, 0xfa, 0x97, 0x28, 0x02, 0x08, 0x02, 0x28, 0x01, 0x30, 0x01, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, - 0x62, 0x2d, 0x6f, 0x72, 0x67, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x36, + 0x62, 0x2d, 0x6f, 0x72, 0x67, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x37, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, }) diff --git a/proto/go/gitalypb/testproto/error_metadata.pb.go b/proto/go/gitalypb/testproto/error_metadata.pb.go index fcba312ade..127efd7e32 100644 --- a/proto/go/gitalypb/testproto/error_metadata.pb.go +++ b/proto/go/gitalypb/testproto/error_metadata.pb.go @@ -89,7 +89,7 @@ var file_testproto_error_metadata_proto_rawDesc = string([]byte{ 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x3e, 0x5a, 0x3c, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2d, 0x6f, 0x72, 0x67, 0x2f, 0x67, 0x69, - 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x36, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, + 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x37, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x70, 0x62, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, }) diff --git a/proto/go/gitalypb/testproto/invalid.pb.go b/proto/go/gitalypb/testproto/invalid.pb.go index 3659b2c6cf..0236838590 100644 --- a/proto/go/gitalypb/testproto/invalid.pb.go +++ b/proto/go/gitalypb/testproto/invalid.pb.go @@ -7,7 +7,7 @@ package testproto import ( - gitalypb "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + gitalypb "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -1018,7 +1018,7 @@ var file_testproto_invalid_proto_rawDesc = string([]byte{ 0x64, 0x4d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x08, 0xfa, 0x97, 0x28, 0x04, 0x08, 0x03, 0x10, 0x02, 0x42, 0x3e, 0x5a, 0x3c, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2d, 0x6f, - 0x72, 0x67, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x36, 0x2f, 0x70, 0x72, + 0x72, 0x67, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x37, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x70, 0x62, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, diff --git a/proto/go/gitalypb/testproto/valid.pb.go b/proto/go/gitalypb/testproto/valid.pb.go index 6c3328c7e9..69a5a1d740 100644 --- a/proto/go/gitalypb/testproto/valid.pb.go +++ b/proto/go/gitalypb/testproto/valid.pb.go @@ -7,7 +7,7 @@ package testproto import ( - gitalypb "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb" + gitalypb "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -626,7 +626,7 @@ var file_testproto_valid_proto_rawDesc = string([]byte{ 0x6c, 0x69, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x06, 0xfa, 0x97, 0x28, 0x02, 0x08, 0x03, 0x42, 0x3e, 0x5a, 0x3c, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2d, 0x6f, 0x72, 0x67, 0x2f, 0x67, 0x69, 0x74, - 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x36, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, + 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x37, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x70, 0x62, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, }) diff --git a/proto/go/gitalypb/transaction.pb.go b/proto/go/gitalypb/transaction.pb.go index f1b84a1a20..a677da46b4 100644 --- a/proto/go/gitalypb/transaction.pb.go +++ b/proto/go/gitalypb/transaction.pb.go @@ -419,7 +419,7 @@ var file_transaction_proto_rawDesc = string([]byte{ 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x1a, 0x04, 0xf0, 0x97, 0x28, 0x01, 0x42, 0x34, 0x5a, 0x32, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x69, 0x74, 0x6c, 0x61, 0x62, 0x2d, 0x6f, 0x72, 0x67, 0x2f, 0x67, 0x69, - 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x36, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, + 0x74, 0x61, 0x6c, 0x79, 0x2f, 0x76, 0x31, 0x37, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x69, 0x74, 0x61, 0x6c, 0x79, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, }) diff --git a/proto/hook.proto b/proto/hook.proto index 4bf963b2ff..4740f39cce 100644 --- a/proto/hook.proto +++ b/proto/hook.proto @@ -5,7 +5,7 @@ package gitaly; import "lint.proto"; import "shared.proto"; -option go_package = "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"; +option go_package = "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb"; // HookService is a service which provides the implementation of a subset of // Git hooks. These are typically invoked via the `gitaly-hooks` binary to diff --git a/proto/internal.proto b/proto/internal.proto index 47d8267779..d28019b51b 100644 --- a/proto/internal.proto +++ b/proto/internal.proto @@ -5,7 +5,7 @@ package gitaly; import "google/protobuf/timestamp.proto"; import "lint.proto"; -option go_package = "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"; +option go_package = "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb"; // InternalGitaly is a gRPC service meant to be served by a Gitaly node, but // only reachable by Praefect or other Gitalies diff --git a/proto/lint.proto b/proto/lint.proto index a0a410f06b..afec025370 100644 --- a/proto/lint.proto +++ b/proto/lint.proto @@ -4,7 +4,7 @@ package gitaly; import "google/protobuf/descriptor.proto"; -option go_package = "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"; +option go_package = "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb"; // OperationMsg ... message OperationMsg { diff --git a/proto/log.proto b/proto/log.proto index dd5546b06d..9479b349c6 100644 --- a/proto/log.proto +++ b/proto/log.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package gitaly; -option go_package = "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"; +option go_package = "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb"; // LogEntry is a single entry in a partition's write-ahead log. // diff --git a/proto/objectpool.proto b/proto/objectpool.proto index 321b60c49c..ae71b6f024 100644 --- a/proto/objectpool.proto +++ b/proto/objectpool.proto @@ -5,7 +5,7 @@ package gitaly; import "lint.proto"; import "shared.proto"; -option go_package = "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"; +option go_package = "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb"; // ObjectPoolService is a service that manages the lifetime of object pools. // diff --git a/proto/operations.proto b/proto/operations.proto index 9730bf0c49..af402b56fc 100644 --- a/proto/operations.proto +++ b/proto/operations.proto @@ -7,7 +7,7 @@ import "google/protobuf/timestamp.proto"; import "lint.proto"; import "shared.proto"; -option go_package = "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"; +option go_package = "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb"; // OperationService provides an interface for performing mutating git // operations on a repository on behalf of a user. The user's operation is diff --git a/proto/packfile.proto b/proto/packfile.proto index d941705767..b98a8790c2 100644 --- a/proto/packfile.proto +++ b/proto/packfile.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package gitaly; -option go_package = "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"; +option go_package = "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb"; // PackfileNegotiationStatistics represents the git packfile negotiation. message PackfileNegotiationStatistics { diff --git a/proto/partition.proto b/proto/partition.proto index ae1e40fbcb..16d679bb55 100644 --- a/proto/partition.proto +++ b/proto/partition.proto @@ -5,7 +5,7 @@ package gitaly; import "lint.proto"; import "shared.proto"; -option go_package = "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"; +option go_package = "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb"; // PartitionService is a service providing RPCs accessing partitions as a whole. service PartitionService { diff --git a/proto/praefect.proto b/proto/praefect.proto index 03aa2b22c7..96f4455e39 100644 --- a/proto/praefect.proto +++ b/proto/praefect.proto @@ -6,7 +6,7 @@ import "google/protobuf/timestamp.proto"; import "lint.proto"; import "shared.proto"; -option go_package = "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"; +option go_package = "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb"; // PraefectInfoService is a service which provides RPCs to query and modify // Praefect-specific parameters. @@ -17,7 +17,7 @@ service PraefectInfoService { rpc RepositoryReplicas(RepositoryReplicasRequest) returns (RepositoryReplicasResponse); // Dataloss provides information on repositories in Praefect that are in a degraded state and - // thus susceptible to dataloss. A repository is considered degraded when its replicas are + // thus susceptible to dataloss. A repository is considered degraded when its replicas are // outdated and/or unavailable. rpc Dataloss(DatalossRequest) returns (stream DatalossResponse); diff --git a/proto/ref.proto b/proto/ref.proto index aefcb9a19e..eccc7a2ab7 100644 --- a/proto/ref.proto +++ b/proto/ref.proto @@ -6,7 +6,7 @@ import "errors.proto"; import "lint.proto"; import "shared.proto"; -option go_package = "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"; +option go_package = "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb"; // RefService is a service that provides RPCs to list and modify Git references. service RefService { diff --git a/proto/remote.proto b/proto/remote.proto index 055cac0469..029382f577 100644 --- a/proto/remote.proto +++ b/proto/remote.proto @@ -5,7 +5,7 @@ package gitaly; import "lint.proto"; import "shared.proto"; -option go_package = "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"; +option go_package = "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb"; // RemoteService is a service providing RPCs to interact with a remote // repository that is hosted on another Git server. diff --git a/proto/repository.proto b/proto/repository.proto index c85b599dcd..4d156a438c 100644 --- a/proto/repository.proto +++ b/proto/repository.proto @@ -6,7 +6,7 @@ import "errors.proto"; import "lint.proto"; import "shared.proto"; -option go_package = "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"; +option go_package = "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb"; // RepositoryService is a service providing RPCs accessing repositories as a whole. service RepositoryService { diff --git a/proto/server.proto b/proto/server.proto index bac97c44d3..67436fc4ff 100644 --- a/proto/server.proto +++ b/proto/server.proto @@ -5,7 +5,7 @@ package gitaly; import "google/protobuf/duration.proto"; import "lint.proto"; -option go_package = "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"; +option go_package = "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb"; // ServerService is a service that provides information about a Gitaly server. service ServerService { diff --git a/proto/service_config.proto b/proto/service_config.proto index f2286f7e3d..88358931a7 100644 --- a/proto/service_config.proto +++ b/proto/service_config.proto @@ -5,7 +5,7 @@ package gitaly; import "google/protobuf/duration.proto"; import "google/protobuf/wrappers.proto"; -option go_package = "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"; +option go_package = "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb"; // ServiceConfig defines the configuration that allows service owners to publish parameters to be // automatically used by all clients of their service. gRPC doesn't export this protobuf. So, we diff --git a/proto/shared.proto b/proto/shared.proto index 0ca6c22507..f2e7dbe209 100644 --- a/proto/shared.proto +++ b/proto/shared.proto @@ -5,7 +5,7 @@ package gitaly; import "google/protobuf/timestamp.proto"; import "lint.proto"; -option go_package = "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"; +option go_package = "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb"; // ObjectType ... enum ObjectType { @@ -245,4 +245,4 @@ enum SortDirection { message Partition { // id is the identifier of a partition within the storage string id = 1; -} \ No newline at end of file +} diff --git a/proto/smarthttp.proto b/proto/smarthttp.proto index c9f2b40ee0..7568f05064 100644 --- a/proto/smarthttp.proto +++ b/proto/smarthttp.proto @@ -6,7 +6,7 @@ import "lint.proto"; import "packfile.proto"; import "shared.proto"; -option go_package = "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"; +option go_package = "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb"; // SmartHTTPService is a service that provides RPCs required for HTTP-based Git // clones via the smart HTTP protocol. diff --git a/proto/ssh.proto b/proto/ssh.proto index f58287c1d4..dd06aed7b3 100644 --- a/proto/ssh.proto +++ b/proto/ssh.proto @@ -6,7 +6,7 @@ import "lint.proto"; import "packfile.proto"; import "shared.proto"; -option go_package = "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"; +option go_package = "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb"; // SSHService is a service that provides RPCs required for SSH-based Git clones. service SSHService { diff --git a/proto/testproto/error_metadata.proto b/proto/testproto/error_metadata.proto index 4d4649ff2c..49f87d213e 100644 --- a/proto/testproto/error_metadata.proto +++ b/proto/testproto/error_metadata.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package testproto; -option go_package = "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb/testproto"; +option go_package = "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb/testproto"; // errorMetadata is a key-value metadata item that may be attached to errors. We only use this // infrastructure for testing purposes to assert that we add error metadata as expected that would diff --git a/proto/testproto/invalid.proto b/proto/testproto/invalid.proto index 11cbd7dbc3..55a9da078c 100644 --- a/proto/testproto/invalid.proto +++ b/proto/testproto/invalid.proto @@ -5,7 +5,7 @@ package testproto; import "lint.proto"; import "shared.proto"; -option go_package = "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb/testproto"; +option go_package = "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb/testproto"; message InvalidMethodRequest { } diff --git a/proto/testproto/valid.proto b/proto/testproto/valid.proto index cfe96f0cba..3a9b31316f 100644 --- a/proto/testproto/valid.proto +++ b/proto/testproto/valid.proto @@ -5,7 +5,7 @@ package testproto; import "lint.proto"; import "shared.proto"; -option go_package = "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb/testproto"; +option go_package = "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb/testproto"; message ValidRequest { gitaly.Repository destination = 1 [(gitaly.target_repository)=true]; diff --git a/proto/transaction.proto b/proto/transaction.proto index ab3c307979..eb8e0a8265 100644 --- a/proto/transaction.proto +++ b/proto/transaction.proto @@ -5,7 +5,7 @@ package gitaly; import "lint.proto"; import "shared.proto"; -option go_package = "gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"; +option go_package = "gitlab.com/gitlab-org/gitaly/v17/proto/go/gitalypb"; // RefTransaction is a service which provides RPCs to interact with reference // transactions. Reference transactions are used in the context of Gitaly -- GitLab