Skip to content

migrate to aws-sdk 3 #45

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 3 commits into from
Apr 29, 2018
Merged

migrate to aws-sdk 3 #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4b07bb1
move to aws-sdk3
avikam-pagaya Feb 18, 2018
c9df095
aligned with td-agent 3.1.1
avikam-pagaya Feb 18, 2018
712debc
fix api changes for aws sdk v3
lobeck Apr 27, 2018
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
6 changes: 3 additions & 3 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ source 'https://rubygems.org'
# Specify your gem's dependencies in fluent-plugin-aws-elasticsearch-service.gemspec
gemspec

gem 'fluent-plugin-elasticsearch', "~> 2.0.0.rc.1", require: false
gem 'aws-sdk', '~> 2', require: false
gem 'faraday_middleware-aws-signers-v4', '>= 0.1.0', '< 0.1.2', require: false
gem 'fluent-plugin-elasticsearch', "~> 2.4.0", require: false
gem 'aws-sdk', '~> 3', require: false
gem 'faraday_middleware-aws-sigv4', '>= 0.2.4', '< 0.3.0', require: false
6 changes: 3 additions & 3 deletions fluent-plugin-aws-elasticsearch-service.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
spec.add_development_dependency "rspec", "~> 3.0"
spec.add_development_dependency "test-unit", "~> 3.0"
spec.add_runtime_dependency "fluentd", "~> 0"
spec.add_runtime_dependency "fluent-plugin-elasticsearch", "~> 2.0.0.rc.1"
spec.add_runtime_dependency "aws-sdk", "~> 2"
spec.add_runtime_dependency "faraday_middleware-aws-signers-v4", ">= 0.1.0", "< 0.1.2"
spec.add_runtime_dependency "fluent-plugin-elasticsearch", "~> 2.4.0"
spec.add_runtime_dependency "aws-sdk", "~> 3"
spec.add_runtime_dependency "faraday_middleware-aws-sigv4", ">= 0.2.4", "< 0.3.0"
end
14 changes: 7 additions & 7 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 @@ -3,7 +3,7 @@
require 'rubygems'
require 'fluent/plugin/out_elasticsearch'
require 'aws-sdk'
require 'faraday_middleware/aws_signers_v4'
require 'faraday_middleware/aws_sigv4'


module Fluent::Plugin
Expand Down Expand Up @@ -157,7 +157,7 @@ def __build_connections
def __aws_elasticsearch_service_setting(host, &block)
lambda do |faraday|
if host[:aws_elasticsearch_service]
faraday.request :aws_signers_v4,
faraday.request :aws_sigv4,
credentials: host[:aws_elasticsearch_service][:credentials],
service_name: 'es',
region: host[:aws_elasticsearch_service][:region]
Expand All @@ -178,7 +178,7 @@ def __aws_elasticsearch_service_setting(host, &block)
#
# monkey patch
#
class FaradayMiddleware::AwsSignersV4
class FaradayMiddleware::AwsSigV4

alias :initialize_origin_from_aws_elasticsearch_service_output :initialize

Expand All @@ -192,14 +192,14 @@ def initialize(app, options = nil)
begin
if credentials.is_a?(Proc)
signer = lambda do
Aws::Signers::V4.new(credentials.call, service_name, region)
Aws::Sigv4::Signer.new(service: service_name, region: region, credentials: credentials.call)
end
def signer.sign(req)
self.call.sign(req)
def signer.sign_request(req)
self.call.sign_request(req)
end
signer
else
Aws::Signers::V4.new(credentials, service_name, region)
Aws::Sigv4::Signer.new(service: service_name, region: region, credentials: credentials)
end
end

Expand Down