A platform for community discussion. Free, open, simple.
FIX: Raise error when S3 asset deletion fails (#38626)
ducksc207b7960ecb
diff --git a/lib/s3_helper.rb b/lib/s3_helper.rbindex 2bf36fe3384..7eee81e03d8 100644--- a/lib/s3_helper.rb+++ b/lib/s3_helper.rb@@ -110,7 +110,18 @@ class S3Helperenddef delete_objects(keys)- s3_bucket.delete_objects({ delete: { objects: keys.map { |k| { key: k } }, quiet: true } })+ return if keys.empty?++ response =+ s3_bucket.delete_objects({ delete: { objects: keys.map { |k| { key: k } }, quiet: false } })++ if response.errors.any?+ error_messages =+ response.errors.map { |error| "#{error.key}: #{error.code} - #{error.message}" }.join(", ")+ raise "Failed to delete #{response.errors.size} S3 objects: #{error_messages}"+ end++ responseenddef copy(source, destination, options: {})diff --git a/spec/lib/s3_helper_spec.rb b/spec/lib/s3_helper_spec.rbindex 6672e3e0f0d..dbe90573856 100644--- a/spec/lib/s3_helper_spec.rb+++ b/spec/lib/s3_helper_spec.rb@@ -247,6 +247,47 @@ RSpec.describe "S3Helper" do# If the request were invalid, this spec would raise an errors3_helper.delete_objects(%w[object/one.txt object/two.txt])end++ it "does nothing when given empty array" do+ expect { s3_helper.delete_objects([]) }.not_to raise_error+ end++ it "raises error when deletions fail" do+ client.stub_responses(+ :delete_objects,+ {+ deleted: [{ key: "object/one.txt" }],+ errors: [{ key: "object/two.txt", code: "AccessDenied", message: "Access Denied" }],+ },+ )++ expect { s3_helper.delete_objects(%w[object/one.txt object/two.txt]) }.to raise_error(+ RuntimeError,+ %r{Failed to delete 1 S3 objects: object/two\.txt: AccessDenied - Access Denied},+ )+ end++ it "includes all errors in exception message" do+ client.stub_responses(+ :delete_objects,+ {+ deleted: [],+ errors: [+ { key: "object/one.txt", code: "AccessDenied", message: "Access Denied" },+ {+ key: "object/two.txt",+ code: "NoSuchKey",+ message: "The specified key does not exist",+ },+ ],+ },+ )++ expect { s3_helper.delete_objects(%w[object/one.txt object/two.txt]) }.to raise_error(+ RuntimeError,+ /Failed to delete 2 S3 objects/,+ )+ endenddescribe "#presigned_url" do