Fix issue #185: Add event rules support (#199)

Author: Szarlus

packages/serverless-offline-s3/src/s3-event-definition.js

@@ -2,6 +2,7 @@ class S3EventDefinition {
   constructor(S3Event) {
     this.event = S3Event.event;
     this.bucket = S3Event.bucket;
+    this.rules = S3Event.rules;
   }
 }
 

packages/serverless-offline-s3/src/s3.js

@@ -57,10 +57,14 @@ class S3 {
   }
 
   async _s3Event(functionKey, s3Event) {
-    const {event, bucket} = s3Event;
+    const {event, bucket, rules} = s3Event;
     await this._waitFor(bucket);
 
-    const listener = this.client.listenBucketNotification(bucket, '*', '*', [event]);
+    const eventRules = rules || [];
+    const prefix = (eventRules.find(rule => rule.prefix) || {prefix: '*'}).prefix;
+    const suffix = (eventRules.find(rule => rule.suffix) || {suffix: '*'}).suffix;
+
+    const listener = this.client.listenBucketNotification(bucket, prefix, suffix, [event]);
 
     listener.on('notification', async record => {
       if (record) {

scripts/create-buckets.sh

@@ -3,7 +3,7 @@ trap "exit 1" INT
 
 AWS_ENDPOINT_URL=${AWS_ENDPOINT_URL:-http://localhost:9000}
 
-BUCKETS="documents pictures files"
+BUCKETS="documents pictures files others"
 for BUCKET in $BUCKETS
 do 
     until aws --endpoint-url ${AWS_ENDPOINT_URL} s3 ls s3://${BUCKET} > /dev/null 2> /dev/null

tests/serverless-plugins-integration/serverless.s3.yml

@@ -22,6 +22,12 @@ functions:
       - s3:
           bucket: pictures
           event: s3:ObjectCreated:Put
+      - s3:
+          bucket: others
+          event: s3:ObjectCreated:Put
+          rules:
+            - prefix: correct/
+            - suffix: .csv
 
   myCallbackHandler:
     handler: lambda/handler.callback

tests/serverless-plugins-integration/test-s3.js

@@ -24,10 +24,14 @@ const uploadFiles = async () => {
     client.fPutObject('files', 'first.txt', path),
     client.fPutObject('documents', 'second.txt', path),
     client.fPutObject('pictures', 'second.txt', path),
-    client.fPutObject('files', 'second.txt', path)
+    client.fPutObject('files', 'second.txt', path),
+    client.fPutObject('others', 'correct/test.txt', path),
+    client.fPutObject('others', 'wrong/test.csv', path),
+    client.fPutObject('others', 'correct/test.csv', path),
+    client.fPutObject('others', 'wrong/test.txt', path)
   ]);
 };
-const EXPECED_LAMBDA_CALL = 8; // pictures files are consumed twice, by myPromiseHandler and myPythonHandler
+const EXPECTED_LAMBDA_CALL = 9; // pictures files are consumed twice, by myPromiseHandler and myPythonHandler
 
 const serverless = spawn('serverless', ['--config', 'serverless.s3.yml', 'offline', 'start'], {
   stdio: ['pipe', 'pipe', 'pipe'],
@@ -51,7 +55,7 @@ pump(
             /offline: \(λ: .*\) RequestId: .* Duration: .* ms {2}Billed Duration: .* ms/g
           ) || []
         ).length;
-      if (this.count === EXPECED_LAMBDA_CALL) serverless.kill();
+      if (this.count === EXPECTED_LAMBDA_CALL) serverless.kill();
       cb();
     }
   })