@@ -6,7 +6,7 @@ class AwsTokenAuth
66
77 # Tokens are valid for up to 15 minutes.
88 # We will assume ours expire in 14 minutes to be safe.
9- TOKEN_EXPIRES_IN = ( 60 * 14 ) # 14 minutes
9+ TOKEN_EXPIRES_IN = ( 60 * 14 ) # 14 minutes
1010
1111 def initialize
1212 begin
@@ -25,7 +25,7 @@ def initialize
2525 @generator = Aws ::RDS ::AuthTokenGenerator . new
2626 end
2727
28- def password ( user , host port , opts )
28+ def password ( user , host , port , opts )
2929 params = to_params ( user , host , port , opts )
3030 key = key_from_params ( params )
3131 passwd = nil
@@ -35,9 +35,10 @@ def password(user, host port, opts)
3535 passwd = @passwords [ key ] [ :password ]
3636 end
3737 rescue KeyError
38+ passwd = nil
3839 end
3940 end
40- if passwd return passwd
41+ return passwd unless passwd . nil?
4142
4243 AwsTokenAuth . instance . mutex . synchronize do
4344 @passwords [ key ] = { }
@@ -59,8 +60,7 @@ def to_params(user, host, port, opts)
5960 end
6061
6162 def key_from_params ( params )
62- return "#{ params [ :user_name ] } /#{ params [ :endpoint ] } /#{ params [ :region ] } "
63+ "#{ params [ :user_name ] } /#{ params [ :endpoint ] } /#{ params [ :region ] } "
6364 end
64-
6565 end
6666end
0 commit comments