Added delete recording functionality to s3 (#1258)

Author: farhatahmad

app/controllers/bigbluebutton_api_controller.rb

@@ -498,15 +498,30 @@ def delete_recordings
     query_params = { record_id: params[:recordID].split(',') }
     query_params[:metadata] = { key: 'tenant-id', value: @tenant.id } if @tenant.present? # filter based on tenant
 
-    query = Recording.includes(:metadata).where(query_params).load
+    query = Recording.includes(:metadata, :playback_formats).where(query_params).load
     raise BBBError.new('notFound', 'We could not find recordings') if query.none?
 
+    s3_client = Aws::S3::Client.new if ENV['S3_RECORDING']
+
     query.each do |rec|
       # Start transaction + lock record
       rec.with_lock do
         logger.debug("Deleting recording: #{rec.record_id}")
-        # TODO: check the unpublished dir when it is implemented
-        FileUtils.rm_r(Dir.glob(File.join(Rails.configuration.x.recording_publish_dir, '/*/', rec.record_id)))
+        if ENV['S3_RECORDING']
+          bucket = ENV.fetch('S3_BUCKET_NAME')
+          state = rec.published ? 'published' : 'unpublished'
+
+          rec.playback_formats.each do |playback_format|
+            prefix = "#{state}/#{playback_format.format}/#{rec.record_id}/"
+            objects = s3_client.list_objects_v2(bucket: bucket, prefix: prefix).contents
+            next if objects.empty?
+
+            s3_client.delete_objects(bucket: bucket, delete: { objects: objects.map { |o| { key: o.key } } })
+          end
+        else
+          # TODO: check the unpublished dir when it is implemented
+          FileUtils.rm_r(Dir.glob(File.join(Rails.configuration.x.recording_publish_dir, '/*/', rec.record_id)))
+        end
         rec.mark_delete!
       rescue StandardError => e
         logger.warn("Error #{e} deleting recording #{rec.record_id}")

spec/requests/bigbluebutton_api_controller_spec.rb

@@ -2536,6 +2536,40 @@
       end
     end
 
+    context 'with S3 recording storage enabled' do
+      let(:s3_client) { Aws::S3::Client.new(stub_responses: true, region: 'us-east-1') }
+
+      before do
+        ENV['S3_RECORDING'] = 'true'
+        ENV['S3_BUCKET_NAME'] = 'test-bucket'
+        s3_client.stub_responses(:list_objects_v2, { contents: [{ key: 'published/presentation/test123/metadata.xml' }] })
+        allow(Aws::S3::Client).to receive(:new).and_return(s3_client)
+      end
+
+      after do
+        ENV.delete('S3_RECORDING')
+        ENV.delete('S3_BUCKET_NAME')
+      end
+
+      it 'deletes the recording objects from S3 and marks the recording deleted' do
+        r = create(:recording, record_id: 'test123')
+        create(:playback_format, recording: r, format: 'presentation')
+        params = encode_bbb_params('deleteRecordings', "recordID=#{r.record_id}")
+
+        expect(FileUtils).not_to receive(:rm_r)
+
+        get bigbluebutton_api_delete_recordings_url, params: params
+
+        expect(response).to be_successful
+        response_xml = Nokogiri::XML(response.body)
+        expect(response_xml.at_xpath('/response/returncode').text).to eq('SUCCESS')
+
+        delete_requests = s3_client.api_requests.select { |req| req[:operation_name] == :delete_objects }
+        expect(delete_requests).not_to be_empty
+        expect(r.reload.state).to eq('deleted')
+      end
+    end
+
     context 'POST request' do
       it 'is not supported' do
         r = create(:recording)