Skip to content
This repository was archived by the owner on Nov 15, 2024. It is now read-only.

Commit b76afad

Browse files
dsellarsnrcstryker
authored andcommitted
Read secrets at runtime for tests
1 parent 99b151b commit b76afad

File tree

4 files changed

+25
-9
lines changed

4 files changed

+25
-9
lines changed

api_server/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
},
6262
"scripts": {
6363
"veryclean": "git clean -fXd",
64-
"test": "mocha --exit",
64+
"test": "mocha --exit --dev_secrets",
6565
"test:ci": "npm run test -- --reporter mocha-teamcity-reporter",
6666
"clean": "git clean -fXd -e !node_modules -e !node_modules/**/*",
6767
"eslint": "eslint .",

api_server/test.js

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,29 @@
22

33
'use strict';
44

5+
// make eslint happy
6+
/* globals before */
7+
8+
before(function (done) {
9+
if (process.argv.find((_) => _ === '--dev_secrets') !== undefined) {
10+
this.timeout(7000);
11+
const devSecrets = require('@datanerd/codestream-utils');
12+
devSecrets
13+
.readVaultSecrets()
14+
.then((secretsEnv) => {
15+
console.log('Merging secrets...');
16+
Object.assign(process.env, secretsEnv);
17+
done();
18+
})
19+
.catch((e) => {
20+
console.error('Error reading secrets', e.message);
21+
done(e);
22+
});
23+
} else {
24+
done();
25+
}
26+
});
27+
528
require('./lib/test.js');
629
require('../shared/server_utils/test.js');
730
require('../shared/codestream_configs/test.js');

start-api-server.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ AWS access will use codestream-server/base/ keys from vault
3232
"
3333

3434
echo "$*" | grep -q '\-mock-mode' && {
35-
echo "======= Mocky ======="
3635
export CS_API_MOCK_MODE=1
3736
}
3837

testMode.sh

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,10 @@ function dev_settings {
77
done
88
}
99

10-
function dev_secrets {
11-
$SCRIPT_DIR/api_server/bin/cs_dev_secrets.js
12-
}
13-
1410
SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
1511
export CSSVC_BACKEND_ROOT=$SCRIPT_DIR
1612
export NODE_PATH="$CSSVC_BACKEND_ROOT/api_server/node_modules:$CSSVC_BACKEND_ROOT/broadcaster/node_modules"
17-
eval `dev_settings` # Needed for dev_secrets to work
18-
# dev_settings
19-
eval `dev_secrets`
13+
eval `dev_settings`
2014
export CS_API_MOCK_MODE='1'
2115
export CSSVC_ENV=local
2216
export CSSVC_CFG_FILE="$CSSVC_BACKEND_ROOT/codestream-docker.json"

0 commit comments

Comments
 (0)