refactor

Author: horike37

lib/apiGateway/methods.js

@@ -1,7 +1,7 @@
 'use strict'
 
 module.exports = {
-  getMethodResponses(http) {
+  async getMethodResponses(http) {
     const methodResponse = {
       Properties: {
         MethodResponses: [
@@ -25,7 +25,7 @@ module.exports = {
         origin = http.cors.origins.join(',')
       }
 
-      methodResponse.Properties.MethodResponses.forEach((val, i) => {
+      methodResponse.Properties.MethodResponses.forEach(async (val, i) => {
         methodResponse.Properties.MethodResponses[i].ResponseParameters = {
           'method.response.header.Access-Control-Allow-Origin': `'${origin}'`
         }

lib/apiGateway/validate.js

@@ -4,18 +4,16 @@ const BbPromise = require('bluebird')
 const _ = require('lodash')
 
 module.exports = {
-  async serviceProxyValidate() {
+  async validateServiceProxies() {
     const events = []
     await BbPromise.all(
       this.getAllServiceProxies().map(async (serviceProxy) => {
         Object.keys(serviceProxy).forEach(async (functionName) => {
           await this.checkAllowedService(functionName)
           const corsPreflight = []
-          const http = {
-            path: await this.getProxyPath(serviceProxy[functionName]),
-            method: await this.getProxyMethod(serviceProxy[functionName]),
-            streamName: serviceProxy[functionName].streamName
-          }
+          const http = serviceProxy[functionName]
+          http.path = await this.getProxyPath(serviceProxy[functionName])
+          http.method = await this.getProxyMethod(serviceProxy[functionName])
 
           if (serviceProxy[functionName].cors) {
             http.cors = await this.getCors(serviceProxy[functionName])

lib/index.js

@@ -12,6 +12,8 @@ const compileDeployment = require('serverless/lib/plugins/aws/package/compile/ev
 const getStackInfo = require('serverless/lib/plugins/aws/info/getStackInfo')
 const compileMethodsToKinesis = require('./package/kinesis/compileMethodsToKinesis')
 const compileIamRoleToKinesis = require('./package/kinesis/compileIamRoleToKinesis')
+const validateKinesisServiceProxy = require('./package/kinesis/validateKinesisServiceProxy')
+const compileKinesisServiceProxy = require('./package/kinesis/compileKinesisServiceProxy')
 
 class ServerlessApigatewayServiceProxy {
   constructor(serverless, options) {
@@ -28,6 +30,8 @@ class ServerlessApigatewayServiceProxy {
       compileMethodsToKinesis,
       compileIamRoleToKinesis,
       compileDeployment,
+      validateKinesisServiceProxy,
+      compileKinesisServiceProxy,
       getStackInfo,
       validate,
       methods,
@@ -37,14 +41,15 @@ class ServerlessApigatewayServiceProxy {
     this.hooks = {
       'package:compileEvents': async () => {
         if (this.getAllServiceProxies().length > 0) {
-          this.validated = await this.serviceProxyValidate()
+          this.validated = await this.validateServiceProxies()
           await this.compileRestApi()
           await this.compileResources()
           if (await this.existsDeployment()) {
             await this.compileDeployment()
           }
-          await this.compileIamRoleToKinesis()
-          await this.compileMethodsToKinesis()
+
+          //Kinesis proxy
+          await this.compileKinesisServiceProxy()
         }
       },
       'after:deploy:deploy': async () => {

lib/package/kinesis/compileIamRoleToKinesis.js

@@ -1,6 +1,6 @@
 'use strict'
-const BbPromise = require('bluebird')
 const _ = require('lodash')
+const BbPromise = require('bluebird')
 
 module.exports = {
   async compileIamRoleToKinesis() {

lib/package/kinesis/compileKinesisServiceProxy.js

@@ -0,0 +1,8 @@
+'use strict'
+module.exports = {
+  async compileKinesisServiceProxy() {
+    await this.validateKinesisServiceProxy()
+    await this.compileIamRoleToKinesis()
+    await this.compileMethodsToKinesis()
+  }
+}

lib/package/kinesis/validateKinesisServiceProxy.js

@@ -0,0 +1,46 @@
+'use strict'
+
+const BbPromise = require('bluebird')
+const _ = require('lodash')
+
+module.exports = {
+  async validateKinesisServiceProxy() {
+    await BbPromise.all(
+      this.validated.events.map(async (serviceProxy) => {
+        if (serviceProxy.functionName == 'kinesis') {
+          if (!_.has(serviceProxy.http, 'streamName')) {
+            return BbPromise.reject(
+              new this.serverless.classes.Error(
+                'Missing "streamName" property in Kinesis Service Proxy'
+              )
+            )
+          }
+
+          if (
+            typeof serviceProxy.http.streamName != 'object' &&
+            typeof serviceProxy.http.streamName != 'string'
+          ) {
+            const errorMessage = [
+              'You can only set "string" or the AWS intrinsic function',
+              ' "Ref" like { Ref: \'KinesisStreamResourceId\' }}',
+              ' as a streamName property'
+            ].join('')
+            return BbPromise.reject(new this.serverless.classes.Error(errorMessage))
+          }
+
+          if (
+            typeof serviceProxy.http.streamName == 'object' &&
+            !_.has(serviceProxy.http.streamName, 'Ref')
+          ) {
+            const errorMessage = [
+              'You can only set "string" or the AWS intrinsic function',
+              ' "Ref" like { Ref: \'KinesisStreamResourceId\' }}',
+              ' as a streamName property'
+            ].join('')
+            return BbPromise.reject(new this.serverless.classes.Error(errorMessage))
+          }
+        }
+      })
+    )
+  }
+}