Merge branch 'sh-fix-multipart-upload-signed-urls' into 'master'

Fix object storage uploads not working with AWS v2

Closes gitlab-workhorse#181

See merge request gitlab-org/gitlab-ce!21731

1 files changed, 10 insertions, 0 deletions

diff --git a/spec/lib/object_storage/direct_upload_spec.rb b/spec/lib/object_storage/direct_upload_spec.rb
index 9c308cc1be9..1024e1a25ea 100644
--- a/spec/lib/object_storage/direct_upload_spec.rb
+++ b/spec/lib/object_storage/direct_upload_spec.rb
@@ -83,6 +83,16 @@ describe ObjectStorage::DirectUpload do
         expect(subject[:MultipartUpload][:AbortURL]).to start_with(storage_url)
         expect(subject[:MultipartUpload][:AbortURL]).to include('uploadId=myUpload')
       end
+
+      it 'uses only strings in query parameters' do
+        expect(direct_upload.send(:connection)).to receive(:signed_url).at_least(:once) do |params|
+          if params[:query]
+            expect(params[:query].keys.all? { |key| key.is_a?(String) }).to be_truthy
+          end
+        end
+
+        subject
+      end
     end
 
     shared_examples 'a valid upload without multipart data' do