Fix error when changing ACL on missing objects during suspension (#15420)

4 years ago · 060d0a1d6b
parent 0b88105e3a
commit 060d0a1d6b
2 changed files with 10 additions and 2 deletions
--- a/app/services/suspend_account_service.rb
+++ b/app/services/suspend_account_service.rb
@ -70,7 +70,11 @@ class SuspendAccountService < BaseService
        styles.each do |style|
          case Paperclip::Attachment.default_options[:storage]
          when :s3
-            attachment.s3_object(style).acl.put(acl: 'private')
+            begin
+              attachment.s3_object(style).acl.put(acl: 'private')
+            rescue Aws::S3::Errors::NoSuchKey
+              Rails.logger.warn "Tried to change acl on non-existent key #{attachment.s3_object(style).key}"
+            end
          when :fog
            # Not supported
          when :filesystem
--- a/app/services/unsuspend_account_service.rb
+++ b/app/services/unsuspend_account_service.rb
@ -61,7 +61,11 @@ class UnsuspendAccountService < BaseService
        styles.each do |style|
          case Paperclip::Attachment.default_options[:storage]
          when :s3
-            attachment.s3_object(style).acl.put(acl: Paperclip::Attachment.default_options[:s3_permissions])
+            begin
+              attachment.s3_object(style).acl.put(acl: Paperclip::Attachment.default_options[:s3_permissions])
+            rescue Aws::S3::Errors::NoSuchKey
+              Rails.logger.warn "Tried to change acl on non-existent key #{attachment.s3_object(style).key}"
+            end
          when :fog
            # Not supported
          when :filesystem