@@ -6,7 +6,7 @@ class AwsTokenAuth
6
6
7
7
# Tokens are valid for up to 15 minutes.
8
8
# 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
10
10
11
11
def initialize
12
12
begin
@@ -25,7 +25,7 @@ def initialize
25
25
@generator = Aws ::RDS ::AuthTokenGenerator . new
26
26
end
27
27
28
- def password ( user , host port , opts )
28
+ def password ( user , host , port , opts )
29
29
params = to_params ( user , host , port , opts )
30
30
key = key_from_params ( params )
31
31
passwd = nil
@@ -35,9 +35,10 @@ def password(user, host port, opts)
35
35
passwd = @passwords [ key ] [ :password ]
36
36
end
37
37
rescue KeyError
38
+ passwd = nil
38
39
end
39
40
end
40
- if passwd return passwd
41
+ return passwd unless passwd . nil?
41
42
42
43
AwsTokenAuth . instance . mutex . synchronize do
43
44
@passwords [ key ] = { }
@@ -59,8 +60,7 @@ def to_params(user, host, port, opts)
59
60
end
60
61
61
62
def key_from_params ( params )
62
- return "#{ params [ :user_name ] } /#{ params [ :endpoint ] } /#{ params [ :region ] } "
63
+ "#{ params [ :user_name ] } /#{ params [ :endpoint ] } /#{ params [ :region ] } "
63
64
end
64
-
65
65
end
66
66
end
0 commit comments