fixes so simple tests work

Author: matt-domsch-sp

lib/mysql2.rb

@@ -38,6 +38,7 @@
 require 'mysql2/client'
 require 'mysql2/field'
 require 'mysql2/statement'
+require 'mysql2/aws_iam_auth'
 
 # = Mysql2
 #

lib/mysql2/aws_iam_auth.rb

@@ -2,8 +2,10 @@
 
 module Mysql2
   # Generates and caches AWS IAM Authentication tokens to use in place of MySQL user passwords
-  class AwsTokenAuth
+  class AwsIamAuth
     include Singleton
+    attr_reader :mutex
+    attr_accessor :passwords
 
     # Tokens are valid for up to 15 minutes.
     # We will assume ours expire in 14 minutes to be safe.
@@ -23,23 +25,24 @@ def initialize
       # :password is the token value
       # :expires_at is (just before) the token was generated plus 14 minutes
       @passwords = {}
-      @generator = Aws::RDS::AuthTokenGenerator.new
+      instance_credentials = Aws::InstanceProfileCredentials.new
+      @generator = Aws::RDS::AuthTokenGenerator.new(:credentials => instance_credentials)
     end
 
     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
+      AwsIamAuth.instance.mutex.synchronize do
         begin
-          passwd = @passwords[key][:password] if @passwords[key][:password] && Time.now.utc < @passwords[key][:expires_at]
+          passwd = @passwords[key][:password] if @passwords.dig(key, :password) && Time.now.utc < @passwords.dig(key, :expires_at)
         rescue KeyError
           passwd = nil
         end
       end
       return passwd unless passwd.nil?
 
-      AwsTokenAuth.instance.mutex.synchronize do
+      AwsIamAuth.instance.mutex.synchronize do
         @passwords[key] = {}
         @passwords[key][:expires_at] = Time.now.utc + TOKEN_EXPIRES_IN
         @passwords[key][:password] = password_from_iam(params)

lib/mysql2/client.rb

@@ -95,7 +95,7 @@ def initialize(opts = {})
       conn_attrs = parse_connect_attrs(opts[:connect_attrs])
 
       if opts[:use_iam_authentication]
-        aws = Mysql2::AwsTokenAuth.new
+        aws = Mysql2::AwsIamAuth.instance
         pass = aws.password(user, host, port, opts)
       end