Fix dependency problem on AWS SDK - awslabs#161

simukappu · Jan 19, 2019 · 5e6957b · 5e6957b
1 parent 2d66922
commit 5e6957b
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 42 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,20 +4,11 @@ sudo: false
 
 gemfile:
   - Gemfile
-  - gemfiles/Gemfile.fluentd-0.14.10
-  - gemfiles/Gemfile.td-agent-3.1.1
-  - gemfiles/Gemfile.td-agent-3.2.0
-  - gemfiles/Gemfile.td-agent-3.2.1
   - gemfiles/Gemfile.td-agent-3.3.0
 
-env:
-  - AWS_SDK_VERSION=DEFAULT
-  - AWS_SDK_VERSION=1.3
-
+# Test with supported td-agent versions
+# https://support.treasuredata.com/hc/en-us/articles/360001479187-The-td-agent-ChangeLog
 matrix:
-  exclude:
-    - gemfile: Gemfile
-      env: AWS_SDK_VERSION=1.3
   include:
     - rvm: 2.4.1
       gemfile: gemfiles/Gemfile.fluentd-0.14.10
@@ -29,8 +20,6 @@ matrix:
       gemfile: gemfiles/Gemfile.td-agent-3.2.1
     - rvm: 2.4.5 # https://github.com/treasure-data/omnibus-td-agent/blob/v3.3.0/config/projects/td-agent3.rb#L22
       gemfile: gemfiles/Gemfile.td-agent-3.3.0
-  allow_failures:
-    - env: AWS_SDK_VERSION=1.3
   fast_finish: true
 
 script: bundle exec rake test
diff --git a/Gemfile b/Gemfile
@@ -16,9 +16,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in fluent-plugin-kinesis.gemspec
 gemspec
-
-# Use specified version of aws-sdk-kinesis and aws-sdk-firehose
-unless ENV['AWS_SDK_VERSION'].nil? or ENV['AWS_SDK_VERSION'] == 'DEFAULT'
-  gem "aws-sdk-kinesis", "#{ENV['AWS_SDK_VERSION']}"
-  gem "aws-sdk-firehose", "#{ENV['AWS_SDK_VERSION']}"
-end
diff --git a/fluent-plugin-kinesis.gemspec b/fluent-plugin-kinesis.gemspec
@@ -33,14 +33,24 @@ Gem::Specification.new do |spec|
   spec.add_dependency "fluentd", ">= 0.14.0", "< 2"
 
   # This plugin is sometimes used with s3 plugin, so watch out for conflicts
-  # https://rubygems.org/gems/fluent-plugin-s3
-  spec.add_dependency "aws-sdk-kinesis", "~> 1", "< 1.4"
-  spec.add_dependency "aws-sdk-firehose", "~> 1", "< 1.4"
+  #   https://rubygems.org/gems/fluent-plugin-s3
+  # Exclude v1.5 to avoid aws-sdk dependency problem due to this issue
+  #   https://github.com/aws/aws-sdk-ruby/issues/1872
+  # Exclude aws-sdk-kinesis v1.4 to avoid aws-sdk-core dependency problem with td-agent v3.1.1
+  #   NoMethodError: undefined method `event=' for #<Seahorse::Model::Shapes::ShapeRef:*>
+  #   https://github.com/aws/aws-sdk-ruby/commit/03d60f9d3d821e645bd2a3efca066f37350ef906#diff-c69f15af8ea3eb9ab152659476e04608R401
+  #   https://github.com/aws/aws-sdk-ruby/blob/03d60f9d3d821e645bd2a3efca066f37350ef906/gems/aws-sdk-kinesis/lib/aws-sdk-kinesis/client_api.rb#L406
+  #   https://github.com/aws/aws-sdk-ruby/commit/571c2d0e5ff9c24ff72893a08a74790db591fb57#diff-a55155f04aa6559460a0814e264eb0cd
+  spec.add_dependency "aws-sdk-kinesis", "~> 1", "!= 1.4", "!= 1.5"
+  # Exclude aws-sdk-firehose v1.9 to avoid aws-sdk-core dependency problem with td-agent v3.2.1
+  #   LoadError: cannot load such file -- aws-sdk-core/plugins/endpoint_discovery.rb
+  #   https://github.com/aws/aws-sdk-ruby/commit/85d8538a62255e58d9e176ee524a9f94354b51a0#diff-d51486091a10ada65b308b7f45966af1R18
+  spec.add_dependency "aws-sdk-firehose", "~> 1", "!= 1.5", "!= 1.9"
 
   spec.add_dependency "google-protobuf", "~> 3"
 
-  spec.add_development_dependency "bundler", "~> 1.10"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", ">= 1.10"
+  spec.add_development_dependency "rake", ">= 10.0"
   spec.add_development_dependency "test-unit", ">= 3.0.8"
   spec.add_development_dependency "test-unit-rr", ">= 1.0.3"
   spec.add_development_dependency "pry", ">= 0.10.1"

diff --git a/gemfiles/Gemfile.fluentd-0.14.10 b/gemfiles/Gemfile.fluentd-0.14.10
@@ -18,9 +18,3 @@ source 'https://rubygems.org'
 gemspec path: ".."
 
 gem "fluentd", "0.14.10"
-
-# Use specified version of aws-sdk-kinesis and aws-sdk-firehose
-unless ENV['AWS_SDK_VERSION'].nil? or ENV['AWS_SDK_VERSION'] == 'DEFAULT'
-  gem "aws-sdk-kinesis", "#{ENV['AWS_SDK_VERSION']}"
-  gem "aws-sdk-firehose", "#{ENV['AWS_SDK_VERSION']}"
-end
diff --git a/gemfiles/Gemfile.td-agent-3.1.1 b/gemfiles/Gemfile.td-agent-3.1.1
@@ -29,9 +29,3 @@ gem "aws-sdk-kms", "1.3.0"
 gem "aws-sdk-sqs", "1.3.0"
 gem "aws-sdk-s3", "1.8.0"
 gem "fluent-plugin-s3", "1.1.0"
-
-# Use specified version of aws-sdk-kinesis and aws-sdk-firehose
-unless ENV['AWS_SDK_VERSION'].nil? or ENV['AWS_SDK_VERSION'] == 'DEFAULT'
-  gem "aws-sdk-kinesis", "#{ENV['AWS_SDK_VERSION']}"
-  gem "aws-sdk-firehose", "#{ENV['AWS_SDK_VERSION']}"
-end
diff --git a/gemfiles/Gemfile.td-agent-3.2.0 b/gemfiles/Gemfile.td-agent-3.2.0
@@ -29,9 +29,3 @@ gem "aws-sdk-kms", "1.5.0"
 gem "aws-sdk-sqs", "1.3.0"
 gem "aws-sdk-s3", "1.13.0"
 gem "fluent-plugin-s3", "1.1.3"
-
-# Use specified version of aws-sdk-kinesis and aws-sdk-firehose
-unless ENV['AWS_SDK_VERSION'].nil? or ENV['AWS_SDK_VERSION'] == 'DEFAULT'
-  gem "aws-sdk-kinesis", "#{ENV['AWS_SDK_VERSION']}"
-  gem "aws-sdk-firehose", "#{ENV['AWS_SDK_VERSION']}"
-end