diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index fe5e1e57f..70fd96b2d 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -59,7 +59,7 @@ jobs: - uses: ./.github/actions/setup-project - name: Create requirements.txt run: pipenv requirements > requirements.txt - - uses: trailofbits/gh-action-pip-audit@v1.0.0 + - uses: pypa/gh-action-pip-audit@v1.0.4 with: inputs: requirements.txt ignore-vulns: PYSEC-2022-237 diff --git a/.github/workflows/daily_checks.yml b/.github/workflows/daily_checks.yml index c0b981b7c..34cef2173 100644 --- a/.github/workflows/daily_checks.yml +++ b/.github/workflows/daily_checks.yml @@ -29,7 +29,7 @@ jobs: - uses: ./.github/actions/setup-project - name: Create requirements.txt run: pipenv requirements > requirements.txt - - uses: trailofbits/gh-action-pip-audit@v1.0.0 + - uses: pypa/gh-action-pip-audit@v1.0.4 with: inputs: requirements.txt ignore-vulns: PYSEC-2022-237 diff --git a/Makefile b/Makefile index 9ced0aaa5..9b22547bc 100644 --- a/Makefile +++ b/Makefile @@ -66,8 +66,8 @@ freeze-requirements: ## Pin all requirements including sub dependencies into req audit: pipenv requirements > requirements.txt pipenv requirements --dev > requirements_for_test.txt - pipenv run pip-audit -r requirements.txt -l --ignore-vuln PYSEC-2022-237 - -pipenv run pip-audit -r requirements_for_test.txt -l + pipenv run pip-audit -r requirements.txt --ignore-vuln PYSEC-2022-237 + -pipenv run pip-audit -r requirements_for_test.txt .PHONY: static-scan static-scan: diff --git a/docker-compose.devcontainer.yml b/docker-compose.devcontainer.yml index 62bdfad51..d08ca2972 100644 --- a/docker-compose.devcontainer.yml +++ b/docker-compose.devcontainer.yml @@ -48,7 +48,6 @@ services: - redis links: - db - restart: always worker: container_name: worker image: dev-notification-api diff --git a/docs/deploying.md b/docs/deploying.md index 15c41afbc..94d85af36 100644 --- a/docs/deploying.md +++ b/docs/deploying.md @@ -42,7 +42,10 @@ for experimenting with infrastructure changes without going through the full CI/ Rules for use: 1. Ensure that no other developer is using the environment, as there is nothing stopping changes from overwriting each other. -1. Clean up services you create when you are done. `terraform destroy` from within the `terraform/sandbox` directory should do it. +1. Clean up when you are done: + - `terraform destroy` from within the `terraform/sandbox` directory will take care of the provisioned services + - Delete the apps and routes shown in `cf apps` by running `cf delete APP_NAME -r` + - Delete the space deployers still shown in `cf services` by running `terraform/destroy_service_account.sh -s notify-sandbox -u ` ### Deploying to the sandbox