ibm_watson 0.20.1 → 1.0.0.rc1

data/test/unit/test_assistant_v2.rb

@@ -10,10 +10,13 @@ WebMock.disable_net_connect!(allow_localhost: true)
 # Unit tests for the Watson Assistant V1 Service
 class AssistantV2Test < Minitest::Test
   def test_message
-    service = IBMWatson::AssistantV2.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-02-16"
+      password: "password"
+    )
+    service = IBMWatson::AssistantV2.new(
+      version: "2018-02-16",
+      authenticator: authenticator
     )
     # service.set_default_headers("x-watson-learning-opt-out" => true)
     assistant_id = "f8fdbc65-e0bd-4e43-b9f8-2975a366d4ec"
@@ -106,10 +109,13 @@ class AssistantV2Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: "", headers: {})
-    service = IBMWatson::AssistantV2.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-02-16"
+      password: "password"
+    )
+    service = IBMWatson::AssistantV2.new(
+      version: "2018-02-16",
+      authenticator: authenticator
     )
     service_response = service.create_session(
       assistant_id: "pizza_app-e0f3"
@@ -126,10 +132,13 @@ class AssistantV2Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: "", headers: {})
-    service = IBMWatson::AssistantV2.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-02-16"
+      password: "password"
+    )
+    service = IBMWatson::AssistantV2.new(
+      version: "2018-02-16",
+      authenticator: authenticator
     )
     service_response = service.delete_session(
       assistant_id: "pizza_app-e0f3",

data/test/unit/test_compare_comply_v1.rb

@@ -11,12 +11,15 @@ WebMock.disable_net_connect!(allow_localhost: true)
 class CompareComplyV1 < Minitest::Test
   def test_convert_to_html
     # service.set_default_headers("x-watson-learning-opt-out" => true)
+    authenticator = IBMCloudSdkCore::BearerTokenAuthenticator.new(
+      bearer_token: "token"
+    )
     service = IBMWatson::CompareComplyV1.new(
-      iam_apikey: "apikey",
-      iam_access_token: "token"
+      version: "2018-10-15",
+      authenticator: authenticator
     )
     file = File.open(Dir.getwd + "/resources/cnc_test.pdf")
-    stub_request(:post, "https://gateway.watsonplatform.net/compare-comply/api/v1/html_conversion").with do |req|
+    stub_request(:post, "https://gateway.watsonplatform.net/compare-comply/api/v1/html_conversion?version=2018-10-15").with do |req|
       # Test the headers.
       assert_equal(req.headers["Accept"], "application/json")
       assert_match(%r{\Amultipart/form-data}, req.headers["Content-Type"])
@@ -24,20 +27,19 @@ class CompareComplyV1 < Minitest::Test
     service.convert_to_html(
       file: file
     )
-    service.convert_to_html(
-      file: "dummy",
-      filename: "file"
-    )
   end
 
   def test_classify_elements
     # service.set_default_headers("x-watson-learning-opt-out" => true)
+    authenticator = IBMCloudSdkCore::BearerTokenAuthenticator.new(
+      bearer_token: "token"
+    )
     service = IBMWatson::CompareComplyV1.new(
-      iam_apikey: "apikey",
-      iam_access_token: "token"
+      version: "2018-10-15",
+      authenticator: authenticator
     )
     file = File.open(Dir.getwd + "/resources/cnc_test.pdf")
-    stub_request(:post, "https://gateway.watsonplatform.net/compare-comply/api/v1/element_classification").with do |req|
+    stub_request(:post, "https://gateway.watsonplatform.net/compare-comply/api/v1/element_classification?version=2018-10-15").with do |req|
       assert_equal(req.headers["Accept"], "application/json")
       assert_match(%r{\Amultipart/form-data}, req.headers["Content-Type"])
       assert_match(/Content-Disposition: form-data/, req.body)
@@ -52,12 +54,15 @@ class CompareComplyV1 < Minitest::Test
 
   def test_extract_tables
     # service.set_default_headers("x-watson-learning-opt-out" => true)
+    authenticator = IBMCloudSdkCore::BearerTokenAuthenticator.new(
+      bearer_token: "token"
+    )
     service = IBMWatson::CompareComplyV1.new(
-      iam_apikey: "apikey",
-      iam_access_token: "token"
+      version: "2018-10-15",
+      authenticator: authenticator
     )
     file = File.open(Dir.getwd + "/resources/cnc_test.pdf")
-    stub_request(:post, "https://gateway.watsonplatform.net/compare-comply/api/v1/tables").with do |req|
+    stub_request(:post, "https://gateway.watsonplatform.net/compare-comply/api/v1/tables?version=2018-10-15").with do |req|
       assert_equal(req.headers["Accept"], "application/json")
       assert_match(%r{\Amultipart/form-data}, req.headers["Content-Type"])
       assert_match(/Content-Disposition: form-data/, req.body)
@@ -72,12 +77,15 @@ class CompareComplyV1 < Minitest::Test
 
   def test_compare_documents
     # service.set_default_headers("x-watson-learning-opt-out" => true)
+    authenticator = IBMCloudSdkCore::BearerTokenAuthenticator.new(
+      bearer_token: "token"
+    )
     service = IBMWatson::CompareComplyV1.new(
-      iam_apikey: "apikey",
-      iam_access_token: "token"
+      version: "2018-10-15",
+      authenticator: authenticator
     )
     file = File.open(Dir.getwd + "/resources/cnc_test.pdf")
-    stub_request(:post, "https://gateway.watsonplatform.net/compare-comply/api/v1/comparison").with do |req|
+    stub_request(:post, "https://gateway.watsonplatform.net/compare-comply/api/v1/comparison?version=2018-10-15").with do |req|
       assert_equal(req.headers["Accept"], "application/json")
       assert_match(%r{\Amultipart/form-data}, req.headers["Content-Type"])
       assert_match(/Content-Disposition: form-data/, req.body)
@@ -93,9 +101,12 @@ class CompareComplyV1 < Minitest::Test
   end
 
   def test_list_feedback
+    authenticator = IBMCloudSdkCore::BearerTokenAuthenticator.new(
+      bearer_token: "token"
+    )
     service = IBMWatson::CompareComplyV1.new(
-      iam_apikey: "apikey",
-      iam_access_token: "token"
+      version: "2018-10-15",
+      authenticator: authenticator
     )
     message_response = {
       "feedback" => [
@@ -108,7 +119,7 @@ class CompareComplyV1 < Minitest::Test
     headers = {
       "Content-Type" => "application/json"
     }
-    stub_request(:get, "https://gateway.watsonplatform.net/compare-comply/api/v1/feedback")
+    stub_request(:get, "https://gateway.watsonplatform.net/compare-comply/api/v1/feedback?version=2018-10-15")
       .with(
         headers: {
           "Accept" => "application/json",
@@ -122,9 +133,12 @@ class CompareComplyV1 < Minitest::Test
   end
 
   def test_add_feedback
+    authenticator = IBMCloudSdkCore::BearerTokenAuthenticator.new(
+      bearer_token: "token"
+    )
     service = IBMWatson::CompareComplyV1.new(
-      iam_apikey: "apikey",
-      iam_access_token: "token"
+      version: "2018-10-15",
+      authenticator: authenticator
     )
     message_response = {
       "feedback_id" => "another_one"
@@ -132,7 +146,7 @@ class CompareComplyV1 < Minitest::Test
     headers = {
       "Content-Type" => "application/json"
     }
-    stub_request(:post, "https://gateway.watsonplatform.net/compare-comply/api/v1/feedback")
+    stub_request(:post, "https://gateway.watsonplatform.net/compare-comply/api/v1/feedback?version=2018-10-15")
       .with(
         headers: {
           "Accept" => "application/json",
@@ -148,9 +162,12 @@ class CompareComplyV1 < Minitest::Test
   end
 
   def test_get_feedback
+    authenticator = IBMCloudSdkCore::BearerTokenAuthenticator.new(
+      bearer_token: "token"
+    )
     service = IBMWatson::CompareComplyV1.new(
-      iam_apikey: "apikey",
-      iam_access_token: "token"
+      version: "2018-10-15",
+      authenticator: authenticator
     )
     message_response = {
       "feedback_id" => "messi"
@@ -158,7 +175,7 @@ class CompareComplyV1 < Minitest::Test
     headers = {
       "Content-Type" => "application/json"
     }
-    stub_request(:get, "https://gateway.watsonplatform.net/compare-comply/api/v1/feedback/messi")
+    stub_request(:get, "https://gateway.watsonplatform.net/compare-comply/api/v1/feedback/messi?version=2018-10-15")
       .with(
         headers: {
           "Accept" => "application/json",
@@ -174,12 +191,15 @@ class CompareComplyV1 < Minitest::Test
   end
 
   def test_delete_feedback
+    authenticator = IBMCloudSdkCore::BearerTokenAuthenticator.new(
+      bearer_token: "token"
+    )
     service = IBMWatson::CompareComplyV1.new(
-      iam_apikey: "apikey",
-      iam_access_token: "token"
+      version: "2018-10-15",
+      authenticator: authenticator
     )
     message_response = "200"
-    stub_request(:delete, "https://gateway.watsonplatform.net/compare-comply/api/v1/feedback/messi")
+    stub_request(:delete, "https://gateway.watsonplatform.net/compare-comply/api/v1/feedback/messi?version=2018-10-15")
       .with(
         headers: {
           "Accept" => "application/json",
@@ -195,11 +215,14 @@ class CompareComplyV1 < Minitest::Test
   end
 
   def test_create_batch
+    authenticator = IBMCloudSdkCore::BearerTokenAuthenticator.new(
+      bearer_token: "token"
+    )
     service = IBMWatson::CompareComplyV1.new(
-      iam_apikey: "apikey",
-      iam_access_token: "token"
+      version: "2018-10-15",
+      authenticator: authenticator
     )
-    stub_request(:post, "https://gateway.watsonplatform.net/compare-comply/api/v1/batches?function=tables")
+    stub_request(:post, "https://gateway.watsonplatform.net/compare-comply/api/v1/batches?function=tables&version=2018-10-15")
       .with do |req|
         assert_equal req.headers["Accept"], "application/json"
         assert_match %r{\Amultipart/form-data}, req.headers["Content-Type"]
@@ -217,9 +240,12 @@ class CompareComplyV1 < Minitest::Test
   end
 
   def test_list_batches
+    authenticator = IBMCloudSdkCore::BearerTokenAuthenticator.new(
+      bearer_token: "token"
+    )
     service = IBMWatson::CompareComplyV1.new(
-      iam_apikey: "apikey",
-      iam_access_token: "token"
+      version: "2018-10-15",
+      authenticator: authenticator
     )
     message_response = {
       "batches" => []
@@ -227,7 +253,7 @@ class CompareComplyV1 < Minitest::Test
     headers = {
       "Content-Type" => "application/json"
     }
-    stub_request(:get, "https://gateway.watsonplatform.net/compare-comply/api/v1/batches")
+    stub_request(:get, "https://gateway.watsonplatform.net/compare-comply/api/v1/batches?version=2018-10-15")
       .with(
         headers: {
           "Accept" => "application/json",
@@ -241,12 +267,15 @@ class CompareComplyV1 < Minitest::Test
   end
 
   def test_get_batch
+    authenticator = IBMCloudSdkCore::BearerTokenAuthenticator.new(
+      bearer_token: "token"
+    )
     service = IBMWatson::CompareComplyV1.new(
-      iam_apikey: "apikey",
-      iam_access_token: "token"
+      version: "2018-10-15",
+      authenticator: authenticator
     )
     message_response = "200"
-    stub_request(:get, "https://gateway.watsonplatform.net/compare-comply/api/v1/batches/mo")
+    stub_request(:get, "https://gateway.watsonplatform.net/compare-comply/api/v1/batches/mo?version=2018-10-15")
       .with(
         headers: {
           "Accept" => "application/json",
@@ -262,12 +291,15 @@ class CompareComplyV1 < Minitest::Test
   end
 
   def test_update_batch
+    authenticator = IBMCloudSdkCore::BearerTokenAuthenticator.new(
+      bearer_token: "token"
+    )
     service = IBMWatson::CompareComplyV1.new(
-      iam_apikey: "apikey",
-      iam_access_token: "token"
+      version: "2018-10-15",
+      authenticator: authenticator
     )
     message_response = "200"
-    stub_request(:put, "https://gateway.watsonplatform.net/compare-comply/api/v1/batches/mo?action=goal")
+    stub_request(:put, "https://gateway.watsonplatform.net/compare-comply/api/v1/batches/mo?action=goal&version=2018-10-15")
       .with(
         headers: {
           "Accept" => "application/json",

data/test/unit/test_configure_http_client.rb

@@ -9,10 +9,12 @@ WebMock.disable_net_connect!(allow_localhost: true)
 # Unit tests for the configure_http_client customizations, such as proxies and timeouts
 class HTTPConfigTest < Minitest::Test
   def test_proxy_address_port
+    authenticator = IBMCloudSdkCore::BearerTokenAuthenticator.new(
+      bearer_token: "token"
+    )
     service = IBMWatson::NaturalLanguageUnderstandingV1.new(
       version: "2018-03-16",
-      username: "username",
-      password: "password"
+      authenticator: authenticator
     )
     service.configure_http_client(
       proxy: {

data/test/unit/test_discovery_v1.rb

@@ -46,10 +46,13 @@ class DiscoveryV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: discovery_response_body.to_json, headers: { "Content-Type" => "application/json" })
-    service = IBMWatson::DiscoveryV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-03-05"
+      password: "password"
+    )
+    service = IBMWatson::DiscoveryV1.new(
+      version: "2018-03-05",
+      authenticator: authenticator
     )
     service_response = service.list_environments
     assert_equal(discovery_response_body, service_response.result)
@@ -64,10 +67,13 @@ class DiscoveryV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: { "resulting_key" => true }.to_json, headers: { "Content-Type" => "application/json" })
-    service = IBMWatson::DiscoveryV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-03-05"
+      password: "password"
+    )
+    service = IBMWatson::DiscoveryV1.new(
+      version: "2018-03-05",
+      authenticator: authenticator
     )
     service_response = service.get_environment(
       environment_id: "envid"
@@ -86,10 +92,13 @@ class DiscoveryV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: { "resulting_key" => true }.to_json, headers: { "Content-Type" => "application/json" })
-    service = IBMWatson::DiscoveryV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-03-05"
+      password: "password"
+    )
+    service = IBMWatson::DiscoveryV1.new(
+      version: "2018-03-05",
+      authenticator: authenticator
     )
     service_response = service.create_environment(
       name: "my name",
@@ -109,10 +118,13 @@ class DiscoveryV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: { "resulting_key" => true }.to_json, headers: { "Content-Type" => "application/json" })
-    service = IBMWatson::DiscoveryV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-03-05"
+      password: "password"
+    )
+    service = IBMWatson::DiscoveryV1.new(
+      version: "2018-03-05",
+      authenticator: authenticator
     )
     service_response = service.update_environment(
       environment_id: "envid",
@@ -131,10 +143,13 @@ class DiscoveryV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: { "resulting_key" => true }.to_json, headers: { "Content-Type" => "application/json" })
-    service = IBMWatson::DiscoveryV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-03-05"
+      password: "password"
+    )
+    service = IBMWatson::DiscoveryV1.new(
+      version: "2018-03-05",
+      authenticator: authenticator
     )
     service_response = service.delete_environment(
       environment_id: "envid"
@@ -151,10 +166,13 @@ class DiscoveryV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: { "body" => "hello" }.to_json, headers: { "Content-Type" => "application/json" })
-    service = IBMWatson::DiscoveryV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-03-05"
+      password: "password"
+    )
+    service = IBMWatson::DiscoveryV1.new(
+      version: "2018-03-05",
+      authenticator: authenticator
     )
     service_response = service.list_collections(
       environment_id: "envid"
@@ -163,10 +181,13 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_collection
-    service = IBMWatson::DiscoveryV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-03-05"
+      password: "password"
+    )
+    service = IBMWatson::DiscoveryV1.new(
+      version: "2018-03-05",
+      authenticator: authenticator
     )
     stub_request(:post, "https://gateway.watsonplatform.net/discovery/api/v1/environments/envid/collections?version=2018-03-05")
       .with(
@@ -249,10 +270,13 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_query
-    service = IBMWatson::DiscoveryV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-03-05"
+      password: "password"
+    )
+    service = IBMWatson::DiscoveryV1.new(
+      version: "2018-03-05",
+      authenticator: authenticator
     )
     stub_request(:post, "https://gateway.watsonplatform.net/discovery/api/v1/environments/envid/collections/collid/query?version=2018-03-05")
       .with(
@@ -260,15 +284,13 @@ class DiscoveryV1Test < Minitest::Test
         headers: {
           "Accept" => "application/json",
           "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
-          "Host" => "gateway.watsonplatform.net",
-          "X-Watson-Logging-Opt-Out" => true
+          "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: { body: "hello" }.to_json, headers: { "Content-Type" => "application/json" })
     service_response = service.query(
       environment_id: "envid",
       collection_id: "collid",
-      count: 10,
-      logging_opt_out: true
+      count: 10
     )
     assert_equal({ "body" => "hello" }, service_response.result)
   end
@@ -284,10 +306,13 @@ class DiscoveryV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: { body: "hello" }.to_json, headers: { "Content-Type" => "application/json" })
-    service = IBMWatson::DiscoveryV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-03-05"
+      password: "password"
+    )
+    service = IBMWatson::DiscoveryV1.new(
+      version: "2018-03-05",
+      authenticator: authenticator
     )
     service_response = service.query_relations(
       environment_id: "envid",
@@ -308,10 +333,13 @@ class DiscoveryV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: { body: "hello" }.to_json, headers: { "Content-Type" => "application/json" })
-    service = IBMWatson::DiscoveryV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-03-05"
+      password: "password"
+    )
+    service = IBMWatson::DiscoveryV1.new(
+      version: "2018-03-05",
+      authenticator: authenticator
     )
     service_response = service.query_entities(
       environment_id: "envid",
@@ -330,10 +358,13 @@ class DiscoveryV1Test < Minitest::Test
         }
       ]
     }
-    service = IBMWatson::DiscoveryV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-03-05"
+      password: "password"
+    )
+    service = IBMWatson::DiscoveryV1.new(
+      version: "2018-03-05",
+      authenticator: authenticator
     )
     stub_request(:get, "https://gateway.watsonplatform.net/discovery/api/v1/environments/envid/configurations?version=2018-03-05")
       .with(
@@ -411,10 +442,13 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_document
-    service = IBMWatson::DiscoveryV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-03-05"
+      password: "password"
+    )
+    service = IBMWatson::DiscoveryV1.new(
+      version: "2018-03-05",
+      authenticator: authenticator
     )
     stub_request(:post, "https://gateway.watsonplatform.net/discovery/api/v1/environments/envid/preview?configuration_id=bogus&version=2018-03-05")
       .with(
@@ -563,10 +597,13 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_delete_all_training_data
-    service = IBMWatson::DiscoveryV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-03-05"
+      password: "password"
+    )
+    service = IBMWatson::DiscoveryV1.new(
+      version: "2018-03-05",
+      authenticator: authenticator
     )
     stub_request(:delete, "https://gateway.watsonplatform.net/discovery/api/v1/environments/envid/collections/collid/training_data?version=2018-03-05")
       .with(
@@ -583,10 +620,13 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_list_training_data
-    service = IBMWatson::DiscoveryV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-03-05"
+      password: "password"
+    )
+    service = IBMWatson::DiscoveryV1.new(
+      version: "2018-03-05",
+      authenticator: authenticator
     )
     mock_response = {
       "environment_id" => "string",
@@ -647,10 +687,13 @@ class DiscoveryV1Test < Minitest::Test
         }
       ]
     }
-    service = IBMWatson::DiscoveryV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-03-05"
+      password: "password"
+    )
+    service = IBMWatson::DiscoveryV1.new(
+      version: "2018-03-05",
+      authenticator: authenticator
     )
     stub_request(:post, "https://gateway.watsonplatform.net/discovery/api/v1/environments/envid/collections/collid/training_data?version=2018-03-05")
       .with(
@@ -673,10 +716,13 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_delete_training_data
-    service = IBMWatson::DiscoveryV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-03-05"
+      password: "password"
+    )
+    service = IBMWatson::DiscoveryV1.new(
+      version: "2018-03-05",
+      authenticator: authenticator
     )
     stub_request(:delete, "https://gateway.watsonplatform.net/discovery/api/v1/environments/envid/collections/collid/training_data/queryid?version=2018-03-05")
       .with(
@@ -714,10 +760,13 @@ class DiscoveryV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: mock_response.to_json, headers: { "Content-Type" => "application/json" })
-    service = IBMWatson::DiscoveryV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-03-05"
+      password: "password"
+    )
+    service = IBMWatson::DiscoveryV1.new(
+      version: "2018-03-05",
+      authenticator: authenticator
     )
     service_response = service.get_training_data(
       environment_id: "envid",
@@ -736,10 +785,13 @@ class DiscoveryV1Test < Minitest::Test
       "cross_reference" => "string",
       "relevance" => 0
     }
-    service = IBMWatson::DiscoveryV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-03-05"
+      password: "password"
+    )
+    service = IBMWatson::DiscoveryV1.new(
+      version: "2018-03-05",
+      authenticator: authenticator
     )
     stub_request(:post, "https://gateway.watsonplatform.net/discovery/api/v1/environments/envid/collections/collid/training_data/queryid/examples?version=2018-03-05")
       .with(
@@ -763,10 +815,13 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_delete_training_example
-    service = IBMWatson::DiscoveryV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-03-05"
+      password: "password"
+    )
+    service = IBMWatson::DiscoveryV1.new(
+      version: "2018-03-05",
+      authenticator: authenticator
     )
     stub_request(:delete, "https://gateway.watsonplatform.net/discovery/api/v1/environments/envid/collections/collid/training_data/queryid/examples/exampleid?version=2018-03-05")
       .with(
@@ -790,10 +845,13 @@ class DiscoveryV1Test < Minitest::Test
       "cross_reference" => "string",
       "relevance" => 0
     }
-    service = IBMWatson::DiscoveryV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-03-05"
+      password: "password"
+    )
+    service = IBMWatson::DiscoveryV1.new(
+      version: "2018-03-05",
+      authenticator: authenticator
     )
     stub_request(:get, "https://gateway.watsonplatform.net/discovery/api/v1/environments/envid/collections/collid/training_data/queryid/examples/exampleid?version=2018-03-05")
       .with(
@@ -820,10 +878,13 @@ class DiscoveryV1Test < Minitest::Test
       "cross_reference" => "string",
       "relevance" => 0
     }
-    service = IBMWatson::DiscoveryV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-03-05"
+      password: "password"
+    )
+    service = IBMWatson::DiscoveryV1.new(
+      version: "2018-03-05",
+      authenticator: authenticator
     )
     stub_request(:put, "https://gateway.watsonplatform.net/discovery/api/v1/environments/envid/collections/collid/training_data/queryid/examples/exampleid?version=2018-03-05")
       .with(
@@ -847,10 +908,13 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_expansions
-    service = IBMWatson::DiscoveryV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-03-05"
+      password: "password"
+    )
+    service = IBMWatson::DiscoveryV1.new(
+      version: "2018-03-05",
+      authenticator: authenticator
     )
     stub_request(:get, "https://gateway.watsonplatform.net/discovery/api/v1/environments/envid/collections/collid/expansions?version=2018-03-05")
       .with(
@@ -903,10 +967,13 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_tokenization_dictionary
-    service = IBMWatson::DiscoveryV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-03-05"
+      password: "password"
+    )
+    service = IBMWatson::DiscoveryV1.new(
+      version: "2018-03-05",
+      authenticator: authenticator
     )
     stub_request(:get, "https://gateway.watsonplatform.net/discovery/api/v1/environments/envid/collections/collid/word_lists/tokenization_dictionary?version=2018-03-05")
       .with(
@@ -959,10 +1026,13 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_delete_user_data
-    service = IBMWatson::DiscoveryV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-03-05"
+      password: "password"
+    )
+    service = IBMWatson::DiscoveryV1.new(
+      version: "2018-03-05",
+      authenticator: authenticator
     )
     stub_request(:delete, "https://gateway.watsonplatform.net/discovery/api/v1/user_data?customer_id=id&version=2018-03-05")
       .with(
@@ -978,10 +1048,13 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_query_notices
-    service = IBMWatson::DiscoveryV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-03-05"
+      password: "password"
+    )
+    service = IBMWatson::DiscoveryV1.new(
+      version: "2018-03-05",
+      authenticator: authenticator
     )
     stub_request(:get, "https://gateway.watsonplatform.net/discovery/api/v1/environments/envid/collections/collid/notices?version=2018-03-05")
       .with(
@@ -999,10 +1072,13 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_federated_query
-    service = IBMWatson::DiscoveryV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-03-05"
+      password: "password"
+    )
+    service = IBMWatson::DiscoveryV1.new(
+      version: "2018-03-05",
+      authenticator: authenticator
     )
     stub_request(:post, "https://gateway.watsonplatform.net/discovery/api/v1/environments/envid/query?&version=2018-03-05")
       .with(
@@ -1022,10 +1098,13 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_federated_query_notices
-    service = IBMWatson::DiscoveryV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-03-05"
+      password: "password"
+    )
+    service = IBMWatson::DiscoveryV1.new(
+      version: "2018-03-05",
+      authenticator: authenticator
     )
     stub_request(:get, "https://gateway.watsonplatform.net/discovery/api/v1/environments/envid/notices?collection_ids=collid&version=2018-03-05")
       .with(
@@ -1043,10 +1122,13 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_list_training_examples
-    service = IBMWatson::DiscoveryV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-03-05"
+      password: "password"
+    )
+    service = IBMWatson::DiscoveryV1.new(
+      version: "2018-03-05",
+      authenticator: authenticator
     )
     stub_request(:get, "https://gateway.watsonplatform.net/discovery/api/v1/environments/envid/collections/collid/training_data/queryid/examples?version=2018-03-05")
       .with(
@@ -1075,10 +1157,13 @@ class DiscoveryV1Test < Minitest::Test
       "type" => "click",
       "data" => "data"
     }
-    service = IBMWatson::DiscoveryV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-05-23"
+      password: "password"
+    )
+    service = IBMWatson::DiscoveryV1.new(
+      version: "2018-05-23",
+      authenticator: authenticator
     )
     stub_request(:post, "https://gateway.watsonplatform.net/discovery/api/v1/events?version=2018-05-23")
       .with(
@@ -1099,12 +1184,15 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_query_log
-    service = IBMWatson::DiscoveryV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-05-23"
+      password: "password"
+    )
+    service = IBMWatson::DiscoveryV1.new(
+      version: "2018-03-05",
+      authenticator: authenticator
     )
-    stub_request(:get, "https://gateway.watsonplatform.net/discovery/api/v1/logs?count=10&query=test&version=2018-05-23")
+    stub_request(:get, "https://gateway.watsonplatform.net/discovery/api/v1/logs?count=10&query=test&version=2018-03-05")
       .with(
         headers: {
           "Accept" => "application/json",
@@ -1121,10 +1209,13 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_metrics_query
-    service = IBMWatson::DiscoveryV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-05-23"
+      password: "password"
+    )
+    service = IBMWatson::DiscoveryV1.new(
+      version: "2018-05-23",
+      authenticator: authenticator
     )
     stub_request(:get, "https://gateway.watsonplatform.net/discovery/api/v1/metrics/number_of_queries?end_time=2018-01-01T00:10:00Z&start_time=2018-01-01T00:00:00Z&version=2018-05-23")
       .with(
@@ -1143,10 +1234,13 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_metrics_query_event
-    service = IBMWatson::DiscoveryV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-05-23"
+      password: "password"
+    )
+    service = IBMWatson::DiscoveryV1.new(
+      version: "2018-05-23",
+      authenticator: authenticator
     )
     stub_request(:get, "https://gateway.watsonplatform.net/discovery/api/v1/metrics/number_of_queries_with_event?end_time=2018-01-01T00:10:00Z&start_time=2018-01-01T00:00:00Z&version=2018-05-23")
       .with(
@@ -1165,10 +1259,13 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_metrics_query_token_event
-    service = IBMWatson::DiscoveryV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-05-23"
+      password: "password"
+    )
+    service = IBMWatson::DiscoveryV1.new(
+      version: "2018-05-23",
+      authenticator: authenticator
     )
     stub_request(:get, "https://gateway.watsonplatform.net/discovery/api/v1/metrics/top_query_tokens_with_event_rate?count=10&version=2018-05-23")
       .with(
@@ -1186,10 +1283,13 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_metrics_event_rate
-    service = IBMWatson::DiscoveryV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-05-23"
+      password: "password"
+    )
+    service = IBMWatson::DiscoveryV1.new(
+      version: "2018-05-23",
+      authenticator: authenticator
     )
     stub_request(:get, "https://gateway.watsonplatform.net/discovery/api/v1/metrics/event_rate?end_time=2018-01-01T00:10:00Z&start_time=2018-01-01T00:00:00Z&version=2018-05-23")
       .with(
@@ -1208,10 +1308,13 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_metrics_query_no_results
-    service = IBMWatson::DiscoveryV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-05-23"
+      password: "password"
+    )
+    service = IBMWatson::DiscoveryV1.new(
+      version: "2018-05-23",
+      authenticator: authenticator
     )
     stub_request(:get, "https://gateway.watsonplatform.net/discovery/api/v1/metrics/number_of_queries_with_no_search_results?end_time=2018-01-01T00:10:00Z&start_time=2018-01-01T00:00:00Z&version=2018-05-23")
       .with(
@@ -1230,10 +1333,13 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_list_credentials
-    service = IBMWatson::DiscoveryV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-03-05"
+      password: "password"
+    )
+    service = IBMWatson::DiscoveryV1.new(
+      version: "2018-03-05",
+      authenticator: authenticator
     )
     stub_request(:get, "https://gateway.watsonplatform.net/discovery/api/v1/environments/envid/credentials?version=2018-03-05")
       .with(
@@ -1250,10 +1356,13 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_create_credentials
-    service = IBMWatson::DiscoveryV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-03-05"
+      password: "password"
+    )
+    service = IBMWatson::DiscoveryV1.new(
+      version: "2018-03-05",
+      authenticator: authenticator
     )
     stub_request(:post, "https://gateway.watsonplatform.net/discovery/api/v1/environments/envid/credentials?version=2018-03-05")
       .with(
@@ -1273,10 +1382,13 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_get_credentials
-    service = IBMWatson::DiscoveryV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-03-05"
+      password: "password"
+    )
+    service = IBMWatson::DiscoveryV1.new(
+      version: "2018-03-05",
+      authenticator: authenticator
     )
     stub_request(:get, "https://gateway.watsonplatform.net/discovery/api/v1/environments/envid/credentials/credid?version=2018-03-05")
       .with(
@@ -1294,10 +1406,13 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_update_credentials
-    service = IBMWatson::DiscoveryV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-03-05"
+      password: "password"
+    )
+    service = IBMWatson::DiscoveryV1.new(
+      version: "2018-03-05",
+      authenticator: authenticator
     )
     stub_request(:put, "https://gateway.watsonplatform.net/discovery/api/v1/environments/envid/credentials/credid?version=2018-03-05")
       .with(
@@ -1318,10 +1433,13 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_delete_credentials
-    service = IBMWatson::DiscoveryV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-03-05"
+      password: "password"
+    )
+    service = IBMWatson::DiscoveryV1.new(
+      version: "2018-03-05",
+      authenticator: authenticator
     )
     stub_request(:delete, "https://gateway.watsonplatform.net/discovery/api/v1/environments/envid/credentials/credid?version=2018-03-05")
       .with(
@@ -1339,10 +1457,13 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_update_collection
-    service = IBMWatson::DiscoveryV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-03-05"
+      password: "password"
+    )
+    service = IBMWatson::DiscoveryV1.new(
+      version: "2018-03-05",
+      authenticator: authenticator
     )
     stub_request(:put, "https://gateway.watsonplatform.net/discovery/api/v1/environments/envid/collections/collid?version=2018-03-05")
       .with(
@@ -1364,10 +1485,13 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_get_stopword_list_status
-    service = IBMWatson::DiscoveryV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-03-05"
+      password: "password"
+    )
+    service = IBMWatson::DiscoveryV1.new(
+      version: "2018-03-05",
+      authenticator: authenticator
     )
     stub_request(:get, "https://gateway.watsonplatform.net/discovery/api/v1/environments/envid/collections/collid/word_lists/stopwords?version=2018-03-05")
       .with(
@@ -1385,10 +1509,13 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_list_fields
-    service = IBMWatson::DiscoveryV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-03-05"
+      password: "password"
+    )
+    service = IBMWatson::DiscoveryV1.new(
+      version: "2018-03-05",
+      authenticator: authenticator
     )
     stub_request(:get, "https://gateway.watsonplatform.net/discovery/api/v1/environments/envid/fields?collection_ids=collid&version=2018-03-05")
       .with(
@@ -1406,10 +1533,13 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_create_stopword_list
-    service = IBMWatson::DiscoveryV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-03-05"
+      password: "password"
+    )
+    service = IBMWatson::DiscoveryV1.new(
+      version: "2018-03-05",
+      authenticator: authenticator
     )
 
     stub_request(:post, "https://gateway.watsonplatform.net/discovery/api/v1/environments/envid/collections/colid/word_lists/stopwords?version=2018-03-05").with do |req|
@@ -1425,10 +1555,13 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_delete_stopword_list
-    service = IBMWatson::DiscoveryV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-03-05"
+      password: "password"
+    )
+    service = IBMWatson::DiscoveryV1.new(
+      version: "2018-03-05",
+      authenticator: authenticator
     )
     stub_request(:delete, "https://gateway.watsonplatform.net/discovery/api/v1/environments/envid/collections/colid/word_lists/stopwords?version=2018-03-05")
       .with(
@@ -1445,10 +1578,13 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_list_gateways
-    service = IBMWatson::DiscoveryV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-03-05"
+      password: "password"
+    )
+    service = IBMWatson::DiscoveryV1.new(
+      version: "2018-03-05",
+      authenticator: authenticator
     )
     stub_request(:get, "https://gateway.watsonplatform.net/discovery/api/v1/environments/envid/gateways?version=2018-03-05")
       .with(
@@ -1465,10 +1601,13 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_create_gateway
-    service = IBMWatson::DiscoveryV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-03-05"
+      password: "password"
+    )
+    service = IBMWatson::DiscoveryV1.new(
+      version: "2018-03-05",
+      authenticator: authenticator
     )
     stub_request(:post, "https://gateway.watsonplatform.net/discovery/api/v1/environments/envid/gateways?version=2018-03-05")
       .with(
@@ -1485,10 +1624,13 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_get_gateway
-    service = IBMWatson::DiscoveryV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-03-05"
+      password: "password"
+    )
+    service = IBMWatson::DiscoveryV1.new(
+      version: "2018-03-05",
+      authenticator: authenticator
     )
     stub_request(:get, "https://gateway.watsonplatform.net/discovery/api/v1/environments/envid/gateways/gatewayid?version=2018-03-05")
       .with(
@@ -1506,10 +1648,13 @@ class DiscoveryV1Test < Minitest::Test
   end
 
   def test_delete_gateway
-    service = IBMWatson::DiscoveryV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-03-05"
+      password: "password"
+    )
+    service = IBMWatson::DiscoveryV1.new(
+      version: "2018-03-05",
+      authenticator: authenticator
     )
     stub_request(:delete, "https://gateway.watsonplatform.net/discovery/api/v1/environments/envid/gateways/gatewayid?version=2018-03-05")
       .with(