update validate.test.js

Author: horike37

lib/apiGateway/validate.js

@@ -12,8 +12,8 @@ module.exports = {
         const serviceName = this.getServiceName(serviceProxy)
         await this.checkAllowedService(serviceName)
         const http = serviceProxy[serviceName]
-        http.path = await this.getProxyPath(serviceProxy[serviceName])
-        http.method = await this.getProxyMethod(serviceProxy[serviceName])
+        http.path = await this.getProxyPath(serviceProxy[serviceName], serviceName)
+        http.method = await this.getProxyMethod(serviceProxy[serviceName], serviceName)
 
         if (serviceProxy[serviceName].cors) {
           http.cors = await this.getCors(serviceProxy[serviceName])
@@ -31,6 +31,10 @@ module.exports = {
             cors.maxAge = http.cors.maxAge
           }
 
+          if (_.has(http.cors, 'cacheControl')) {
+            cors.cacheControl = http.cors.cacheControl
+          }
+
           corsPreflight[http.path] = cors
         }
 
@@ -50,20 +54,24 @@ module.exports = {
         `Invalid APIG proxy "${serviceName}".`,
         ` This plugin supported Proxies are: ${allowedProxies.join(', ')}.`
       ].join('')
-      console.log(errorMessage)
       return BbPromise.reject(new this.serverless.classes.Error(errorMessage))
     }
   },
 
-  async getProxyPath(proxy) {
-    if (typeof proxy.path === 'string') {
+  async getProxyPath(proxy, serviceName) {
+    if (proxy.path && typeof proxy.path === 'string') {
       return proxy.path.replace(/^\//, '').replace(/\/$/, '')
     }
-    return BbPromise.reject(new this.serverless.classes.Error('Invalid service proxy syntax'))
+
+    return BbPromise.reject(
+      new this.serverless.classes.Error(
+        `Missing or invalid "path" property in ${serviceName} proxy`
+      )
+    )
   },
 
-  async getProxyMethod(proxy) {
-    if (typeof proxy.method === 'string') {
+  async getProxyMethod(proxy, serviceName) {
+    if (proxy.method && typeof proxy.method === 'string') {
       const method = proxy.method.toLowerCase()
 
       const allowedMethods = ['get', 'post', 'put', 'patch', 'options', 'head', 'delete', 'any']
@@ -76,7 +84,11 @@ module.exports = {
       }
       return method
     }
-    return BbPromise.reject(new this.serverless.classes.Error('Invalid service proxy syntax'))
+    return BbPromise.reject(
+      new this.serverless.classes.Error(
+        `Missing or invalid "method" property in ${serviceName} proxy`
+      )
+    )
   },
 
   async getCors(proxy) {
@@ -130,6 +142,13 @@ module.exports = {
       if (cors.methods.indexOf(proxy.method.toUpperCase()) === NOT_FOUND) {
         cors.methods.push(proxy.method.toUpperCase())
       }
+
+      if (_.has(cors, 'maxAge')) {
+        if (!_.isInteger(cors.maxAge) || cors.maxAge < 1) {
+          const errorMessage = 'maxAge should be an integer over 0'
+          return BbPromise.reject(new this.serverless.classes.Error(errorMessage))
+        }
+      }
     } else {
       cors.methods.push(proxy.method.toUpperCase())
     }