Format API host correctly when protocol is already present.

Author: rabbah

info/index.js

@@ -34,6 +34,7 @@ class OpenWhiskInfo {
 
     return this.provider.props().then(props => {
       this.props = props;
+      this.props.apihost = formatApiHost(props.apihost);
       return this.provider.client();
     }).then(client => {
       this.client = client;
@@ -93,7 +94,7 @@ class OpenWhiskInfo {
     return this.provider.props().then(props => {
       web_actions.forEach(action => {
         const nsPkge = extractNsAndPkge(action.namespace)
-        this.consoleLog(`https://${props.apihost}/api/v1/web/${nsPkge.ns}/${nsPkge.pkge}/${action.name}`)
+        this.consoleLog(`${formatApiHost(props.apihost)}/api/v1/web/${nsPkge.ns}/${nsPkge.pkge}/${action.name}`)
       })
     })
   }
@@ -173,4 +174,13 @@ class OpenWhiskInfo {
   }
 }
 
+function formatApiHost(apihost) {
+  if (apihost && !(apihost.startsWith('http://') || apihost.startsWith('https://'))) {
+    // assume https unless explicitly declared
+    return `https://${apihost}`;
+  } else {
+    return apihost;
+  }
+}
+
 module.exports = OpenWhiskInfo;

info/tests/index.js

@@ -307,5 +307,27 @@ describe('OpenWhiskInfo', () => {
         expect(log.args[3][0].match(/https:\/\/openwhisk.ng.bluemix.net\/api\/v1\/web\/user_name\/custom_package\/sixth/)).to.be.ok;
       }));
     })
+
+    it('should show web action routes returned with apihost that include a protocol', () => {
+      const apihost = 'http://localhost'
+      openwhiskInfo.provider = { props: () => Promise.resolve({ apihost }) }
+      const log = sandbox.stub(openwhiskInfo, 'consoleLog')
+      openwhiskInfo._actions = [
+        {name: 'first', namespace: 'user_name', annotations: [{key: 'web-export', value: true}, {key: 'a', value: 'b'}]},
+        {name: 'second', namespace: 'user_name', annotations: [{key: 'web-export', value: false}]},
+        {name: 'third'},
+        {name: 'fourth', namespace: 'user_name', annotations: [{key: 'web-export', value: true}]},
+        {name: 'fifth', annotations: []},
+        {name: 'sixth', namespace: 'user_name/custom_package', annotations: [{key: 'web-export', value: true}]},
+      ];
+
+      return expect(openwhiskInfo.showWebActionsInfo().then(() => {
+        expect(log.callCount).to.be.equal(4);
+        expect(log.args[0][0].match(/endpoints \(web actions\):/)).to.be.ok;
+        expect(log.args[1][0].match(/http:\/\/localhost\/api\/v1\/web\/user_name\/default\/first/)).to.be.ok;
+        expect(log.args[2][0].match(/http:\/\/localhost\/api\/v1\/web\/user_name\/default\/fourth/)).to.be.ok;
+        expect(log.args[3][0].match(/http:\/\/localhost\/api\/v1\/web\/user_name\/custom_package\/sixth/)).to.be.ok;
+      }));
+    })
   })
 });