Merge branch 'v1' into fix-dynamodb-ttl-configuration-from-cf

Author: rehrumesh

.travis.yml

@@ -4,8 +4,43 @@ node_js:
 
 sudo: false
 
+before_install:
+  - cd test
+  - mkdir sample-template
+  - cd sample-template
+  - npm init --yes
+
 install:
+  - npm install --save-dev serverless-offline 
+  - npm install -g [email protected]
+  - npm install aws-sdk
+  - npm install --save dynamodb-doc-client-wrapper
+  - serverless create --template aws-nodejs
+  - cd ..
+  - cd ..
+  - npm link
+  - cd test/sample-template/node_modules
+  - npm link serverless-dynamodb-local
+  - cd ..
+  - sed -i '18 a plugins:' serverless.yml
+  - sed -i '19 a - serverless-offline' serverless.yml
+  - sed -i '20 a - serverless-dynamodb-local' serverless.yml
+  - cd ..
+  - cd ..
+  - npm install --save-dev mocha
+  - npm install --save-dev should
+  - npm install --save expect
+  - npm install --save request
+  - npm install --save chai
   - travis_retry npm install
+  - cd test/sample-template
 
+before_script:
+  - sls dynamodb install
+  - sls dynamodb start -p 3000 & 
+  - cd .. 
+  - cd ..
+  - npm run test
+  
 script:
-  - npm test
+  - npm test

CODE_OF_CONDUCT.md

@@ -0,0 +1,46 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [email protected]. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

README.md

@@ -65,6 +65,8 @@ custom:
       inMemory: true
       migrate: true
       seed: true
+    # Uncomment only if you already have a DynamoDB running locally
+    # noStart: true
 ```
 
 ##  Migrations: sls dynamodb migrate

index.js

@@ -66,6 +66,11 @@ class ServerlessDynamodbLocal {
                             }
                         }
                     },
+                    noStart: {
+                      shortcut: "n",
+                      default: false,
+                      usage: "Do not start DynamoDB local (in case it is already running)",
+                    },
                     remove: {
                         lifecycleEvents: ["removeHandler"],
                         usage: "Removes local DynamoDB"
@@ -102,9 +107,15 @@ class ServerlessDynamodbLocal {
         return port;
     }
 
+    get host() {
+        const config = this.config;
+        const host = _.get(config, "start.host", "localhost");
+        return host;
+    }
+
     dynamodbOptions() {
         const dynamoOptions = {
-            endpoint: `http://localhost:${this.port}`,
+            endpoint: `http://${this.host}:${this.port}`,
             region: "localhost",
             accessKeyId: "MOCK_ACCESS_KEY_ID",
             secretAccessKey: "MOCK_SECRET_ACCESS_KEY"
@@ -151,30 +162,60 @@ class ServerlessDynamodbLocal {
             config && config.start,
             this.options
         );
-
-        dynamodbLocal.start(options);
+        if (!options.noStart) {
+          dynamodbLocal.start(options);
+        }
         return BbPromise.resolve()
         .then(() => options.migrate && this.migrateHandler())
         .then(() => options.seed && this.seedHandler());
     }
 
     endHandler() {
-        this.serverlessLog('DynamoDB - stopping local database');
-        dynamodbLocal.stop(this.port);
+        if (!this.options.noStart) {
+            this.serverlessLog("DynamoDB - stopping local database");
+            dynamodbLocal.stop(this.port);
+        }
     }
 
-    /**
-     * Gets the table definitions
-     */
-    get tables() {
-        const resources = this.service.resources.Resources;
+    getDefaultStack() {
+        return _.get(this.service, "resources");
+    }
+
+    getAdditionalStacks() {
+        return _.values(_.get(this.service, "custom.additionalStacks", {}));
+    }
+
+    hasAdditionalStacksPlugin() {
+        return _.get(this.service, "plugins", []).includes("serverless-plugin-additional-stacks");
+    }
+
+    getTableDefinitionsFromStack(stack) {
+        const resources = _.get(stack, "Resources", []);
         return Object.keys(resources).map((key) => {
             if (resources[key].Type === "AWS::DynamoDB::Table") {
                 return resources[key].Properties;
             }
         }).filter((n) => n);
     }
 
+    /**
+     * Gets the table definitions
+     */
+    get tables() {
+        let stacks = [];
+
+        const defaultStack = this.getDefaultStack();
+        if (defaultStack) {
+            stacks.push(defaultStack);
+        }
+
+        if (this.hasAdditionalStacksPlugin()) {
+            stacks = stacks.concat(this.getAdditionalStacks());
+        }
+
+        return stacks.map((stack) => this.getTableDefinitionsFromStack(stack)).reduce((tables, tablesInStack) => tables.concat(tablesInStack), []);
+    }
+
     /**
      * Gets the seeding sources
      */

package.json

@@ -1,6 +1,6 @@
 {
     "name": "serverless-dynamodb-local",
-    "version": "0.2.22",
+    "version": "0.2.24",
     "engines": {
         "node": ">=4.0"
     },
@@ -12,29 +12,34 @@
         "url": "https://github.com/99xt/serverless-dynamodb-local"
     },
     "keywords": [
-    "serverless framework plugin",
-    "serverless applications",
-    "serverless plugins",
-    "api gateway",
-    "lambda",
-    "dynamodb",
-    "dynamodb local",
-    "aws",
-    "aws lambda",
-    "aws dynamodb",
-    "amazon",
-    "amazon web services",
-    "serverless.com"
-  ],
+        "serverless framework plugin",
+        "serverless applications",
+        "serverless plugins",
+        "api gateway",
+        "lambda",
+        "dynamodb",
+        "dynamodb local",
+        "aws",
+        "aws lambda",
+        "aws dynamodb",
+        "amazon",
+        "amazon web services",
+        "serverless.com"
+    ],
     "main": "index.js",
     "bin": {},
     "scripts": {
-        "test": "echo \"Warning: no test specified\" && exit 0"
+        "test": "mocha ./test"
     },
     "dependencies": {
         "aws-sdk": "^2.7.0",
         "bluebird": "^3.4.6",
         "dynamodb-localhost": "^0.0.5",
         "lodash": "^4.17.0"
+    },
+    "devDependencies": {
+        "chai": "^4.1.1",
+        "mocha": "^3.5.0",
+        "should": "^11.2.1"
     }
 }

test/indexTest.js

@@ -1,24 +1,68 @@
-var should = require("should");
-var request = require("request");
-var expect = require("chai").expect;
-var util = require("util");
-
-var assert = require('chai').assert;
-var config = require('../index');
-
-describe('Unit Test', function () {
-    it('Check endpoint', function () {
-        before(function () {
-            config.listen(8989);
-        });
-        after(function () {
-            console.log('after');
-        });
+"use strict";
+//Define the modules required to mocha testing
+const assert = require("chai").assert;
+const http = require ("http");
+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");
+
+describe("Port function",function(){
+  it("Port should return number",function(){
+    let myport = dataApp.prototype.port;
+    assert(typeof myport, "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('Check timeout test to 1000ms', () => {
-        this.timeout(1000);
-        assert.ok(true);
+describe("Check the dynamodb function",function(){
+  it("Endpoint should listen to the port",function () {
+     let server;
+     before(function () {
+      server = dynamodbOptions.listen(port);
+     });
+     after(function () {
+      assert.ok;
+     });
     });
+
+  it("Should be an object",function(){
+    let dynamoOptions = dataApp.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 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;
+    assert(handler =! null);
+  });
+});
+
+
+describe ("createTable functon",function(){
+  it ("Should check as a function",function(){
+    const tbl = dataApp.prototype.createTable;
+    assert.equal(typeof tbl, "function");
+  });
+}); 
+
+describe ("Check the Seeder file",function(){
+  it("Table name shoud be a string",function(){
+    let tblName = seeder.writeSeeds.name;
+    expect(tblName).to.be.a("string");
+  });
+});