me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Storage: add :azure to remaining callers (#26080)

Browse source
This commit is contained in:
Misty De Méo 2023-07-27 07:13:45 -07:00 committed by GitHub
parent e76a4d54e3
commit a4cdbc52b1
6 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/backups_controller.rb
View file

@ -10,7 +10,7 @@ class BackupsController < ApplicationController
def download def download
case Paperclip::Attachment.default_options[:storage] case Paperclip::Attachment.default_options[:storage]
when :s3 when :s3, :azure
redirect_to @backup.dump.expiring_url(10), allow_other_host: true redirect_to @backup.dump.expiring_url(10), allow_other_host: true
when :fog when :fog
if Paperclip::Attachment.default_options.dig(:fog_credentials, :openstack_temp_url_key).present? if Paperclip::Attachment.default_options.dig(:fog_credentials, :openstack_temp_url_key).present?

3
app/lib/attachment_batch.rb
View file

@ -76,6 +76,9 @@ class AttachmentBatch
when :fog when :fog
logger.debug { "Deleting #{attachment.path(style)}" } logger.debug { "Deleting #{attachment.path(style)}" }
attachment.directory.files.new(key: attachment.path(style)).destroy attachment.directory.files.new(key: attachment.path(style)).destroy
when :azure
logger.debug { "Deleting #{attachment.path(style)}" }
attachment.destroy
end end
end end
end end

2
app/services/suspend_account_service.rb
View file

@ -85,7 +85,7 @@ class SuspendAccountService < BaseService
rescue Aws::S3::Errors::NotImplemented => e rescue Aws::S3::Errors::NotImplemented => e
Rails.logger.error "Error trying to change ACL on #{attachment.s3_object(style).key}: #{e.message}" Rails.logger.error "Error trying to change ACL on #{attachment.s3_object(style).key}: #{e.message}"
end end
when :fog when :fog, :azure
# Not supported # Not supported
when :filesystem when :filesystem
begin begin

2
app/services/unsuspend_account_service.rb
View file

@ -81,7 +81,7 @@ class UnsuspendAccountService < BaseService
rescue Aws::S3::Errors::NotImplemented => e rescue Aws::S3::Errors::NotImplemented => e
Rails.logger.error "Error trying to change ACL on #{attachment.s3_object(style).key}: #{e.message}" Rails.logger.error "Error trying to change ACL on #{attachment.s3_object(style).key}: #{e.message}"
end end
when :fog when :fog, :azure
# Not supported # Not supported
when :filesystem when :filesystem
begin begin

3
lib/mastodon/cli/media.rb
View file

@ -158,6 +158,9 @@ module Mastodon::CLI
when :fog when :fog
say('The fog storage driver is not supported for this operation at this time', :red) say('The fog storage driver is not supported for this operation at this time', :red)
exit(1) exit(1)
when :azure
say('The azure storage driver is not supported for this operation at this time', :red)
exit(1)
when :filesystem when :filesystem
require 'find' require 'find'

7
lib/mastodon/cli/upgrade.rb
View file

@ -46,6 +46,8 @@ module Mastodon::CLI
upgrade_storage_s3(progress, attachment, style) upgrade_storage_s3(progress, attachment, style)
when :fog when :fog
upgrade_storage_fog(progress, attachment, style) upgrade_storage_fog(progress, attachment, style)
when :azure
upgrade_storage_azure(progress, attachment, style)
when :filesystem when :filesystem
upgrade_storage_filesystem(progress, attachment, style) upgrade_storage_filesystem(progress, attachment, style)
end end
@ -105,6 +107,11 @@ module Mastodon::CLI
exit(1) exit(1)
end end
def upgrade_storage_azure(_progress, _attachment, _style)
say('The azure storage driver is not supported for this operation at this time', :red)
exit(1)
end
def upgrade_storage_filesystem(progress, attachment, style) def upgrade_storage_filesystem(progress, attachment, style)
previous_storage_schema_version = attachment.storage_schema_version previous_storage_schema_version = attachment.storage_schema_version
previous_path = attachment.path(style) previous_path = attachment.path(style)