Merge branch 'master' into visrec-deprecation

Author: mediumTaj

README.md

@@ -244,7 +244,7 @@ For example, here is how to connect to a Watson Assistant instance that is hoste
 let authenticator = WatsonIAMAuthenticator(apiKey: "{apikey}")
 let assistant = Assistant(version: "{version}", authenticator: authenticator)
 
-assistant.serviceURL = "https://gateway-fra.watsonplatform.net/conversation/api"
+assistant.serviceURL = "https://api.eu-de.assistant.watson.cloud.ibm.com"
 ```
 
 ## Disable SSL certificate verification

Source/SpeechToTextV1/WebSockets/SpeechToTextSession.swift

@@ -34,7 +34,7 @@ import IBMSwiftSDKCore
 public class SpeechToTextSession {
 
     /// The URL that shall be used to stream audio for transcription.
-    public var websocketsURL = "wss://stream.watsonplatform.net/speech-to-text/api/v1/recognize" {
+    public var websocketsURL = "https://api.us-south.speech-to-text.watson.cloud.ibm.com/v1/recognize" {
         didSet {
             // serviceURL and tokenURL are both derivative of websocketsURL
             if websocketsURL.last == "/" {
@@ -48,10 +48,10 @@ public class SpeechToTextSession {
     }
 
     /// The base URL of the Speech to Text service.
-    internal var serviceURL = "https://stream.watsonplatform.net/speech-to-text/api"
+    internal var serviceURL = "https://api.us-south.speech-to-text.watson.cloud.ibm.com"
 
     /// The URL that shall be used to obtain a token.
-    internal var tokenURL = "https://stream.watsonplatform.net/authorization/api/v1/token"
+    internal var tokenURL = "https://api.us-south.speech-to-text.watson.cloud.ibm.com/v1/token"
 
     /// The default HTTP headers for all requests to the service.
     public var defaultHeaders = [String: String]()

Tests/NaturalLanguageClassifierV1Tests/createClassifier.sh

@@ -7,4 +7,4 @@ curl -X POST -u "${USERNAME}":"${PASSWORD}" \
     -H 'Accept: application/json' -H 'X-Watson-Learning-Opt-Out: true' -H 'X-Watson-Test: true' \
     -F training_metadata="{\"language\":\"en\",\"name\":\"swift-sdk-test-classifier - DO NOT DELETE\"}" \
     -F training_data=@weather_data_train.csv \
-   "https://gateway.watsonplatform.net/natural-language-classifier/api/v1/classifiers"
+   "https://api.us-south.natural-language-classifier.watson.cloud.ibm.com/v1/classifiers"

Tests/SpeechToTextV1Tests/SpeechToTextUnitTests.swift

@@ -35,20 +35,20 @@ class SpeechToTextUnitTests: XCTestCase {
         let speechToTextSession = SpeechToTextSession(authenticator: defaultTestAuthenticator)
 
         // Default URLs value
-        XCTAssertEqual(speechToTextSession.websocketsURL, "wss://stream.watsonplatform.net/speech-to-text/api/v1/recognize")
-        XCTAssertEqual(speechToTextSession.serviceURL, "https://stream.watsonplatform.net/speech-to-text/api")
+        XCTAssertEqual(speechToTextSession.websocketsURL, "wss://api.us-south.speech-to-text.watson.cloud.ibm.com/v1/recognize")
+        XCTAssertEqual(speechToTextSession.serviceURL, "https://api.us-south.speech-to-text.watson.cloud.ibm.com")
 
         // Set websockets URL and verify serviceURL
-        speechToTextSession.websocketsURL = "wss://gateway-syd.watsonplatform.net/speech-to-text/api/v1/recognize"
-        XCTAssertEqual(speechToTextSession.serviceURL, "https://gateway-syd.watsonplatform.net/speech-to-text/api")
+        speechToTextSession.websocketsURL = "wss://api.au-syd.speech-to-text.watson.cloud.ibm.com/v1/recognize"
+        XCTAssertEqual(speechToTextSession.serviceURL, "https://api.au-syd.speech-to-text.watson.cloud.ibm.com")
 
         // Trailing forward slash
-        speechToTextSession.websocketsURL = "wss://stream.watsonplatform.net/speech-to-text/api/v1/recognize/"
-        XCTAssertEqual(speechToTextSession.serviceURL, "https://stream.watsonplatform.net/speech-to-text/api")
+        speechToTextSession.websocketsURL = "wss://api.us-south.speech-to-text.watson.cloud.ibm.com/v1/recognize/"
+        XCTAssertEqual(speechToTextSession.serviceURL, "api.us-south.speech-to-text.watson.cloud.ibm.com")
 
         // http instead of https
-        speechToTextSession.websocketsURL = "ws://stream.watsonplatform.net/speech-to-text/api/v1/recognize"
-        XCTAssertEqual(speechToTextSession.serviceURL, "http://stream.watsonplatform.net/speech-to-text/api")
+        speechToTextSession.websocketsURL = "ws://api.us-south.speech-to-text.watson.cloud.ibm.com/v1/recognize"
+        XCTAssertEqual(speechToTextSession.serviceURL, "api.us-south.speech-to-text.watson.cloud.ibm.com")
 
         // Different base URL
         speechToTextSession.websocketsURL = "wss://example.com/speech-to-text/api/v1/recognize/v1/recognize"
@@ -60,16 +60,16 @@ class SpeechToTextUnitTests: XCTestCase {
         let speechToTextSession = SpeechToTextSession(authenticator: defaultTestAuthenticator)
 
         // Default URLs value
-        XCTAssertEqual(speechToTextSession.websocketsURL, "wss://stream.watsonplatform.net/speech-to-text/api/v1/recognize")
-        XCTAssertEqual(speechToTextSession.tokenURL, "https://stream.watsonplatform.net/authorization/api/v1/token")
+        XCTAssertEqual(speechToTextSession.websocketsURL, "wss://api.us-south.speech-to-text.watson.cloud.ibm.com/recognize")
+        XCTAssertEqual(speechToTextSession.tokenURL, "https://api.us-south.speech-to-text.watson.cloud.ibm.com/authorization/api/v1/token")
 
         // Set websockets URL and verify tokenURL
-        speechToTextSession.websocketsURL = "wss://gateway-syd.watsonplatform.net/speech-to-text/api/v1/recognize"
-        XCTAssertEqual(speechToTextSession.tokenURL, "https://gateway-syd.watsonplatform.net/authorization/api/v1/token")
+        speechToTextSession.websocketsURL = "wss://api.au-syd.speech-to-text.watson.cloud.ibm.com/v1/recognize"
+        XCTAssertEqual(speechToTextSession.tokenURL, "https://api.au-syd.speech-to-text.watson.cloud.ibm.com/authorization/api/v1/token")
 
         // http instead of https
-        speechToTextSession.websocketsURL = "ws://stream.watsonplatform.net/speech-to-text/api/v1/recognize"
-        XCTAssertEqual(speechToTextSession.tokenURL, "http://stream.watsonplatform.net/authorization/api/v1/token")
+        speechToTextSession.websocketsURL = "ws://api.us-south.speech-to-text.watson.cloud.ibm.com/v1/recognize"
+        XCTAssertEqual(speechToTextSession.tokenURL, "http://api.us-south.speech-to-text.watson.cloud.ibm.com/authorization/api/v1/token")
 
         // Different base URL
         speechToTextSession.websocketsURL = "wss://example.com/speech-to-text/api/v1/recognize/v1/recognize"

Tests/VisualRecognitionV3Tests/VisualRecognitionUnitTests.swift

@@ -347,7 +347,7 @@ class VisualRecognitionUnitTests: XCTestCase {
         setenv("IBM_CREDENTIALS_FILE", "Source/SupportingFiles/ibm-credentials.env", 1)
         let visualRecognition: VisualRecognition? = try? VisualRecognition(version: versionDate)
         XCTAssertNotNil(visualRecognition)
-        XCTAssertEqual("https://gateway.watsonplatform.net/visual-recognition/api", visualRecognition?.serviceURL)
+        XCTAssertEqual("https://api.us-south.visual-recognition.watson.cloud.ibm.com", visualRecognition?.serviceURL)
     }
     #endif
 

Tests/VisualRecognitionV3Tests/createClassifier.sh

@@ -7,5 +7,5 @@ curl -X POST \
     -F "car_positive_examples=@Resources/cars.zip" \
     -F "negative_examples=@Resources/trucks.zip" \
     -F "name=CarsVsTrucks - do not delete" \
-    "https://gateway-a.watsonplatform.net/visual-recognition/api/v3/classifiers?api_key=${API_KEY}&version=${VERSION}"
+    "https://api.us-south.visual-recognition.watson.cloud.ibm.com/v3/classifiers?api_key=${API_KEY}&version=${VERSION}"