Merge branch '323920-artifacts-object-storage' into 'master'

Replace Excon with Faraday for requesting object storage

See merge request gitlab-org/gitlab!64192

app/uploaders/object_storage.rb

@@ -283,8 +283,9 @@ module ObjectStorage
         if file_storage?
           IO.copy_stream(path, file)
         else
-          streamer = lambda { |chunk, _, _| file.write(chunk) }
-          Excon.get(url, response_block: streamer)
+          Faraday.get(url) do |req|
+            req.options.on_data = proc { |chunk, _| file.write(chunk) }
+          end
         end
 
         file.seek(0, IO::SEEK_SET)

spec/uploaders/object_storage_spec.rb

@@ -222,7 +222,11 @@ RSpec.describe ObjectStorage do
 
           before do
             stub_artifacts_object_storage
-            stub_request(:get, %r{s3.amazonaws.com/#{uploader.path}}).to_return(status: 200, body: '')
+
+            # We need to check the Host header not including the port because AWS does not accept
+            stub_request(:get, %r{s3.amazonaws.com/#{uploader.path}})
+              .with { |request| !request.headers['Host'].to_s.include?(':443') }
+              .to_return(status: 200, body: '')
           end
 
           it "returns the file" do