miasma-aws 0.3.20 → 0.3.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04a578bff18113ac8611dca8ce988c964e54c7ad28e9c5da32742bb07e4a5afd
-  data.tar.gz: f495f1066d0f3a42aac9485330799a3588e7e3144b5ae3b2b65950067a769b94
+  metadata.gz: 52b34565420604144ef097dabea4e434e2f413af448c3cd5041abeb6a3aab3f3
+  data.tar.gz: e2de941c5c78209ba8ee8c737f5c6b43113ce2251818e53e610bd2c688d4ed78
 SHA512:
-  metadata.gz: 04015f3c41bb33aaa3316411ae089b5dfa28f95f8798c78890c37c12d501760a84d3cdc04b9db5039eabde96a8861f9a433504d470647b8c126056007d2fc84e
-  data.tar.gz: f91b0f9d0c61803f21470b6a3e171ad682d91cbcd2b36da01e31cfc6e74c0b88a99b115bdd6d75b527f19c513e433ea135fdc322c206104c1e41e1a1e65b71a8
+  metadata.gz: 9eba4d31741db7cd4efa9277ab0b8c831bcf6081f56bd591e943f694084d26ab5adfbb8e130c755350c2dd052a9f059e46f8d32c75dfd26ac56432edf6509168
+  data.tar.gz: f89d2ca230d03b1bbc0745bab06e2dffc23828e785926e75bd604e1784777c8c831feef8bf03077852e17383ebff9b7680c8245f6f26ea3da56b0bd04125cdb5

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# v0.3.22
+* [fix] Resolve configuration loading issues (#58)
+* [enhancement] Update token refresh to within 10m of expiry (#59)
+* [enhancement] Unify token expiry checks (#56)
+
 # v0.3.20
 * [fix] Properly calculate token expiry (#52)
 * [enhancement] Generate custom exception when key is not provided to signer (#53)

data/lib/miasma-aws/version.rb

@@ -1,4 +1,4 @@
 module MiasmaAws
   # Current library version
-  VERSION = Gem::Version.new("0.3.20")
+  VERSION = Gem::Version.new("0.3.22")
 end

data/lib/miasma/contrib/aws.rb

@@ -395,6 +395,8 @@ module Miasma
           klass.const_set(
             :ECS_TASK_PROFILE_PATH, ENV["AWS_CONTAINER_CREDENTIALS_RELATIVE_URI"]
           )
+          # Reload sts tokens if expiry is within the next 10 minutes
+          klass.const_set(:STS_TOKEN_EXPIRY_BUFFER, 600)
         end
 
         # Build new API for specified type using current provider / creds
@@ -421,9 +423,14 @@ module Miasma
         # @param creds [Hash]
         # @return [TrueClass]
         def custom_setup(creds)
-          cred_file = load_aws_file(aws_credentials_file)
-          config_file = load_aws_file(aws_config_file)
-          profile = creds[:aws_profile_name]
+          cred_file = load_aws_file(creds.fetch(
+            :aws_credentials_file, aws_credentials_file
+          ))
+          config_file = load_aws_file(creds.fetch(
+            :aws_config_file, aws_config_file
+          ))
+          # Load any configuration available from the config file
+          profile = creds.fetch(:aws_profile_name, aws_profile_name)
           profile_list = [profile].compact
           new_config_creds = Smash.new
           while profile
@@ -436,7 +443,7 @@ module Miasma
           new_config_creds = config_file.fetch(:default, Smash.new).merge(
             new_config_creds
           )
-          profile = creds[:aws_profile_name]
+          # Load any configuration available from the creds file
           new_creds = Smash.new
           profile_list.each do |profile|
             new_creds = cred_file.fetch(profile, Smash.new).merge(
@@ -448,15 +455,17 @@ module Miasma
             new_creds
           )
           new_creds = new_creds.merge(new_config_creds)
-          # Update original data source
+          # Provided credentials override any config file or creds
+          # file configuration so set them into new creds if available
+          new_creds.merge!(creds)
+          # Replace creds hash with updated hash so it is loaded with
+          # updated values
           creds.replace(new_creds)
           if creds[:aws_iam_instance_profile]
             self.class.const_get(:ECS_TASK_PROFILE_PATH).nil? ?
               load_instance_credentials!(creds) :
               load_ecs_credentials!(creds)
           end
-          # Set underlying attributes
-          data.replace(creds)
           true
         end
 
@@ -790,24 +799,27 @@ module Miasma
         # @return [TrueClass, FalseClass]
         # @note update check only applied if assuming role
         def sts_assume_role_update_required?(args = {})
-          if args.fetch(:aws_sts_role_arn, attributes[:aws_sts_role_arn])
-            expiry = args.fetch(:aws_sts_token_expires, attributes[:aws_sts_token_expires])
-            expiry.nil? || expiry - 15 <= Time.now
-          else
-            false
-          end
+          sts_attribute_update_required?(:aws_sts_role_arn,
+                                         :aws_sts_token_expires, args)
         end
 
         # @return [TrueClass, FalseClass]
         # @note update check only applied if assuming role
         def sts_mfa_session_update_required?(args = {})
-          if (args.fetch(:aws_sts_session_token_code,
-                         attributes[:aws_sts_session_token_code]))
-            expiry = args.fetch(
-              :aws_sts_session_token_expires,
-              attributes[:aws_sts_session_token_expires]
-            )
-            expiry.nil? || expiry - 15 <= Time.now
+          sts_attribute_update_required?(:aws_sts_session_token_code,
+                                         :aws_sts_session_token_expires, args)
+        end
+
+        # Check if STS attribute requires update
+        #
+        # @param key [String, Symbol] token key
+        # @param expiry_key [Time] expiry of token
+        # @param args [Hash] overrides to check instead of instance values
+        # @return [TrueClass, FalseClass]
+        def sts_attribute_update_required?(key, expiry_key, args = {})
+          if args.fetch(key, attributes[key])
+            expiry = args.fetch(expiry_key, attributes[expiry_key])
+            expiry.nil? || expiry - self.class.const_get(:STS_TOKEN_EXPIRY_BUFFER) <= Time.now
           else
             false
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: miasma-aws
 version: !ruby/object:Gem::Version
-  version: 0.3.20
+  version: 0.3.22
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-14 00:00:00.000000000 Z
+date: 2018-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: miasma