test(iam): Add more code coverage for iam authentication

Author: maxnussbaum

lib/watson_apis/iam_token_manager.rb

@@ -65,7 +65,7 @@ def request(method:, url:, headers: nil, params: nil, data: nil)
   # If this class is managing tokens and has a valid token stored, send it
   def _token
     return @user_access_token unless @user_access_token.nil? || (@user_access_token.respond_to?(:empty?) && @user_access_token.empty?)
-    if @token_info.nil?
+    if @token_info.all? { |_k, v| v.nil? }
       token_info = _request_token
       _save_token_info(
         token_info: token_info

lib/watson_apis/watson_service.rb

@@ -104,7 +104,7 @@ def _token_manager(iam_api_key: nil, iam_access_token: nil, iam_url: nil)
   end
 
   def _iam_access_token(iam_access_token:)
-    @token_manager._access_token(iam_access_token) unless @token_manager.nil?
+    @token_manager._access_token(iam_access_token: iam_access_token) unless @token_manager.nil?
     @token_manager = IAMTokenManager.new(iam_access_token: iam_access_token) if @token_manager.nil?
     @iam_access_token = iam_access_token
   end
@@ -120,9 +120,7 @@ def request(args)
     defaults = { method: nil, url: nil, accept_json: false, headers: nil, params: nil, json: {}, data: nil }
     args = defaults.merge(args)
     args[:data].delete_if { |_k, v| v.nil? } if args[:data].instance_of?(Hash)
-    if args[:data].respond_to?(:merge)
-      args[:json] = args[:data].merge(args[:json]) unless args[:data].instance_of?(String)
-    end
+    args[:json] = args[:data].merge(args[:json]) if args[:data].respond_to?(:merge)
     args[:json] = args[:data] if args[:json].empty? || (args[:data].instance_of?(String) && !args[:data].empty?)
     args[:json].delete_if { |_k, v| v.nil? } if args[:json].instance_of?(Hash)
     args[:headers]["Accept"] = "application/json" if args[:accept_json]

test/integration/test_iam_assistant_v1.rb

@@ -7,10 +7,11 @@ class IAMAssistantV1Test < Minitest::Test
   Minitest::Test.parallelize_me!
   def test_create_update_delete_workspace
     service = WatsonAPIs::AssistantV1.new(
-      iam_api_key: ENV["ASSISTANT_IAM_APIKEY"],
       url: ENV["ASSISTANT_IAM_URL"],
       version: "2018-02-16"
     )
+    service._iam_api_key(iam_api_key: ENV["ASSISTANT_IAM_APIKEY"])
+    service._iam_api_key(iam_api_key: ENV["ASSISTANT_IAM_APIKEY"])
     service.add_default_headers(
       headers: {
         "X-Watson-Learning-Opt-Out" => "1",
@@ -682,4 +683,26 @@ def test_get_workspace_with_iam_user_pass_non_params
     )
     assert((200..299).cover?(service_response.status))
   end
+
+  def test_receive_error
+    service = WatsonAPIs::AssistantV1.new(
+      url: ENV["ASSISTANT_IAM_URL"],
+      version: "2018-02-16"
+    )
+    service.add_default_headers(
+      headers: {
+        "X-Watson-Learning-Opt-Out" => "1",
+        "X-Watson-Test" => "1"
+      }
+    )
+    error_received = false
+    begin
+      service._iam_api_key(iam_api_key: "bogus_api_key")
+      service.list_workspaces
+    rescue WatsonApiException => e
+      assert_equal("Provided API key could not be found", e.info["errorMessage"])
+      error_received = true
+    end
+    assert(error_received)
+  end
 end