diff options
| author | George Claghorn <george@basecamp.com> | 2017-07-16 19:17:47 -0400 |
|---|---|---|
| committer | George Claghorn <george@basecamp.com> | 2017-07-16 19:17:47 -0400 |
| commit | 94a450acbec0a33f1ad9003e6e9c5545549a3ab9 (patch) | |
| tree | 451e8e31edcb066e220e5f2b6aa496c4afa8265a /lib/active_storage | |
| parent | 2f15938587a6a3fa1ce6745511aeb81d833e51c2 (diff) | |
| download | rails-94a450acbec0a33f1ad9003e6e9c5545549a3ab9.tar.gz rails-94a450acbec0a33f1ad9003e6e9c5545549a3ab9.tar.bz2 rails-94a450acbec0a33f1ad9003e6e9c5545549a3ab9.zip | |
Splat options
Diffstat (limited to 'lib/active_storage')
| -rw-r--r-- | lib/active_storage/service/s3_service.rb | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/lib/active_storage/service/s3_service.rb b/lib/active_storage/service/s3_service.rb index ba8251b77e..5703cfd0ed 100644 --- a/lib/active_storage/service/s3_service.rb +++ b/lib/active_storage/service/s3_service.rb @@ -4,22 +4,8 @@ require "active_support/core_ext/numeric/bytes" class ActiveStorage::Service::S3Service < ActiveStorage::Service attr_reader :client, :bucket - def initialize(access_key_id:, secret_access_key:, region:, bucket:, endpoint: nil) - @client = if endpoint - Aws::S3::Resource.new( - access_key_id: access_key_id, - secret_access_key: secret_access_key, - region: region, - endpoint: endpoint - ) - else - Aws::S3::Resource.new( - access_key_id: access_key_id, - secret_access_key: secret_access_key, - region: region - ) - end - + def initialize(access_key_id:, secret_access_key:, region:, bucket:, **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) end |