Merge branch 'v1' into v1

Author: rehrumesh

.travis.yml

@@ -37,7 +37,8 @@ install:
 
 before_script:
   - sls dynamodb install
-  - sls dynamodb start -p 3000 & 
+  - sls offline start & 
+  - sleep 15
   - cd .. 
   - cd ..
   - npm run test

README.md

@@ -3,7 +3,7 @@ serverless-dynamodb-local
 
 [![Join the chat at https://gitter.im/99xt/serverless-dynamodb-local](https://badges.gitter.im/99xt/serverless-dynamodb-local.svg)](https://gitter.im/99xt/serverless-dynamodb-local?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![npm version](https://badge.fury.io/js/serverless-dynamodb-local.svg)](https://badge.fury.io/js/serverless-dynamodb-local)
-[![license](https://img.shields.io/npm/l/serverless-dynamodb-local.svg)](https://www.npmjs.com/package/serverless-dynamodb-local)
+[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 
 ## This Plugin Requires
 * serverless@v1-rc.1
@@ -110,6 +110,8 @@ In `serverless.yml` seeding categories are defined under `dynamodb.seed`.
 
 If `dynamodb.start.seed` is true, then seeding is performed after table migrations.
 
+If you wish to use raw AWS AttributeValues to specify your seed data instead of Javascript types then simply change the variable of any such json files from `sources:` to `rawsources:`.
+
 ```yml
 dynamodb:
   start:
@@ -125,7 +127,7 @@ dynamodb:
     test:
       sources:
         - table: users
-          sources: [./fake-test-users.json]
+          rawsources: [./fake-test-users.json]
         - table: subscriptions
           sources: [./fake-test-subscriptions.json]
 ```

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 = {
@@ -115,13 +114,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;
     }
@@ -160,14 +159,17 @@ class ServerlessDynamodbLocal {
 
     seedHandler() {
         const options = this.options; 
-        const documentClient = this.dynamodbOptions(options).doc;
-        const seedSources = this.seedSources;
-        return BbPromise.each(seedSources, (source) => {
+        const dynamodb = this.dynamodbOptions(options);
+
+        return BbPromise.each(this.seedSources, (source) => {
             if (!source.table) {
                 throw new Error("seeding source \"table\" property not defined");
             }
-            return seeder.locateSeeds(source.sources || [])
-            .then((seeds) => seeder.writeSeeds(documentClient, source.table, seeds));
+            const seedPromise = seeder.locateSeeds(source.sources || [])
+            .then((seeds) => seeder.writeSeeds(dynamodb.doc.batchWrite.bind(dynamodb.doc), source.table, seeds));
+            const rawSeedPromise = seeder.locateSeeds(source.rawsources || [])
+            .then((seeds) => seeder.writeSeeds(dynamodb.raw.batchWriteItem.bind(dynamodb.raw), source.table, seeds));
+            return BbPromise.all([seedPromise, rawSeedPromise]);
         });
     }
 
@@ -181,7 +183,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
             },

package.json

@@ -1,6 +1,6 @@
 {
     "name": "serverless-dynamodb-local",
-    "version": "0.2.28",
+    "version": "0.2.30",
     "engines": {
         "node": ">=4.0"
     },

src/seeder.js

@@ -15,11 +15,11 @@ const MIGRATION_SEED_CONCURRENCY = 5;
 /**
  * Writes a batch chunk of migration seeds to DynamoDB. DynamoDB has a limit on the number of
  * items that may be written in a batch operation.
- * @param {DynamoDocumentClient} dynamodb The DynamoDB Document client
+ * @param {function} dynamodbWriteFunction The DynamoDB DocumentClient.batchWrite or DynamoDB.batchWriteItem function 
  * @param {string} tableName The table name being written to
  * @param {any[]} seeds The migration seeds being written to the table
  */
-function writeSeedBatch(dynamodb, tableName, seeds) {
+function writeSeedBatch(dynamodbWriteFunction, tableName, seeds) {
   const params = {
     RequestItems: {
       [tableName]: seeds.map((seed) => ({
@@ -34,7 +34,7 @@ function writeSeedBatch(dynamodb, tableName, seeds) {
     // again a few times in case the Database resources are in the middle of provisioning.
     let interval = 0;
     function execute(interval) {
-      setTimeout(() => dynamodb.batchWrite(params, (err) => {
+      setTimeout(() => dynamodbWriteFunction(params, (err) => {
         if (err) {
           if (err.code === "ResourceNotFoundException" && interval <= 5000) {
             execute(interval + 1000);
@@ -52,13 +52,13 @@ function writeSeedBatch(dynamodb, tableName, seeds) {
 
 /**
  * Writes a seed corpus to the given database table
- * @param {DocumentClient} dynamodb The DynamoDB document instance
+ * @param {function} dynamodbWriteFunction The DynamoDB DocumentClient.batchWrite or DynamoDB.batchWriteItem function
  * @param {string} tableName The table name
  * @param {any[]} seeds The seed values
  */
-function writeSeeds(dynamodb, tableName, seeds) {
-  if (!dynamodb) {
-    throw new Error("dynamodb argument must be provided");
+function writeSeeds(dynamodbWriteFunction, tableName, seeds) {
+  if (!dynamodbWriteFunction) {
+    throw new Error("dynamodbWriteFunction argument must be provided");
   }
   if (!tableName) {
     throw new Error("table name argument must be provided");
@@ -71,7 +71,7 @@ function writeSeeds(dynamodb, tableName, seeds) {
     const seedChunks = _.chunk(seeds, MAX_MIGRATION_CHUNK);
     return BbPromise.map(
       seedChunks,
-      (chunk) => writeSeedBatch(dynamodb, tableName, chunk),
+      (chunk) => writeSeedBatch(dynamodbWriteFunction, tableName, chunk),
       { concurrency: MIGRATION_SEED_CONCURRENCY }
     )
       .then(() => console.log("Seed running complete for table: " + tableName));

test/indexTest.js

@@ -6,17 +6,21 @@ 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 () {
-  http.get(`http://localhost:${dataApp.prototype.port}`, function (response) {
-    assert.equal(response.statusCode, 200);
+  it("Port value should be >= 0 and < 65536",function(done){
+    let service = new Plugin(serverlessMock, {});
+    http.get(`http://localhost:${service.port}/shell/`, function (response) {
+      assert.equal(response.statusCode, 200);
+      done();
     });
   });
 });
@@ -33,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: {}
+};

test/testTable.js

@@ -46,7 +46,7 @@ describe("Check Table operations", function() {
         if(err){
             should.exist(err);
         } else {
-            should.not.exist(data);
+            expect(data.TableNames).to.be.empty;
         }
         done();     
         });