lib/logstash/outputs/s3.rb in logstash-output-s3-4.0.1 vs lib/logstash/outputs/s3.rb in logstash-output-s3-4.0.2
- old
+ new
@@ -251,11 +251,11 @@
@uploader.stop # wait until all the current upload are complete
@crash_uploader.stop if @restore # we might have still work to do for recovery so wait until we are done
end
def full_options
- options = { :credentials => credentials }
+ options = Hash.new
options[:s3_signature_version] = @signature_version if @signature_version
options.merge(aws_options_hash)
end
def normalize_key(prefix_key)
@@ -279,10 +279,10 @@
def stop_periodic_check
@periodic_check.shutdown
end
def bucket_resource
- Aws::S3::Bucket.new(@bucket, { :credentials => credentials }.merge(aws_options_hash))
+ Aws::S3::Bucket.new(@bucket, full_options)
end
def aws_service_endpoint(region)
{ :s3_endpoint => region == 'us-east-1' ? 's3.amazonaws.com' : "s3-#{region}.amazonaws.com"}
end