add validate.js test

horike37 · horike37 · commit 8499da3b0311 · 2019-07-21T17:30:01.000+09:00
diff --git a/lib/apiGateway/methods.test.js b/lib/apiGateway/methods.test.js
@@ -25,55 +25,40 @@ describe('#getAllServiceProxies()', () => {
   })
 
   describe('#getMethodResponses()', () => {
-    it('should return a corresponding methodResponses resource', () => {
-      return
-      serverlessApigatewayServiceProxy
-        .getMethodResponses()
-        .to.eventually.be.fulfilled.then((json) => {
-          expect(json.Properties).to.have.property('MethodResponses')
-        })
+    it('should return a corresponding methodResponses resource', async () => {
+      await expect(
+        serverlessApigatewayServiceProxy.getMethodResponses()
+      ).to.eventually.have.nested.property('Properties.MethodResponses')
     })
 
-    it('should set Access-Control-Allow-Origin header when cors is true', () => {
-      return
-      serverlessApigatewayServiceProxy
-        .getMethodResponses({
+    it('should set Access-Control-Allow-Origin header when cors is true', async () => {
+      await expect(
+        serverlessApigatewayServiceProxy.getMethodResponses({
           cors: {
-            origins: ['*', 'http://example.com']
+            origin: '*'
           }
         })
-        .to.eventually.be.fulfilled.then((json) => {
-          expect(
-            json.Properties.MethodResponses[0].ResponseParameters[
-              'method.response.header.Access-Control-Allow-Origin'
-            ]
-          ).to.equal("'*,http://example.com'")
-
-          expect(
-            serverlessApigatewayServiceProxy.getMethodResponses({
-              cors: {
-                origin: '*'
-              }
-            }).Properties.MethodResponses[0].ResponseParameters[
-              'method.response.header.Access-Control-Allow-Origin'
-            ]
-          ).to.equal("'*'")
-        })
+      ).to.be.fulfilled.then((json) => {
+        expect(
+          json.Properties.MethodResponses[0].ResponseParameters[
+            'method.response.header.Access-Control-Allow-Origin'
+          ]
+        ).to.equal("'*'")
+      })
 
-      return
-      serverlessApigatewayServiceProxy
-        .getMethodResponses({
+      await expect(
+        serverlessApigatewayServiceProxy.getMethodResponses({
           cors: {
-            origin: '*'
+            origins: ['*', 'http://example.com']
           }
         })
-        .to.eventually.be.fulfilled.then((json) => {
-          expect(
-            json.Properties.MethodResponses[0].ResponseParameters[
-              'method.response.header.Access-Control-Allow-Origin'
-            ]
-          ).to.equal("'*'")
-        })
+      ).to.be.fulfilled.then((json) => {
+        expect(
+          json.Properties.MethodResponses[0].ResponseParameters[
+            'method.response.header.Access-Control-Allow-Origin'
+          ]
+        ).to.equal("'*,http://example.com'")
+      })
     })
   })
 })
diff --git a/lib/apiGateway/validate.js b/lib/apiGateway/validate.js
@@ -9,33 +9,32 @@ module.exports = {
     const corsPreflight = {}
     await BbPromise.all(
       this.getAllServiceProxies().map(async (serviceProxy) => {
-        Object.keys(serviceProxy).forEach(async (functionName) => {
-          await this.checkAllowedService(functionName)
-          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])
-
-            const cors = corsPreflight[http.path] || {}
-
-            cors.headers = _.union(http.cors.headers, cors.headers)
-            cors.methods = _.union(http.cors.methods, cors.methods)
-            cors.origins = _.union(http.cors.origins, cors.origins)
-            cors.origin = http.cors.origin || '*'
-            cors.allowCredentials = cors.allowCredentials || http.cors.allowCredentials
-
-            // when merging, last one defined wins
-            if (_.has(http.cors, 'maxAge')) {
-              cors.maxAge = http.cors.maxAge
-            }
-
-            corsPreflight[http.path] = cors
+        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])
+
+        if (serviceProxy[serviceName].cors) {
+          http.cors = await this.getCors(serviceProxy[serviceName])
+
+          const cors = corsPreflight[http.path] || {}
+
+          cors.headers = _.union(http.cors.headers, cors.headers)
+          cors.methods = _.union(http.cors.methods, cors.methods)
+          cors.origins = _.union(http.cors.origins, cors.origins)
+          cors.origin = http.cors.origin || '*'
+          cors.allowCredentials = cors.allowCredentials || http.cors.allowCredentials
+
+          // when merging, last one defined wins
+          if (_.has(http.cors, 'maxAge')) {
+            cors.maxAge = http.cors.maxAge
           }
 
-          events.push({ functionName, http })
-        })
+          corsPreflight[http.path] = cors
+        }
+
+        events.push({ serviceName, http })
       })
     )
     return {
@@ -51,6 +50,7 @@ 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))
     }
   },
diff --git a/lib/apiGateway/validate.test.js b/lib/apiGateway/validate.test.js
@@ -0,0 +1,43 @@
+'use strict'
+
+const chai = require('chai')
+const Serverless = require('serverless/lib/Serverless')
+const AwsProvider = require('serverless/lib/plugins/aws/provider/awsProvider')
+const ServerlessApigatewayServiceProxy = require('./../index')
+
+chai.use(require('chai-as-promised'))
+const expect = require('chai').expect
+
+describe('#validateServiceProxies()', () => {
+  let serverless
+  let serverlessApigatewayServiceProxy
+
+  beforeEach(() => {
+    serverless = new Serverless()
+    serverless.servicePath = true
+    serverless.service.service = 'apigw-service-proxy'
+    const options = {
+      stage: 'dev',
+      region: 'us-east-1'
+    }
+    serverless.setProvider('aws', new AwsProvider(serverless))
+    serverlessApigatewayServiceProxy = new ServerlessApigatewayServiceProxy(serverless, options)
+  })
+
+  it('should reject an invalid proxies', async () => {
+    serverlessApigatewayServiceProxy.serverless.service.custom = {
+      apiGatewayServiceProxies: [
+        {
+          xxxxx: {
+            path: '/kinesis',
+            method: 'post'
+          }
+        }
+      ]
+    }
+
+    await expect(serverlessApigatewayServiceProxy.validateServiceProxies()).to.be.rejectedWith(
+      'Invalid APIG proxy "xxxxx". This plugin supported Proxies are: kinesis, sqs.'
+    )
+  })
+})
diff --git a/lib/utils.js b/lib/utils.js
@@ -6,5 +6,9 @@ module.exports = {
       return this.serverless.service.custom.apiGatewayServiceProxies
     }
     return []
+  },
+
+  getServiceName(serviceProxy) {
+    return Object.keys(serviceProxy)[0]
   }
 }
diff --git a/lib/utils.test.js b/lib/utils.test.js
@@ -5,7 +5,7 @@ const Serverless = require('serverless/lib/Serverless')
 const AwsProvider = require('serverless/lib/plugins/aws/provider/awsProvider')
 const ServerlessApigatewayServiceProxy = require('./index')
 
-describe('#getAllServiceProxies()', () => {
+describe('#utils()', () => {
   let serverless
   let serverlessApigatewayServiceProxy
 
@@ -21,29 +21,44 @@ describe('#getAllServiceProxies()', () => {
     serverlessApigatewayServiceProxy = new ServerlessApigatewayServiceProxy(serverless, options)
   })
 
-  it('should return this plugin configutration', () => {
-    serverless.service.custom = {
-      apiGatewayServiceProxies: [
+  describe('#getAllServiceProxies()', () => {
+    it('should return this plugin configutration', () => {
+      serverless.service.custom = {
+        apiGatewayServiceProxies: [
+          {
+            kinesis: {
+              path: '/kinesis',
+              method: 'post'
+            }
+          }
+        ]
+      }
+
+      expect(serverlessApigatewayServiceProxy.getAllServiceProxies()).to.deep.equal([
         {
           kinesis: {
             path: '/kinesis',
             method: 'post'
           }
         }
-      ]
-    }
+      ])
+    })
 
-    expect(serverlessApigatewayServiceProxy.getAllServiceProxies()).to.deep.equal([
-      {
-        kinesis: {
-          path: '/kinesis',
-          method: 'post'
-        }
-      }
-    ])
+    it('should return empty if no configuration', () => {
+      expect(serverlessApigatewayServiceProxy.getAllServiceProxies()).to.be.empty
+    })
   })
 
-  it('should return empty if no configuration', () => {
-    expect(serverlessApigatewayServiceProxy.getAllServiceProxies()).to.be.empty
+  describe('#getServiceName()', () => {
+    it('should return corresponding service name', () => {
+      expect(
+        serverlessApigatewayServiceProxy.getServiceName({
+          kinesis: {
+            path: '/kinesis',
+            method: 'post'
+          }
+        })
+      ).to.be.equal('kinesis')
+    })
   })
 })

Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,9 @@ module.exports = {`
`6`	`6`	`return this.serverless.service.custom.apiGatewayServiceProxies`
`7`	`7`	`}`
`8`	`8`	`return []`
	`9`	`+ },`
	`10`	`+`
	`11`	`+ getServiceName(serviceProxy) {`
	`12`	`+ return Object.keys(serviceProxy)[0]`
`9`	`13`	`}`
`10`	`14`	`}`