lib/fog/aws/elasticache.rb in fog-1.3.1 vs lib/fog/aws/elasticache.rb in fog-1.4.0

@@ -1,14 +1,15 @@
 module Fog
   module AWS
     class Elasticache < Fog::Service
+      extend Fog::AWS::CredentialFetcher::ServiceMethods
 
       class IdentifierTaken < Fog::Errors::Error; end
       class InvalidInstance < Fog::Errors::Error; end
 
       requires :aws_access_key_id, :aws_secret_access_key
-      recognizes :region, :host, :path, :port, :scheme, :persistent
+      recognizes :region, :host, :path, :port, :scheme, :persistent, :use_iam_profile, :aws_session_token, :aws_credentials_expire_at
 
       request_path 'fog/aws/requests/elasticache'
 
       request :create_cache_cluster
       request :delete_cache_cluster
@@ -45,15 +46,14 @@
           Fog::Mock.not_implemented
         end
       end
 
       class Real
-
+        include Fog::AWS::CredentialFetcher::ConnectionMethods
         def initialize(options={})
-          @aws_access_key_id      = options[:aws_access_key_id]
-          @aws_secret_access_key  = options[:aws_secret_access_key]
-          @hmac = Fog::HMAC.new('sha256', @aws_secret_access_key)
+          @use_iam_profile = options[:use_iam_profile]
+          setup_credentials(options)
 
           options[:region] ||= 'us-east-1'
           @host = options[:host] || "elasticache.#{options[:region]}.amazonaws.com"
           @path       = options[:path]      || '/'
           @port       = options[:port]      || 443
@@ -66,17 +66,30 @@
         def reload
           @connection.reset
         end
 
         private
+
+        def setup_credentials(options)
+          @aws_access_key_id      = options[:aws_access_key_id]
+          @aws_secret_access_key  = options[:aws_secret_access_key]
+          @aws_session_token      = options[:aws_session_token]
+          @aws_credentials_expire_at = options[:aws_credentials_expire_at]
+
+          @hmac = Fog::HMAC.new('sha256', @aws_secret_access_key)
+        end
+
         def request(params)
+          refresh_credentials_if_expired
+
           idempotent  = params.delete(:idempotent)
           parser      = params.delete(:parser)
 
           body = Fog::AWS.signed_params(
             params,
             {
             :aws_access_key_id  => @aws_access_key_id,
+            :aws_session_token  => @aws_session_token,
             :hmac               => @hmac,
             :host               => @host,
             :path               => @path,
             :port               => @port,
             :version            => '2011-07-15'