Merge branch 'sh-fix-azure-content-disposition' into 'master'

Fix Content-Disposition header not working in Azure Blob storage

See merge request gitlab-org/gitlab!70874

Gemfile

@@ -129,7 +129,7 @@ gem 'fog-local', '~> 0.6'
 gem 'fog-openstack', '~> 1.0'
 gem 'fog-rackspace', '~> 0.1.1'
 gem 'fog-aliyun', '~> 0.3'
-gem 'gitlab-fog-azure-rm', '~> 1.1.1', require: false
+gem 'gitlab-fog-azure-rm', '~> 1.2.0', require: false
 
 # for Google storage
 gem 'google-api-client', '~> 0.33'

Gemfile.lock

@@ -467,7 +467,7 @@ GEM
       activesupport (>= 3.0)
       request_store (>= 1.0)
       scientist (~> 1.6, >= 1.6.0)
-    gitlab-fog-azure-rm (1.1.1)
+    gitlab-fog-azure-rm (1.2.0)
       azure-storage-blob (~> 2.0)
       azure-storage-common (~> 2.0)
       fog-core (= 2.1.0)
@@ -1466,7 +1466,7 @@ DEPENDENCIES
   gitlab-chronic (~> 0.10.5)
   gitlab-dangerfiles (~> 2.3.0)
   gitlab-experiment (~> 0.6.4)
-  gitlab-fog-azure-rm (~> 1.1.1)
+  gitlab-fog-azure-rm (~> 1.2.0)
   gitlab-labkit (~> 0.21.1)
   gitlab-license (~> 2.0)
   gitlab-mail_room (~> 0.0.9)

config/initializers/carrierwave_patch.rb

@@ -49,14 +49,8 @@ module CarrierWave
             local_file = local_directory.files.new(key: path)
             expire_at = options[:expire_at] || ::Fog::Time.now + @uploader.fog_authenticated_url_expiration
             case @uploader.fog_credentials[:provider]
-            when 'AWS', 'Google'
-              # Older versions of fog-google do not support options as a parameter
-              if url_options_supported?(local_file)
-                local_file.url(expire_at, options)
-              else
-                warn "Options hash not supported in #{local_file.class}. You may need to upgrade your Fog provider."
-                local_file.url(expire_at)
-              end
+            when 'AWS', 'Google', 'AzureRM'
+              local_file.url(expire_at, options)
             when 'Rackspace'
               connection.get_object_https_url(@uploader.fog_directory, path, expire_at, options)
             when 'OpenStack'

spec/initializers/carrierwave_patch_spec.rb

@@ -81,19 +81,32 @@ RSpec.describe 'CarrierWave::Storage::Fog::File' do
     end
 
     describe '#authenticated_url' do
+      let(:expire_at) { 24.hours.from_now }
+      let(:options) { { expire_at: expire_at } }
+
       it 'has an authenticated URL' do
-        expect(subject.authenticated_url).to eq("https://sa.blob.core.windows.net/test_container/test_blob?token")
+        expect(subject.authenticated_url(options)).to eq("https://sa.blob.core.windows.net/test_container/test_blob?token")
       end
 
       context 'with custom expire_at' do
         it 'properly sets expires param' do
-          expire_at = 24.hours.from_now
+          expect_next_instance_of(Fog::Storage::AzureRM::File) do |file|
+            expect(file).to receive(:url).with(expire_at, options).and_call_original
+          end
+
+          expect(subject.authenticated_url(options)).to eq("https://sa.blob.core.windows.net/test_container/test_blob?token")
+        end
+      end
+
+      context 'with content_disposition option' do
+        let(:options) { { expire_at: expire_at, content_disposition: 'attachment' } }
 
+        it 'passes options' do
           expect_next_instance_of(Fog::Storage::AzureRM::File) do |file|
-            expect(file).to receive(:url).with(expire_at).and_call_original
+            expect(file).to receive(:url).with(expire_at, options).and_call_original
           end
 
-          expect(subject.authenticated_url(expire_at: expire_at)).to eq("https://sa.blob.core.windows.net/test_container/test_blob?token")
+          expect(subject.authenticated_url(options)).to eq("https://sa.blob.core.windows.net/test_container/test_blob?token")
         end
       end
     end