Merge pull request #82 from awslabs/fix/aws-sdk-2.5

Fix incompatibility for aws-sdk 2.5, specify travis matrix

.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

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"

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"

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"

lib/fluent/plugin/kinesis_helper/credentials.rb

@@ -38,11 +38,11 @@ def credentials
       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

test/kinesis_helper/test_credentials.rb

@@ -25,6 +25,7 @@ def setup
     WebMock.enable!
     FakeFS.activate!
     @object = Mock.new
+    Aws.shared_config.fresh
   end
 
   def teardown