Merge branch 'develop'

Author: James Cori

config/default.js

@@ -25,9 +25,9 @@ module.exports = {
     }
   },
   DYNAMODB: {
-    AWS_ACCESS_KEY_ID: process.env.AWS_ACCESS_KEY_ID || '',
-    AWS_SECRET_ACCESS_KEY: process.env.AWS_SECRET_ACCESS_KEY || '',
+    // AWS_ACCESS_KEY_ID: process.env.AWS_ACCESS_KEY_ID || '',
+    // AWS_SECRET_ACCESS_KEY: process.env.AWS_SECRET_ACCESS_KEY || '',
     AWS_REGION: process.env.AWS_REGION || '',
-    IS_LOCAL: process.env.IS_LOCAL || 'false'
+    IS_LOCAL: process.env.IS_LOCAL === 'true' || 'false'
   }
 };

models/index.js

@@ -13,16 +13,31 @@
 const config = require('config');
 const dynamoose = require('dynamoose');
 
-dynamoose.AWS.config.update({
+
+const awsConfigs = config.DYNAMODB.IS_LOCAL_DB ? {
   accessKeyId: config.DYNAMODB.AWS_ACCESS_KEY_ID,
   secretAccessKey: config.DYNAMODB.AWS_SECRET_ACCESS_KEY,
   region: config.DYNAMODB.AWS_REGION
-});
+} : {
+  region: config.DYNAMODB.AWS_REGION
+};
 
-if (config.DYNAMODB.IS_LOCAL === 'true') {
-  dynamoose.local();
+dynamoose.AWS.config.update(awsConfigs);
+
+if (config.DYNAMODB.IS_LOCAL_DB) {
+  dynamoose.local(config.DYNAMODB.DYNAMODB_URL);
 }
 
+// dynamoose.AWS.config.update({
+//   // accessKeyId: config.DYNAMODB.AWS_ACCESS_KEY_ID,
+//   // secretAccessKey: config.DYNAMODB.AWS_SECRET_ACCESS_KEY,
+//   region: config.DYNAMODB.AWS_REGION
+// });
+
+// if (config.DYNAMODB.IS_LOCAL === 'true') {
+//   dynamoose.local();
+// }
+
 dynamoose.setDefaults({
   create: false,
   update: false