fluent-plugin-kinesis 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24d75eb607afb3a1a251ab9bac156cde85e5053e
-  data.tar.gz: 30bb3774c5c3f9f8aa5f921ed8e78a6bc49e495e
+  metadata.gz: 3b0377336aca16e998f29f478eaf04265dd8b771
+  data.tar.gz: ec110cd43b0f3dd16f6a9f4bbadf236c97fc46e7
 SHA512:
-  metadata.gz: 2b8d65b4999dc9ad78f88119ee166649dd96b3df1f1acadd707134333f14aa50f4052b58ca2870712e34f5a0bfd583a21c208c71e58538fd60cf6bd7d66e127d
-  data.tar.gz: 598e0b74f91110529ea4a89e22f1d62b5b8f55dd5860d76980001be4e4a7cc57514767fa58e7892741002794fec89c4537fe494dd2ab73e14c47871f8bbf1bb8
+  metadata.gz: af17bc14e59b32a101cd0f774ae29df5213dd2b333b9af1c8c2697fc847ecbd86d8f35a6f4a4690602eb07c4184d71fa00c332002312a63ed52f81d55824e2cb
+  data.tar.gz: f6e7c4ff10c85ddc8da01456f58d8c41e1b0062d89ab102a5f5f8848cc945852dbb0b274f2402c687fa5a32ffeee3cc29e564297a8ea2e611023639e3678c40d

data/.travis.yml

@@ -7,7 +7,7 @@ matrix:
       gemfile: Gemfile
     - rvm: 2.1.10
       os: linux
-      gemfile: gemfiles/Gemfile.fluentd-0.12
+      gemfile: gemfiles/Gemfile.td-agent-2.3.5
 
 script: bundle exec rake test
 

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 2.0.1
+
+- Bug - Fix AWS SDK conflict with s3 plugin [#131](https://github.com/awslabs/aws-fluent-plugin-kinesis/pull/131)
+
 ## 2.0.0
 
 - Feature - Add `kinesis_streams_aggregated` ouput plugin [#107](https://github.com/awslabs/aws-fluent-plugin-kinesis/issues/107)

data/Makefile

@@ -12,7 +12,7 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-.PHONY: run run-v0.12 test test-v.012 install $(wildcard test/test_*.rb) $(wildcard test/**/test_*.rb) benchmark benchmark-remote
+.PHONY: run run-td-agent-2.3.5 test test-td-agent-2.3.5 install $(wildcard test/test_*.rb) $(wildcard test/**/test_*.rb) benchmark benchmark-remote
 
 all:
 	bundle install
@@ -20,14 +20,16 @@ all:
 run:
 	bundle exec fluentd -v
 
-run-v0.12:
-	BUNDLE_GEMFILE=./gemfiles/Gemfile.fluentd-0.12 bundle exec fluentd -v
+run-td-agent-2.3.5:
+	RBENV_VERSION=2.1.10 BUNDLE_GEMFILE=./gemfiles/Gemfile.td-agent-2.3.5 bundle update
+	RBENV_VERSION=2.1.10 BUNDLE_GEMFILE=./gemfiles/Gemfile.td-agent-2.3.5 bundle exec fluentd -v
 
 test:
 	bundle exec rake test
 
-test-v.012:
-	BUNDLE_GEMFILE=./gemfiles/Gemfile.fluentd-0.12 bundle exec rake test
+test-td-agent-2.3.5:
+	RBENV_VERSION=2.1.10 BUNDLE_GEMFILE=./gemfiles/Gemfile.td-agent-2.3.5 bundle update
+	RBENV_VERSION=2.1.10 BUNDLE_GEMFILE=./gemfiles/Gemfile.td-agent-2.3.5 bundle exec rake test
 
 install:
 	bundle exec rake install:local

data/README.md

@@ -11,6 +11,8 @@ that sends events to [Amazon Kinesis Streams][streams] and [Amazon Kinesis Fireh
 
 Also, there is a [documentation on Fluentd official site][fluentd-doc-kinesis].
 
+**Note**: This README is for v2.x. If you use v1.x, see the [old README][v1-readme].
+
 ## Installation
 This fluentd plugin is available as the `fluent-plugin-kinesis` gem from RubyGems.
 
@@ -47,7 +49,7 @@ Or just download specify your Ruby library path. Below is the sample for specify
 
 ## Dependencies
  * Ruby 2.1.0+
- * Fluentd 0.12.35+
+ * Fluentd 0.12.35+ (supporting 0.14.x)
 
 ## Basic Usage
 Here are general procedures for using this plugin:
@@ -377,7 +379,7 @@ To launch `fluentd` process with this plugin for development, follow the steps b
 
 To launch using Fluentd v0.12, use `BUNDLE_GEMFILE` environment variable:
 
-    BUNDLE_GEMFILE=$PWD/gemfiles/Gemfile.fluentd-0.12 bundle exec fluentd -c /path/to/fluent.conf
+    BUNDLE_GEMFILE=$PWD/gemfiles/Gemfile.td-agent-2.3.5 bundle exec fluentd -c /path/to/fluent.conf
 
 ## Contributing
 
@@ -401,3 +403,4 @@ Bug reports and pull requests are welcome on [GitHub][github].
 [inject.rb]: https://github.com/fluent/fluentd/blob/master/lib/fluent/plugin_helper/inject.rb
 [fluentd-doc-kinesis]: http://docs.fluentd.org/articles/kinesis-stream
 [fluent-plugin-s3]: https://github.com/fluent/fluent-plugin-s3
+[v1-readme]: https://github.com/awslabs/aws-fluent-plugin-kinesis/blob/v1/README.md

data/fluent-plugin-kinesis.gemspec

@@ -31,8 +31,15 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.1'
 
   spec.add_dependency "fluentd", ">= 0.12.35", "< 2"
-  spec.add_dependency "aws-sdk-kinesis", "~> 1"
-  spec.add_dependency "aws-sdk-firehose", "~> 1"
+  spec.add_dependency "aws-sdk", ">= 2.9.9", "< 4"
+  # TODO: fluent-plugin-s3 depends on v2 only.
+  # https://github.com/fluent/fluent-plugin-s3/issues/208
+  #
+  # This plugin is sometimes used with s3 plugin.
+  # Unless s3 plugin is updated to be available with v3,
+  # this plugin should depend on v2 only.
+  # spec.add_dependency "aws-sdk-kinesis", "~> 1"
+  # spec.add_dependency "aws-sdk-firehose", "~> 1"
   spec.add_dependency "google-protobuf", "~> 3"
 
   spec.add_development_dependency "bundler", "~> 1.10"

data/gemfiles/{Gemfile.fluentd-0.12 → Gemfile.td-agent-2.3.5}

@@ -17,4 +17,9 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in fluent-plugin-kinesis.gemspec
 gemspec path: ".."
 
-gem "fluentd", ">= 0.12.35", "< 0.14"
+# Specify related gems for td-agent v2.3.5
+# https://github.com/treasure-data/omnibus-td-agent/blob/release-2.3.5/config/projects/td-agent2.rb#L23
+gem "fluentd", "0.12.35"
+# https://github.com/treasure-data/omnibus-td-agent/blob/release-2.3.5/plugin_gems.rb#L13-L15
+gem "fluent-plugin-s3", "0.8.2"
+gem "aws-sdk", "2.9.9"

data/lib/fluent/plugin/kinesis_helper/client.rb

@@ -76,13 +76,25 @@ module Fluent
 
       private
 
+      def aws_sdk_v2?
+        @aws_sdk_v2 ||= Gem.loaded_specs['aws-sdk-core'].version < Gem::Version.create('3')
+      end
+
       def client_class
         case request_type
         when :streams, :streams_aggregated
-          require 'aws-sdk-kinesis'
+          if aws_sdk_v2?
+            require 'aws-sdk'
+          else
+            require 'aws-sdk-kinesis'
+          end
           Aws::Kinesis::Client
         when :firehose
-          require 'aws-sdk-firehose'
+          if aws_sdk_v2?
+            require 'aws-sdk'
+          else
+            require 'aws-sdk-firehose'
+          end
           Aws::Firehose::Client
         end
       end

data/lib/fluent_plugin_kinesis/version.rb

@@ -13,5 +13,5 @@
 # language governing permissions and limitations under the License.
 
 module FluentPluginKinesis
-  VERSION = '2.0.0'
+  VERSION = '2.0.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-kinesis
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-27 00:00:00.000000000 Z
+date: 2017-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -31,33 +31,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk-kinesis
+  name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
-- !ruby/object:Gem::Dependency
-  name: aws-sdk-firehose
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: 2.9.9
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.9.9
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: google-protobuf
   requirement: !ruby/object:Gem::Requirement
@@ -244,7 +236,7 @@ files:
 - Rakefile
 - benchmark/task.rake
 - fluent-plugin-kinesis.gemspec
-- gemfiles/Gemfile.fluentd-0.12
+- gemfiles/Gemfile.td-agent-2.3.5
 - lib/fluent/plugin/kinesis.rb
 - lib/fluent/plugin/kinesis_helper/aggregator.rb
 - lib/fluent/plugin/kinesis_helper/api.rb