github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-24 22:57:16 -04:00
Code Issues Projects Releases Packages Wiki Activity

Change credentials default to [], use empty array

Browse source 
closes /elasticsearch/logstash/#1619
This commit is contained in:
John Pariseau 2014-08-25 10:36:14 -04:00 • committed by Suyog Rao
parent 73e52b2465
commit c327896b62
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/logstash/inputs/s3.rb
View file

@ -21,8 +21,8 @@ class LogStash::Inputs::S3 < LogStash::Inputs::Base
# Credentials can be specified:
# - As an ["id","secret"] array
# - As a path to a file containing AWS_ACCESS_KEY_ID=... and AWS_SECRET_ACCESS_KEY=...
# - In the environment (variables AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY)
config :credentials, :validate => :array, :default => nil
# - In the environment if not set (variables AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY)
config :credentials, :validate => :array, :default => []
# The name of the S3 bucket.
config :bucket, :validate => :string, :required => true
@ -72,7 +72,10 @@ class LogStash::Inputs::S3 < LogStash::Inputs::Base
@access_key_id = ENV['AWS_ACCESS_KEY_ID']
@secret_access_key = ENV['AWS_SECRET_ACCESS_KEY']
elsif @credentials.is_a? Array
if @credentials.length ==1
if @credentials.length == 0
@access_key_id = ENV['AWS_ACCESS_KEY_ID']
@secret_access_key = ENV['AWS_SECRET_ACCESS_KEY']
elsif @credentials.length == 1
File.open(@credentials[0]) { |f| f.each do |line|
unless (/^\#/.match(line))
if(/\s*=\s*/.match(line))