Skip to content

Commit f4f65b4

Browse files
authored
Merge pull request #1736 from NASA-AMMOS/fix/action-server-test-log-files
Small action server test improvements
2 parents b089d38 + a32e178 commit f4f65b4

File tree

4 files changed

+6
-2
lines changed

4 files changed

+6
-2
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ jobs:
109109
**/e2e-tests/build/reports/tests/e2eTest
110110
**/db-tests/build/reports/tests/e2eTest
111111
**/sequencing-server/test-report.*
112+
**/action-server/action-server-test-report.log
112113
- name: Print Logs for Services
113114
if: always()
114115
run: docker compose -f ./e2e-tests/docker-compose-test.yml logs -t

action-server/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
action-server-test-report.log

action-server/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"clean": "rm -rf build",
99
"start": "npm run clean; npm run build-quiet; node build/app.js",
1010
"dev": "npm run clean; npm run build; nodemon --watch src/**/* -e ts --exec 'node --inspect=0.0.0.0:9229 --require ts-node/register build/app.js'",
11-
"test": "node -r ts-node/register tests/*.test.ts",
11+
"test": "bash -c 'node -r ts-node/register tests/*.test.ts | tee action-server-test-report.log; exit ${PIPESTATUS[0]}'",
1212
"lint": "eslint src/**/*.ts",
1313
"reformat": "npx prettier --config ./.prettierrc.json -w ./src"
1414
},

action-server/src/utils/codeRunner.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ function injectLogger(oldConsole: any, logBuffer: string[], secrets?: Record<str
2828
const secretValues = Object.values(secrets);
2929

3030
for (const secretValue of secretValues) {
31-
output = output.replaceAll(secretValue, "*****");
31+
if(secretValue.length) {
32+
output = output.replaceAll(secretValue, "*****");
33+
}
3234
}
3335
}
3436

0 commit comments

Comments
 (0)