Merge branch 'master' of github.com:serverless/serverless-openwhisk

Author: jthomas

compile/packages/index.js

@@ -11,6 +11,7 @@ class OpenWhiskCompilePackages {
     this.hooks = {
       'before:package:compileEvents': () => BbPromise.bind(this)
         .then(this.setup)
+        .then(this.renameManifestPackages)
         .then(this.mergeActionPackages),
       'package:compileEvents': this.compilePackages.bind(this),
     };
@@ -22,9 +23,25 @@ class OpenWhiskCompilePackages {
     this.serverless.service.packages = {};
   }
 
+  renameManifestPackages() {
+    if (!this.serverless.service.resources.packages) return;
+
+    const manifestPackages = this.serverless.service.resources.packages;
+
+    Object.keys(manifestPackages).forEach(packageKey => {
+      const pack = manifestPackages[packageKey];
+
+      if (pack.name && pack.name !== packageKey) {
+        // move the package under the new name
+        manifestPackages[pack.name] = pack;
+        delete manifestPackages[packageKey];
+      }
+    })
+  }
+
   mergeActionPackages() {
-    const packages = this.getActionPackages();
-    if (!packages.length) return;
+    const actionPackages = this.getActionPackages();
+    if (!actionPackages.length) return;
 
     if (!this.serverless.service.resources) {
       this.serverless.service.resources = {};
@@ -34,9 +51,9 @@ class OpenWhiskCompilePackages {
       this.serverless.service.resources.packages = {};
     }
 
-    const manifestPackages = this.serverless.service.resources.packages || {};
+    const manifestPackages = this.serverless.service.resources.packages;
 
-    packages.forEach(pkge => {
+    actionPackages.forEach(pkge => {
       manifestPackages[pkge] = manifestPackages[pkge] || {}
     })
   }

compile/packages/tests/index.js

@@ -36,6 +36,25 @@ describe('OpenWhiskCompilePackages', () => {
     sandbox.restore();
   });
 
+  describe('#renameManifestPackages()', () => {
+    it('should rename packages with explicit names', () => {
+      openwhiskCompilePackages.serverless.service.resources.packages = {
+        'first' : { name: 'firstchanged', parameters: { hello: 'world first' } },
+        'second' : { parameters: { hello: 'world second' } }
+      };
+
+      const expected = {
+        'firstchanged' : { name: 'firstchanged', parameters: { hello: 'world first' } },
+        'second' : { parameters: { hello: 'world second' } }
+      };
+
+      openwhiskCompilePackages.renameManifestPackages();
+      expect(openwhiskCompilePackages.serverless.service.resources.packages)
+        .to.deep.equal(expected);
+
+    })
+  })
+
   describe('#getActionPackages()', () => {
     it('should return no package names for functions without name property', () => {
       const service = openwhiskCompilePackages.serverless.service;
@@ -140,6 +159,46 @@ describe('OpenWhiskCompilePackages', () => {
           .to.deep.equal({ sample: expected })
       )).to.eventually.be.fulfilled;
     });
+
+    it('should merge packages with explicit names', () => {
+      openwhiskCompilePackages.serverless.service.resources.packages = {
+        'first' : { name: 'firstchanged', parameters: { hello: 'world first' } },
+        'second' : { parameters: { hello: 'world second' } }
+      };
+
+      sandbox.stub(openwhiskCompilePackages, 'getActionPackages', () => ['firstchanged', 'second', 'third']);
+
+      const expected = {
+        firstchanged: {
+          name: 'firstchanged',
+          overwrite: true,
+          package: { parameters: [{ key: 'hello', value: 'world first' }] },
+          namespace: 'testing'
+        },
+        second: {
+          name: 'second',
+          overwrite: true,
+          package: { parameters: [{ key: 'hello', value: 'world second' }] },
+          namespace: 'testing'
+        },
+        third: {
+          name: 'third',
+          overwrite: true,
+          package: {},
+          namespace: 'testing'
+        }
+      };
+
+      // Simulate hooks
+      openwhiskCompilePackages.setup();
+      openwhiskCompilePackages.renameManifestPackages();
+      openwhiskCompilePackages.mergeActionPackages();
+
+      return expect(openwhiskCompilePackages.compilePackages().then(() => {
+        expect(openwhiskCompilePackages.serverless.service.packages)
+          .to.deep.equal(expected)
+      })).to.eventually.be.fulfilled;
+    });
   });
   describe('#compilePackage()', () => {
     it('should define packages without a body', () => {