Merge pull request #84 from jcortega/master

fix(eventbridge): multiple-integration integration test and validation

Author: horike37

__tests__/integration/eventbridge/multiple-integrations/service/serverless.yml

@@ -46,6 +46,18 @@ custom:
         eventBusName: { Ref: 'YourBus' }
         source: mySourceName
         cors: true
+    # set value of detail, detailType and source as bodyParam
+    - eventbridge:
+        path: /eventbridge5
+        method: post
+        eventBusName: { Ref: 'YourBus' }
+        source:
+          bodyParam: data.source
+        detailType:
+          bodyParam: data.detailType
+        detail:
+          bodyParam: data.detail
+        cors: true        
 
 resources:
   Resources:

__tests__/integration/eventbridge/multiple-integrations/tests.js

@@ -78,4 +78,25 @@ describe('Multiple EventBridge Proxy Integrations Test', () => {
     expect(body).to.have.own.property('FailedEntryCount')
     expect(body.FailedEntryCount).to.equal(0)
   })
+
+  it('should get correct response from eventbridge proxy endpoints with bodyParams', async () => {
+    const testEndpoint = `${endpoint}/eventbridge5`
+    const response = await fetch(testEndpoint, {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({
+        data: {
+          detail: `{"data": "data for event bus"}`,
+          detailType: `myDetailType`,
+          source: `mySource`
+        }
+      })
+    })
+    expect(response.headers.get('access-control-allow-origin')).to.deep.equal('*')
+    expect(response.status).to.be.equal(200)
+    const body = await response.json()
+    expect(body).to.have.own.property('Entries')
+    expect(body).to.have.own.property('FailedEntryCount')
+    expect(body.FailedEntryCount).to.equal(0)
+  })
 })

lib/apiGateway/schema.js

@@ -163,23 +163,49 @@ const dynamodbDefaultKeyScheme = Joi.object()
     )
   )
 
+// EventBridge source parameter
+const eventBridgeSource = Joi.alternatives().try([
+  Joi.string(),
+  Joi.object()
+    .keys({
+      pathParam: Joi.string(),
+      queryStringParam: Joi.string(),
+      bodyParam: Joi.string()
+    })
+    .xor('pathParam', 'queryStringParam', 'bodyParam')
+    .error(
+      customErrorBuilder(
+        'object.xor',
+        'key must contain "pathParam" or "queryStringParam" or "bodyParam" and only one'
+      )
+    )
+])
+
 // EventBridge detailType parameter
-const detailType = Joi.alternatives().try([
+const eventBridgeDetailType = Joi.alternatives().try([
   Joi.string(),
   Joi.object()
     .keys({
       pathParam: Joi.string(),
-      queryStringParam: Joi.string()
+      queryStringParam: Joi.string(),
+      bodyParam: Joi.string()
     })
-    .xor('pathParam', 'queryStringParam')
+    .xor('pathParam', 'queryStringParam', 'bodyParam')
     .error(
       customErrorBuilder(
         'object.xor',
-        'key must contain "pathParam" or "queryStringParam and only one'
+        'key must contain "pathParam" or "queryStringParam" or "bodyParam" and only one'
       )
     )
 ])
 
+// EventBridge source parameter
+const eventBridgeDetail = Joi.alternatives().try([
+  Joi.object().keys({
+    bodyParam: Joi.string()
+  })
+])
+
 const request = Joi.object({
   template: Joi.object().required()
 })
@@ -238,8 +264,9 @@ const proxiesSchemas = {
   eventbridge: Joi.object({
     eventbridge: proxy.append({
       eventBusName: stringOrRef.required(),
-      source: stringOrRef.required(),
-      detailType
+      source: eventBridgeSource.required(),
+      detailType: eventBridgeDetailType,
+      detail: eventBridgeDetail
     })
   })
 }