ibm_cloud_sdk_core 0.3.3 → 1.0.0.rc1

data/lib/ibm_cloud_sdk_core/utils.rb

@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+DEFAULT_CREDENTIALS_FILE_NAME = "ibm-credentials.env"
+
+def get_service_properties(service_name)
+  # - 1) Credential file
+  config = load_from_credential_file(service_name)
+  # - 2) Environment variables
+  config = load_from_environment_variables(service_name) if config.nil? || config.empty?
+  # - 3) VCAP_SERVICES env variable
+  config = load_from_vcap_services(service_name) if config.nil? || config.empty?
+  config
+end
+
+def check_bad_first_or_last_char(str)
+  return str.start_with?("{", "\"") || str.end_with?("}", "\"") unless str.nil?
+end
+
+# Initiates the credentials based on the credential file
+def load_from_credential_file(service_name, separator = "=")
+  credential_file_path = ENV["IBM_CREDENTIALS_FILE"]
+
+  # Home directory
+  if credential_file_path.nil?
+    file_path = ENV["HOME"] + "/" + DEFAULT_CREDENTIALS_FILE_NAME
+    credential_file_path = file_path if File.exist?(file_path)
+  end
+
+  # Top-level directory of the project
+  if credential_file_path.nil?
+    file_path = File.join(File.dirname(__FILE__), "/../../" + DEFAULT_CREDENTIALS_FILE_NAME)
+    credential_file_path = file_path if File.exist?(file_path)
+  end
+
+  return if credential_file_path.nil?
+
+  file_contents = File.open(credential_file_path, "r")
+  config = {}
+  file_contents.each_line do |line|
+    key_val = line.strip.split(separator)
+    unless line.start_with?("#") && key.length == 2
+      key = parse_key(key_val[0].downcase, service_name) unless key_val[0].nil?
+      config.store(key.to_sym, key_val[1]) unless key.nil?
+    end
+  end
+  config
+end
+
+def load_from_environment_variables(service_name)
+  config = {}
+  ENV.each do |key, val|
+    parsed_key = parse_key(key.downcase, service_name) unless key.nil?
+    config.store(parsed_key.to_sym, val) unless parsed_key.nil?
+  end
+  config
+end
+
+def parse_key(key, service_name)
+  key[service_name.length + 1, key.length] if key.include?(service_name)
+end
+
+def load_from_vcap_services(service_name)
+  vcap_services = ENV["VCAP_SERVICES"]
+  unless vcap_services.nil?
+    services = JSON.parse(vcap_services)
+    config = {}
+    credentials = services[service_name][0]["credentials"] if services.key?(service_name)
+    return config if credentials.nil?
+
+    credentials.each do |key, val|
+      config.store(key.to_sym, val)
+    end
+    config[:auth_type] = "basic" if !config[:username].nil? && !config[:password].nil?
+    config[:auth_type] = "iam" unless config[:apikey].nil?
+    return config
+  end
+  nil
+end

data/lib/ibm_cloud_sdk_core/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module IBMCloudSdkCore
-  VERSION = "0.3.3"
+  VERSION = "1.0.0.rc1"
 end

data/test/unit/test_base_service.rb

@@ -3,6 +3,8 @@
 require("json")
 require("jwt")
 require_relative("./../test_helper.rb")
+require_relative("./../../lib/ibm_cloud_sdk_core/authenticators/basic_authenticator")
+require_relative("./../../lib/ibm_cloud_sdk_core/authenticators/config_based_authenticator_factory")
 require("webmock/minitest")
 
 WebMock.disable_net_connect!(allow_localhost: true)
@@ -11,7 +13,7 @@ WebMock.disable_net_connect!(allow_localhost: true)
 class BaseServiceTest < Minitest::Test
   def test_wrong_username
     assert_raises do
-      IBMCloudSdkCore::BaseService.new(
+      IBMCloudSdkCore::BasicAuthenticator.new(
         username: "\"username",
         password: "password"
       )
@@ -20,26 +22,30 @@ class BaseServiceTest < Minitest::Test
 
   def test_wrong_apikey
     assert_raises do
-      IBMCloudSdkCore::BaseService.new(
-        iam_apikey: "{apikey"
+      IBMCloudSdkCore::IamAuthenticator.new(
+        apikey: "{apikey"
       )
     end
   end
 
   def test_wrong_url
     assert_raises do
-      IBMCloudSdkCore::BaseService.new(
-        iam_apikey: "apikey",
+      IBMCloudSdkCore::IamAuthenticator.new(
+        apikey: "apikey",
         url: "url}"
       )
     end
   end
 
   def test_correct_creds_and_headers
-    service = IBMCloudSdkCore::BaseService.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
+    service = IBMCloudSdkCore::BaseService.new(
+      display_name: "Assistant",
+      authenticator: authenticator
+    )
     service.add_default_headers(
       headers: {
         "X-Watson-Learning-Opt-Out" => "1",
@@ -50,20 +56,11 @@ class BaseServiceTest < Minitest::Test
     refute_nil(service)
   end
 
-  def test_iam_access_token
-    token = "new$token"
-    service = IBMCloudSdkCore::BaseService.new(
-      url: "https://we.the.best"
-    )
-    response = service.iam_access_token(iam_access_token: token)
-    assert_equal(response, token)
-  end
-
   def test_set_credentials_from_path_in_env
     file_path = File.join(File.dirname(__FILE__), "../../resources/ibm-credentials.env")
     ENV["IBM_CREDENTIALS_FILE"] = file_path
     service = IBMCloudSdkCore::BaseService.new(display_name: "Visual Recognition")
-    assert_equal(service.url, "https://gateway.ronaldo.com")
+    assert_equal(service.instance_variable_get(:@url), "https://gateway.ronaldo.com")
     refute_nil(service)
     ENV.delete("IBM_CREDENTIALS_FILE")
   end
@@ -72,16 +69,27 @@ class BaseServiceTest < Minitest::Test
     file_path = File.join(File.dirname(__FILE__), "../../resources/ibm-credentials.env")
     ENV["IBM_CREDENTIALS_FILE"] = file_path
     service = IBMCloudSdkCore::BaseService.new(display_name: "Natural Language Understanding")
-    assert_equal(service.url, "https://gateway.messi.com")
-    assert_equal(service.token_manager.instance_variable_get(:@iam_apikey), "salah")
+    assert_equal(service.instance_variable_get(:@url), "https://gateway.messi.com")
+    refute_nil(service)
+    ENV.delete("IBM_CREDENTIALS_FILE")
+  end
+
+  def test_set_credentials_from_path_in_env_bearer_token
+    file_path = File.join(File.dirname(__FILE__), "../../resources/ibm-credentials.env")
+    ENV["IBM_CREDENTIALS_FILE"] = file_path
+    authenticator = IBMCloudSdkCore::ConfigBasedAuthenticatorFactory.new.get_authenticator(service_name: "leo_messi")
+    service = IBMCloudSdkCore::BaseService.new(display_name: "Leo Messi", url: "some.url", authenticator: authenticator)
+    assert_equal(authenticator.authentication_type, "bearerToken")
     refute_nil(service)
     ENV.delete("IBM_CREDENTIALS_FILE")
   end
 
   def test_vcap_services
     ENV["VCAP_SERVICES"] = JSON.parse(File.read(Dir.getwd + "/resources/vcap-testing.json")).to_json
-    service = IBMCloudSdkCore::BaseService.new(vcap_services_name: "salah", use_vcap_services: true)
-    assert_equal(service.username, "mo")
+    authenticator = IBMCloudSdkCore::ConfigBasedAuthenticatorFactory.new.get_authenticator(service_name: "salah")
+    service = IBMCloudSdkCore::BaseService.new(display_name: "salah", authenticator: authenticator)
+    assert_equal(authenticator.username, "mo")
+    assert_equal(service.display_name, "salah")
   end
 
   def test_dummy_request
@@ -92,14 +100,16 @@ class BaseServiceTest < Minitest::Test
           "Host" => "we.the.best"
         }
       ).to_return(status: 200, body: "", headers: {})
-    service = IBMCloudSdkCore::BaseService.new(display_name: "Salah", url: "https://we.the.best")
+    authenticator = IBMCloudSdkCore::ConfigBasedAuthenticatorFactory.new.get_authenticator(service_name: "Salah")
+    service = IBMCloudSdkCore::BaseService.new(display_name: "Salah", authenticator: authenticator, url: "https://we.the.best")
     service_response = service.request(method: "GET", url: "/music", headers: {})
     assert_equal("", service_response.result)
   end
 
   def test_dummy_request_form_data
     service = IBMCloudSdkCore::BaseService.new(
-      iam_apikey: "apikey",
+      display_name: "Assistant",
+      apikey: "apikey",
       iam_access_token: "token",
       url: "https://gateway.watsonplatform.net/"
     )
@@ -133,7 +143,8 @@ class BaseServiceTest < Minitest::Test
           "Host" => "we.the.best"
         }
       ).to_return(status: 500, body: response.to_json, headers: {})
-    service = IBMCloudSdkCore::BaseService.new(display_name: "Salah", url: "https://we.the.best")
+    authenticator = IBMCloudSdkCore::ConfigBasedAuthenticatorFactory.new.get_authenticator(service_name: "Salah")
+    service = IBMCloudSdkCore::BaseService.new(display_name: "Salah", authenticator: authenticator, url: "https://we.the.best")
     assert_raises do
       service.request(method: "GET", url: "/music", headers: {})
     end
@@ -151,237 +162,48 @@ class BaseServiceTest < Minitest::Test
     stub_request(:get, "https://we.the.best/music")
       .with(
         headers: {
-          "Authorization" => "Basic YXBpa2V5OmljcC14eXo=",
           "Host" => "we.the.best"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    service = IBMCloudSdkCore::BaseService.new(
-      url: "https://we.the.best",
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "apikey",
       password: "icp-xyz"
     )
-    service_response = service.request(method: "GET", url: "/music", headers: {})
-    assert_equal(response, service_response.result)
-  end
-
-  def test_dummy_request_icp_iam_apikey
-    response = {
-      "text" => "I want financial advice today.",
-      "created" => "2016-07-11T16:39:01.774Z",
-      "updated" => "2015-12-07T18:53:59.153Z"
-    }
-    headers = {
-      "Content-Type" => "application/json"
-    }
-    stub_request(:get, "https://we.the.best/music")
-      .with(
-        headers: {
-          "Authorization" => "Basic YXBpa2V5OmljcC14eXo=",
-          "Host" => "we.the.best"
-        }
-      ).to_return(status: 200, body: response.to_json, headers: headers)
-    service = IBMCloudSdkCore::BaseService.new(
-      url: "https://we.the.best",
-      iam_apikey: "icp-xyz"
-    )
-    service_response = service.request(method: "GET", url: "/music", headers: {})
-    assert_equal(response, service_response.result)
-  end
-
-  def test_dummy_request_icp_iam_apikey_cred_file
-    response = {
-      "text" => "I want financial advice today.",
-      "created" => "2016-07-11T16:39:01.774Z",
-      "updated" => "2015-12-07T18:53:59.153Z"
-    }
-    headers = {
-      "Content-Type" => "application/json"
-    }
-    stub_request(:get, "https://we.the.best/music")
-      .with(
-        headers: {
-          "Authorization" => "Basic YXBpa2V5OmljcC14eXo=",
-          "Host" => "we.the.best"
-        }
-      ).to_return(status: 200, body: response.to_json, headers: headers)
-    file_path = File.join(File.dirname(__FILE__), "../../resources/ibm-credentials.env")
-    ENV["IBM_CREDENTIALS_FILE"] = file_path
-    service = IBMCloudSdkCore::BaseService.new(
-      url: "https://we.the.best",
-      display_name: "messi"
-    )
-    service_response = service.request(method: "GET", url: "/music", headers: {})
-    assert_equal(response, service_response.result)
-  end
-
-  def test_dummy_request_username_apikey
-    response = {
-      "text" => "I want financial advice today.",
-      "created" => "2016-07-11T16:39:01.774Z",
-      "updated" => "2015-12-07T18:53:59.153Z"
-    }
-    access_token_layout = {
-      "username" => "dummy",
-      "role" => "Admin",
-      "permissions" => %w[administrator manage_catalog],
-      "sub" => "admin",
-      "iss" => "sss",
-      "aud" => "sss",
-      "uid" => "sss",
-      "iat" => 3600,
-      "exp" => Time.now.to_i
-    }
-
-    access_token = JWT.encode(access_token_layout, "secret", "HS256", "kid": "230498151c214b788dd97f22b85410a5")
-    token_response = {
-      "access_token" => access_token,
-      "token_type" => "Bearer",
-      "expires_in" => 3600,
-      "expiration" => 1_524_167_011,
-      "refresh_token" => "jy4gl91BQ"
-    }
-
-    headers = {
-      "Content-Type" => "application/json"
-    }
-    stub_request(:post, "https://iam.cloud.ibm.com/identity/token")
-      .with(
-        body: {
-          "apikey" => "xyz",
-          "grant_type" => "urn:ibm:params:oauth:grant-type:apikey",
-          "response_type" => "cloud_iam"
-        },
-        headers: {
-          "Accept" => "application/json",
-          "Authorization" => "Basic Yng6Yng=",
-          "Connection" => "close",
-          "Content-Type" => "application/x-www-form-urlencoded",
-          "Host" => "iam.cloud.ibm.com",
-          "User-Agent" => "http.rb/4.1.1"
-        }
-      ).to_return(status: 200, body: token_response.to_json, headers: {})
-    stub_request(:get, "https://we.the.best/music")
-      .with(
-        headers: {
-          "Authorization" => "Bearer " + access_token,
-          "Host" => "we.the.best"
-        }
-      ).to_return(status: 200, body: response.to_json, headers: headers)
     service = IBMCloudSdkCore::BaseService.new(
-      url: "https://we.the.best",
-      username: "apikey",
-      password: "xyz"
+      display_name: "Assistant",
+      authenticator: authenticator,
+      url: "https://we.the.best"
     )
     service_response = service.request(method: "GET", url: "/music", headers: {})
     assert_equal(response, service_response.result)
   end
 
-  def test_for_icp4d
-    service = IBMCloudSdkCore::BaseService.new(
+  def test_for_cp4d_authenticator
+    authenticator = IBMCloudSdkCore::CloudPakForDataAuthenticator.new(
       username: "hello",
       password: "world",
-      icp4d_url: "service_url",
-      authentication_type: "icp4d"
-    )
-    refute_nil(service.token_manager)
-  end
-
-  def test_dummy_request_username_apikey_cred_file
-    response = {
-      "text" => "I want financial advice today.",
-      "created" => "2016-07-11T16:39:01.774Z",
-      "updated" => "2015-12-07T18:53:59.153Z"
-    }
-
-    access_token_layout = {
-      "username" => "dummy",
-      "role" => "Admin",
-      "permissions" => %w[administrator manage_catalog],
-      "sub" => "admin",
-      "iss" => "sss",
-      "aud" => "sss",
-      "uid" => "sss",
-      "iat" => 3600,
-      "exp" => Time.now.to_i
-    }
-
-    access_token = JWT.encode(access_token_layout, "secret", "HS256", "kid": "230498151c214b788dd97f22b85410a5")
-    token_response = {
-      "access_token" => access_token,
-      "token_type" => "Bearer",
-      "expires_in" => 3600,
-      "expiration" => 1_524_167_011,
-      "refresh_token" => "jy4gl91BQ"
-    }
-
-    headers = {
-      "Content-Type" => "application/json"
-    }
-    stub_request(:post, "https://iam.cloud.ibm.com/identity/token")
-      .with(
-        body: {
-          "apikey" => "xyz",
-          "grant_type" => "urn:ibm:params:oauth:grant-type:apikey",
-          "response_type" => "cloud_iam"
-        },
-        headers: {
-          "Accept" => "application/json",
-          "Authorization" => "Basic Yng6Yng=",
-          "Connection" => "close",
-          "Content-Type" => "application/x-www-form-urlencoded",
-          "Host" => "iam.cloud.ibm.com",
-          "User-Agent" => "http.rb/4.1.1"
-        }
-      ).to_return(status: 200, body: token_response.to_json, headers: {})
-    stub_request(:get, "https://we.the.best/music")
-      .with(
-        headers: {
-          "Authorization" => "Bearer " + access_token,
-          "Host" => "we.the.best"
-        }
-      ).to_return(status: 200, body: response.to_json, headers: headers)
-    file_path = File.join(File.dirname(__FILE__), "../../resources/ibm-credentials.env")
-    ENV["IBM_CREDENTIALS_FILE"] = file_path
-    service = IBMCloudSdkCore::BaseService.new(
-      display_name: "ronaldo",
-      url: "https://we.the.best"
-    )
-    service_response = service.request(method: "GET", url: "/music", headers: {})
-    assert_equal(response, service_response.result)
-  end
-
-  def test_icp4d_access_token
-    service = IBMCloudSdkCore::BaseService.new(
-      authentication_type: "icp4d",
-      icp4d_url: "https://the.sixth.one",
-      icp4d_access_token: "token"
+      url: "hello.world"
     )
-    assert_equal(service.instance_variable_get(:@icp4d_access_token), "token")
-    service.send :icp4d_token_manager, icp4d_access_token: "new_token", icp4d_url: "the.url"
-    token_manager = service.instance_variable_get(:@token_manager)
-    assert_equal(token_manager.instance_variable_get(:@user_access_token), "new_token")
-  end
-
-  def test_icp4d_disable_ssl
-    service = IBMCloudSdkCore::BaseService.new(
-      authentication_type: "icp4d",
-      icp4d_url: "https://the.sixth.one",
-      icp4d_access_token: "token",
-      url: "http://the.com"
-    )
-    stub_request(:get, "http://the.com/music")
-      .with(
-        headers: {
-          "Authorization" => "Basic Og==",
-          "Host" => "the.com"
-        }
-      ).to_return(status: 200, body: {}.to_json, headers: {})
-    assert_equal(service.instance_variable_get(:@icp4d_access_token), "token")
-    service.send :icp4d_token_manager, icp4d_access_token: "new_token", icp4d_url: "the.url"
-    token_manager = service.instance_variable_get(:@token_manager)
-    service.configure_http_client(disable_ssl_verification: true)
-    assert_equal(token_manager.instance_variable_get(:@disable_ssl_verification), true)
-    service_response = token_manager.send :request, method: "GET", url: "http://the.com/music", headers: {}
-    assert_equal({}, service_response)
-  end
+    refute_nil(authenticator)
+  end
+
+  # def test_CP4D_disable_ssl
+  #   authenticator = IBMCloudSdkCore::CloudPakForDataAuthenticator.new(
+  #     username: "username",
+  #     password: "password"
+  #   )
+  #   IBMCloudSdkCore::BaseService.new(
+  #     display_name: "Assistant",
+  #     url: "http://the.com",
+  #     authenticator: authenticator
+  #   )
+  #   stub_request(:get, "http://the.com/music")
+  #     .with(
+  #       headers: {
+  #         "Authorization" => "Basic Og==",
+  #         "Host" => "the.com"
+  #       }
+  #     ).to_return(status: 200, body: {}.to_json, headers: {})
+  #   assert_equal(authenticator.instance_variable_get(:@access_token), "token")
+  # end
 end

data/test/unit/test_iam_token_manager.rb

@@ -18,12 +18,14 @@ class IAMTokenManagerTest < Minitest::Test
 
     # Use default iam_url, client id/secret
     token_manager = IBMCloudSdkCore::IAMTokenManager.new(
-      iam_apikey: "iam_apikey",
-      iam_access_token: "iam_access_token"
+      apikey: "apikey",
+      url: "https://iam.cloud.ibm.com/identity/token",
+      client_id: "bx",
+      client_secret: "bx"
     )
     stub_request(:post, "https://iam.cloud.ibm.com/identity/token")
       .with(
-        body: { "apikey" => "iam_apikey", "grant_type" => "urn:ibm:params:oauth:grant-type:apikey", "response_type" => "cloud_iam" },
+        body: { "apikey" => "apikey", "grant_type" => "urn:ibm:params:oauth:grant-type:apikey", "response_type" => "cloud_iam" },
         headers: {
           "Accept" => "application/json",
           "Authorization" => "Basic Yng6Yng=",
@@ -38,9 +40,8 @@ class IAMTokenManagerTest < Minitest::Test
   def test_request_token_fails
     iam_url = "https://iam.cloud.ibm.com/identity/token"
     token_manager = IBMCloudSdkCore::IAMTokenManager.new(
-      iam_apikey: "iam_apikey",
-      iam_access_token: "iam_access_token",
-      iam_url: iam_url
+      apikey: "apikey",
+      url: iam_url
     )
     response = {
       "code" => "500",
@@ -48,10 +49,10 @@ class IAMTokenManagerTest < Minitest::Test
     }
     stub_request(:post, "https://iam.cloud.ibm.com/identity/token")
       .with(
-        body: { "apikey" => "iam_apikey", "grant_type" => "urn:ibm:params:oauth:grant-type:apikey", "response_type" => "cloud_iam" },
+        body: { "apikey" => "apikey", "grant_type" => "urn:ibm:params:oauth:grant-type:apikey", "response_type" => "cloud_iam" },
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Basic Yng6Yng=",
+          "Authorization" => "Basic Og==",
           "Content-Type" => "application/x-www-form-urlencoded",
           "Host" => "iam.cloud.ibm.com"
         }
@@ -63,8 +64,10 @@ class IAMTokenManagerTest < Minitest::Test
 
   def test_request_token_fails_catch_exception
     token_manager = IBMCloudSdkCore::IAMTokenManager.new(
-      iam_apikey: "iam_apikey",
-      iam_access_token: "iam_access_token"
+      apikey: "apikey",
+      url: "https://iam.cloud.ibm.com/identity/token",
+      client_id: "bx",
+      client_secret: "bx"
     )
     response = {
       "code" => "500",
@@ -72,7 +75,7 @@ class IAMTokenManagerTest < Minitest::Test
     }
     stub_request(:post, "https://iam.cloud.ibm.com/identity/token")
       .with(
-        body: { "apikey" => "iam_apikey", "grant_type" => "urn:ibm:params:oauth:grant-type:apikey", "response_type" => "cloud_iam" },
+        body: { "apikey" => "apikey", "grant_type" => "urn:ibm:params:oauth:grant-type:apikey", "response_type" => "cloud_iam" },
         headers: {
           "Accept" => "application/json",
           "Authorization" => "Basic Yng6Yng=",
@@ -89,9 +92,10 @@ class IAMTokenManagerTest < Minitest::Test
 
   def test_is_token_expired
     token_manager = IBMCloudSdkCore::IAMTokenManager.new(
-      iam_apikey: "iam_apikey",
-      iam_access_token: "iam_access_token",
-      iam_url: "iam_url"
+      apikey: "apikey",
+      url: "https://url.com",
+      client_id: "bx",
+      client_secret: "bx"
     )
 
     assert(token_manager.send(:token_expired?))
@@ -106,13 +110,11 @@ class IAMTokenManagerTest < Minitest::Test
   def test_get_token
     iam_url = "https://iam.cloud.ibm.com/identity/token"
     token_manager = IBMCloudSdkCore::IAMTokenManager.new(
-      iam_apikey: "iam_apikey",
-      iam_url: iam_url
+      apikey: "apikey",
+      url: iam_url,
+      client_id: "bx",
+      client_secret: "bx"
     )
-    token_manager.user_access_token = "user_access_token"
-
-    token = token_manager.token
-    assert_equal(token_manager.user_access_token, token)
 
     access_token_layout = {
       "username" => "dummy",
@@ -138,7 +140,7 @@ class IAMTokenManagerTest < Minitest::Test
 
     stub_request(:post, "https://iam.cloud.ibm.com/identity/token")
       .with(
-        body: { "apikey" => "iam_apikey", "grant_type" => "urn:ibm:params:oauth:grant-type:apikey", "response_type" => "cloud_iam" },
+        body: { "apikey" => "apikey", "grant_type" => "urn:ibm:params:oauth:grant-type:apikey", "response_type" => "cloud_iam" },
         headers: {
           "Accept" => "application/json",
           "Authorization" => "Basic Yng6Yng=",
@@ -147,13 +149,13 @@ class IAMTokenManagerTest < Minitest::Test
         }
       ).to_return(status: 200, body: response.to_json, headers: {})
     token = token_manager.token
-    assert_equal(token_manager.user_access_token, token)
+    assert_equal(access_token, token)
   end
 
   def test_client_id_only
     assert_raises do
       IBMCloudSdkCore::IAMTokenManager.new(
-        iam_apikey: "iam_apikey",
+        apikey: "apikey",
         iam_access_token: "iam_access_token",
         iam_client_id: "client_id"
       )
@@ -163,51 +165,13 @@ class IAMTokenManagerTest < Minitest::Test
   def test_client_secret_only
     assert_raises do
       IBMCloudSdkCore::IAMTokenManager.new(
-        iam_apikey: "iam_apikey",
+        apikey: "apikey",
         iam_access_token: "iam_access_token",
         iam_client_secret: "client_secret"
       )
     end
   end
 
-  def test_request_token_nondefault_client_id_secret
-    response = {
-      "access_token" => "oAeisG8yqPY7sFR_x66Z15",
-      "token_type" => "Bearer",
-      "expires_in" => 3600,
-      "expiration" => 1_524_167_011,
-      "refresh_token" => "jy4gl91BQ"
-    }
-
-    token_manager = IBMCloudSdkCore::IAMTokenManager.new(
-      iam_apikey: "iam_apikey",
-      iam_client_id: "foo",
-      iam_client_secret: "bar"
-    )
-    stub_request(:post, "https://iam.cloud.ibm.com/identity/token")
-      .with(basic_auth: %w[foo bar]).to_return(status: 200, body: response.to_json, headers: {})
-    token_response = token_manager.send(:request_token)
-    assert_equal(response, token_response)
-  end
-
-  def test_request_token_default_client_id_secret
-    response = {
-      "access_token" => "oAeisG8yqPY7sFR_x66Z15",
-      "token_type" => "Bearer",
-      "expires_in" => 3600,
-      "expiration" => 1_524_167_011,
-      "refresh_token" => "jy4gl91BQ"
-    }
-
-    token_manager = IBMCloudSdkCore::IAMTokenManager.new(
-      iam_apikey: "iam_apikey"
-    )
-    stub_request(:post, "https://iam.cloud.ibm.com/identity/token")
-      .with(basic_auth: %w[bx bx]).to_return(status: 200, body: response.to_json, headers: {})
-    token_response = token_manager.send(:request_token)
-    assert_equal(response, token_response)
-  end
-
   def test_dont_leak_constants
     assert_nil(defined? DEFAULT_IAM_URL)
     assert_nil(defined? CONTENT_TYPE)