refactor

Author: horike37

lib/apiGateway/methods.js

@@ -0,0 +1,37 @@
+'use strict'
+
+module.exports = {
+  getMethodResponses(http) {
+    const methodResponse = {
+      Properties: {
+        MethodResponses: [
+          {
+            ResponseParameters: {},
+            ResponseModels: {},
+            StatusCode: 200
+          },
+          {
+            ResponseParameters: {},
+            ResponseModels: {},
+            StatusCode: 400
+          }
+        ]
+      }
+    }
+
+    if (http && http.cors) {
+      let origin = http.cors.origin
+      if (http.cors.origins && http.cors.origins.length) {
+        origin = http.cors.origins.join(',')
+      }
+
+      methodResponse.Properties.MethodResponses.forEach((val, i) => {
+        methodResponse.Properties.MethodResponses[i].ResponseParameters = {
+          'method.response.header.Access-Control-Allow-Origin': `'${origin}'`
+        }
+      })
+    }
+
+    return methodResponse
+  }
+}

lib/apiGateway/validate.js

@@ -18,7 +18,7 @@ module.exports = {
           }
 
           if (serviceProxy[functionName].cors) {
-            http.cors = this.getCors(serviceProxy[functionName])
+            http.cors = await this.getCors(serviceProxy[functionName])
 
             const cors = corsPreflight[http.path] || {}
 
@@ -64,7 +64,7 @@ module.exports = {
     return BbPromise.reject(new this.serverless.classes.Error('Invalid service proxy syntax'))
   },
 
-  getProxyMethod(proxy) {
+  async getProxyMethod(proxy) {
     if (typeof proxy.method === 'string') {
       const method = proxy.method.toLowerCase()
 
@@ -74,14 +74,14 @@ module.exports = {
           `Invalid APIG method "${proxy.method}" in AWS service proxy.`,
           ` AWS supported methods are: ${allowedMethods.join(', ')}.`
         ].join('')
-        throw new this.serverless.classes.Error(errorMessage)
+        return BbPromise.reject(new this.serverless.classes.Error(errorMessage))
       }
       return method
     }
     return BbPromise.reject(new this.serverless.classes.Error('Invalid service proxy syntax'))
   },
 
-  getCors(proxy) {
+  async getCors(proxy) {
     const headers = [
       'Content-Type',
       'X-Amz-Date',
@@ -110,7 +110,7 @@ module.exports = {
           ' but not both at the same time to configure CORS.',
           ' Please check the docs for more info.'
         ].join('')
-        throw new this.serverless.classes.Error(errorMessage)
+        return BbPromise.reject(new this.serverless.classes.Error(errorMessage))
       }
 
       if (cors.headers) {
@@ -119,7 +119,7 @@ module.exports = {
             'CORS header values must be provided as an array.',
             ' Please check the docs for more info.'
           ].join('')
-          throw new this.serverless.classes.Error(errorMessage)
+          return BbPromise.reject(new this.serverless.classes.Error(errorMessage))
         }
       } else {
         cors.headers = headers

lib/index.js

@@ -5,12 +5,13 @@ const _ = require('lodash')
 
 const utils = require('./utils')
 const validate = require('./apiGateway/validate')
+const methods = require('./apiGateway/methods')
 const compileRestApi = require('serverless/lib/plugins/aws/package/compile/events/apiGateway/lib/restApi')
 const compileResources = require('serverless/lib/plugins/aws/package/compile/events/apiGateway/lib/resources')
 const compileDeployment = require('serverless/lib/plugins/aws/package/compile/events/apiGateway/lib/deployment')
 const getStackInfo = require('serverless/lib/plugins/aws/info/getStackInfo')
-const compileKinesisMethods = require('./package/kinesis/methods')
-const compileToKinesisIamRole = require('./package/kinesis/compileToKinesisIamRole')
+const compileMethodsToKinesis = require('./package/kinesis/compileMethodsToKinesis')
+const compileIamRoleToKinesis = require('./package/kinesis/compileIamRoleToKinesis')
 
 class ServerlessApigatewayServiceProxy {
   constructor(serverless, options) {
@@ -24,11 +25,12 @@ class ServerlessApigatewayServiceProxy {
       this,
       compileRestApi,
       compileResources,
-      compileKinesisMethods,
-      compileToKinesisIamRole,
+      compileMethodsToKinesis,
+      compileIamRoleToKinesis,
       compileDeployment,
       getStackInfo,
       validate,
+      methods,
       utils
     )
 
@@ -41,8 +43,8 @@ class ServerlessApigatewayServiceProxy {
           if (await this.existsDeployment()) {
             await this.compileDeployment()
           }
-          await this.compileKinesisMethods()
-          await this.compileToKinesisIamRole()
+          await this.compileIamRoleToKinesis()
+          await this.compileMethodsToKinesis()
         }
       },
       'after:deploy:deploy': async () => {

lib/package/kinesis/compileToKinesisIamRole.js renamed to lib/package/kinesis/compileIamRoleToKinesis.js

@@ -3,7 +3,7 @@ const BbPromise = require('bluebird')
 const _ = require('lodash')
 
 module.exports = {
-  async compileToKinesisIamRole() {
+  async compileIamRoleToKinesis() {
     await BbPromise.all(
       this.getAllServiceProxies().map(async (serviceProxy) => {
         Object.keys(serviceProxy).forEach(async (serviceName) => {

lib/package/kinesis/methods.js renamed to lib/package/kinesis/compileMethodsToKinesis.js

@@ -4,7 +4,7 @@ const BbPromise = require('bluebird')
 const _ = require('lodash')
 
 module.exports = {
-  async compileKinesisMethods() {
+  async compileMethodsToKinesis() {
     this.apiGatewayMethodLogicalIds = []
     this.validated.events.forEach((event) => {
       const resourceId = this.getResourceId(event.http.path)
@@ -22,7 +22,11 @@ module.exports = {
         }
       }
 
-      _.merge(template, this.getMethodIntegration(event.http), this.getMethodResponses(event.http))
+      _.merge(
+        template,
+        this.getKinesisMethodIntegration(event.http),
+        this.getMethodResponses(event.http)
+      )
 
       const methodLogicalId = this.provider.naming.getMethodLogicalId(
         resourceName,
@@ -39,7 +43,7 @@ module.exports = {
     return BbPromise.resolve()
   },
 
-  getMethodIntegration(http) {
+  getKinesisMethodIntegration(http) {
     const integration = {
       IntegrationHttpMethod: 'POST',
       Type: 'AWS',
@@ -59,7 +63,7 @@ module.exports = {
         ]
       },
       PassthroughBehavior: 'NEVER',
-      RequestTemplates: this.getIntegrationRequestTemplates(http)
+      RequestTemplates: this.getKinesisIntegrationRequestTemplates(http)
     }
 
     const integrationResponse = {
@@ -101,19 +105,19 @@ module.exports = {
     }
   },
 
-  getIntegrationRequestTemplates(http) {
-    const defaultRequestTemplates = this.getDefaultRequestTemplates(http)
+  getKinesisIntegrationRequestTemplates(http) {
+    const defaultRequestTemplates = this.getDefaultKinesisRequestTemplates(http)
     return Object.assign(defaultRequestTemplates, _.get(http, ['request', 'template']))
   },
 
-  getDefaultRequestTemplates(http) {
+  getDefaultKinesisRequestTemplates(http) {
     return {
-      'application/json': this.buildDefaultRequestTemplate(http),
-      'application/x-www-form-urlencoded': this.buildDefaultRequestTemplate(http)
+      'application/json': this.buildDefaultKinesisRequestTemplate(http),
+      'application/x-www-form-urlencoded': this.buildDefaultKinesisRequestTemplate(http)
     }
   },
 
-  buildDefaultRequestTemplate(http) {
+  buildDefaultKinesisRequestTemplate(http) {
     let streamName
     if (typeof http.streamName == 'object') {
       streamName = http.streamName
@@ -135,39 +139,5 @@ module.exports = {
         ]
       ]
     }
-  },
-
-  getMethodResponses(http) {
-    const methodResponse = {
-      Properties: {
-        MethodResponses: [
-          {
-            ResponseParameters: {},
-            ResponseModels: {},
-            StatusCode: 200
-          },
-          {
-            ResponseParameters: {},
-            ResponseModels: {},
-            StatusCode: 400
-          }
-        ]
-      }
-    }
-
-    if (http && http.cors) {
-      let origin = http.cors.origin
-      if (http.cors.origins && http.cors.origins.length) {
-        origin = http.cors.origins.join(',')
-      }
-
-      methodResponse.Properties.MethodResponses.forEach((val, i) => {
-        methodResponse.Properties.MethodResponses[i].ResponseParameters = {
-          'method.response.header.Access-Control-Allow-Origin': `'${origin}'`
-        }
-      })
-    }
-
-    return methodResponse
   }
 }