Merge pull request #33 from AshanFernando/master

Update serverless version, adding remote script execution support

Author: AshanFernando

README.md

@@ -67,7 +67,7 @@ All the above options can be added to s-project.json to set default configuratio
 To remove the installed dynamodb local, run:
 `sls dynamodb remove`
 
-## Manage migrations
+## Manage Migrations
 
 Start dynamodb local instance in another window before running the following commands. To store your dynamodb migration templates do the following configuration (If not specified default directory <project-root>/dynamodb is used)
 
@@ -84,14 +84,17 @@ Start dynamodb local instance in another window before running the following com
 ```
 
 To create new migration template with the given name, run:
-`sls dynamodb create -n <your-table-name>`
+`sls dynamodb create -n <migration-name>`
 
 To execute a migration template with the given name, run:
-`sls dynamodb execute -n <your-table-name>`
+`sls dynamodb execute -n <migration-file-name>`
 
 To execute all migration templates, run:
 `sls dynamodb executeAll`
 
+Note: Optionally to execute/executeAll migrations on remote dynamodb, use -r <region> and -s <stage> parameters
+'sls dynamodb executeAll -r us-west-1 -s dev'
+
 ## Migration Template
 
 ```json
@@ -163,9 +166,6 @@ References
 * Defining table schema (Dynamodb Client SDK): http://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/DynamoDB.html#createTable-property
 * Defining seeds (Dynamodb Document Client SDK): http://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/DynamoDB/DocumentClient.html#put-property
 
-To create table & run the seeds in your project root, run:
-`sls dynamodb table -c`
-
 If you need to prefix_<your-table-name>_suffix, you can configure the values accordingly. This is usefull when you have multiple stages which needs multiple database tables
 
 Optionally if you want to execute all migrations on dynamodb starts, use the argument -m or add the "migration": true inside s-project.json as shown below
@@ -180,7 +180,7 @@ Optionally if you want to execute all migrations on dynamodb starts, use the arg
 }
 ```
 
-## Accessing dynamodb local from your code
+## Using in code
 
 You need to add the following parameters to the AWS SDK dynamodb constructor
 

index.js

@@ -45,9 +45,13 @@ module.exports = function (S) {
                     shortcut: 'n',
                     description: 'Execute a migration template with the given name'
                 }, {
-                    option: 'remote',
+                    option: 'region',
                     shortcut: 'r',
-                    description: 'Execute migration template in remote dynamodb given in s-project.json.'
+                    description: 'Region that dynamodb should be remotely executed'
+                }, {
+                    option: 'stage',
+                    shortcut: 's',
+                    description: 'Stage that dynamodb should be remotely executed'
                 }]
             });
             S.addAction(this.executeAll.bind(this), {
@@ -56,9 +60,13 @@ module.exports = function (S) {
                 context: 'dynamodb',
                 contextAction: 'executeAll',
                 options: [{
-                    option: 'remote',
+                    option: 'region',
                     shortcut: 'r',
-                    description: 'Execute all migration templates in remote dynamodb given in s-project.json.'
+                    description: 'Region that dynamodb should be remotely executed'
+                }, {
+                    option: 'stage',
+                    shortcut: 's',
+                    description: 'Stage that dynamodb should be remotely executed'
                 }]
             });
             S.addAction(this.remove.bind(this), {
@@ -116,15 +124,25 @@ module.exports = function (S) {
             return BbPromise.resolve();
         }
 
-        dynamodbOptions(remote) {
-            let config = S.getProject().custom.dynamodb || {},
-                region = config.migration.region || 'localhost',
+        dynamodbOptions(stage, region) {
+            let credentials, config = S.getProject().custom.dynamodb || {},
                 port = config.start && config.start.port || 8000,
-                endpoint = remote ? config.migration.endpoint : 'http://localhost:' + port,
-                dynamoOptions = {
+                dynamoOptions;
+            if (stage && region) {
+                credentials = S.getProvider('aws').getCredentials(stage, region);
+                AWS.config.update({
                     region: region,
-                    endpoint: endpoint
+                    accessKeyId: credentials.accessKeyId,
+                    secretAccessKey: credentials.secretAccessKey,
+                    sessionToken: credentials.sessionToken
+                });
+            } else {
+                dynamoOptions = {
+                    endpoint: 'http://localhost:' + port,
+                    region: 'localhost'
                 };
+            }
+
             return {
                 raw: new AWS.DynamoDB(dynamoOptions),
                 doc: new AWS.DynamoDB.DocumentClient(dynamoOptions)
@@ -170,7 +188,7 @@ module.exports = function (S) {
             let self = this,
                 options = evt.options;
             return new BbPromise(function (resolve, reject) {
-                let dynamodb = self.dynamodbOptions(options.remote),
+                let dynamodb = self.dynamodbOptions(options.stage, options.region),
                     tableOptions = self.tableOptions();
                 dynamodbMigrations.init(dynamodb, tableOptions.path);
                 dynamodbMigrations.execute(options.name, {
@@ -184,7 +202,7 @@ module.exports = function (S) {
             let self = this,
                 options = evt.options;
             return new BbPromise(function (resolve, reject) {
-                let dynamodb = self.dynamodbOptions(options.remote),
+                let dynamodb = self.dynamodbOptions(options.stage, options.region),
                     tableOptions = self.tableOptions();
                 dynamodbMigrations.init(dynamodb, tableOptions.path);
                 dynamodbMigrations.executeAll({

package.json

@@ -1,6 +1,6 @@
 {
     "name": "serverless-dynamodb-local",
-    "version": "0.2.1",
+    "version": "0.2.2",
     "engines": {
         "node": ">=4.0"
     },
@@ -39,7 +39,7 @@
         "aws-sdk": "^2.3.19",
         "bluebird": "^3.0.6",
         "dynamodb-localhost": "0.0.2",
-        "dynamodb-migrations": "0.0.6",
+        "dynamodb-migrations": "0.0.7",
         "lodash": "^4.13.1",
         "mkdirp": "^0.5.0",
         "tar": "^2.0.0"