kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Add latest changes from gitlab-org/gitlab@master

Browse source
This commit is contained in:
GitLab Bot 2021-07-03 12:08:08 +00:00
parent 840b3aceff
commit 0c922a0a15
4 changed files with 0 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
config/feature_flags/development/use_workhorse_s3_client.yml
View file

@ -1,8 +0,0 @@
---
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

15
doc/administration/object_storage.md
View file

@ -718,21 +718,6 @@ must be fulfilled:
[ETag mismatch errors](#etag-mismatch) occur if server side [ETag mismatch errors](#etag-mismatch) occur if server side
encryption headers are used without enabling the Workhorse S3 client. encryption headers are used without enabling the Workhorse S3 client.
##### Disabling the feature
The Workhorse S3 client is enabled by default when the
[`use_iam_profile` configuration option](#iam-permissions) is set to `true` or consolidated
object storage settings are configured.
The feature can be disabled using the `:use_workhorse_s3_client` feature flag. To disable the
feature, ask a GitLab administrator with
[Rails console access](feature_flags.md#how-to-enable-and-disable-features-behind-flags) to run the
following command:
```ruby
Feature.disable(:use_workhorse_s3_client)
```
#### IAM Permissions #### IAM Permissions
To set up an instance profile: To set up an instance profile:

1
lib/object_storage/direct_upload.rb
View file

@ -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

10
spec/lib/object_storage/direct_upload_spec.rb
View file

@ -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