From 32331b19e1da8bdab3c9f6d1666ac2d3108e5042 Mon Sep 17 00:00:00 2001 From: James Baer Date: Thu, 20 Jul 2017 12:29:37 -0400 Subject: Accept S3 upload options (e.g. server_side_encryption) --- lib/active_storage/service/s3_service.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'lib/active_storage') diff --git a/lib/active_storage/service/s3_service.rb b/lib/active_storage/service/s3_service.rb index 5703cfd0ed..efffdec157 100644 --- a/lib/active_storage/service/s3_service.rb +++ b/lib/active_storage/service/s3_service.rb @@ -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 -- cgit v1.2.3