Commit 152f6ad7 authored by Nick Thomas's avatar Nick Thomas

Remove the use_workhorse_s3_client feature flag

This has been present since 13.2. Time to remove!

Changelog: removed
parent 8fc42807
---
name: use_workhorse_s3_client
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/35480
rollout_issue_url:
milestone: '13.2'
type: development
group: group::source code
default_enabled: true
...@@ -112,7 +112,6 @@ module ObjectStorage ...@@ -112,7 +112,6 @@ module ObjectStorage
end end
def use_workhorse_s3_client? def use_workhorse_s3_client?
return false unless Feature.enabled?(:use_workhorse_s3_client, default_enabled: true)
return false unless config.use_iam_profile? || config.consolidated_settings? return false unless config.use_iam_profile? || config.consolidated_settings?
# The Golang AWS SDK does not support V2 signatures # The Golang AWS SDK does not support V2 signatures
return false unless credentials.fetch(:aws_signature_version, 4).to_i >= 4 return false unless credentials.fetch(:aws_signature_version, 4).to_i >= 4
......
...@@ -136,16 +136,6 @@ RSpec.describe ObjectStorage::DirectUpload do ...@@ -136,16 +136,6 @@ RSpec.describe ObjectStorage::DirectUpload do
end end
end end
context 'when feature flag is disabled' do
before do
stub_feature_flags(use_workhorse_s3_client: false)
end
it 'does not enable Workhorse client' do
expect(subject[:UseWorkhorseClient]).to be false
end
end
context 'when V2 signatures are used' do context 'when V2 signatures are used' do
before do before do
credentials[:aws_signature_version] = 2 credentials[:aws_signature_version] = 2
......
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