Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FAI-9345: Update nock to address lodash vulns #333

Merged
merged 3 commits into from
Feb 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,18 @@ jobs:
- name: Show services
run: docker compose ps -a

# The init container is configured to restart 3 times on failure, but
# docker wait only uses the first exit code. This container's entrypoint
# always fails on its first attempt, but usually one retry is sufficient.
- name: Wait for init to complete
run: |
CONTAINER_EXIT_CODE=$(docker wait faros-community-edition-faros-init-1)
echo "Faros init container exit code was ${CONTAINER_EXIT_CODE}"
[[ $CONTAINER_EXIT_CODE -eq 0 ]]
uses: nick-fields/retry@v3
with:
max_attempts: 2
timeout_minutes: 5
command: |
CONTAINER_EXIT_CODE=$(docker wait faros-community-edition-faros-init-1)
echo "Faros init container exit code was ${CONTAINER_EXIT_CODE}"
[[ $CONTAINER_EXIT_CODE -eq 0 ]]

- name: Get Hasura Admin Secret
run: |
Expand Down
28 changes: 7 additions & 21 deletions cli/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"eslint": "^8.7.0",
"eslint-plugin-simple-import-sort": "^7.0.0",
"jest": "^27.5.1",
"nock": "^13.2.4",
"nock": "^13.5.1",
"pino-pretty": "^7.5.1",
"prettier": "2.5.1",
"ts-jest": "^27.1.3",
Expand Down
28 changes: 7 additions & 21 deletions init/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion init/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"eslint": "^8.7.0",
"eslint-plugin-simple-import-sort": "^7.0.0",
"jest": "^29.7.0",
"nock": "^13.2.4",
"nock": "^13.5.1",
"pino-pretty": "^7.5.1",
"prettier": "2.5.1",
"ts-jest": "^29.1.1",
Expand Down
Loading