Merge branch 'eb-return-filesize-authorize' into 'master'

Include max artifact size in authorize response

See merge request gitlab-org/gitlab!37632

app/uploaders/object_storage.rb

@@ -178,10 +178,14 @@ module ObjectStorage
       end
 
       def workhorse_authorize(has_length:, maximum_size: nil)
-        if self.object_store_enabled? && self.direct_upload_enabled?
-          { RemoteObject: workhorse_remote_upload_options(has_length: has_length, maximum_size: maximum_size) }
-        else
-          { TempPath: workhorse_local_upload_path }
+        {}.tap do |hash|
+          if self.object_store_enabled? && self.direct_upload_enabled?
+            hash[:RemoteObject] = workhorse_remote_upload_options(has_length: has_length, maximum_size: maximum_size)
+          else
+            hash[:TempPath] = workhorse_local_upload_path
+          end
+
+          hash[:MaximumSize] = maximum_size if maximum_size.present?
         end
       end
 

changelogs/unreleased/eb-return-filesize-authorize.yml

+---
+title: Include max artifact size in authorize response
+merge_request: 37632
+author:
+type: added

spec/requests/api/ci/runner/jobs_artifacts_spec.rb

@@ -143,6 +143,7 @@ RSpec.describe API::Ci::Runner, :clean_gitlab_redis_shared_state do
                 expect(response.media_type).to eq(Gitlab::Workhorse::INTERNAL_API_CONTENT_TYPE)
                 expect(json_response['TempPath']).to eq(JobArtifactUploader.workhorse_local_upload_path)
                 expect(json_response['RemoteObject']).to be_nil
+                expect(json_response['MaximumSize']).not_to be_nil
               end
             end
 
@@ -167,6 +168,7 @@ RSpec.describe API::Ci::Runner, :clean_gitlab_redis_shared_state do
                   expect(json_response['RemoteObject']).to have_key('StoreURL')
                   expect(json_response['RemoteObject']).to have_key('DeleteURL')
                   expect(json_response['RemoteObject']).to have_key('MultipartUpload')
+                  expect(json_response['MaximumSize']).not_to be_nil
                 end
               end
 
@@ -188,6 +190,7 @@ RSpec.describe API::Ci::Runner, :clean_gitlab_redis_shared_state do
             expect(response).to have_gitlab_http_status(:ok)
             expect(response.media_type).to eq(Gitlab::Workhorse::INTERNAL_API_CONTENT_TYPE)
             expect(json_response['TempPath']).not_to be_nil
+            expect(json_response['MaximumSize']).not_to be_nil
           end
 
           it 'fails to post too large artifact' do

spec/uploaders/object_storage_spec.rb

@@ -414,28 +414,38 @@ RSpec.describe ObjectStorage do
 
     subject { uploader_class.workhorse_authorize(has_length: has_length, maximum_size: maximum_size) }
 
-    shared_examples 'uses local storage' do
+    shared_examples 'returns the maximum size given' do
       it "returns temporary path" do
-        is_expected.to have_key(:TempPath)
+        expect(subject[:MaximumSize]).to eq(maximum_size)
+      end
+    end
+
+    shared_examples 'uses local storage' do
+      it_behaves_like 'returns the maximum size given' do
+        it "returns temporary path" do
+          is_expected.to have_key(:TempPath)
 
-        expect(subject[:TempPath]).to start_with(uploader_class.root)
-        expect(subject[:TempPath]).to include(described_class::TMP_UPLOAD_PATH)
+          expect(subject[:TempPath]).to start_with(uploader_class.root)
+          expect(subject[:TempPath]).to include(described_class::TMP_UPLOAD_PATH)
+        end
       end
     end
 
     shared_examples 'uses remote storage' do
-      it "returns remote store" do
-        is_expected.to have_key(:RemoteObject)
-
-        expect(subject[:RemoteObject]).to have_key(:ID)
-        expect(subject[:RemoteObject]).to include(Timeout: a_kind_of(Integer))
-        expect(subject[:RemoteObject][:Timeout]).to be(ObjectStorage::DirectUpload::TIMEOUT)
-        expect(subject[:RemoteObject]).to have_key(:GetURL)
-        expect(subject[:RemoteObject]).to have_key(:DeleteURL)
-        expect(subject[:RemoteObject]).to have_key(:StoreURL)
-        expect(subject[:RemoteObject][:GetURL]).to include(described_class::TMP_UPLOAD_PATH)
-        expect(subject[:RemoteObject][:DeleteURL]).to include(described_class::TMP_UPLOAD_PATH)
-        expect(subject[:RemoteObject][:StoreURL]).to include(described_class::TMP_UPLOAD_PATH)
+      it_behaves_like 'returns the maximum size given' do
+        it "returns remote store" do
+          is_expected.to have_key(:RemoteObject)
+
+          expect(subject[:RemoteObject]).to have_key(:ID)
+          expect(subject[:RemoteObject]).to include(Timeout: a_kind_of(Integer))
+          expect(subject[:RemoteObject][:Timeout]).to be(ObjectStorage::DirectUpload::TIMEOUT)
+          expect(subject[:RemoteObject]).to have_key(:GetURL)
+          expect(subject[:RemoteObject]).to have_key(:DeleteURL)
+          expect(subject[:RemoteObject]).to have_key(:StoreURL)
+          expect(subject[:RemoteObject][:GetURL]).to include(described_class::TMP_UPLOAD_PATH)
+          expect(subject[:RemoteObject][:DeleteURL]).to include(described_class::TMP_UPLOAD_PATH)
+          expect(subject[:RemoteObject][:StoreURL]).to include(described_class::TMP_UPLOAD_PATH)
+        end
       end
     end