github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-11 05:53:49 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: Add option to pass s3 client in param

Browse Source
This commit is contained in:
Vinoth Kannan
2019-01-04 12:16:09 +05:30
parent 75dbb98cca
commit 940a61037c
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/s3_helper.rb
View File

@ -7,6 +7,7 @@ class S3Helper
attr_reader :s3_bucket_name, :s3_bucket_folder_path attr_reader :s3_bucket_name, :s3_bucket_folder_path
def initialize(s3_bucket_name, tombstone_prefix = '', options = {}) def initialize(s3_bucket_name, tombstone_prefix = '', options = {})
@s3_client = options.delete(:client)
@s3_options = default_s3_options.merge(options) @s3_options = default_s3_options.merge(options)
@s3_bucket_name, @s3_bucket_folder_path = begin @s3_bucket_name, @s3_bucket_folder_path = begin
@ -224,7 +225,7 @@ class S3Helper
end end
def s3_client def s3_client
Aws::S3::Client.new(@s3_options) @s3_client ||= Aws::S3::Client.new(@s3_options)
end end
def s3_resource def s3_resource