Skip to content

Fix for missing variable bug #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 23, 2016
+5 −5
Merged

Fix for missing variable bug #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ gemspec

gem 'fluent-plugin-elasticsearch', '~> 1.0', require: false
gem 'aws-sdk', '~> 2', require: false
gem 'faraday_middleware-aws-signers-v4', '>= 0.1.0, < 0.1.2', require: false
gem 'faraday_middleware-aws-signers-v4', '>= 0.1.0', '< 0.1.2', require: false
8 changes: 4 additions & 4 deletions lib/fluent/plugin/out_aws-elasticsearch-service.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class AwsElasticsearchServiceOutput < ElasticsearchOutput
#
def get_connection_options
raise "`endpoint` require." if @endpoint.empty?

hosts =
begin
@endpoint.map do |ep|
Expand All @@ -40,11 +40,11 @@ def get_connection_options
:credentials => credentials(ep),
:region => ep[:region]
}

host
end
end

{
hosts: hosts
}
Expand All @@ -60,7 +60,7 @@ def credentials(opts)
calback = lambda do
credentials = nil
unless opts[:access_key_id].empty? or opts[:secret_access_key].empty?
credentials = Aws::Credentials.new access_key, secret_key
credentials = Aws::Credentials.new opts[:access_key_id], opts[:secret_access_key]
else
if opts[:assume_role_arn].nil?
credentials = Aws::SharedCredentials.new({
Expand Down