fixes #3180

2017-06-27 15:12:12 -07:00
parent 610e2bdedd
commit 4c4ef5cc5b
3 changed files with 15 additions and 5 deletions
--- a/app/logical/s3_backup_service.rb
+++ b/app/logical/s3_backup_service.rb
@@ -12,6 +12,11 @@ class S3BackupService < BackupService
    upload_to_s3(key, file_path)
  end

+  def delete(file_path, type: nil)
+    key = s3_key(file_path, type)
+    delete_from_s3(key)
+  end
+
 protected
  def s3_key(file_path, type)
    case type
@@ -26,6 +31,12 @@ protected
    end
  end

+  def delete_from_s3(key)
+    client.delete_object(bucket: bucket, key: key)
+  rescue Aws::S3::Errors::NoSuchKey
+    # ignore
+  end
+
  def upload_to_s3(key, file_path)
    File.open(file_path, "rb") do |body|
      base64_md5 = Digest::MD5.base64digest(File.read(file_path))