Merge branch 'sh-add-http-status-lfs-push-service' into 'master'

Add HTTP status to LFS push client error messages

See merge request !77334

lib/gitlab/lfs/client.rb

@@ -36,7 +36,7 @@ def batch!(operation, objects)
           headers: build_request_headers
         )
 
-        raise BatchSubmitError unless rsp.success?
+        raise BatchSubmitError.new(http_response: rsp) unless rsp.success?
 
         # HTTParty provides rsp.parsed_response, but it only kicks in for the
         # application/json content type in the response, which we can't rely on
@@ -65,7 +65,7 @@ def upload!(object, upload_action, authenticated:)
 
         rsp = Gitlab::HTTP.put(upload_action['href'], params)
 
-        raise ObjectUploadError unless rsp.success?
+        raise ObjectUploadError.new(http_response: rsp) unless rsp.success?
       ensure
         file&.close
       end
@@ -81,7 +81,7 @@ def verify!(object, verify_action, authenticated:)
 
         rsp = Gitlab::HTTP.post(verify_action['href'], params)
 
-        raise ObjectVerifyError unless rsp.success?
+        raise ObjectVerifyError.new(http_response: rsp) unless rsp.success?
       end
 
       private
@@ -105,9 +105,21 @@ def basic_auth
         { username: credentials[:user], password: credentials[:password] }
       end
 
-      class BatchSubmitError < StandardError
+      class HttpError < StandardError
+        def initialize(http_response:)
+          super
+
+          @http_response = http_response
+        end
+
+        def http_error
+          "HTTP status #{@http_response.code}"
+        end
+      end
+
+      class BatchSubmitError < HttpError
         def message
-          "Failed to submit batch"
+          "Failed to submit batch: #{http_error}"
         end
       end
 
@@ -122,15 +134,15 @@ def message
         end
       end
 
-      class ObjectUploadError < StandardError
+      class ObjectUploadError < HttpError
         def message
-          "Failed to upload object"
+          "Failed to upload object: #{http_error}"
         end
       end
 
-      class ObjectVerifyError < StandardError
+      class ObjectVerifyError < HttpError
         def message
-          "Failed to verify object"
+          "Failed to verify object: #{http_error}"
         end
       end
     end

spec/lib/gitlab/lfs/client_spec.rb

@@ -159,7 +159,7 @@ def stub_batch(objects:, headers:, operation: 'upload', transfer: 'basic')
       it 'raises an error' do
         stub_upload(object: object, headers: upload_action['header']).to_return(status: 400)
 
-        expect { lfs_client.upload!(object, upload_action, authenticated: true) }.to raise_error(/Failed/)
+        expect { lfs_client.upload!(object, upload_action, authenticated: true) }.to raise_error(/Failed to upload object: HTTP status 400/)
       end
     end
 
@@ -167,7 +167,7 @@ def stub_batch(objects:, headers:, operation: 'upload', transfer: 'basic')
       it 'raises an error' do
         stub_upload(object: object, headers: upload_action['header']).to_return(status: 500)
 
-        expect { lfs_client.upload!(object, upload_action, authenticated: true) }.to raise_error(/Failed/)
+        expect { lfs_client.upload!(object, upload_action, authenticated: true) }.to raise_error(/Failed to upload object: HTTP status 500/)
       end
     end
 
@@ -226,7 +226,7 @@ def stub_upload(object:, headers:)
       it 'raises an error' do
         stub_verify(object: object, headers: verify_action['header']).to_return(status: 400)
 
-        expect { lfs_client.verify!(object, verify_action, authenticated: true) }.to raise_error(/Failed/)
+        expect { lfs_client.verify!(object, verify_action, authenticated: true) }.to raise_error(/Failed to verify object: HTTP status 400/)
       end
     end
 
@@ -234,7 +234,7 @@ def stub_upload(object:, headers:)
       it 'raises an error' do
         stub_verify(object: object, headers: verify_action['header']).to_return(status: 500)
 
-        expect { lfs_client.verify!(object, verify_action, authenticated: true) }.to raise_error(/Failed/)
+        expect { lfs_client.verify!(object, verify_action, authenticated: true) }.to raise_error(/Failed to verify object: HTTP status 500/)
       end
     end
 

[Ghost User]

The package-and-qa job from pipeline https://gitlab.com/gitlab-org/gitlab/-/pipelines/438986686 triggered https://gitlab.com/gitlab-org/build/omnibus-gitlab-mirror/-/pipelines/438990101 downstream.

[Ghost User]

The qa-test job from pipeline https://gitlab.com/gitlab-org/build/omnibus-gitlab-mirror/-/pipelines/438990101 triggered https://gitlab.com/gitlab-org/gitlab-qa-mirror/-/pipelines/439009588 downstream.

[Ghost User]

The gitlab-qa downstream pipeline failed! .