linter/syntax fixes

Author: matt-domsch-sp

lib/mysql2/aws_iam_auth.rb

@@ -1,12 +1,13 @@
 require 'singleton'
 
 module Mysql2
+  # Generates and caches AWS IAM Authentication tokens to use in place of MySQL user passwords
   class AwsTokenAuth
     include Singleton
 
     # Tokens are valid for up to 15 minutes.
     # We will assume ours expire in 14 minutes to be safe.
-    TOKEN_EXPIRES_IN = (60*14) # 14 minutes
+    TOKEN_EXPIRES_IN = (60 * 14) # 14 minutes
 
     def initialize
       begin
@@ -25,19 +26,18 @@ def initialize
       @generator = Aws::RDS::AuthTokenGenerator.new
     end
 
-    def password(user, host port, opts)
+    def password(user, host, port, opts)
       params = to_params(user, host, port, opts)
       key = key_from_params(params)
       passwd = nil
       AwsTokenAuth.instance.mutex.synchronize do
         begin
-          if @passwords[key][:password] && Time.now.utc < @passwords[key][:expires_at]
-            passwd = @passwords[key][:password]
-          end
+          passwd = @passwords[key][:password] if @passwords[key][:password] && Time.now.utc < @passwords[key][:expires_at]
         rescue KeyError
+          passwd = nil
         end
       end
-      if passwd return passwd
+      return passwd unless passwd.nil?
 
       AwsTokenAuth.instance.mutex.synchronize do
         @passwords[key] = {}
@@ -59,8 +59,7 @@ def to_params(user, host, port, opts)
     end
 
     def key_from_params(params)
-      return "#{params[:user_name]}/#{params[:endpoint]}/#{params[:region]}"
+      "#{params[:user_name]}/#{params[:endpoint]}/#{params[:region]}"
     end
-
   end
 end