Skip to content
This repository was archived by the owner on Dec 14, 2022. It is now read-only.

Commit cd8f568

Browse files
author
Chris Wiechmann
committed
Make sure test environment variables are overwritten
1 parent 3396889 commit cd8f568

14 files changed

+66
-40
lines changed

‎apibuilder4elastic/test/trafficMonitorAPI/restricted/filetransfer/test_search_filetransfer.js‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const getDate = require('../../../util');
44
const path = require('path');
55
const fs = require('fs');
66
const nock = require('nock');
7-
const envLoader = require('dotenv');
7+
const dotenv = require('dotenv');
88

99
describe('Endpoints', function () {
1010
this.timeout(30000);
@@ -31,8 +31,10 @@ describe('Endpoints', function () {
3131
before(() => {
3232
return new Promise(function(resolve, reject){
3333
const envFilePath = path.join(__dirname, '../../../.env');
34-
if (fs.existsSync(envFilePath)) {
35-
envLoader.config({ path: envFilePath });
34+
// Make sure the existing environment variables are overwritten (https://github.com/motdotla/dotenv#what-happens-to-environment-variables-that-were-already-set)
35+
const envConfig = dotenv.parse(fs.readFileSync(envFilePath));
36+
for (const k in envConfig) {
37+
process.env[k] = envConfig[k];
3638
}
3739
server = startApiBuilder();
3840
server.apibuilder.config.testElasticIndex = indexName;

‎apibuilder4elastic/test/trafficMonitorAPI/restricted/http/test_circuitpath_disabled_authz.js‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ const { startApiBuilder, stopApiBuilder, requestAsync, sendToElasticsearch, getR
33
const path = require('path');
44
const fs = require('fs');
55
const nock = require('nock');
6-
const envLoader = require('dotenv');
6+
const dotenv = require('dotenv');
77

88
describe('Traffic Monitor API', function () {
99
this.timeout(30000);
@@ -18,8 +18,10 @@ describe('Traffic Monitor API', function () {
1818
return new Promise(function(resolve, reject){
1919
delete process.env.AUTHZ_CONFIG; // Make sure, it is not using config from a previous test
2020
const envFilePath = path.join(__dirname, '../../../.env');
21-
if (fs.existsSync(envFilePath)) {
22-
envLoader.config({ path: envFilePath });
21+
// Make sure the existing environment variables are overwritten (https://github.com/motdotla/dotenv#what-happens-to-environment-variables-that-were-already-set)
22+
const envConfig = dotenv.parse(fs.readFileSync(envFilePath));
23+
for (const k in envConfig) {
24+
process.env[k] = envConfig[k];
2325
}
2426
process.env.AUTHZ_CONFIG = "../../../test/trafficMonitorAPI/authZConfig/authorization-config-skipped.js";
2527
server = startApiBuilder();

‎apibuilder4elastic/test/trafficMonitorAPI/restricted/http/test_circuitpath_extHttp1.js‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ const { startApiBuilder, stopApiBuilder, requestAsync, sendToElasticsearch, getR
33
const path = require('path');
44
const fs = require('fs');
55
const nock = require('nock');
6-
const envLoader = require('dotenv');
6+
const dotenv = require('dotenv');
77

88
describe('Traffic Monitor API Circuitpath - Ext-HTTP-AuthZ', function () {
99
this.timeout(30000);
@@ -18,8 +18,10 @@ describe('Traffic Monitor API Circuitpath - Ext-HTTP-AuthZ', function () {
1818
return new Promise(function(resolve, reject){
1919
delete process.env.AUTHZ_CONFIG; // Make sure, it is not using config from a previous test
2020
const envFilePath = path.join(__dirname, '../../../.env');
21-
if (fs.existsSync(envFilePath)) {
22-
envLoader.config({ path: envFilePath });
21+
// Make sure the existing environment variables are overwritten (https://github.com/motdotla/dotenv#what-happens-to-environment-variables-that-were-already-set)
22+
const envConfig = dotenv.parse(fs.readFileSync(envFilePath));
23+
for (const k in envConfig) {
24+
process.env[k] = envConfig[k];
2325
}
2426
process.env.AUTHZ_CONFIG = "../../../test/trafficMonitorAPI/authZConfig/authorization-config-1.js";
2527
server = startApiBuilder();

‎apibuilder4elastic/test/trafficMonitorAPI/restricted/http/test_circuitpath_restricted.js‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ const { startApiBuilder, stopApiBuilder, requestAsync, sendToElasticsearch, getR
33
const path = require('path');
44
const fs = require('fs');
55
const nock = require('nock');
6-
const envLoader = require('dotenv');
6+
const dotenv = require('dotenv');
77

88
describe('Traffic Monitor API', function () {
99
this.timeout(30000);
@@ -18,8 +18,10 @@ describe('Traffic Monitor API', function () {
1818
return new Promise(function(resolve, reject){
1919
delete process.env.AUTHZ_CONFIG; // Make sure, it is not using config from a previous test
2020
const envFilePath = path.join(__dirname, '../../../.env');
21-
if (fs.existsSync(envFilePath)) {
22-
envLoader.config({ path: envFilePath });
21+
// Make sure the existing environment variables are overwritten (https://github.com/motdotla/dotenv#what-happens-to-environment-variables-that-were-already-set)
22+
const envConfig = dotenv.parse(fs.readFileSync(envFilePath));
23+
for (const k in envConfig) {
24+
process.env[k] = envConfig[k];
2325
}
2426
server = startApiBuilder();
2527
server.apibuilder.config.testElasticIndex = indexName;

‎apibuilder4elastic/test/trafficMonitorAPI/restricted/http/test_getinfo_endpoint_disabled_authz.js‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ const { startApiBuilder, stopApiBuilder, requestAsync, sendToElasticsearch, getR
33
const path = require('path');
44
const fs = require('fs');
55
const nock = require('nock');
6-
const envLoader = require('dotenv');
6+
const dotenv = require('dotenv');
77

88
describe('Endpoints', function () {
99
this.timeout(30000);
@@ -18,8 +18,10 @@ describe('Endpoints', function () {
1818
return new Promise(function(resolve, reject){
1919
delete process.env.AUTHZ_CONFIG; // Make sure, it is not using config from a previous test
2020
const envFilePath = path.join(__dirname, '../../../.env');
21-
if (fs.existsSync(envFilePath)) {
22-
envLoader.config({ path: envFilePath });
21+
// Make sure the existing environment variables are overwritten (https://github.com/motdotla/dotenv#what-happens-to-environment-variables-that-were-already-set)
22+
const envConfig = dotenv.parse(fs.readFileSync(envFilePath));
23+
for (const k in envConfig) {
24+
process.env[k] = envConfig[k];
2325
}
2426
process.env.AUTHZ_CONFIG = "../../../test/trafficMonitorAPI/authZConfig/authorization-config-skipped.js";
2527
server = startApiBuilder();

‎apibuilder4elastic/test/trafficMonitorAPI/restricted/http/test_getinfo_endpoint_extHttp1.js‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ const { startApiBuilder, stopApiBuilder, requestAsync, sendToElasticsearch, getR
33
const path = require('path');
44
const fs = require('fs');
55
const nock = require('nock');
6-
const envLoader = require('dotenv');
6+
const dotenv = require('dotenv');
77

88
describe('Endpoints', function () {
99
this.timeout(30000);
@@ -18,8 +18,10 @@ describe('Endpoints', function () {
1818
return new Promise(function(resolve, reject){
1919
delete process.env.AUTHZ_CONFIG; // Make sure, it is not using config from a previous test
2020
const envFilePath = path.join(__dirname, '../../../.env');
21-
if (fs.existsSync(envFilePath)) {
22-
envLoader.config({ path: envFilePath });
21+
// Make sure the existing environment variables are overwritten (https://github.com/motdotla/dotenv#what-happens-to-environment-variables-that-were-already-set)
22+
const envConfig = dotenv.parse(fs.readFileSync(envFilePath));
23+
for (const k in envConfig) {
24+
process.env[k] = envConfig[k];
2325
}
2426
process.env.AUTHZ_CONFIG = "../../../test/trafficMonitorAPI/authZConfig/authorization-config-1.js";
2527
server = startApiBuilder();

‎apibuilder4elastic/test/trafficMonitorAPI/restricted/http/test_getinfo_endpoint_restricted.js‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ const { startApiBuilder, stopApiBuilder, requestAsync, sendToElasticsearch, getR
33
const path = require('path');
44
const fs = require('fs');
55
const nock = require('nock');
6-
const envLoader = require('dotenv');
6+
const dotenv = require('dotenv');
77

88
describe('Endpoints', function () {
99
this.timeout(30000);
@@ -23,8 +23,10 @@ describe('Endpoints', function () {
2323
return new Promise(function(resolve, reject){
2424
delete process.env.AUTHZ_CONFIG; // Make sure, it is not using config from a previous test
2525
const envFilePath = path.join(__dirname, '../../../.env');
26-
if (fs.existsSync(envFilePath)) {
27-
envLoader.config({ path: envFilePath });
26+
// Make sure the existing environment variables are overwritten (https://github.com/motdotla/dotenv#what-happens-to-environment-variables-that-were-already-set)
27+
const envConfig = dotenv.parse(fs.readFileSync(envFilePath));
28+
for (const k in envConfig) {
29+
process.env[k] = envConfig[k];
2830
}
2931
server = startApiBuilder();
3032
server.apibuilder.config.testElasticIndex = indexName;

‎apibuilder4elastic/test/trafficMonitorAPI/restricted/http/test_payload_disabled_authz.js‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ const { startApiBuilder, stopApiBuilder, requestAsync, sendToElasticsearch, getR
33
const path = require('path');
44
const fs = require('fs');
55
const nock = require('nock');
6-
const envLoader = require('dotenv');
6+
const dotenv = require('dotenv');
77

88
describe('Payload restricted', function () {
99
this.timeout(30000);
@@ -19,8 +19,10 @@ describe('Payload restricted', function () {
1919
return new Promise(function(resolve, reject){
2020
delete process.env.AUTHZ_CONFIG; // Make sure, it is not using config from a previous test
2121
const envFilePath = path.join(__dirname, '../../../.env');
22-
if (fs.existsSync(envFilePath)) {
23-
envLoader.config({ path: envFilePath });
22+
// Make sure the existing environment variables are overwritten (https://github.com/motdotla/dotenv#what-happens-to-environment-variables-that-were-already-set)
23+
const envConfig = dotenv.parse(fs.readFileSync(envFilePath));
24+
for (const k in envConfig) {
25+
process.env[k] = envConfig[k];
2426
}
2527
process.env.AUTHZ_CONFIG = "../../../test/trafficMonitorAPI/authZConfig/authorization-config-skipped.js";
2628
process.env.PAYLOAD_FOLDER = payloadFolder;

‎apibuilder4elastic/test/trafficMonitorAPI/restricted/http/test_payload_extHttp1.js‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ const { startApiBuilder, stopApiBuilder, requestAsync, sendToElasticsearch, getR
33
const path = require('path');
44
const fs = require('fs');
55
const nock = require('nock');
6-
const envLoader = require('dotenv');
6+
const dotenv = require('dotenv');
77

88
describe('Payload restricted using Ext HTTP-Service', function () {
99
this.timeout(30000);
@@ -19,8 +19,10 @@ describe('Payload restricted using Ext HTTP-Service', function () {
1919
return new Promise(function(resolve, reject){
2020
delete process.env.AUTHZ_CONFIG; // Make sure, it is not using config from a previous test
2121
const envFilePath = path.join(__dirname, '../../../.env');
22-
if (fs.existsSync(envFilePath)) {
23-
envLoader.config({ path: envFilePath });
22+
// Make sure the existing environment variables are overwritten (https://github.com/motdotla/dotenv#what-happens-to-environment-variables-that-were-already-set)
23+
const envConfig = dotenv.parse(fs.readFileSync(envFilePath));
24+
for (const k in envConfig) {
25+
process.env[k] = envConfig[k];
2426
}
2527
process.env.AUTHZ_CONFIG = "../../../test/trafficMonitorAPI/authZConfig/authorization-config-1.js";
2628
process.env.PAYLOAD_FOLDER = payloadFolder;

‎apibuilder4elastic/test/trafficMonitorAPI/restricted/http/test_payload_restricted.js‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ const { startApiBuilder, stopApiBuilder, requestAsync, sendToElasticsearch, getR
33
const path = require('path');
44
const fs = require('fs');
55
const nock = require('nock');
6-
const envLoader = require('dotenv');
6+
const dotenv = require('dotenv');
77

88
describe('Payload restricted', function () {
99
this.timeout(30000);
@@ -19,8 +19,10 @@ describe('Payload restricted', function () {
1919
return new Promise(function(resolve, reject){
2020
delete process.env.AUTHZ_CONFIG; // Make sure, it is not using config from a previous test
2121
const envFilePath = path.join(__dirname, '../../../.env');
22-
if (fs.existsSync(envFilePath)) {
23-
envLoader.config({ path: envFilePath });
22+
// Make sure the existing environment variables are overwritten (https://github.com/motdotla/dotenv#what-happens-to-environment-variables-that-were-already-set)
23+
const envConfig = dotenv.parse(fs.readFileSync(envFilePath));
24+
for (const k in envConfig) {
25+
process.env[k] = envConfig[k];
2426
}
2527
process.env.PAYLOAD_FOLDER = payloadFolder;
2628
server = startApiBuilder();

0 commit comments

Comments
 (0)