Add S3 trigger to publish lambda

eventbrite/config.js

@@ -28,7 +28,7 @@ const eventsParams = page =>
 module.exports = {
   buckets: () => ({
     producerBucket: "muxer-produced-events-eventbrite",
-    eventsBucket: "muxer-transformed-events"
+    eventsBucket: "muxer-events"
   }),
   getEventsUrl: ({ page }) => `${eventsApi}?${eventsParams(page)}`
 };

farsetlabs/config.js

@@ -17,7 +17,7 @@ const eventsParams = () =>
 module.exports = {
   buckets: () => ({
     producerBucket: "muxer-produced-events-farsetlabs",
-    eventsBucket: "muxer-transformed-events"
+    eventsBucket: "muxer-events"
   }),
   getEventsUrl: () => `${eventsApi}?${eventsParams()}`
 };

farsetlabs/handlers/transformer.js

@@ -37,6 +37,9 @@ const transformEvent = function(
       city: "Belfast",
       country: "GB"
     },
+    charge: {
+      is_free: true
+    },
     created_at: new Date(created).toISOString(),
     last_updated: new Date(updated).toISOString(),
     source_data: {

meetupcom/config.js

@@ -36,7 +36,7 @@ const eventsParams = convert({
 module.exports = {
   buckets: () => ({
     producerBucket: "muxer-produced-events-meetupcom",
-    eventsBucket: "muxer-transformed-events"
+    eventsBucket: "muxer-events"
   }),
   getGroupsUrl: () => `${groupsApi}?${groupsParams}`,
   getEventsUrl: slug => `${eventsApi(slug)}?${eventsParams}`

package.json

@@ -39,6 +39,8 @@
     "farsetlabs:transformer:invoke": "cd farsetlabs && serverless invoke -f transform -l --aws-profile muxer",
     "farsetlabs:transformer:invoke-local": "cd farsetlabs && serverless invoke local -f transform",
     "farsetlabs:transformer:logs": "cd farsetlabs && serverless logs -f transform -l --aws-profile muxer",
+    "publisher:deploy": "cd publisher && serverless deploy -v --aws-profile muxer",
+    "publisher:s3deploy": "cd publisher && sls s3deploy --aws-profile=muxer",
     "publisher:publish:update": "cd publisher && serverless deploy function -f publish --aws-profile muxer",
     "publisher:publish:invoke": "cd publisher && serverless invoke -f publish -l --aws-profile muxer",
     "publisher:publish:invoke-local": "cd publisher && serverless invoke local -f publish",

publisher/config.js

@@ -1,6 +1,6 @@
 module.exports = {
   buckets: () => ({
-    eventsBucket: "muxer-transformed-events"
+    eventsBucket: "muxer-events"
   }),
   muxerEventsApi: process.env.MUXER_EVENTS_API
 };

publisher/package.json

@@ -11,6 +11,7 @@
     "@muxer/event-schema": "1.0.0",
     "aws-lambda-data-utils": "1.0.0",
     "jsonschema": "1.2.4",
-    "request": "2.88.0"
+    "request": "2.88.0",
+    "serverless-plugin-existing-s3": "^2.3.0"
   }
 }

publisher/serverless.yml

@@ -21,27 +21,20 @@ functions:
     handler: handlers/publisher.publish
     environment:
       TZ: Europe/Belfast
+    events:
+      - existingS3:
+          bucket: ${self:custom.eventsBucket}
+          events:
+            - s3:ObjectCreated:*
+
 
 resources:
   Resources:
-    S3BucketMuxerTransformedEvents:
-      DependsOn:
-        - TransformLambdaPermissionS3BucketMuxerTransformedEventsS3
+    MuxerTransformedEventsS3Bucket:
       Type: AWS::S3::Bucket
       Properties:
         BucketName: ${self:custom.eventsBucket}
-        NotificationConfiguration:
-          LambdaConfigurations:
-            - Event: "s3:ObjectCreated:*"
-              Function:
-                "Fn::GetAtt": [ TransformLambdaFunction, Arn ]
-    TransformLambdaPermissionS3BucketMuxerTransformedEventsS3:
-      DependsOn:
-        - TransformLambdaFunction
-      Type: AWS::Lambda::Permission
-      Properties:
-        FunctionName:
-          "Fn::GetAtt": [ TransformLambdaFunction, Arn ]
-        Action: "lambda:InvokeFunction"
-        Principal: "s3.amazonaws.com"
-        SourceArn: "arn:aws:s3:::${self:custom.eventsBucket}"
+
+
+plugins:
+  - serverless-plugin-existing-s3

tests/eventbrite/handlers/__snapshots__/tranformer.test.js.snap

@@ -3,7 +3,7 @@
 exports[`Eventbrite transformer when a new file is added to the bucket which contains complete events uploads transformed events list 1`] = `
 Array [
   Array [
-    "muxer-transformed-events",
+    "muxer-events",
     [Function],
     Array [
       Object {
@@ -387,7 +387,7 @@ Worst Case Scenario is the second show in the Zombie Science spoof lecture serie
 exports[`Eventbrite transformer when a new file is added to the bucket which contains incomplete events uploads transformed events list, without incomplete events 1`] = `
 Array [
   Array [
-    "muxer-transformed-events",
+    "muxer-events",
     [Function],
     Array [
       Object {
@@ -697,7 +697,7 @@ Worst Case Scenario is the second show in the Zombie Science spoof lecture serie
 exports[`Eventbrite transformer when multiple new files are added to the bucket uploads transformed events lists 1`] = `
 Array [
   Array [
-    "muxer-transformed-events",
+    "muxer-events",
     [Function],
     Array [
       Object {
@@ -1076,7 +1076,7 @@ Worst Case Scenario is the second show in the Zombie Science spoof lecture serie
     ],
   ],
   Array [
-    "muxer-transformed-events",
+    "muxer-events",
     [Function],
     Array [
       Object {

tests/eventbrite/handlers/tranformer.test.js

@@ -80,7 +80,7 @@ describe("Eventbrite transformer", function() {
         transformer.transform(event, context, function() {
           expect(uploadTo).toHaveBeenCalledTimes(1);
           expect(uploadTo).toHaveBeenCalledWith(
-            "muxer-transformed-events",
+            "muxer-events",
             expect.any(Function),
             []
           );