Merge branch 'v1' into v1

Author: rehrumesh

README.md

@@ -61,6 +61,9 @@ All the above options can be added to serverless.yml to set default configuratio
 ```yml
 custom:
   dynamodb:
+  # If you only want to use DynamoDB Local in some stages, declare them here
+    stages:
+      - dev
     start:
       port: 8000
       inMemory: true

index.js

@@ -10,7 +10,6 @@ class ServerlessDynamodbLocal {
         this.serverless = serverless;
         this.service = serverless.service;
         this.serverlessLog = serverless.cli.log.bind(serverless.cli);
-        this.config = this.service.custom && this.service.custom.dynamodb || {};
         this.options = options;
         this.provider = "aws";
         this.commands = {
@@ -100,6 +99,13 @@ class ServerlessDynamodbLocal {
             }
         };
 
+        const stage = this.options.stage || this.service.provider.stage;
+        if (this.config.stages && !this.config.stages.includes(stage)) {
+          // don't do anything for this stage
+          this.hooks = {};
+          return;
+        }
+
         this.hooks = {
             "dynamodb:migrate:migrateHandler": this.migrateHandler.bind(this),
             "dynamodb:seed:seedHandler": this.seedHandler.bind(this),
@@ -112,13 +118,13 @@ class ServerlessDynamodbLocal {
     }
 
     get port() {
-        const config = this.config;
+        const config = this.service.custom && this.service.custom.dynamodb || {};
         const port = _.get(config, "start.port", 8000);
         return port;
     }
 
     get host() {
-        const config = this.config;
+        const config = this.service.custom && this.service.custom.dynamodb || {};
         const host = _.get(config, "start.host", "localhost");
         return host;
     }
@@ -128,7 +134,7 @@ class ServerlessDynamodbLocal {
 
         if(options && options.online){
             this.serverlessLog("Connecting to online tables...");
-            if (!options.region) { 
+            if (!options.region) {
                 throw new Error("please specify the region");
             }
             dynamoOptions = {
@@ -158,7 +164,7 @@ class ServerlessDynamodbLocal {
     }
 
     seedHandler() {
-        const options = this.options; 
+        const options = this.options;
         const dynamodb = this.dynamodbOptions(options);
 
         return BbPromise.each(this.seedSources, (source) => {
@@ -183,7 +189,7 @@ class ServerlessDynamodbLocal {
     }
 
     startHandler() {
-        const config = this.config;
+        const config = this.service.custom && this.service.custom.dynamodb || {};
         const options = _.merge({
                 sharedDb: this.options.sharedDb || true
             },
@@ -279,6 +285,9 @@ class ServerlessDynamodbLocal {
               migration.SSESpecification.Enabled = migration.SSESpecification.SSEEnabled;
               delete migration.SSESpecification.SSEEnabled;
             }
+            if (migration.PointInTimeRecoverySpecification) {
+              delete migration.PointInTimeRecoverySpecification;
+            }
             if (migration.Tags) {
                 delete migration.Tags;
             }

test/indexTest.js

@@ -6,16 +6,19 @@ const expect = require("chai").expect;
 const should = require("should");
 const aws = require ("aws-sdk");
 const seeder = require("../src/seeder.js");
-const dataApp = require("../index.js");
+const Plugin = require("../index.js");
+
+const serverlessMock = require("./serverlessMock");
 
 describe("Port function",function(){
   it("Port should return number",function(){
-    let myport = dataApp.prototype.port;
-    assert(typeof myport, "number");
+    let service = new Plugin(serverlessMock, {});
+    assert(typeof service.port, "number");
   });
 
   it("Port value should be >= 0 and < 65536",function(done){
-    http.get(`http://localhost:${dataApp.prototype.port}/shell/`, function (response) {
+    let service = new Plugin(serverlessMock, {});
+    http.get(`http://localhost:${service.port}/shell/`, function (response) {
       assert.equal(response.statusCode, 200);
       done();
     });
@@ -34,29 +37,29 @@ describe("Check the dynamodb function",function(){
     });
 
   it("Should be an object",function(){
-    let dynamoOptions = dataApp.prototype.dynamodbOptions;
+    let dynamoOptions = Plugin.prototype.dynamodbOptions;
     let raw = new aws.DynamoDB(dynamoOptions);
     raw.should.be.type("object");
   });
 
   it("Should be an object",function(){
-    let dynamoOptions =  dataApp.prototype.dynamodbOptions;
+    let dynamoOptions =  Plugin.prototype.dynamodbOptions;
     let doc = new aws.DynamoDB(dynamoOptions);
     doc.should.be.type("object");
   });
 });
 
 describe ("Start handler function",function(){
   it ("Should not  be null",function(){
-    let handler = dataApp.prototype.startHandler;
+    let handler = Plugin.prototype.startHandler;
     assert(handler =! null);
   });
 });
 
 
 describe ("createTable functon",function(){
   it ("Should check as a function",function(){
-    const tbl = dataApp.prototype.createTable;
+    const tbl = Plugin.prototype.createTable;
     assert.equal(typeof tbl, "function");
   });
 }); 

test/serverlessMock.js

@@ -0,0 +1,7 @@
+module.exports = {
+    service: {},
+    cli: {
+        log: () => {}
+    },
+    custom: {}
+};