Commit 54ac33b4 authored by Sean McGivern's avatar Sean McGivern Committed by Jacob Vosmaer

Revert "Merge branch 'workhorse-gitaly-mandatory' into 'master'"

This reverts merge request !18002
parent bbede12a
---
title: Make all workhorse gitaly calls opt-out
merge_request: 18002
author:
type: other
...@@ -44,7 +44,7 @@ module Gitlab ...@@ -44,7 +44,7 @@ module Gitlab
end end
def send_git_blob(repository, blob) def send_git_blob(repository, blob)
params = if Gitlab::GitalyClient.feature_enabled?(:workhorse_raw_show, Gitlab::GitalyClient::MigrationStatus::OPT_OUT) params = if Gitlab::GitalyClient.feature_enabled?(:workhorse_raw_show)
{ {
'GitalyServer' => gitaly_server_hash(repository), 'GitalyServer' => gitaly_server_hash(repository),
'GetBlobRequest' => { 'GetBlobRequest' => {
...@@ -72,7 +72,7 @@ module Gitlab ...@@ -72,7 +72,7 @@ module Gitlab
params = repository.archive_metadata(ref, Gitlab.config.gitlab.repository_downloads_path, format) params = repository.archive_metadata(ref, Gitlab.config.gitlab.repository_downloads_path, format)
raise "Repository or ref not found" if params.empty? raise "Repository or ref not found" if params.empty?
if Gitlab::GitalyClient.feature_enabled?(:workhorse_archive, Gitlab::GitalyClient::MigrationStatus::OPT_OUT) if Gitlab::GitalyClient.feature_enabled?(:workhorse_archive)
params.merge!( params.merge!(
'GitalyServer' => gitaly_server_hash(repository), 'GitalyServer' => gitaly_server_hash(repository),
'GitalyRepository' => repository.gitaly_repository.to_h 'GitalyRepository' => repository.gitaly_repository.to_h
...@@ -89,7 +89,7 @@ module Gitlab ...@@ -89,7 +89,7 @@ module Gitlab
end end
def send_git_diff(repository, diff_refs) def send_git_diff(repository, diff_refs)
params = if Gitlab::GitalyClient.feature_enabled?(:workhorse_send_git_diff, Gitlab::GitalyClient::MigrationStatus::OPT_OUT) params = if Gitlab::GitalyClient.feature_enabled?(:workhorse_send_git_diff)
{ {
'GitalyServer' => gitaly_server_hash(repository), 'GitalyServer' => gitaly_server_hash(repository),
'RawDiffRequest' => Gitaly::RawDiffRequest.new( 'RawDiffRequest' => Gitaly::RawDiffRequest.new(
...@@ -107,7 +107,7 @@ module Gitlab ...@@ -107,7 +107,7 @@ module Gitlab
end end
def send_git_patch(repository, diff_refs) def send_git_patch(repository, diff_refs)
params = if Gitlab::GitalyClient.feature_enabled?(:workhorse_send_git_patch, Gitlab::GitalyClient::MigrationStatus::OPT_OUT) params = if Gitlab::GitalyClient.feature_enabled?(:workhorse_send_git_patch)
{ {
'GitalyServer' => gitaly_server_hash(repository), 'GitalyServer' => gitaly_server_hash(repository),
'RawPatchRequest' => Gitaly::RawPatchRequest.new( 'RawPatchRequest' => Gitaly::RawPatchRequest.new(
......
...@@ -55,7 +55,7 @@ describe Gitlab::Workhorse do ...@@ -55,7 +55,7 @@ describe Gitlab::Workhorse do
end end
end end
context 'when Gitaly workhorse_archive feature is disabled', :disable_gitaly do context 'when Gitaly workhorse_archive feature is disabled', :skip_gitaly_mock do
it 'sets the header correctly' do it 'sets the header correctly' do
key, command, params = decode_workhorse_header(subject) key, command, params = decode_workhorse_header(subject)
...@@ -100,7 +100,7 @@ describe Gitlab::Workhorse do ...@@ -100,7 +100,7 @@ describe Gitlab::Workhorse do
end end
end end
context 'when Gitaly workhorse_send_git_patch feature is disabled', :disable_gitaly do context 'when Gitaly workhorse_send_git_patch feature is disabled', :skip_gitaly_mock do
it 'sets the header correctly' do it 'sets the header correctly' do
key, command, params = decode_workhorse_header(subject) key, command, params = decode_workhorse_header(subject)
...@@ -173,7 +173,7 @@ describe Gitlab::Workhorse do ...@@ -173,7 +173,7 @@ describe Gitlab::Workhorse do
end end
end end
context 'when Gitaly workhorse_send_git_diff feature is disabled', :disable_gitaly do context 'when Gitaly workhorse_send_git_diff feature is disabled', :skip_gitaly_mock do
it 'sets the header correctly' do it 'sets the header correctly' do
key, command, params = decode_workhorse_header(subject) key, command, params = decode_workhorse_header(subject)
...@@ -455,7 +455,7 @@ describe Gitlab::Workhorse do ...@@ -455,7 +455,7 @@ describe Gitlab::Workhorse do
end end
end end
context 'when Gitaly workhorse_raw_show feature is disabled', :disable_gitaly do context 'when Gitaly workhorse_raw_show feature is disabled', :skip_gitaly_mock do
it 'sets the header correctly' do it 'sets the header correctly' do
key, command, params = decode_workhorse_header(subject) key, command, params = decode_workhorse_header(subject)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment