clean up directories. Refactor - inject endpoints when setting credentials rather than after the service is created. Otherwise credentials are validated against the remote endpoint.

Author: tim

.travis.yml

@@ -1,6 +1,16 @@
-before_install: 
+before_install:
+  - docker-compose pull
+  - docker-compose run localstack
   - npm install --ignore-scripts
 language: node_js
 node_js:
   - "5.10"
   - "4.4"
+services:
+  - docker
+
+before_install:
+script:
+  echo "127.0.0.1  localstack" | sudo tee -a /etc/hosts
+  npm test
+  npm run test_integration

docker-compose.yml

@@ -13,7 +13,18 @@ services:
       - AWS_SESSION_TOKEN
       - AWS_SECURITY_TOKEN
   localstack:
-    image: atlassianlabs/localstack:latest
+    image: atlassianlabs/localstack
     ports:
-      - "4567-4578"
-      - "8080"
+      - "4567-4582:4567-4582"
+      - "8080:8080"
+    environment:
+      # Only start a subset of services required for testing.
+      - SERVICES=s3,sns,sqs,apigateway,lambda,dynamodb,dynamodbstreams,cloudformation
+      # - DEBUG=${DEBUG- }
+      # - DATA_DIR=${DATA_DIR- }
+      # - LAMBDA_EXECUTOR=${LAMBDA_EXECUTOR- }
+      # - KINESIS_ERROR_PROBABILITY=${KINESIS_ERROR_PROBABILITY- }
+      # - DOCKER_HOST=unix:///var/run/docker.sock
+    # volumes:
+    #   - "${TMP_DIR:-/tmp/localstack}:${TMP_DIR:-/tmp/localstack}"
+    #   - "/var/run/docker.sock:/var/run/docker.sock"

spec/support/service/handler.js renamed to example/service/handler.js

@@ -7,6 +7,10 @@ provider:
 plugins:
   - serverless-plugin-localstack
 
+custom:
+  localstack:
+    endpoint: localstack_endpoints.json
+
 functions:
   hello:
     handler: handler.hello

example/localstack_endpoints.json renamed to example/service/localstack_endpoints.json

@@ -2,12 +2,12 @@
   "name": "serverless-plugin-localstack",
   "version": "0.0.1",
   "description": "",
-  "main": "index.js",
+  "main": "src/index.js",
   "scripts": {
     "lint": "eslint .",
     "lint-fix": "eslint . --fix",
     "test": "jasmine",
-    "test_integration": "npm pack && TMPDIR=/tmp jasmine --config=spec/support/jasmine_integration.json",
+    "test_integration": "TMPDIR=/tmp jasmine --config=spec/support/jasmine_integration.json",
     "test:watch": "nodemon -L -i spec/integrate ./node_modules/.bin/jasmine",
     "test:cover": "jasmine --coverage"
   },

spec/support/service/serverless.yml renamed to example/service/serverless.yml

@@ -32,22 +32,27 @@ const installPlugin = (tmpDir) => {
     '.serverless_plugins');
   const myPluginDir=path.join(pluginsDir,
     `${packageJson.name}`);
-  const rootPlugin=path.join(__dirname, '..', '..', '..', `${packageJson.name}-${packageJson.version}.tgz`)
+  const rootPluginDir=path.join(__dirname, '..', '..', '..')
 
 
   fse.mkdirsSync(pluginsDir)
+
   // TODO - use nodejs
   // TODO - copy directories locally from node_modules
-  execSync(`tar -xz -C ${pluginsDir} -f ${rootPlugin}`)
-  execSync(`mv ${pluginsDir}/package ${pluginsDir}/${packageJson.name}`)
-  for (dependency in packageJson.dependencies){
-    moduleDir=path.join('..','..','..','node_modules','dependency');
-    fse.copySync(dependency,path.join(myPluginDir,'node_modules'), { clobber: true, preserveTimestamps: true });
-  }
+  console.log(`ln -s ${rootPluginDir} ${myPluginDir}`)
+  execSync(`ln -s ${rootPluginDir} ${myPluginDir}`)
+
+  // execSync(`tar -xz -C ${pluginsDir} -f ${rootPlugin}`)
+  // execSync(`mv ${pluginsDir}/package ${pluginsDir}/${packageJson.name}`)
+  // for (dependency in packageJson.dependencies){
+    // moduleDir=path.join('..','..','..','node_modules','dependency');
+    // fse.copySync(dependency,path.join(myPluginDir,'node_modules'), { clobber: true, preserveTimestamps: true });
+  // }
 
   console.log(`Plugin installed to: ${myPluginDir}`)
+  // throw 'wobbly'
 
-  fse.copySync(rootPlugin,path.join(pluginDir, 'index.js'), { clobber: true, preserveTimestamps: true });
+  // fse.copySync(rootPlugin,path.join(pluginDir, 'index.js'), { clobber: true, preserveTimestamps: true });
 };
 
 module.exports = {
@@ -201,8 +206,8 @@ module.exports = {
     return logsString;
   },
 
-  deployService(args='') {
-    execSync(`${serverlessExec} deploy ${args}`, { stdio: 'inherit' });
+  deployService() {
+    execSync(`${serverlessExec} deploy`, { stdio: 'inherit' });
   },
 
   removeService() {

package.json

@@ -24,6 +24,12 @@ describe('Test utils', () => {
     });
   });
 
+  describe('#createTestService()', () => {
+    it('should copy the localstack_endpoints.json', ()=> {
+      fail('TODO')
+    });
+  });
+
   describe('Localstack Support', ()=> {
 
     const snsEndpoint="http://localstack:4575"
@@ -88,6 +94,7 @@ describe('Test utils', () => {
     });
 
     describe("Lambda", () => {
+      // TODO require
       const lambdaEndpoint='http://localstack:4574';
       const endpoint=path.join(__dirname, 'localstack_endpoints.json')
       beforeAll((done) => {
@@ -98,7 +105,7 @@ describe('Test utils', () => {
 
       describe("#deployService()", ()=> {
         it("should create a local function", ()=> {
-          testUtils.deployService(`--endpoint file://${endpoint}`)
+          testUtils.deployService()
           .then( (response) => {
             return request(lambdaEndpoint + '/2015-03-31/functions/')
           })

spec/integrate/utils/index.js

@@ -23,7 +23,6 @@ describe("example/localstack_endpoints.json", () => {
       'SQS',
     ]
     services.forEach( (service) => {
-
       expect(example_endpoints[service]).to.be.a('string', `${service} is not defined`)
     });
   });