This repository was archived by the owner on Nov 15, 2024. It is now read-only.
File tree Expand file tree Collapse file tree 4 files changed +25
-9
lines changed Expand file tree Collapse file tree 4 files changed +25
-9
lines changed Original file line number Diff line number Diff line change 61
61
},
62
62
"scripts" : {
63
63
"veryclean" : " git clean -fXd" ,
64
- "test" : " mocha --exit" ,
64
+ "test" : " mocha --exit --dev_secrets " ,
65
65
"test:ci" : " npm run test -- --reporter mocha-teamcity-reporter" ,
66
66
"clean" : " git clean -fXd -e !node_modules -e !node_modules/**/*" ,
67
67
"eslint" : " eslint ." ,
Original file line number Diff line number Diff line change 2
2
3
3
'use strict' ;
4
4
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
+
5
28
require ( './lib/test.js' ) ;
6
29
require ( '../shared/server_utils/test.js' ) ;
7
30
require ( '../shared/codestream_configs/test.js' ) ;
Original file line number Diff line number Diff line change @@ -32,7 +32,6 @@ AWS access will use codestream-server/base/ keys from vault
32
32
"
33
33
34
34
echo " $* " | grep -q ' \-mock-mode' && {
35
- echo " ======= Mocky ======="
36
35
export CS_API_MOCK_MODE=1
37
36
}
38
37
Original file line number Diff line number Diff line change @@ -7,16 +7,10 @@ function dev_settings {
7
7
done
8
8
}
9
9
10
- function dev_secrets {
11
- $SCRIPT_DIR /api_server/bin/cs_dev_secrets.js
12
- }
13
-
14
10
SCRIPT_DIR=$( cd -- " $( dirname -- " ${BASH_SOURCE[0]} " ) " & > /dev/null && pwd )
15
11
export CSSVC_BACKEND_ROOT=$SCRIPT_DIR
16
12
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`
20
14
export CS_API_MOCK_MODE=' 1'
21
15
export CSSVC_ENV=local
22
16
export CSSVC_CFG_FILE=" $CSSVC_BACKEND_ROOT /codestream-docker.json"
You can’t perform that action at this time.
0 commit comments