From e169a916a13e1e458515668d613028b6682b98e4 Mon Sep 17 00:00:00 2001 From: "Ronnie A. Baez Sesto" Date: Tue, 3 Apr 2018 13:33:58 -0400 Subject: [PATCH 1/2] Adds environment variables for mongo connection string --- lib/mocksConfig.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/lib/mocksConfig.js b/lib/mocksConfig.js index bb4d5fa..04b784f 100644 --- a/lib/mocksConfig.js +++ b/lib/mocksConfig.js @@ -1,16 +1,21 @@ "use strict"; +function buildConnectionStr(host, port, db) { + return "mongodb://" + host + ":" + port + "/" + db; +} + function generateConfig() { const env = process.env.NODE_ENV || "development"; + const host = process.env.MONGODB_HOST || 'localhost'; + const port = process.env.MONGODB_PORT || 27017; + let db = process.env.MONGODB_DB || 'mockSQS'; if (env === "test") { - return { - db: process.env.MOCK_SQS_DB || "mongodb://localhost:27017/mockSQS_test", - }; + db += "_" + env; } return { - db: process.env.MOCK_SQS_DB || "mongodb://localhost:27017/mockSQS", + db: process.env.MOCK_SQS_DB || buildConnectionStr(host, port, db), }; } From 716f54501cc9742b8c8b4fae2dcaea6e5710265e Mon Sep 17 00:00:00 2001 From: "Ronnie A. Baez Sesto" Date: Tue, 3 Apr 2018 13:46:19 -0400 Subject: [PATCH 2/2] style: Use templates and double quotes --- lib/mocksConfig.js | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/lib/mocksConfig.js b/lib/mocksConfig.js index 04b784f..5c97468 100644 --- a/lib/mocksConfig.js +++ b/lib/mocksConfig.js @@ -1,21 +1,17 @@ "use strict"; -function buildConnectionStr(host, port, db) { - return "mongodb://" + host + ":" + port + "/" + db; -} - function generateConfig() { const env = process.env.NODE_ENV || "development"; - const host = process.env.MONGODB_HOST || 'localhost'; + const host = process.env.MONGODB_HOST || "localhost"; const port = process.env.MONGODB_PORT || 27017; - let db = process.env.MONGODB_DB || 'mockSQS'; + let db = process.env.MONGODB_DB || "mockSQS"; if (env === "test") { - db += "_" + env; + db = `${db}_${env}`; } return { - db: process.env.MOCK_SQS_DB || buildConnectionStr(host, port, db), + db: process.env.MOCK_SQS_DB || `mongodb://${host}:${port}/${db}`, }; }