Merge pull request #13485 from demarche-numerique/fix_openstack_bulk_delete_patch

Tech: corrige la correction (!) de fog delete_mutliple_object

Author: LeSim

config/initializers/active_storage.rb

@@ -161,10 +161,16 @@ def publicize(url)
 # same escaping rules, and it keeps the `container/object` slash literal (unlike
 # `ERB::Util.url_encode`, which would encode it and break the path).
 #
+# We PREPEND a module rather than reopen the class: fog requires the original request
+# file lazily, on the first `Fog::OpenStack::Storage.new` (setup_requirements ->
+# require_requests_and_mock), which happens AFTER this initializer. A class reopen
+# would then be redefined (clobbered) by that require; a prepended module stays ahead
+# of Real in the ancestor chain and wins whatever the load order.
+#
 # https://github.com/fog/fog-openstack/blob/v1.1.5/lib/fog/openstack/storage/requests/delete_multiple_objects.rb
 require 'fog/openstack'
 
-class Fog::OpenStack::Storage::Real
+module OpenStackBulkDeletePatch
   def delete_multiple_objects(container, object_names, options = {})
     body = object_names.map do |name|
       object_name = container ? "#{container}/#{name}" : name
@@ -182,3 +188,5 @@ def delete_multiple_objects(container, object_names, options = {})
     response
   end
 end
+
+Fog::OpenStack::Storage::Real.prepend(OpenStackBulkDeletePatch)

spec/initializers/active_storage_spec.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require "rails_helper"
+
+RSpec.describe 'delete_multiple_objects bulk-delete patch' do
+  # fog requires its original delete_multiple_objects (with the Ruby-3.0-removed
+  # URI.encode) lazily, on the first client instantiation — after our initializer.
+  # A prepended module stays ahead of Real in the ancestor chain, so it wins whatever
+  # the load order; a plain class reopen would be clobbered (owner back to Real).
+  it 'keeps the prepended patch ahead of the fog original' do
+    expect(Fog::OpenStack::Storage::Real.instance_method(:delete_multiple_objects).owner)
+      .to eq(OpenStackBulkDeletePatch)
+  end
+end