Fixes #134 - Invoke Local Should Use Package Params

Author: jthomas

invokeLocal/index.js

@@ -16,6 +16,7 @@ class OpenWhiskInvokeLocal {
     this.hooks = {
       'invoke:local:invoke': () => BbPromise.bind(this)
         .then(this.validate)
+        .then(this.mergePackageParams)
         .then(this.loadEnvVars)
         .then(this.invokeLocal),
     };
@@ -63,6 +64,21 @@ class OpenWhiskInvokeLocal {
     });
   }
 
+  mergePackageParams() {
+    const functionObj = this.serverless.service.getFunction(this.options.function) || {}
+    const name = functionObj.name || ''
+    const id = name.match(/^(.+)\/.+$/)
+    if (id) {
+      const pgke = id[1]
+      const manifestPackages = this.serverless.service.resources.packages || {};
+      const packageDetails = manifestPackages[pgke] || {}
+      const packageParams = packageDetails.parameters || {}
+      this.options.data = Object.assign(packageParams, this.options.data);
+    }
+
+    return BbPromise.resolve();
+  }
+
   loadEnvVars() {
     return this.provider.props().then(props => {
       const envVars = {

invokeLocal/tests/index.js

@@ -250,6 +250,41 @@ describe('OpenWhiskInvokeLocal', () => {
     );
   });
 
+  describe('#mergePackageParams()', () => {
+    beforeEach(() => {
+      serverless.config.servicePath = true;
+      serverless.service.provider = {
+        namespace: 'testing_ns',
+        environment: {
+          providerVar: 'providerValue',
+        },
+      };
+
+      serverless.service.functions.first.name = 'mypackage/first'
+      serverless.service.functions.first.parameters = {
+        foo: 'bar', nums: 1, arr: ['foo', 'bar']
+      }
+      openwhiskInvokeLocal.options = { data: { foo: 'bar', nums: 1, arr: ['foo', 'bar'] }};
+    });
+
+
+    it('it should ignore implicit packages without parameters', () => openwhiskInvokeLocal
+      .mergePackageParams().then(() => {
+        expect(openwhiskInvokeLocal.options.data).to.deep.equal(serverless.service.functions.first.parameters);
+      })
+    );
+
+    it('it should merge implicit packages with parameters', () => { 
+      serverless.service.resources.packages = {
+        mypackage: { parameters: { hello: 'world', foo: 'baz' } }
+      }
+      return openwhiskInvokeLocal.mergePackageParams().then(() => {
+        const merged = Object.assign(serverless.service.resources.packages.mypackage.parameters, openwhiskInvokeLocal.options.data)
+        expect(openwhiskInvokeLocal.options.data).to.deep.equal(merged);
+      })
+    });
+  });
+
   describe('#invokeLocal()', () => {
     let invokeLocalNodeJsStub, invokeLocalPythonStub;