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

Author: jthomas

README.md

@@ -777,6 +777,7 @@ functions:
 HTTP event configuration also supports using explicit parameters.
 
 - `method` - HTTP method (mandatory).
+- `basepath` - base path of the API in which the event is added (optional, defaults to service name)
 - `path` - URI path for API gateway (mandatory).
 - `resp` - controls [web action content type](https://github.com/apache/incubator-openwhisk/blob/master/docs/webactions.md#additional-features), values include: `json`, `html`, `http`, `svg`or `text` (optional, defaults to `json`).
 
@@ -787,6 +788,7 @@ functions:
     events:
       - http:
           method: GET
+          basepath: /mybasepath
           path: /api/http
           resp: http
 ```

compile/apigw/README.md

@@ -10,7 +10,7 @@ definitions.
 
 It loops over all functions which are defined in `serverless.yaml` looking for
 the defined events. For each `http` event defined for the function, the
-corresponding API gateway endpoint definitoin will be created.
+corresponding API gateway endpoint definition will be created.
 
 ## Examples
 
@@ -37,6 +37,7 @@ functions:
         events:
             - http: 
                 method: GET 
+                basepath: /mypath
                 path: /api/greeting
                 resp: json
 ```

compile/apigw/index.js

@@ -65,6 +65,10 @@ class OpenWhiskCompileHttpEvents {
       || '_';
   }
 
+  calculateBasePath(httpEvent) {
+    return httpEvent.basepath || `/${this.serverless.service.service}`;
+  }
+
   retrieveAuthKey(functionObject) {
     const annotations = functionObject.annotations || {}
     return annotations['require-whisk-auth']
@@ -82,7 +86,7 @@ class OpenWhiskCompileHttpEvents {
   compileHttpEvent(funcName, funcObj, http) {
     const options = this.parseHttpEvent(http);
     options.action = this.calculateFunctionName(funcName, funcObj);
-    options.basepath = `/${this.serverless.service.service}`;
+    options.basepath = this.calculateBasePath(http);
 
     const secure_key = this.retrieveAuthKey(funcObj)
     if (secure_key) {

compile/apigw/tests/index.js

@@ -189,18 +189,13 @@ describe('OpenWhiskCompileHttpEvents', () => {
       return expect(result).to.deep.equal({basepath: '/my-service', relpath: '/api/foo/bar', operation: 'GET', action: '/sample_ns/my-service_action-name', responsetype: 'http'});
     });
 
-    /**
-    it('should define http events with optional API GW parameters', () => {
+    it('should define http events with explicit base path', () => {
       openwhiskCompileHttpEvents.serverless.service.service = 'my-service' 
       openwhiskCompileHttpEvents.serverless.service.provider = {namespace: "sample_ns"};
-      const http =  {path: "/api/foo/bar", method: "GET", cors: true}
-      let result = openwhiskCompileHttpEvents.compileHttpEvent('action-name', {}, http);
-      expect(result.options).to.deep.equal({cors: true});
-      http.cors = false
-      result = openwhiskCompileHttpEvents.compileHttpEvent('action-name', {}, http);
-      expect(result.options).to.deep.equal({cors: false});
+      const http =  {path: "/api/foo/bar", method: "GET", resp: 'http', basepath: '/custompath'}
+      const result = openwhiskCompileHttpEvents.compileHttpEvent('action-name', {}, http);
+      return expect(result).to.deep.equal({basepath: '/custompath', relpath: '/api/foo/bar', operation: 'GET', action: '/sample_ns/my-service_action-name', responsetype: 'http'});
     });
-    */
 
     it('should throw if http event value invalid', () => {
       expect(() => openwhiskCompileHttpEvents.compileHttpEvent('', {}, 'OPERATION'))