Merge branch 'carrierwave_expire_at' into 'master'

Backport expire_at from carrierwave 2.1.* to patch

See merge request gitlab-org/gitlab!41401

config/initializers/carrierwave_patch.rb

@@ -7,7 +7,9 @@ require "carrierwave/storage/fog"
 #
 # This patch also incorporates
 # https://github.com/carrierwaveuploader/carrierwave/pull/2375 to
-# provide Azure support. This is already in CarrierWave v2.1.x, but
+# provide Azure support
+# and https://github.com/carrierwaveuploader/carrierwave/pull/2397 to
+# support custom expire_at. This is already in CarrierWave v2.1.x, but
 # upgrading this gem is a significant task:
 # https://gitlab.com/gitlab-org/gitlab/-/issues/216067
 module CarrierWave
@@ -28,7 +30,7 @@ module CarrierWave
             # avoid a get by using local references
             local_directory = connection.directories.new(key: @uploader.fog_directory)
             local_file = local_directory.files.new(key: path)
-            expire_at = ::Fog::Time.now + @uploader.fog_authenticated_url_expiration
+            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

spec/initializers/carrierwave_patch_spec.rb

@@ -28,5 +28,17 @@ RSpec.describe 'CarrierWave::Storage::Fog::File' do
         expect(subject.authenticated_url).to eq("https://sa.blob.core.windows.net/test_container/test_blob?token")
       end
     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).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")
+      end
+    end
   end
 end