fix for semi-broken invoke --param-file

Fixes #487

Author: starpit

app/plugins/ui/commands/openwhisk-core.js

@@ -196,7 +196,7 @@ const paramFile = (M, idx, argv, type) => {
     const params = JSON.parse(require('fs').readFileSync(expandHomeDir(file)).toString())
     M[type].parameters = M[type].parameters.concat(toArray(params))
 
-    return idx
+    return idx + 1
 }
 
 const isBinary = {
@@ -804,6 +804,7 @@ const executor = (_entity, _verb, verbSynonym, commandTree, preflight) => (block
         //
         // OPERATION WITH IMPLICIT ENTITY: try to get the name from the current selection
         //
+        debug('seeing if we can use an implicit entity')
         const sidecar = document.querySelector('#sidecar')
         if (sidecar && sidecar.entity) {
             options.name = `/${sidecar.entity.namespace || '_'}/${sidecar.entity.name}`

app/plugins/ui/commands/openwhisk-usage.js

@@ -55,7 +55,7 @@ const activationID = [{ name: 'activationId', docs: 'an activation ID', entity:
 
 /** optional parameters having to do with parameter bindings */
 const params = [{ name: '--param', alias: '-p', example: 'key value', docs: 'bind a variable to a value', narg: 2, key: 'parameters' },
-                { name: '--param-file', alias: '-P', advanced: true, docs: 'a local path to a bindings file' }]
+                { name: '--param-file', alias: '-P', advanced: true, docs: 'a local path to a bindings file', file: true }]
 
 /** optional parameters having to do with annotations */
 const annotations = [{ name: '--annotation', alias: '-a', example: 'key value', docs: 'annotate a variable with a value', narg: 2, key: 'annotations' },

tests/tests/passes/03/invoke-implicit.js

@@ -18,6 +18,7 @@ const common = require('../../../lib/common'),
       openwhisk = require('../../../lib/openwhisk'),
       ui = require('../../../lib/ui'),
       assert = require('assert'),
+      path = require('path'),
       keys = ui.keys,
       cli = ui.cli,
       sidecar = ui.sidecar,
@@ -46,6 +47,32 @@ describe('wsk action invoke with implicit entity', function() {
            .catch(common.oops(this)))
     }
 
+    const paramsJson = require(path.join(__dirname, '../../../data/params.json'))
+
+    it(`should invoke ${actionName} with implicit entity and --param-file`, () => cli.do(`invoke --param-file ./data/params.json`, this.app)
+       .then(cli.expectOK)
+       .then(sidecar.expectOpen)
+       .then(sidecar.expectShowing(actionName))
+       .then(() => this.app.client.getText(ui.selectors.SIDECAR_ACTIVATION_RESULT))
+       .then(ui.expectStruct(Object.assign({ x:3 }, paramsJson )))
+       .catch(common.oops(this)))
+
+    it(`should invoke ${actionName} with implicit entity and -P`, () => cli.do(`invoke -P ./data/params.json`, this.app)
+       .then(cli.expectOK)
+       .then(sidecar.expectOpen)
+       .then(sidecar.expectShowing(actionName))
+       .then(() => this.app.client.getText(ui.selectors.SIDECAR_ACTIVATION_RESULT))
+       .then(ui.expectStruct(Object.assign({ x:3 }, paramsJson )))
+       .catch(common.oops(this)))
+
+    it(`should invoke ${actionName} with explicit entity and -P`, () => cli.do(`invoke ${actionName} -P ./data/params.json`, this.app)
+       .then(cli.expectOK)
+       .then(sidecar.expectOpen)
+       .then(sidecar.expectShowing(actionName))
+       .then(() => this.app.client.getText(ui.selectors.SIDECAR_ACTIVATION_RESULT))
+       .then(ui.expectStruct(Object.assign({ x:3 }, paramsJson )))
+       .catch(common.oops(this)))
+
     it(`should fail when requesting parameters of an activation`, () => cli.do('params', this.app)
        .then(cli.expectError(0, 'The current entity does not support viewing parameters'))
        .catch(common.oops(this)))