From 94a450acbec0a33f1ad9003e6e9c5545549a3ab9 Mon Sep 17 00:00:00 2001 From: George Claghorn Date: Sun, 16 Jul 2017 19:17:47 -0400 Subject: Splat options --- lib/active_storage/service/s3_service.rb | 18 ++---------------- 1 file changed, 2 insertions(+), 16 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 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 -- cgit v1.2.3