Merge branch 'ac-accelerate-wiki-attachments' into 'master'

accelerate wiki attachments

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

3 files changed, 80 insertions, 2 deletions

diff --git a/spec/requests/api/wikis_spec.rb b/spec/requests/api/wikis_spec.rb
index d1b58aac104..97de26650db 100644
--- a/spec/requests/api/wikis_spec.rb
+++ b/spec/requests/api/wikis_spec.rb
@@ -11,6 +11,8 @@ require 'spec_helper'
 # because they are 3 edge cases of using wiki pages.
 
 describe API::Wikis do
+  include WorkhorseHelpers
+
   let(:user) { create(:user) }
   let(:group) { create(:group).tap { |g| g.add_owner(user) } }
   let(:project_wiki) { create(:project_wiki, project: project, user: user) }
@@ -155,7 +157,7 @@ describe API::Wikis do
     it 'pushes attachment to the wiki repository' do
       allow(SecureRandom).to receive(:hex).and_return('fixed_hex')
 
-      post(api(url, user), params: payload)
+      workhorse_post_with_file(api(url, user), file_key: :file, params: payload)
 
       expect(response).to have_gitlab_http_status(201)
       expect(json_response).to eq result_hash.deep_stringify_keys
@@ -180,6 +182,15 @@ describe API::Wikis do
       expect(json_response.size).to eq(1)
       expect(json_response['error']).to eq('file is invalid')
     end
+
+    it 'is backward compatible with regular multipart uploads' do
+      allow(SecureRandom).to receive(:hex).and_return('fixed_hex')
+
+      post(api(url, user), params: payload)
+
+      expect(response).to have_gitlab_http_status(201)
+      expect(json_response).to eq result_hash.deep_stringify_keys
+    end
   end
 
   describe 'GET /projects/:id/wikis' do
diff --git a/spec/requests/projects/uploads_spec.rb b/spec/requests/projects/uploads_spec.rb
new file mode 100644
index 00000000000..aca4644289d
--- /dev/null
+++ b/spec/requests/projects/uploads_spec.rb
@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'File uploads' do
+  include WorkhorseHelpers
+
+  let(:project) { create(:project, :public, :repository) }
+  let(:user) { create(:user) }
+
+  describe 'POST /:namespace/:project/create/:branch' do
+    let(:branch) { 'master' }
+    let(:create_url) { project_blob_path(project, branch) }
+    let(:blob_url) { project_blob_path(project, "#{branch}/dk.png") }
+    let(:params) do
+      {
+        namespace_id: project.namespace,
+        project_id: project,
+        id: branch,
+        branch_name: branch,
+        file: fixture_file_upload('spec/fixtures/dk.png'),
+        commit_message: 'Add an image'
+      }
+    end
+
+    before do
+      project.add_maintainer(user)
+
+      login_as(user)
+    end
+
+    it 'redirects to blob' do
+      workhorse_post_with_file(create_url, file_key: :file, params: params)
+
+      expect(response).to redirect_to(blob_url)
+    end
+  end
+end
diff --git a/spec/support/helpers/workhorse_helpers.rb b/spec/support/helpers/workhorse_helpers.rb
index 4488e5f227e..fdbfe53fa39 100644
--- a/spec/support/helpers/workhorse_helpers.rb
+++ b/spec/support/helpers/workhorse_helpers.rb
@@ -17,7 +17,36 @@ module WorkhorseHelpers
   end
 
   def workhorse_internal_api_request_header
-    jwt_token = JWT.encode({ 'iss' => 'gitlab-workhorse' }, Gitlab::Workhorse.secret, 'HS256')
     { 'HTTP_' + Gitlab::Workhorse::INTERNAL_API_REQUEST_HEADER.upcase.tr('-', '_') => jwt_token }
   end
+
+  # workhorse_post_with_file will transform file_key inside params as if it was disk accelerated by workhorse
+  def workhorse_post_with_file(url, file_key:, params:)
+    workhorse_params = params.dup
+    file = workhorse_params.delete(file_key)
+
+    workhorse_params.merge!(workhorse_disk_accelerated_file_params(file_key, file))
+
+    post(url,
+         params: workhorse_params,
+         headers: workhorse_rewritten_fields_header('file' => file.path)
+        )
+  end
+
+  private
+
+  def jwt_token(data = {})
+    JWT.encode({ 'iss' => 'gitlab-workhorse' }.merge(data), Gitlab::Workhorse.secret, 'HS256')
+  end
+
+  def workhorse_rewritten_fields_header(fields)
+    { Gitlab::Middleware::Multipart::RACK_ENV_KEY => jwt_token('rewritten_fields' => fields) }
+  end
+
+  def workhorse_disk_accelerated_file_params(key, file)
+    {
+      "#{key}.name" => file.original_filename,
+      "#{key}.path" => file.path
+    }
+  end
 end