Merge pull request #708 from watson-developer-cloud/patch-vr

Fixes bug for visual recognition RC instances

Author: germanattanasio

lib/base_service.ts

@@ -112,7 +112,7 @@ export class BaseService {
     const _options = this.initCredentials(options);
     // If url is not specified, visual recognition requires gateway-a for CF instances
     // https://github.ibm.com/Watson/developer-experience/issues/4589
-    if (_options && this.name === 'watson_vision_combined' && !_options.url && _options.api_key){
+    if (_options && this.name === 'watson_vision_combined' && !_options.url && _options.api_key && !_options.iam_apikey){
       _options.url = 'https://gateway-a.watsonplatform.net/visual-recognition/api';
     }
     if (options.url) {

test/unit/test.visual_recognition.v3.js

@@ -582,6 +582,38 @@ describe('visual_recognition', function() {
         'https://gateway-a.watsonplatform.net/visual-recognition/api'
       );
     });
+
+    it('should load its credentials from bluemix (VR) with correct url (RC)', function() {
+      process.env.VCAP_SERVICES = JSON.stringify({
+        watson_vision_combined: [
+          {
+            credentials: {
+              iam_apikey: 'somekey',
+            },
+          },
+        ],
+      });
+      const visual_recognition_bluemix = new watson.VisualRecognitionV3({
+        version: '2018-03-19',
+      });
+      assert(visual_recognition_bluemix);
+      assert.equal(
+        visual_recognition_bluemix.getCredentials().url,
+        'https://gateway.watsonplatform.net/visual-recognition/api'
+      );
+    });
+
+    it('should load its credentials from environment (VR) (RC)', function() {
+      process.env.VISUAL_RECOGNITION_IAM_APIKEY = 'key';
+      const visual_recognition_env = new watson.VisualRecognitionV3({
+        version: '2018-03-19',
+      });
+      assert(visual_recognition_env);
+      assert.equal(
+        visual_recognition_env.getCredentials().url,
+        'https://gateway.watsonplatform.net/visual-recognition/api'
+      );
+    });
   });
 
   describe('getCoreMlModel()', function() {