Reorganisation having docker-compose only at top level

Author: AdrieanKhisbe

docker-compose.test.yml

@@ -1,11 +1,59 @@
 version: "3"
 services:
-  kinesis:
-    image: dlsniper/kinesalite:latest
-    ports:
-      - "4567:4567"
 
   dynamodb:
     image: cnadiminti/dynamodb-local:latest
     ports:
       - "8000:8000"
+  dynamodb-create:
+    image: infrastructureascode/aws-cli:latest
+    links:
+      - dynamodb
+    entrypoint: sh
+    command: ./create-tables.sh
+    volumes:
+      - ./:/project
+      - ./scripts/create-tables.sh:/project/create-tables.sh:ro
+    environment:
+      - AWS_ACCESS_KEY_ID=local
+      - AWS_SECRET_ACCESS_KEY=local
+      - AWS_DEFAULT_REGION=eu-west-1
+      - AWS_ENDPOINT_URL=http://dynamodb:8000
+
+  sqs:
+    image: s12v/elasticmq:latest
+    ports:
+      - "9324:9324"
+  sqs-create:
+    image: infrastructureascode/aws-cli:latest
+    links:
+      - sqs
+    entrypoint: sh
+    command: ./create-queues.sh
+    volumes:
+      - ./:/project
+      - ./scripts/create-queues.sh:/project/create-queues.sh:ro
+    environment:
+      - AWS_ACCESS_KEY_ID=local
+      - AWS_SECRET_ACCESS_KEY=local
+      - AWS_DEFAULT_REGION=eu-west-1
+      - AWS_ENDPOINT_URL=http://sqs:9324
+
+  kinesis:
+    image: dlsniper/kinesalite:latest
+    ports:
+      - "4567:4567"
+  kinesis-create:
+    image: infrastructureascode/aws-cli:latest
+    links:
+      - kinesis
+    entrypoint: sh
+    command: ./create-streams.sh
+    volumes:
+      - ./:/project
+      - ./scripts/create-streams.sh:/project/create-streams.sh:ro
+    environment:
+      - AWS_ACCESS_KEY_ID=local
+      - AWS_SECRET_ACCESS_KEY=local
+      - AWS_DEFAULT_REGION=eu-west-1
+      - AWS_ENDPOINT_URL=http://kinesis:4567

package-lock.json

@@ -0,0 +1,17 @@
+#!/bin/bash
+set -e
+service=$1
+
+function dc () {
+    docker-compose -f docker-compose.test.yml $@
+}
+
+dc stop $service
+dc rm -f $service
+dc stop $service-create
+dc rm -f $service-create
+dc up -d $service-create
+echo "> Service $service was started"
+sidekick_container=$(dc ps --quiet $service-create)
+docker wait $sidekick_container > /dev/null
+echo "> Setup of $service is now complete"

scripts/clean-start.sh

@@ -5,12 +5,13 @@
   "scripts": {
     "start": "sls offline",
     "test": "npm run test:sqs && npm run test:kinesis && npm run test:dynamodb-streams",
-    "pretest:dynamodb-streams": "./scripts/clean-start.sh dynamodb",
+    "setup-service": "../../scripts/clean-start.sh",
+    "pretest:dynamodb-streams": "npm run -s setup-service dynamodb",
     "test:dynamodb-streams": "node test-dynamodb-streams",
     "test:sqs": "node test-sqs",
-    "pretest:sqs": "./scripts/clean-start.sh sqs",
+    "pretest:sqs": "npm run -s setup-service sqs",
     "test:kinesis": "node test-kinesis",
-    "pretest:kinesis": "./scripts/clean-start.sh kinesis"
+    "pretest:kinesis": "npm run -s setup-service kinesis"
   },
   "dependencies": {
     "aws-sdk": "^2.444.0",

tests/serverless-plugins-integration/scripts/create-queues.sh renamed to scripts/create-queues.sh

@@ -13,14 +13,14 @@ plugins:
 
 functions:
   myPromiseHandler:
-    handler: handler.promise
+    handler: lambda/handler.promise
     events:
       - stream: arn:aws:dynamodb:region:XXXXXX:table/MyFirstTable
       - stream:
           type: dynamodb
           arn: arn:aws:dynamodb:region:XXXXXX:table/MySecondTable
   myCallbackHandler:
-    handler: handler.callback
+    handler: lambda/handler.callback
     events:
       - stream:
           type: dynamodb
@@ -31,7 +31,7 @@ functions:
               - Arn
   myPythonHandler:
     runtime: python2.7
-    handler: handler.handler
+    handler: lambda/handler.handler
     events:
       - stream:
           type: dynamodb