fluent-plugin-kinesis 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48189e937b18e7a7ab26165826394ffb37db0f3d
-  data.tar.gz: 2cc691c0c3f6f57b7472f61edc689b99d8955677
+  metadata.gz: 46273afe8f8e8fa0f70931b1f2bbf1893df30256
+  data.tar.gz: 55beac91c0b19714355e901ed256dbf16210a930
 SHA512:
-  metadata.gz: 0a8d48c3ed01e845ab675b4242f5441af5a8a361f8d557d9bab58be7e8d378900c20f50c9dcb93b1e79863254d3c2e15907e9ed9d06ece30de47a92bda7455f6
-  data.tar.gz: 3f5556e659c9889efd3f5d47c0482ed31f0bc185e91ae3acf9831d8edd38616e553b16d577f5063abee06a5b143932c5487fcfe28d3a8c389a88ff9ba20029b7
+  metadata.gz: 57f4784a5c00763fb358de48d74d161815a90a466f4e8afe895b91485bae1db6a6eba84b994def1ddf6a90f9a60742ac63b4abd91d1fa9eda16d360bb5c0db02
+  data.tar.gz: a5b6e7769c7ddce92bd9ee27e603c7bfbe41ac3a53d032b12b5edf30522a1eb98f70e54a75dee6ec33dd8a197f8af8effd3d373a0c98c9bb709e67ecd0d947a0

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 1.0.1
+
+- Bug fix - Instance profile credentials expiring [#58](https://github.com/awslabs/aws-fluent-plugin-kinesis/issues/58)
+
 ## 1.0.0
 
 To support Firehose and KPL, this was refactored and added more tests.

data/README.md

@@ -431,7 +431,7 @@ Verify the endpoint's certificate. Do not disable unless using [**custom_endpoin
 Default: `true`
 
 #### credentials_refresh_delay
-Interval seconds for refreshing credentials seding to KPL.
+Interval milliseconds for refreshing credentials seding to KPL.
 
 Defalut 5000
 

data/fluent-plugin-kinesis.gemspec

@@ -49,4 +49,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "dummer", ">= 0.4.0"
   spec.add_development_dependency "rubyzip", ">= 1.0.0"
   spec.add_development_dependency "mocha", ">= 1.1.0"
+  spec.add_development_dependency "webmock", ">= 1.24.2"
+  spec.add_development_dependency "fakefs", ">= 0.8.1"
 end

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

@@ -16,23 +16,23 @@ module Fluent
   module KinesisHelper
     module Credentials
       def credentials
-        case
-        when @assume_role_credentials
-          Aws::AssumeRoleCredentials.new(
-            client:            Aws::STS::Client.new(region: @region),
-            role_arn:          @assume_role_credentials.role_arn,
-            external_id:       @assume_role_credentials.external_id,
-            role_session_name: 'aws-fluent-plugin-kinesis',
-            duration_seconds:  60 * 60,
-        )
-        when @shared_credentials
-          Aws::SharedCredentials.new(
-            profile_name: @shared_credentials.profile_name,
-            path:         @shared_credentials.path,
+        @provider ||= case
+          when @assume_role_credentials
+            Aws::AssumeRoleCredentials.new(
+              client:            Aws::STS::Client.new(region: @region),
+              role_arn:          @assume_role_credentials.role_arn,
+              external_id:       @assume_role_credentials.external_id,
+              role_session_name: 'aws-fluent-plugin-kinesis',
+              duration_seconds:  60 * 60,
           )
-        else
-          default_credentials_provider
-        end
+          when @shared_credentials
+            Aws::SharedCredentials.new(
+              profile_name: @shared_credentials.profile_name,
+              path:         @shared_credentials.path,
+            )
+          else
+            default_credentials_provider
+          end
       end
 
       private
@@ -44,7 +44,7 @@ module Fluent
         if provider.nil?
           raise Fluent::ConfigError, "You must specify credentials on ~/.aws/credentials, environment variables or IAM role for default credentials"
         end
-        provider.credentials
+        provider
       end
     end
   end

data/lib/fluent_plugin_kinesis/version.rb

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

data/lib/kinesis_producer/daemon.rb

@@ -158,7 +158,7 @@ module KinesisProducer
     def update_credentials
       add(make_set_credentials_message)
       add(make_set_metrics_credentials_message) if @metrics_credentials
-      sleep @credentials_refresh_delay
+      sleep(@credentials_refresh_delay.to_f/1000)
     end
 
     def make_configuration_message
@@ -183,9 +183,9 @@ module KinesisProducer
     def make_set_credential_message(credentials, for_metrics = false)
       return nil if credentials.nil?
       cred = KinesisProducer::Protobuf::Credentials.new(
-        akid:       credentials.access_key_id,
-        secret_key: credentials.secret_access_key,
-        token:      credentials.session_token
+        akid:       credentials.credentials.access_key_id,
+        secret_key: credentials.credentials.secret_access_key,
+        token:      credentials.credentials.session_token
       )
       set_credentials = KinesisProducer::Protobuf::SetCredentials.new(credentials: cred, for_metrics: for_metrics)
       make_message(FixnumMax, :set_credentials, set_credentials)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-kinesis
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-18 00:00:00.000000000 Z
+date: 2016-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -240,6 +240,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.24.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.24.2
+- !ruby/object:Gem::Dependency
+  name: fakefs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.1
 description: 
 email: 
 executables: []