Merge pull request #22 from mamoonraja/fix-kube

fix(kube): returm apikey as iam_apikey
germanattanasio · Nov 7, 2018 · 4edacc5 · 4edacc5
2 parents 96b7d1a + 2a21144
commit 4edacc5
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/index.js b/index.js
@@ -119,6 +119,10 @@ const getCredentialsForStarter = function(serviceLabel, credsFromFile) {
   }
   else if (process.env[`service_watson_${serviceLabel}`]){
     creds = JSON.parse(process.env[`service_watson_${serviceLabel}`]);
+    if (creds.apikey) {
+      creds.iam_apikey = creds.apikey;
+      delete creds.apikey;
+    }
   }
   return creds;
 }

diff --git a/test/test.parse.js b/test/test.parse.js
@@ -187,9 +187,26 @@ describe('credentials file and Kube', function() {
   });
 
 
-  it('should get the credentials for Starter from Kube', function() {
-    process.env.service_watson_conversation = JSON.stringify(cloudCredentials);
-    assert.deepEqual(cloudCredentials, vcapServices.getCredentialsForStarter('conversation'));
+  it('should get the IAM credentials for Starter from Kube', function() {
+    var kubeCredentials = {
+      apikey: 'apikey',
+      url: 'url'
+    };
+    var expectedCredentials = {
+      iam_apikey: 'apikey',
+      url: 'url'
+    };
+    process.env.service_watson_discovery = JSON.stringify(kubeCredentials);
+    assert.deepEqual(expectedCredentials, vcapServices.getCredentialsForStarter('discovery'));
+  });
+
+  it('should get the CF credentials for Starter from Kube', function() {
+    var kubeCredentials = {
+      username: 'username',
+      password: 'password'
+    };
+    process.env.service_watson_discovery = JSON.stringify(kubeCredentials);
+    assert.deepEqual(kubeCredentials, vcapServices.getCredentialsForStarter('discovery'));
   });
 
   it('should get the credentials for Starter from file', function() {