ibm_watson 0.20.1 → 1.0.0.rc1

data/test/integration/test_assistant_v1.rb

@@ -3,6 +3,7 @@
 require_relative("./../test_helper.rb")
 SimpleCov.command_name "test:integration"
 require("minitest/hooks/test")
+require("ibm_cloud_sdk_core")
 
 if !ENV["ASSISTANT_APIKEY"].nil? && !ENV["ASSISTANT_URL"].nil?
   # Integration tests for the Watson Assistant V1 Service
@@ -10,10 +11,14 @@ if !ENV["ASSISTANT_APIKEY"].nil? && !ENV["ASSISTANT_URL"].nil?
     include Minitest::Hooks
     attr_accessor :service
     def before_all
+      authenticator = IBMCloudSdkCore::IamAuthenticator.new(
+        apikey: ENV["ASSISTANT_APIKEY"],
+        version: "2018-02-16"
+      )
       @service = IBMWatson::AssistantV1.new(
-        iam_apikey: ENV["ASSISTANT_APIKEY"],
+        version: "2018-02-16",
         url: ENV["ASSISTANT_URL"],
-        version: "2018-02-16"
+        authenticator: authenticator
       )
       @service.add_default_headers(
         headers: {
@@ -51,8 +56,7 @@ if !ENV["ASSISTANT_APIKEY"].nil? && !ENV["ASSISTANT_URL"].nil?
 
     def test_get_workspace
       service_response = service.get_workspace(
-        workspace_id: ENV["ASSISTANT_WORKSPACE_ID"],
-        export: false
+        workspace_id: ENV["ASSISTANT_WORKSPACE_ID"]
       )
       assert((200..299).cover?(service_response.status))
     end

data/test/integration/test_assistant_v2.rb

@@ -2,6 +2,8 @@
 
 require_relative("./../test_helper.rb")
 SimpleCov.command_name "test:integration"
+require("minitest/hooks/test")
+require("ibm_cloud_sdk_core")
 
 if !ENV["ASSISTANT_APIKEY"].nil? && !ENV["ASSISTANT_URL"].nil?
   # Integration tests for the Watson Assistant V2 Service
@@ -9,9 +11,12 @@ if !ENV["ASSISTANT_APIKEY"].nil? && !ENV["ASSISTANT_URL"].nil?
     include Minitest::Hooks
     attr_accessor :service
     def before_all
+      authenticator = IBMCloudSdkCore::IamAuthenticator.new(
+        apikey: ENV["ASSISTANT_APIKEY"]
+      )
       @service = IBMWatson::AssistantV2.new(
         version: "2018-12-31",
-        iam_apikey: ENV["ASSISTANT_APIKEY"],
+        authenticator: authenticator,
         url: ENV["ASSISTANT_URL"],
         assistant_id: ENV["ASSISTANT_ASSISTANT_ID"]
       )

data/test/integration/test_compare_comply_v1.rb

@@ -2,6 +2,7 @@
 
 require_relative("./../test_helper.rb")
 require("minitest/hooks/test")
+require("ibm_cloud_sdk_core")
 
 if !ENV["COMPARE_COMPLY_APIKEY"].nil?
   # Integration tests for the Discovery V1 Service
@@ -10,9 +11,12 @@ if !ENV["COMPARE_COMPLY_APIKEY"].nil?
     attr_accessor :service, :environment_id, :collection_id
 
     def before_all
+      authenticator = IBMCloudSdkCore::IamAuthenticator.new(
+        apikey: ENV["ASSISTANT_APIKEY"]
+      )
       @service = IBMWatson::CompareComplyV1.new(
-        iam_apikey: ENV["COMPARE_COMPLY_APIKEY"],
-        version: "2018-10-15"
+        version: "2018-10-15",
+        authenticator: authenticator
       )
       @service.add_default_headers(
         headers: {

data/test/integration/test_discovery_v1.rb

@@ -10,8 +10,11 @@ if !ENV["DISCOVERY_APIKEY"].nil? && !ENV["DISCOVERY_URL"].nil?
     attr_accessor :service, :environment_id, :collection_id
 
     def before_all
+      authenticator = IBMCloudSdkCore::IamAuthenticator.new(
+        apikey: ENV["DISCOVERY_APIKEY"]
+      )
       @service = IBMWatson::DiscoveryV1.new(
-        iam_apikey: ENV["DISCOVERY_APIKEY"],
+        authenticator: authenticator,
         url: ENV["DISCOVERY_URL"],
         version: "2018-03-05"
       )

data/test/integration/test_language_translator_v3.rb

@@ -10,8 +10,11 @@ if !ENV["LANGUAGE_TRANSLATOR_APIKEY"].nil? && !ENV["LANGUAGE_TRANSLATOR_URL"].ni
     include Minitest::Hooks
     attr_accessor :service
     def before_all
+      authenticator = IBMCloudSdkCore::IamAuthenticator.new(
+        apikey: ENV["LANGUAGE_TRANSLATOR_APIKEY"]
+      )
       @service = IBMWatson::LanguageTranslatorV3.new(
-        iam_apikey: ENV["LANGUAGE_TRANSLATOR_APIKEY"],
+        authenticator: authenticator,
         url: ENV["LANGUAGE_TRANSLATOR_URL"],
         version: "2018-05-01"
       )
@@ -59,11 +62,6 @@ if !ENV["LANGUAGE_TRANSLATOR_APIKEY"].nil? && !ENV["LANGUAGE_TRANSLATOR_URL"].ni
     end
 
     def test_translate_document
-      @service = IBMWatson::LanguageTranslatorV3.new(
-        iam_apikey: ENV["LANGUAGE_TRANSLATOR_APIKEY"],
-        url: ENV["LANGUAGE_TRANSLATOR_URL"],
-        version: "2018-05-01"
-      )
       @service.add_default_headers(
         headers: {
           "X-Watson-Test" => "1"
@@ -81,16 +79,6 @@ if !ENV["LANGUAGE_TRANSLATOR_APIKEY"].nil? && !ENV["LANGUAGE_TRANSLATOR_URL"].ni
     end
 
     def test_list_documents
-      @service = IBMWatson::LanguageTranslatorV3.new(
-        iam_apikey: ENV["LANGUAGE_TRANSLATOR_APIKEY"],
-        url: ENV["LANGUAGE_TRANSLATOR_URL"],
-        version: "2018-05-01"
-      )
-      @service.add_default_headers(
-        headers: {
-          "X-Watson-Test" => "1"
-        }
-      )
       service_response = service.list_documents.result
       refute(service_response.nil?)
     end

data/test/integration/test_natural_language_classifier_v1.rb

@@ -10,8 +10,11 @@ if !ENV["NATURAL_LANGUAGE_CLASSIFIER_APIKEY"].nil? && !ENV["NATURAL_LANGUAGE_CLA
     include Minitest::Hooks
     attr_accessor :service
     def before_all
+      authenticator = IBMCloudSdkCore::IamAuthenticator.new(
+        apikey: ENV["NATURAL_LANGUAGE_CLASSIFIER_APIKEY"]
+      )
       @service = IBMWatson::NaturalLanguageClassifierV1.new(
-        iam_apikey: ENV["NATURAL_LANGUAGE_CLASSIFIER_APIKEY"],
+        authenticator: authenticator,
         url: ENV["NATURAL_LANGUAGE_CLASSIFIER_URL"]
       )
       @service.add_default_headers(

data/test/integration/test_natural_language_understanding_v1.rb

@@ -9,9 +9,12 @@ if !ENV["NATURAL_LANGUAGE_UNDERSTANDING_APIKEY"].nil? && !ENV["NATURAL_LANGUAGE_
     include Minitest::Hooks
     attr_accessor :service
     def before_all
+      authenticator = IBMCloudSdkCore::IamAuthenticator.new(
+        apikey: ENV["NATURAL_LANGUAGE_UNDERSTANDING_APIKEY"]
+      )
       @service = IBMWatson::NaturalLanguageUnderstandingV1.new(
         version: "2018-03-16",
-        iam_apikey: ENV["NATURAL_LANGUAGE_UNDERSTANDING_APIKEY"],
+        authenticator: authenticator,
         url: ENV["NATURAL_LANGUAGE_UNDERSTANDING_URL"]
       )
       @service.add_default_headers(

data/test/integration/test_personality_insights_v3.rb

@@ -9,10 +9,13 @@ if !ENV["PERSONALITY_INSIGHTS_APIKEY"].nil? && !ENV["PERSONALITY_INSIGHTS_URL"].
     include Minitest::Hooks
     attr_accessor :service
     def before_all
+      authenticator = IBMCloudSdkCore::IamAuthenticator.new(
+        apikey: ENV["PERSONALITY_INSIGHTS_APIKEY"]
+      )
       @service = IBMWatson::PersonalityInsightsV3.new(
         version: "2017-10-13",
-        iam_apikey: ENV["PERSONALITY_INSIGHTS_APIKEY"],
-        url: ENV["PERSONALITY_INSIGHTS_URL"]
+        url: ENV["PERSONALITY_INSIGHTS_URL"],
+        authenticator: authenticator
       )
       @service.add_default_headers(
         headers: {

data/test/integration/test_speech_to_text_v1.rb

@@ -28,9 +28,12 @@ if !ENV["SPEECH_TO_TEXT_APIKEY"].nil? && !ENV["SPEECH_TO_TEXT_URL"].nil?
     include Minitest::Hooks
     attr_accessor :service
     def before_all
+      authenticator = IBMCloudSdkCore::IamAuthenticator.new(
+        apikey: ENV["SPEECH_TO_TEXT_APIKEY"]
+      )
       @service = IBMWatson::SpeechToTextV1.new(
-        iam_apikey: ENV["SPEECH_TO_TEXT_APIKEY"],
-        url: ENV["SPEECH_TO_TEXT_URL"]
+        url: ENV["SPEECH_TO_TEXT_URL"],
+        authenticator: authenticator
       )
       @service.add_default_headers(
         headers: {
@@ -243,8 +246,11 @@ if !ENV["SPEECH_TO_TEXT_APIKEY"].nil? && !ENV["SPEECH_TO_TEXT_URL"].nil?
       audio_file = File.open(Dir.getwd + "/resources/speech.wav")
       atomic_boolean = Concurrent::AtomicBoolean.new
       mycallback = MyRecognizeCallback.new(atomic_boolean: atomic_boolean)
+      authenticator = IBMCloudSdkCore::BearerTokenAuthenticator.new(
+        bearer_token: "bogus_iam_access_token"
+      )
       temp_service = IBMWatson::SpeechToTextV1.new(
-        iam_access_token: "bogus_iam_access_token"
+        authenticator: authenticator
       )
       temp_service.add_default_headers(
         headers: {

data/test/integration/test_text_to_speech_v1.rb

@@ -9,9 +9,12 @@ if !ENV["TEXT_TO_SPEECH_APIKEY"].nil? && !ENV["TEXT_TO_SPEECH_URL"].nil?
     include Minitest::Hooks
     attr_accessor :service
     def before_all
+      authenticator = IBMCloudSdkCore::IamAuthenticator.new(
+        apikey: ENV["TEXT_TO_SPEECH_APIKEY"]
+      )
       @service = IBMWatson::TextToSpeechV1.new(
-        iam_apikey: ENV["TEXT_TO_SPEECH_APIKEY"],
-        url: ENV["TEXT_TO_SPEECH_URL"]
+        url: ENV["TEXT_TO_SPEECH_URL"],
+        authenticator: authenticator
       )
       @service.add_default_headers(
         headers: {

data/test/integration/test_tone_analyzer_v3.rb

@@ -9,10 +9,13 @@ if !ENV["TONE_ANALYZER_APIKEY"].nil? && !ENV["TONE_ANALYZER_URL"].nil?
     include Minitest::Hooks
     attr_accessor :service
     def before_all
+      authenticator = IBMCloudSdkCore::IamAuthenticator.new(
+        apikey: ENV["TONE_ANALYZER_APIKEY"]
+      )
       @service = IBMWatson::ToneAnalyzerV3.new(
-        iam_apikey: ENV["TONE_ANALYZER_APIKEY"],
         url: ENV["TONE_ANALYZER_URL"],
-        version: "2017-09-21"
+        version: "2017-09-21",
+        authenticator: authenticator
       )
       @service.add_default_headers(
         headers: {

data/test/integration/test_visual_recognition_v3.rb

@@ -10,10 +10,13 @@ if !ENV["VISUAL_RECOGNITION_APIKEY"].nil? && !ENV["VISUAL_RECOGNITION_URL"].nil?
     include Minitest::Hooks
     attr_accessor :service, :classifier_id
     def before_all
+      authenticator = IBMCloudSdkCore::IamAuthenticator.new(
+        apikey: ENV["VISUAL_RECOGNITION_APIKEY"]
+      )
       @service = IBMWatson::VisualRecognitionV3.new(
-        iam_apikey: ENV["VISUAL_RECOGNITION_APIKEY"],
         version: "2018-03-19",
-        url: ENV["VISUAL_RECOGNITION_URL"]
+        url: ENV["VISUAL_RECOGNITION_URL"],
+        authenticator: authenticator
       )
       @classifier_id = "doxnotxdeletexsdksxintegration_718351350"
       @service.add_default_headers(

data/test/test_helper.rb

@@ -21,6 +21,8 @@ end
 require("minitest/autorun")
 require_relative("./../lib/ibm_watson.rb")
 require("minitest/retry")
+require("minitest/hooks/test")
+require("ibm_cloud_sdk_core")
 
 Minitest::Retry.use!
 

data/test/unit/test_assistant_v1.rb

@@ -3,6 +3,7 @@
 require("json")
 require_relative("./../test_helper.rb")
 require("webmock/minitest")
+require("ibm_cloud_sdk_core")
 SimpleCov.command_name "test:unit"
 
 WebMock.disable_net_connect!(allow_localhost: true)
@@ -28,11 +29,14 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 201, body: response.to_json, headers: headers)
-    service = IBMWatson::AssistantV1.new(
-      version: "2018-02-16",
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
       password: "password"
     )
+    service = IBMWatson::AssistantV1.new(
+      version: "2018-02-16",
+      authenticator: authenticator
+    )
     service_response = service.create_counterexample(
       workspace_id: "boguswid",
       text: "I want financial advice today."
@@ -54,15 +58,18 @@ class AssistantV1Test < Minitest::Test
         body: "{\"text\":\"I want financial advice today.\"}",
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Basic YXBpa2V5OmljcC14eXo=",
+          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
           "Content-Type" => "application/json",
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 201, body: response.to_json, headers: headers)
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
+      username: "username",
+      password: "password"
+    )
     service = IBMWatson::AssistantV1.new(
       version: "2018-02-16",
-      username: "apikey",
-      password: "icp-xyz"
+      authenticator: authenticator
     )
     service_response = service.create_counterexample(
       workspace_id: "boguswid",
@@ -91,10 +98,13 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 429, body: error_response.to_json, headers: headers)
-    service = IBMWatson::AssistantV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-02-16"
+      password: "password"
+    )
+    service = IBMWatson::AssistantV1.new(
+      version: "2018-02-16",
+      authenticator: authenticator
     )
     begin
       service.create_counterexample(
@@ -128,10 +138,13 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 407, body: error_response.to_json, headers: headers)
-    service = IBMWatson::AssistantV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-02-16"
+      password: "password"
+    )
+    service = IBMWatson::AssistantV1.new(
+      version: "2018-02-16",
+      authenticator: authenticator
     )
     begin
       service.create_counterexample(
@@ -156,10 +169,13 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: {}.to_json, headers: headers)
-    service = IBMWatson::AssistantV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-02-16"
+      password: "password"
+    )
+    service = IBMWatson::AssistantV1.new(
+      version: "2018-02-16",
+      authenticator: authenticator
     )
     service_response = service.delete_counterexample(
       workspace_id: "boguswid",
@@ -185,10 +201,13 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    service = IBMWatson::AssistantV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-02-16"
+      password: "password"
+    )
+    service = IBMWatson::AssistantV1.new(
+      version: "2018-02-16",
+      authenticator: authenticator
     )
     service_response = service.get_counterexample(
       workspace_id: "boguswid",
@@ -226,10 +245,13 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    service = IBMWatson::AssistantV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-02-16"
+      password: "password"
+    )
+    service = IBMWatson::AssistantV1.new(
+      version: "2018-02-16",
+      authenticator: authenticator
     )
     service_response = service.list_counterexamples(
       workspace_id: "boguswid"
@@ -256,10 +278,13 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    service = IBMWatson::AssistantV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-02-16"
+      password: "password"
+    )
+    service = IBMWatson::AssistantV1.new(
+      version: "2018-02-16",
+      authenticator: authenticator
     )
     service_response = service.update_counterexample(
       workspace_id: "boguswid",
@@ -292,10 +317,13 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    service = IBMWatson::AssistantV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-02-16"
+      password: "password"
+    )
+    service = IBMWatson::AssistantV1.new(
+      version: "2018-02-16",
+      authenticator: authenticator
     )
     service_response = service.create_entity(
       workspace_id: "boguswid",
@@ -320,10 +348,13 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: "{}", headers: headers)
-    service = IBMWatson::AssistantV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-02-16"
+      password: "password"
+    )
+    service = IBMWatson::AssistantV1.new(
+      version: "2018-02-16",
+      authenticator: authenticator
     )
     service_response = service.delete_entity(
       workspace_id: "boguswid",
@@ -353,10 +384,13 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    service = IBMWatson::AssistantV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-02-16"
+      password: "password"
+    )
+    service = IBMWatson::AssistantV1.new(
+      version: "2018-02-16",
+      authenticator: authenticator
     )
     service_response = service.get_entity(
       workspace_id: "boguswid",
@@ -397,10 +431,13 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    service = IBMWatson::AssistantV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-02-16"
+      password: "password"
+    )
+    service = IBMWatson::AssistantV1.new(
+      version: "2018-02-16",
+      authenticator: authenticator
     )
     service_response = service.list_entities(
       workspace_id: "boguswid",
@@ -432,10 +469,13 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    service = IBMWatson::AssistantV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-02-16"
+      password: "password"
+    )
+    service = IBMWatson::AssistantV1.new(
+      version: "2018-02-16",
+      authenticator: authenticator
     )
     service_response = service.update_entity(
       workspace_id: "boguswid",
@@ -464,10 +504,13 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 201, body: response.to_json, headers: headers)
-    service = IBMWatson::AssistantV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-02-16"
+      password: "password"
+    )
+    service = IBMWatson::AssistantV1.new(
+      version: "2018-02-16",
+      authenticator: authenticator
     )
     service_response = service.create_example(
       workspace_id: "boguswid",
@@ -490,10 +533,13 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: "{}", headers: headers)
-    service = IBMWatson::AssistantV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-02-16"
+      password: "password"
+    )
+    service = IBMWatson::AssistantV1.new(
+      version: "2018-02-16",
+      authenticator: authenticator
     )
     service_response = service.delete_example(
       workspace_id: "boguswid",
@@ -520,10 +566,13 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    service = IBMWatson::AssistantV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-02-16"
+      password: "password"
+    )
+    service = IBMWatson::AssistantV1.new(
+      version: "2018-02-16",
+      authenticator: authenticator
     )
     service_response = service.get_example(
       workspace_id: "boguswid",
@@ -562,10 +611,13 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    service = IBMWatson::AssistantV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-02-16"
+      password: "password"
+    )
+    service = IBMWatson::AssistantV1.new(
+      version: "2018-02-16",
+      authenticator: authenticator
     )
     service_response = service.list_examples(
       workspace_id: "boguswid",
@@ -593,10 +645,13 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    service = IBMWatson::AssistantV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-02-16"
+      password: "password"
+    )
+    service = IBMWatson::AssistantV1.new(
+      version: "2018-02-16",
+      authenticator: authenticator
     )
     service_response = service.update_example(
       workspace_id: "boguswid",
@@ -628,10 +683,13 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 201, body: response.to_json, headers: headers)
-    service = IBMWatson::AssistantV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-02-16"
+      password: "password"
+    )
+    service = IBMWatson::AssistantV1.new(
+      version: "2018-02-16",
+      authenticator: authenticator
     )
     service_response = service.create_intent(
       workspace_id: "boguswid",
@@ -653,10 +711,13 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: "{}", headers: headers)
-    service = IBMWatson::AssistantV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-02-16"
+      password: "password"
+    )
+    service = IBMWatson::AssistantV1.new(
+      version: "2018-02-16",
+      authenticator: authenticator
     )
     service_response = service.delete_intent(
       workspace_id: "boguswid",
@@ -683,10 +744,13 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    service = IBMWatson::AssistantV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-02-16"
+      password: "password"
+    )
+    service = IBMWatson::AssistantV1.new(
+      version: "2018-02-16",
+      authenticator: authenticator
     )
     service_response = service.get_intent(
       workspace_id: "boguswid",
@@ -722,10 +786,13 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    service = IBMWatson::AssistantV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-02-16"
+      password: "password"
+    )
+    service = IBMWatson::AssistantV1.new(
+      version: "2018-02-16",
+      authenticator: authenticator
     )
     service_response = service.list_intents(
       workspace_id: "boguswid",
@@ -754,9 +821,12 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    service = IBMWatson::AssistantV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
+      password: "password"
+    )
+    service = IBMWatson::AssistantV1.new(
+      authenticator: authenticator,
       version: "2018-02-16"
     )
     service_response = service.update_intent(
@@ -831,10 +901,13 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    service = IBMWatson::AssistantV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-02-16"
+      password: "password"
+    )
+    service = IBMWatson::AssistantV1.new(
+      version: "2018-02-16",
+      authenticator: authenticator
     )
     service_response = service.list_logs(
       workspace_id: "boguswid"
@@ -913,10 +986,13 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    service = IBMWatson::AssistantV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-02-16"
+      password: "password"
+    )
+    service = IBMWatson::AssistantV1.new(
+      version: "2018-02-16",
+      authenticator: authenticator
     )
     service_response = service.list_all_logs(
       filter: "language::en,request.context.metadata.deployment::deployment_1"
@@ -925,10 +1001,13 @@ class AssistantV1Test < Minitest::Test
   end
 
   def test_message
-    service = IBMWatson::AssistantV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-02-16"
+      password: "password"
+    )
+    service = IBMWatson::AssistantV1.new(
+      version: "2018-02-16",
+      authenticator: authenticator
     )
     # service.set_default_headers("x-watson-learning-opt-out" => true)
     workspace_id = "f8fdbc65-e0bd-4e43-b9f8-2975a366d4ec"
@@ -1016,10 +1095,13 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 201, body: response.to_json, headers: headers)
-    service = IBMWatson::AssistantV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-02-16"
+      password: "password"
+    )
+    service = IBMWatson::AssistantV1.new(
+      version: "2018-02-16",
+      authenticator: authenticator
     )
     service_response = service.create_synonym(
       workspace_id: "boguswid",
@@ -1042,10 +1124,13 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: "", headers: headers)
-    service = IBMWatson::AssistantV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-02-16"
+      password: "password"
+    )
+    service = IBMWatson::AssistantV1.new(
+      version: "2018-02-16",
+      authenticator: authenticator
     )
     service_response = service.delete_synonym(
       workspace_id: "boguswid",
@@ -1073,10 +1158,13 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    service = IBMWatson::AssistantV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-02-16"
+      password: "password"
+    )
+    service = IBMWatson::AssistantV1.new(
+      version: "2018-02-16",
+      authenticator: authenticator
     )
     service_response = service.get_synonym(
       workspace_id: "boguswid",
@@ -1119,10 +1207,13 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    service = IBMWatson::AssistantV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-02-16"
+      password: "password"
+    )
+    service = IBMWatson::AssistantV1.new(
+      version: "2018-02-16",
+      authenticator: authenticator
     )
     service_response = service.list_synonyms(
       workspace_id: "boguswid",
@@ -1151,10 +1242,13 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    service = IBMWatson::AssistantV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-02-16"
+      password: "password"
+    )
+    service = IBMWatson::AssistantV1.new(
+      version: "2018-02-16",
+      authenticator: authenticator
     )
     service_response = service.update_synonym(
       workspace_id: "boguswid",
@@ -1187,10 +1281,13 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 201, body: response.to_json, headers: headers)
-    service = IBMWatson::AssistantV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-02-16"
+      password: "password"
+    )
+    service = IBMWatson::AssistantV1.new(
+      version: "2018-02-16",
+      authenticator: authenticator
     )
     service_response = service.create_value(
       workspace_id: "boguswid",
@@ -1212,10 +1309,13 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: "", headers: headers)
-    service = IBMWatson::AssistantV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-02-16"
+      password: "password"
+    )
+    service = IBMWatson::AssistantV1.new(
+      version: "2018-02-16",
+      authenticator: authenticator
     )
     service_response = service.delete_value(
       workspace_id: "boguswid",
@@ -1246,10 +1346,13 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    service = IBMWatson::AssistantV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-02-16"
+      password: "password"
+    )
+    service = IBMWatson::AssistantV1.new(
+      version: "2018-02-16",
+      authenticator: authenticator
     )
     service_response = service.get_value(
       workspace_id: "boguswid",
@@ -1291,10 +1394,13 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    service = IBMWatson::AssistantV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-02-16"
+      password: "password"
+    )
+    service = IBMWatson::AssistantV1.new(
+      version: "2018-02-16",
+      authenticator: authenticator
     )
     service_response = service.list_values(
       workspace_id: "boguswid",
@@ -1327,10 +1433,13 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    service = IBMWatson::AssistantV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-02-16"
+      password: "password"
+    )
+    service = IBMWatson::AssistantV1.new(
+      version: "2018-02-16",
+      authenticator: authenticator
     )
     service_response = service.update_value(
       workspace_id: "boguswid",
@@ -1366,10 +1475,13 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 201, body: response.to_json, headers: headers)
-    service = IBMWatson::AssistantV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-02-16"
+      password: "password"
+    )
+    service = IBMWatson::AssistantV1.new(
+      version: "2018-02-16",
+      authenticator: authenticator
     )
     service_response = service.create_workspace(
       name: "Pizza app",
@@ -1393,10 +1505,13 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: "", headers: headers)
-    service = IBMWatson::AssistantV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-02-16"
+      password: "password"
+    )
+    service = IBMWatson::AssistantV1.new(
+      version: "2018-02-16",
+      authenticator: authenticator
     )
     service_response = service.delete_workspace(
       workspace_id: "boguswid"
@@ -1427,10 +1542,13 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    service = IBMWatson::AssistantV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-02-16"
+      password: "password"
+    )
+    service = IBMWatson::AssistantV1.new(
+      version: "2018-02-16",
+      authenticator: authenticator
     )
     service_response = service.get_workspace(
       workspace_id: "boguswid",
@@ -1468,10 +1586,13 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    service = IBMWatson::AssistantV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-02-16"
+      password: "password"
+    )
+    service = IBMWatson::AssistantV1.new(
+      version: "2018-02-16",
+      authenticator: authenticator
     )
     service_response = service.list_workspaces
     assert_equal(response, service_response.result)
@@ -1500,10 +1621,13 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    service = IBMWatson::AssistantV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-02-16"
+      password: "password"
+    )
+    service = IBMWatson::AssistantV1.new(
+      version: "2018-02-16",
+      authenticator: authenticator
     )
     service_response = service.update_workspace(
       workspace_id: "pizza_app-e0f3",
@@ -1517,10 +1641,13 @@ class AssistantV1Test < Minitest::Test
   end
 
   def test_dialog_nodes
-    service = IBMWatson::AssistantV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-02-16"
+      password: "password"
+    )
+    service = IBMWatson::AssistantV1.new(
+      version: "2018-02-16",
+      authenticator: authenticator
     )
     headers = {
       "Content-Type" => "application/json"
@@ -1597,10 +1724,13 @@ class AssistantV1Test < Minitest::Test
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: "", headers: headers)
-    service = IBMWatson::AssistantV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-02-16"
+      password: "password"
+    )
+    service = IBMWatson::AssistantV1.new(
+      version: "2018-02-16",
+      authenticator: authenticator
     )
     service_response = service.delete_user_data(
       customer_id: "id"
@@ -1609,10 +1739,13 @@ class AssistantV1Test < Minitest::Test
   end
 
   def test_update_dialog_node
-    service = IBMWatson::AssistantV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-02-16"
+      password: "password"
+    )
+    service = IBMWatson::AssistantV1.new(
+      version: "2018-02-16",
+      authenticator: authenticator
     )
     stub_request(:post, "https://gateway.watsonplatform.net/assistant/api/v1/workspaces/workspace_id/dialog_nodes/dialog_node?version=2018-02-16")
       .with(
@@ -1634,10 +1767,13 @@ class AssistantV1Test < Minitest::Test
   end
 
   def test_list_mentions
-    service = IBMWatson::AssistantV1.new(
+    authenticator = IBMCloudSdkCore::BasicAuthenticator.new(
       username: "username",
-      password: "password",
-      version: "2018-02-16"
+      password: "password"
+    )
+    service = IBMWatson::AssistantV1.new(
+      version: "2018-02-16",
+      authenticator: authenticator
     )
     stub_request(:get, "https://gateway.watsonplatform.net/assistant/api/v1/workspaces/workspace_id/entities/entity/mentions?export=true&include_audit=true&version=2018-02-16")
       .with(