fluent-plugin-kinesis 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f1802cbf044412c40fee66e52412c78a8f00c58
-  data.tar.gz: 3bb9b8bb9b5a079cbf3fa61f90b6b3e16cd81e77
+  metadata.gz: af13ca5555ee396e24c22114057a2fe2095d6a98
+  data.tar.gz: 55013538d174c46e54592675891aea41df32a45d
 SHA512:
-  metadata.gz: acf1eefc4d2d071cb81cf22dd1969f5fe60276bfecd3616ac193b19106073c3d585bef51d3a5750f7a803a914e5a4cab75ea32d37153380d19b910c40891f35e
-  data.tar.gz: ceed8d7790f50d07256fc7a927ee053d3808d92ee6d444d87c96c30813283a8758b21d13364b476747efd777a1882dc729a0a7d3308777258a3214eb59f6c939
+  metadata.gz: 0b993cd00e37f89fdef57f96910daf615724c5c71f6006ba27cef7cd69abab33a1951f86d0f56e3dafac5e84f5c005a03a7ea734e30600fef02391b3ed3b016d
+  data.tar.gz: 6f1aabaef1d6e31267399a3ed3fddb2efc6c4b739fef2be99cb48ad569ce7942974eb95417e1d9bda4f951a2b0edbb124825df43de6a30798586d5e1e3fafece

data/.travis.yml

@@ -1,37 +1,29 @@
 language: ruby
 
-rvm:
-  - 2.0.0
-  - 2.1
-  - 2.2
-
-gemfile:
-  - Gemfile
-  - gemfiles/Gemfile.fluentd-0.10.58
-  - gemfiles/Gemfile.fluentd-0.12
-
-os:
-  - linux
-  - osx
-
-before_install:
-  - gem update bundler
-
-script: bundle exec rake test
-
-sudo: false
-
 matrix:
-  exclude:
-    - rvm: 2.0.0
-      os: osx
-    - rvm: 2.0.0
+  include:
+    - rvm: 2.0.0-p648
+      os: linux
+      gemfile: gemfiles/Gemfile.ruby-2.0
+    - rvm: 2.1.10
+      os: linux
+      gemfile: gemfiles/Gemfile.ruby-2.1
+    - rvm: 2.2.5
+      os: linux
+      gemfile: Gemfile
+    - rvm: 2.3.1
+      os: linux
       gemfile: Gemfile
-    - rvm: 2.1
-      os: osx
+    - rvm: 2.3.1
+      os: linux
       gemfile: gemfiles/Gemfile.fluentd-0.10.58
-    - rvm: 2.1
-      os: osx
+    - rvm: 2.3.1
+      os: linux
       gemfile: gemfiles/Gemfile.fluentd-0.12
-    - rvm: 2.2
-      os: osx
+    - rvm: 2.3.1
+      os: linux
+      gemfile: gemfiles/Gemfile.aws-sdk-2.4
+
+script: bundle exec rake test
+
+sudo: false

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 1.1.1
+
+- Bug fix - Fix incompatibility for AWS SDK 2.5 [#80](https://github.com/awslabs/aws-fluent-plugin-kinesis/issues/80)
+- Bug fix - Fix wrong logic for batch request [#81](https://github.com/awslabs/aws-fluent-plugin-kinesis/issues/81)
+
 ## 1.1.0
 
 - Feature - Derive stream name from fluentd tag for KPL [#67](https://github.com/awslabs/aws-fluent-plugin-kinesis/issues/67)

data/gemfiles/Gemfile.aws-sdk-2.4

@@ -0,0 +1,20 @@
+#
+#  Copyright 2014-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+#  Licensed under the Amazon Software License (the "License").
+#  You may not use this file except in compliance with the License.
+#  A copy of the License is located at
+#
+#  http://aws.amazon.com/asl/
+#
+#  or in the "license" file accompanying this file. This file is distributed
+#  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+#  express or implied. See the License for the specific language governing
+#  permissions and limitations under the License.
+
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in fluent-plugin-kinesis.gemspec
+gemspec path: ".."
+
+gem "aws-sdk", "~> 2.4.4"

data/gemfiles/Gemfile.ruby-2.0

@@ -0,0 +1,21 @@
+#
+#  Copyright 2014-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+#  Licensed under the Amazon Software License (the "License").
+#  You may not use this file except in compliance with the License.
+#  A copy of the License is located at
+#
+#  http://aws.amazon.com/asl/
+#
+#  or in the "license" file accompanying this file. This file is distributed
+#  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+#  express or implied. See the License for the specific language governing
+#  permissions and limitations under the License.
+
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in fluent-plugin-kinesis.gemspec
+gemspec path: ".."
+
+gem "activesupport", "~> 4"
+gem "fluentd", "~> 0.12.26"

data/gemfiles/Gemfile.ruby-2.1

@@ -0,0 +1,21 @@
+#
+#  Copyright 2014-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+#  Licensed under the Amazon Software License (the "License").
+#  You may not use this file except in compliance with the License.
+#  A copy of the License is located at
+#
+#  http://aws.amazon.com/asl/
+#
+#  or in the "license" file accompanying this file. This file is distributed
+#  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+#  express or implied. See the License for the specific language governing
+#  permissions and limitations under the License.
+
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in fluent-plugin-kinesis.gemspec
+gemspec path: ".."
+
+gem "activesupport", "~> 4"
+gem "fluentd", "~> 0.12.26"

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

@@ -58,13 +58,14 @@ module Fluent
 
       def batch_by_limit(records, max_count, max_size)
         result, buf, size = records.inject([[],[],0]){|(result, buf, size), record|
-          if buf.size >= max_count or size >= max_size
+          record_size = size_of_values(record)
+          if buf.size+1 > max_count or size+record_size > max_size
             result << buf
             buf = []
             size = 0
           end
           buf << record
-          size += size_of_values(record)
+          size += record_size
           [result, buf, size]
         }
         result << buf

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

@@ -38,11 +38,11 @@ module Fluent
       private
 
       def default_credentials_provider
-        config_class = Struct.new(:access_key_id, :secret_access_key, :session_token, :profile)
-        config = config_class.new(@aws_key_id, @aws_sec_key)
+        config_class = Struct.new(:access_key_id, :secret_access_key, :region, :session_token, :profile)
+        config = config_class.new(@aws_key_id, @aws_sec_key, @region)
         provider = Aws::CredentialProviderChain.new(config).resolve
         if provider.nil?
-          raise Fluent::ConfigError, "You must specify credentials on ~/.aws/credentials, environment variables or IAM role for default credentials"
+          raise Fluent::ConfigError, "You must specify credentials on ~/.aws/credentials, environment variables or instance profile for default credentials"
         end
         provider
       end

data/lib/fluent_plugin_kinesis/version.rb

@@ -13,5 +13,5 @@
 #  permissions and limitations under the License.
 
 module FluentPluginKinesis
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-kinesis
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-13 00:00:00.000000000 Z
+date: 2016-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -277,8 +277,11 @@ files:
 - benchmark/dummy.conf
 - benchmark/task.rake
 - fluent-plugin-kinesis.gemspec
+- gemfiles/Gemfile.aws-sdk-2.4
 - gemfiles/Gemfile.fluentd-0.10.58
 - gemfiles/Gemfile.fluentd-0.12
+- gemfiles/Gemfile.ruby-2.0
+- gemfiles/Gemfile.ruby-2.1
 - lib/fluent/plugin/kinesis_helper.rb
 - lib/fluent/plugin/kinesis_helper/api.rb
 - lib/fluent/plugin/kinesis_helper/class_methods.rb