Rework integration tests

.gitignore

@@ -14,3 +14,6 @@ coverage
 
 # OSX
 .DS_Store
+
+# Python
+*.pyc

.travis.yml

@@ -1,4 +1,5 @@
 language: node_js
+
 node_js:
   - "10"
   - "8"
@@ -7,8 +8,9 @@ sudo: required
 services:
   - docker
 
+cache: npm
+
 addons:
-  chrome: stable
   apt:
     sources:
       - ubuntu-toolchain-r-test

.vscode/launch.json

@@ -8,33 +8,39 @@
             "type": "node",
             "request": "launch",
             "name": "SQS",
-            "program": "${workspaceFolder}/node_modules/.bin/serverless",
-            "cwd": "${workspaceFolder}/packages/serverless-offline-sqs/example",
+            "program": "${workspaceFolder}/packages/serverless-offline-sqs-integration/node_modules/.bin/serverless",
+            "cwd": "${workspaceFolder}/packages/serverless-offline-sqs-integration",
+            "env": {
+                "PATH": "${env:PATH}:${workspaceFolder}/packages/serverless-offline-sqs-integration/node_modules/.bin" 
+            },
             "args": [
-                "offline",
-                "start"
+                "offline"
             ]
         },
         {
             "type": "node",
             "request": "launch",
             "name": "DynamoDB Streams",
-            "program": "${workspaceFolder}/node_modules/.bin/serverless",
-            "cwd": "${workspaceFolder}/packages/serverless-offline-dynamodb-streams/example",
+            "program": "${workspaceFolder}/packages/serverless-offline-dynamodb-streams-integration/node_modules/.bin/serverless",
+            "cwd": "${workspaceFolder}/packages/serverless-offline-dynamodb-streams-integration",
+            "env": {
+                "PATH": "${env:PATH}:${workspaceFolder}/packages/serverless-offline-dynamodb-streams-integration/node_modules/.bin" 
+            },
             "args": [
-                "offline",
-                "start"
+                "offline"
             ]
         },
         {
             "type": "node",
             "request": "launch",
             "name": "Kinesis",
-            "program": "${workspaceFolder}/node_modules/.bin/serverless",
-            "cwd": "${workspaceFolder}/packages/serverless-offline-kinesis/example",
+            "program": "${workspaceFolder}/packages/serverless-offline-kinesis-integration/node_modules/.bin/serverless",
+            "cwd": "${workspaceFolder}/packages/serverless-offline-kinesis-integration",
+            "env": {
+                "PATH": "${env:PATH}:${workspaceFolder}/packages/serverless-offline-kinesis-integration/node_modules/.bin" 
+            },
             "args": [
-                "offline",
-                "start"
+                "offline"
             ]
         }
     ]

packages/dynamodb-streams-readable/src/index.js

@@ -105,6 +105,12 @@ function DynamoDBStreamReadable(client, arn, options) {
         pending--;
 
         if (err) {
+          if (err.name === 'TrimmedDataAccessException') {
+            return describeStream(function(e) {
+              if (e) return checkpoint.emit('error', e);
+              read(callback);
+            });
+          }
           return callback(err);
         }
 

packages/serverless-apigateway-access-logs/package.json

@@ -17,7 +17,7 @@
   "author": "Adrien Becchis @Coorpacademy (https://github.com/AdrieanKhisbe)",
   "license": "MIT",
   "dependencies": {
-    "aws-sdk": "^2.443.0",
+    "aws-sdk": "^2.444.0",
     "lodash": "^4.17.11"
   },
   "keywords": [

packages/serverless-offline-dynamodb-streams/example/create-tables.sh → packages/serverless-offline-dynamodb-streams-integration/create-tables.sh

@@ -16,8 +16,8 @@ do
         --provisioned-throughput ReadCapacityUnits=1,WriteCapacityUnits=1 \
         --stream-specification StreamEnabled=true,StreamViewType=NEW_AND_OLD_IMAGES \
         > /dev/null 2> /dev/null
-    done
-done &
+    done &
+done
 
 wait
 

packages/serverless-offline-dynamodb-streams/docker-compose.yml → packages/serverless-offline-dynamodb-streams-integration/docker-compose.yml

@@ -10,8 +10,8 @@ services:
       - dynamodb
     entrypoint: sh
     volumes:
-      - ./example/:/project
-      - ./example/create-tables.sh:/project/create-tables.sh:ro
+      - ./:/project
+      - ./create-tables.sh:/project/create-tables.sh:ro
     environment:
       - AWS_ACCESS_KEY_ID=local
       - AWS_SECRET_ACCESS_KEY=local

packages/serverless-offline-dynamodb-streams-integration/handler.py

@@ -0,0 +1,5 @@
+import json
+
+def handler(event, context):
+    print(event)
+    return

packages/serverless-offline-dynamodb-streams-integration/package.json

@@ -0,0 +1,19 @@
+{
+    "name": "serverless-offline-dynamodb-streams-integration",
+    "private": true,
+    "scripts": {
+      "start": "sls offline",
+      "pretest": "docker-compose stop dynamodb && docker-compose rm -f dynamodb && docker-compose run dynamodb-create",
+      "test": "node ./test.js"
+    },
+    "dependencies": {
+      "aws-sdk": "^2.444.0",
+      "figures": "^3.0.0",
+      "lodash": "^4.17.11",
+      "serverless": "^1.41.1",
+      "serverless-offline": "^4.9.4",
+      "serverless-offline-dynamodb-streams": "1.5.1",
+      "signal-exit": "^3.0.2"
+    }
+  }
+

packages/serverless-offline-dynamodb-streams/example/serverless.yml → packages/serverless-offline-dynamodb-streams-integration/serverless.yml

@@ -29,6 +29,10 @@ functions:
             Fn::GetAtt:
               - MyThirdTable
               - Arn
+  myPythonHandler:
+    runtime: python2.7
+    handler: handler.handler
+    events:
       - stream:
           type: dynamodb
           arn:

packages/serverless-offline-dynamodb-streams-integration/test.js

@@ -0,0 +1,79 @@
+/* eslint-disable unicorn/no-process-exit */
+const {Writable} = require('stream');
+const {spawn} = require('child_process');
+const onExit = require('signal-exit');
+const {DynamoDB} = require('aws-sdk');
+
+const client = new DynamoDB({
+  region: 'eu-west-1',
+  accessKeyId: 'local',
+  secretAccessKey: 'local',
+  endpoint: 'http://localhost:8000'
+});
+
+const putItems = () => {
+  return Promise.all([
+    client
+      .putItem({
+        Item: {id: {S: 'MyFirstId'}},
+        TableName: 'MyFirstTable'
+      })
+      .promise(),
+    client
+      .putItem({
+        Item: {id: {S: 'MySecondId'}},
+        TableName: 'MySecondTable'
+      })
+      .promise(),
+    client
+      .putItem({
+        Item: {id: {S: 'MyThirdId'}},
+        TableName: 'MyThirdTable'
+      })
+      .promise(),
+    client
+      .putItem({
+        Item: {id: {S: 'MyFourthId'}},
+        TableName: 'MyFourthTable'
+      })
+      .promise()
+  ]);
+};
+
+const serverless = spawn('sls', ['offline'], {
+  stdio: ['pipe', 'pipe', 'pipe'],
+  cwd: __dirname
+});
+
+serverless.stdout.pipe(
+  new Writable({
+    write(chunk, enc, cb) {
+      const output = chunk.toString();
+
+      if (/Offline listening on/.test(output)) {
+        putItems();
+      }
+
+      this.count = (this.count || 0) + (output.match(/\[✔\]/g) || []).length;
+      if (this.count === 4) serverless.kill();
+      cb();
+    }
+  })
+);
+
+serverless.stdout.on('data', data => {
+  console.log(data.toString());
+});
+
+serverless.stderr.on('data', data => {
+  console.error(data.toString());
+  process.exit(1);
+});
+
+serverless.on('close', code => {
+  process.exit(code);
+});
+
+onExit((code, signal) => {
+  if (signal) serverless.kill(signal);
+});

packages/serverless-offline-dynamodb-streams/README.md

@@ -23,7 +23,7 @@ plugins:
   - serverless-offline
 ```
 
-[See example](./example/README.md)
+[See example](../serverless-offline-dynamodb-streams-integration/README.md)
 
 ## Configure
 

packages/serverless-offline-dynamodb-streams/package.json

@@ -16,11 +16,8 @@
   ],
   "author": "godu",
   "license": "MIT",
-  "scripts": {
-    "test": "cd example && npm test"
-  },
   "dependencies": {
-    "aws-sdk": "^2.443.0",
+    "aws-sdk": "^2.444.0",
     "dynamodb-streams-readable": "^1.0.3",
     "figures": "^3.0.0",
     "lodash": "^4.17.11",

packages/serverless-offline-kinesis/example/create-streams.sh → packages/serverless-offline-kinesis-integration/create-streams.sh

@@ -13,8 +13,8 @@ do
         --stream-name ${STREAM} \
         --shard-count 1 \
         > /dev/null 2> /dev/null
-    done
-done &
+    done &
+done
 
 wait