fix nlu credentials from bluemix env

Author: nfriedly

CHANGELOG.md

@@ -1,3 +1,6 @@
+# v2.25.1
+* Natural Language Understanding: fixed credentials pulling from bluemix
+
 # v2.25.0
 * Natural Language Understanding: new version_date and addition of listModels() and deleteModel() methods
 

natural-language-understanding/v1.js

@@ -19,6 +19,7 @@
 const requestFactory = require('../lib/requestwrapper');
 const util = require('util');
 const BaseService = require('../lib/base_service');
+const extend = require('extend');
 
 /**
  * NaturalLanguageUnderstanding
@@ -41,6 +42,23 @@ NaturalLanguageUnderstandingV1.VERSION_DATE_2016_01_23 = '2016-01-23';
 // https://www.ibm.com/watson/developercloud/doc/natural-language-understanding/release-notes.html
 NaturalLanguageUnderstandingV1.VERSION_DATE_2017_02_27 = '2017-02-27';
 
+/**
+ * Bluemix uses hyphens instead of underscores for NLU in the VCAP_SERVICES env property.
+ * No idea why.
+ *
+ * This method also checks for the underscore'd version just in case they ever change it.
+ *
+ * @private
+ * @override
+ */
+NaturalLanguageUnderstandingV1.prototype.getCredentialsFromBluemix = function(name) {
+  return extend(
+    {},
+    BaseService.prototype.getCredentialsFromBluemix.call(this, name),
+    BaseService.prototype.getCredentialsFromBluemix.call(this, name.replace(/_/g, '-'))
+  );
+};
+
 /**
   * Analyze the query.
   * @params {object} params for the query

test/unit/test.natural_language_understanding.v1.js

@@ -38,6 +38,42 @@ describe('natural_language_understanding', function() {
     done();
   });
 
+  describe('env', function() {
+    // create a new, empty env for each test, then restore it at the end
+    const env = process.env;
+    beforeEach(function() {
+      process.env = {};
+    });
+    after(function() {
+      process.env = env;
+    });
+
+    it('should load its credentials from bluemix (hyphenated)', function() {
+      process.env.VCAP_SERVICES = JSON.stringify({
+        'natural-language-understanding': [
+          {
+            credentials: {
+              url: 'https://gateway.watsonplatform.net/natural-language-understanding/api',
+              username: 'hyphenated-user',
+              password: 'hpyhenated-pass'
+            },
+            syslog_drain_url: null,
+            label: 'natural-language-understanding',
+            provider: null,
+            plan: 'standard',
+            name: 'my-nlu-service',
+            tags: ['watson', 'ibm_created']
+          }
+        ]
+      });
+      const nluHyphenated = new watson.NaturalLanguageUnderstandingV1({
+        version_date: watson.NaturalLanguageUnderstandingV1.VERSION_DATE_2017_02_27
+      });
+      assert(nluHyphenated);
+      assert.equal(nluHyphenated.getCredentials().username, 'hyphenated-user');
+    });
+  });
+
   it('2016_01_23 version should work', function(done) {
     const mockApi = nock(watson.NaturalLanguageUnderstandingV1.URL)
       .post('/v1/analyze?version=' + watson.NaturalLanguageUnderstandingV1.VERSION_DATE_2016_01_23)