Merge pull request #11569 from demarches-simplifiees/use_active_storage_client

[Tech] Remove ConnectionPool and use activestorage client instead

Author: mmagn

Gemfile

@@ -24,7 +24,6 @@ gem 'chartkick'
 gem 'chunky_png'
 gem 'clamav-client', require: 'clamav/client'
 gem "concurrent-ruby", "< 1.3.5" # force version to avoid https://github.com/rails/rails/pull/54264, should be removed after rails 7.2.x
-gem 'connection_pool'
 gem 'daemons'
 gem 'deep_cloneable' # Enable deep clone of active record models
 gem 'delayed_cron_job', require: false # Cron jobs

Gemfile.lock

@@ -996,7 +996,6 @@ DEPENDENCIES
   chunky_png
   clamav-client
   concurrent-ruby (< 1.3.5)
-  connection_pool
   daemons
   deep_cloneable
   delayed_cron_job

app/jobs/delayed_purge_job.rb

@@ -48,13 +48,11 @@ def delay = Integer(ENV['PURGE_LATER_DELAY_IN_DAY']).day.from_now.to_i
 
   # head object to update metadata makes pj unreadable. copy with extra headers
   def soft_delete
-    OpenStackStorage.with_client do |client|
-      excon_response = client.copy_object(container, key, container, key, { "Content-Type" => blob.content_type, 'X-Delete-At' => delay.to_s })
-      if excon_response.status != 201
-        Sentry.capture_message("Can't expire blob", extra: { key:, headers: })
-      else
-        service.delete_prefixed("variants/#{key}/") if blob.image?
-      end
+    excon_response = client.copy_object(container, key, container, key, { "Content-Type" => blob.content_type, 'X-Delete-At' => delay.to_s })
+    if excon_response.status != 201
+      Sentry.capture_message("Can't expire blob", extra: { key:, headers: })
+    else
+      service.delete_prefixed("variants/#{key}/") if blob.image?
     end
   end
 
@@ -63,4 +61,8 @@ def soft_delete_enabled?
   rescue
     false
   end
+
+  def client
+    ActiveStorage::Blob.service.send(:client)
+  end
 end

app/lib/active_storage/downloadable_file.rb

@@ -25,9 +25,7 @@ def self.cleanup_list_from_dossier(files)
       else
         service = file.blob.service
         begin
-          OpenStackStorage.with_client do |client|
-            client.head_object(service.container, file.blob.key)
-          end
+          client.head_object(service.container, file.blob.key)
           true
         rescue Fog::OpenStack::Storage::NotFound
           false
@@ -38,6 +36,10 @@ def self.cleanup_list_from_dossier(files)
 
   private
 
+  def self.client
+    ActiveStorage::Blob.service.send(:client)
+  end
+
   def self.bill_and_path(bill)
     [
       bill,

config/initializers/openstack_connection_pool.rb

@@ -18,10 +18,11 @@
 
   it 'emit request instead of destroying it' do
     container = "bucket"
+    client = double("client")
     double_service = double(container:)
     allow_any_instance_of(ActiveStorage::Blob).to receive(:service).and_return(double_service)
 
-    allow(OpenStackStorage).to receive(:with_client).and_yield(client)
+    allow_any_instance_of(DelayedPurgeJob).to receive(:client).and_return(client)
 
     expect(client).to receive(:copy_object)
       .with(container, blob.key, container, blob.key, { 'X-Delete-At' => anything, "Content-Type" => blob.content_type })

spec/jobs/delayed_purge_job_spec.rb

@@ -44,7 +44,7 @@
         require 'fog/openstack'
         Rails.application.config.active_storage.service = :openstack
 
-        allow(OpenStackStorage).to receive(:with_client).and_yield(active_storage_client)
+        allow(ActiveStorage::DownloadableFile).to receive(:client).and_return(active_storage_client)
       end
       after { Rails.application.config.active_storage.service = :test }