lib/sfn/callback/aws_assume_role.rb in sfn-3.0.28 vs lib/sfn/callback/aws_assume_role.rb in sfn-3.0.30

- old
+ new

@@ -8,31 +8,31 @@ # Items to cache in local file STS_STORE_ITEMS = [ :aws_sts_token, :aws_sts_access_key_id, :aws_sts_secret_access_key, - :aws_sts_token_expires + :aws_sts_token_expires, ] # Prevent callback output to user def quiet true end # Inject STS related configuration into # API provider credentials def after_config(*_) - if(enabled? && config.fetch(:credentials, :aws_sts_role_arn)) + if enabled? && config.fetch(:credentials, :aws_sts_role_arn) load_stored_session end end # Store session token if available for # later use def after(*_) - if(enabled?) - if(api.connection.aws_sts_role_arn && api.connection.aws_sts_token) + if enabled? + if api.connection.aws_sts_role_arn && api.connection.aws_sts_token path = config.fetch(:aws_assume_role, :cache_file, '.sfn-aws') FileUtils.touch(path) File.chmod(0600, path) values = load_stored_values(path) STS_STORE_ITEMS.map do |key| @@ -53,16 +53,16 @@ # Load stored configuration data into the api connection # # @return [TrueClass, FalseClass] def load_stored_session path = config.fetch(:aws_assume_role, :cache_file, '.sfn-aws') - if(File.exists?(path)) + if File.exists?(path) values = load_stored_values(path) STS_STORE_ITEMS.each do |key| api.connection.data[key] = values[key] end - if(values[:aws_sts_token_expires]) + if values[:aws_sts_token_expires] begin api.connection.data[:aws_sts_token_expires] = Time.parse(values[:aws_sts_token_expires]) rescue end end @@ -76,18 +76,17 @@ # # @param path [String] # @return [Hash] def load_stored_values(path) begin - if(File.exists?(path)) + if File.exists?(path) MultiJson.load(File.read(path)).to_smash else Smash.new end rescue MultiJson::ParseError Smash.new end end - end end end