kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Accept S3 upload options (e.g. server_side_encryption)

Browse source
This commit is contained in:
James Baer 2017-07-20 12:29:37 -04:00 committed by George Claghorn
parent d0d4e33b86
commit 32331b19e1
2 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/active_storage/service/s3_service.rb
View file

@ -2,17 +2,19 @@ require "aws-sdk"
require "active_support/core_ext/numeric/bytes"
class ActiveStorage::Service::S3Service < ActiveStorage::Service
attr_reader :client, :bucket
attr_reader :client, :bucket, :upload_options
def initialize(access_key_id:, secret_access_key:, region:, bucket:, **options)
def initialize(access_key_id:, secret_access_key:, region:, bucket:, upload: {}, **options)
@client = Aws::S3::Resource.new(access_key_id: access_key_id, secret_access_key: secret_access_key, region: region, **options)
@bucket = @client.bucket(bucket)
@upload_options = upload
end
def upload(key, io, checksum: nil)
instrument :upload, key, checksum: checksum do
begin
object_for(key).put(body: io, content_md5: checksum)
object_for(key).put(upload_options.merge(body: io, content_md5: checksum))
rescue Aws::S3::Errors::BadDigest
raise ActiveStorage::IntegrityError
end

18
test/service/s3_service_test.rb
View file

@ -30,6 +30,24 @@ if SERVICE_CONFIGURATIONS[:s3]
assert_match /#{SERVICE_CONFIGURATIONS[:s3][:bucket]}\.s3.(\S+)?amazonaws.com.*response-content-disposition=inline.*avatar\.png/,
@service.url(FIXTURE_KEY, expires_in: 5.minutes, disposition: :inline, filename: "avatar.png")
end
test "uploading with server-side encryption" do
config = {}
config[:s3] = SERVICE_CONFIGURATIONS[:s3].merge \
upload: { server_side_encryption: "AES256" }
sse_service = ActiveStorage::Service.configure(:s3, config)
begin
key = SecureRandom.base58(24)
data = "Something else entirely!"
sse_service.upload(key, StringIO.new(data), checksum: Digest::MD5.base64digest(data))
assert_equal "AES256", sse_service.bucket.object(key).server_side_encryption
ensure
sse_service.delete key
end
end
end
else
puts "Skipping S3 Service tests because no S3 configuration was supplied"