summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2018-06-04 14:06:07 +0200
committerKamil Trzciński <ayufan@ayufan.eu>2018-06-04 22:31:01 +0200
commiteea26a93e7d4ac0c6fefe46592c9baa0d3e6a5cd (patch)
treef0e0c3ee9664426661f97d5bd94d094bc00117e8
parentb8370c9f55843351b49073dafe84a2e9858c8c8a (diff)
downloadgitlab-ce-eea26a93e7d4ac0c6fefe46592c9baa0d3e6a5cd.tar.gz
-rw-r--r--config/initializers/direct_upload_support.rb24
-rw-r--r--lib/object_storage/direct_upload.rb2
-rw-r--r--spec/initializers/direct_upload_support_spec.rb7
-rw-r--r--spec/lib/object_storage/direct_upload_spec.rb24
-rw-r--r--spec/support/helpers/stub_object_storage.rb4
5 files changed, 22 insertions, 39 deletions
diff --git a/config/initializers/direct_upload_support.rb b/config/initializers/direct_upload_support.rb
index 8ba1229415f..32fc8c8bc69 100644
--- a/config/initializers/direct_upload_support.rb
+++ b/config/initializers/direct_upload_support.rb
@@ -1,13 +1,19 @@
-SUPPORTED_DIRECT_UPLOAD_PROVIDERS = %w(Google AWS).freeze
+class DirectUploadsValidator
+ SUPPORTED_DIRECT_UPLOAD_PROVIDERS = %w(Google AWS).freeze
-def verify_provider_support!(object_store)
- return unless object_store.enabled
- return unless object_store.direct_upload
- return if SUPPORTED_DIRECT_UPLOAD_PROVIDERS.include?(object_store.connection&.provider.to_s)
+ ValidationError = Class.new(StandardError)
- raise "Only #{SUPPORTED_DIRECT_UPLOAD_PROVIDERS.join(',')} are supported as a object storage provider when 'direct_upload' is used"
+ def verify!(object_store)
+ return unless object_store.enabled
+ return unless object_store.direct_upload
+ return if SUPPORTED_DIRECT_UPLOAD_PROVIDERS.include?(object_store.connection&.provider.to_s)
+
+ raise ValidationError, "Only #{SUPPORTED_DIRECT_UPLOAD_PROVIDERS.join(',')} are supported as a object storage provider when 'direct_upload' is used"
+ end
end
-verify_provider_support!(Gitlab.config.artifacts.object_store)
-verify_provider_support!(Gitlab.config.uploads.object_store)
-verify_provider_support!(Gitlab.config.lfs.object_store)
+DirectUploadsValidator.new.tap do |validator|
+ [Gitlab.config.artifacts, Gitlab.config.uploads, Gitlab.config.lfs].each do |uploader|
+ validator.verify!(uploader.object_store)
+ end
+end
diff --git a/lib/object_storage/direct_upload.rb b/lib/object_storage/direct_upload.rb
index a4d6b79eb45..61a69e7ffe4 100644
--- a/lib/object_storage/direct_upload.rb
+++ b/lib/object_storage/direct_upload.rb
@@ -2,7 +2,7 @@ module ObjectStorage
#
# The DirectUpload c;ass generates a set of presigned URLs
# that can be used to upload data to object storage from untrusted component: Workhorse, Runner?
- #
+ #
# For Google it assumes that the platform supports variable Content-Length.
#
# For AWS it initiates Multipart Upload and presignes a set of part uploads.
diff --git a/spec/initializers/direct_upload_support_spec.rb b/spec/initializers/direct_upload_support_spec.rb
index f124e726bac..e51d404e030 100644
--- a/spec/initializers/direct_upload_support_spec.rb
+++ b/spec/initializers/direct_upload_support_spec.rb
@@ -6,7 +6,7 @@ describe 'Direct upload support' do
end
where(:config_name) do
- ['lfs', 'artifacts', 'uploads']
+ %w(lfs artifacts uploads)
end
with_them do
@@ -23,8 +23,9 @@ describe 'Direct upload support' do
end
before do
- allow(Gitlab.config).to receive_messages(to_settings(
- config_name => { object_store: object_store }))
+ allow(Gitlab.config).to receive_messages(to_settings(config_name => {
+ object_store: object_store
+ }))
end
context 'when object storage is enabled' do
diff --git a/spec/lib/object_storage/direct_upload_spec.rb b/spec/lib/object_storage/direct_upload_spec.rb
index 0f86d10b881..5187821e8f4 100644
--- a/spec/lib/object_storage/direct_upload_spec.rb
+++ b/spec/lib/object_storage/direct_upload_spec.rb
@@ -161,28 +161,4 @@ describe ObjectStorage::DirectUpload do
end
end
end
-
- describe '#get_url' do
- # this method can only be tested with integration tests
- end
-
- describe '#delete_url' do
- # this method can only be tested with integration tests
- end
-
- describe '#store_url' do
- # this method can only be tested with integration tests
- end
-
- describe '#multipart_part_upload_url' do
- # this method can only be tested with integration tests
- end
-
- describe '#multipart_complete_url' do
- # this method can only be tested with integration tests
- end
-
- describe '#multipart_abort_url' do
- # this method can only be tested with integration tests
- end
end
diff --git a/spec/support/helpers/stub_object_storage.rb b/spec/support/helpers/stub_object_storage.rb
index 80204bdab8b..bceaf8277ee 100644
--- a/spec/support/helpers/stub_object_storage.rb
+++ b/spec/support/helpers/stub_object_storage.rb
@@ -47,8 +47,8 @@ module StubObjectStorage
end
def stub_object_storage_multipart_init(endpoint, upload_id = "upload_id")
- stub_request(:post, %r{\A#{endpoint}tmp/uploads/[a-z0-9-]*\?uploads\z}).
- to_return status: 200, body: <<-EOS.strip_heredoc
+ stub_request(:post, %r{\A#{endpoint}tmp/uploads/[a-z0-9-]*\?uploads\z})
+ .to_return status: 200, body: <<-EOS.strip_heredoc
<?xml version="1.0" encoding="UTF-8"?>
<InitiateMultipartUploadResult xmlns="http://s3.amazonaws.com/doc/2006-03-01/">
<Bucket>example-bucket</Bucket>