From f5cdc7c18c4a7255c516e774c1f56067a965a4b0 Mon Sep 17 00:00:00 2001
From: rafaelatc3sl <rpd17@c3sl>
Date: Thu, 10 Jan 2019 09:48:31 -0200
Subject: [PATCH] Issue #98: Add verification to env variable
Signed-off-by: rafaelatc3sl <rpd17@c3sl>
---
scripts/loadTest.ts | 10 +++++++++-
src/api/controllers/collect.spec.ts | 12 ++++++++++--
src/main.ts | 12 +++++++++++-
test/scenario.ts | 11 ++++++++++-
4 files changed, 40 insertions(+), 5 deletions(-)
diff --git a/scripts/loadTest.ts b/scripts/loadTest.ts
index dfef421c..0e83f791 100644
--- a/scripts/loadTest.ts
+++ b/scripts/loadTest.ts
@@ -27,7 +27,15 @@ import { ConfigParser } from "../src/util/configParser";
let config: any;
let fixture;
-const configPath = process.env.BLENDB_SCHEMA_FILE;
+let configPath;
+
+if(process.env.BLENDB_SCHEMA_FILE){
+ configPath = process.env.BLENDB_SCHEMA_FILE;
+}
+else{
+ console.error("BLENDB_SCHEMA_FILE wasn't informed");
+ process.exit(1);
+}
config = ConfigParser.parse(configPath);
fixture = new FixPostgres(config.connection);
diff --git a/src/api/controllers/collect.spec.ts b/src/api/controllers/collect.spec.ts
index d189bd57..6b792416 100644
--- a/src/api/controllers/collect.spec.ts
+++ b/src/api/controllers/collect.spec.ts
@@ -72,8 +72,16 @@ function loadDb(db: string, index: number, cb: (err: any, result: Adapter) => vo
describe("API collect controller", () => {
// Initializing
before(function (done): void {
- // Arrow function not used to get acces to this and skip the test
- const configPath = process.env.BLENDB_SCHEMA_FILE;
+ // Arrow function not used to get acces to this and skip the test
+ let configPath;
+
+ if(process.env.BLENDB_SCHEMA_FILE){
+ configPath = process.env.BLENDB_SCHEMA_FILE;
+ }
+ else{
+ console.error("BLENDB_SCHEMA_FILE wasn't informed");
+ process.exit(1);
+ }
config = ConfigParser.parse(configPath);
eachOf(config.adapters , function(database, key: number, callback) {
diff --git a/src/main.ts b/src/main.ts
index 456e82a8..63f9c3d7 100755
--- a/src/main.ts
+++ b/src/main.ts
@@ -36,8 +36,18 @@ const app = module.exports = express();
// Load configuration file
import { ConfigParser } from "./util/configParser";
+
+let configPath;
+
/** @hidden */
-const configPath = process.env.BLENDB_SCHEMA_FILE;
+if(process.env.BLENDB_SCHEMA_FILE){
+ configPath = process.env.BLENDB_SCHEMA_FILE;
+}
+else{
+ console.error("BLENDB_SCHEMA_FILE wasn't informed");
+ process.exit(1);
+}
+
/** @hidden */
const config = ConfigParser.parse(configPath);
diff --git a/test/scenario.ts b/test/scenario.ts
index 0cad7fa5..dc058058 100644
--- a/test/scenario.ts
+++ b/test/scenario.ts
@@ -29,7 +29,16 @@ import { ViewHandler } from "../src/util/viewHandler";
import { EngineScenario, AdapterScenario, DataCtrlScenario } from "../src/util/scenarioHandler";
import { Query, QueryOpts } from "../src/common/query";
-const configPath = process.env.BLENDB_SCHEMA_FILE;
+let configPath;
+
+if(process.env.BLENDB_SCHEMA_FILE){
+ configPath = process.env.BLENDB_SCHEMA_FILE;
+}
+else{
+ console.error("BLENDB_SCHEMA_FILE wasn't informed");
+ process.exit(1);
+}
+
const config = ConfigParser.parse(configPath);
const mets : {[key: string]: Metric} = {};
--
GitLab