Merge branch 'main' into OPS-3276/create-can-history-endpoint

HHS · Jan 9, 2025 · 599108a · 599108a
2 parents 1f3dc80 + c536be5
commit 599108a
Show file tree

Hide file tree

Showing 20 changed files with 149 additions and 107 deletions.
diff --git a/.github/actions/bump-and-tag/package-lock.json b/.github/actions/bump-and-tag/package-lock.json
diff --git a/.github/workflows/dev_be_build_and_deploy.yml b/.github/workflows/dev_be_build_and_deploy.yml
@@ -47,7 +47,7 @@ jobs:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           context: ${{ github.workspace }}/${{ env.WORKING_DIR }}
           dockerfile: ${{ github.workspace }}/${{ env.WORKING_DIR }}/${{ env.BE_DOCKER_FILE }}
-          image_tags: "unstable,${{ github.sha }}"
+          image_tags: "${{ env.ENVIRONMENT }},${{ github.sha }}"
 
   deploy-data-tools:
     needs: build-data-tools

diff --git a/.github/workflows/nightly_scans.yml b/.github/workflows/nightly_scans.yml
@@ -25,7 +25,7 @@ jobs:
           target: 'https://stg.ops.opre.acf.gov/'
           allow_issue_writing: false
           fail_action: false
-          cmd_options: '-I'
+          cmd_options: '-I -l FAIL'
 
       ## Manually reviewed the action, and validated it performs basic
       ## conversion from zap.json to zap.sarif.

diff --git a/.github/workflows/prod_be_build_and_deploy.yml b/.github/workflows/prod_be_build_and_deploy.yml
@@ -42,7 +42,7 @@ jobs:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           context: ${{ github.workspace }}/${{ env.WORKING_DIR }}
           dockerfile: ${{ github.workspace }}/${{ env.WORKING_DIR }}/${{ env.BE_DOCKER_FILE }}
-          image_tags: "${{ github.sha }}"
+          image_tags: "${{ env.ENVIRONMENT }},${{ github.sha }}"
 
   deploy-data-tools:
     needs: build-data-tools

diff --git a/.github/workflows/security_semgrep.yml b/.github/workflows/security_semgrep.yml
@@ -9,7 +9,7 @@ jobs:
     name: Semgrep Analyze
     runs-on: ubuntu-latest
     container:
-      image: returntocorp/semgrep@sha256:62c5c71d6da15096bdde79035782d30be8b89a6e2b5fb9b3228d37c3316fa9d4 # 1.47.0
+      image: returntocorp/semgrep@sha256:5145f6e54f8df98588023f56c66acbf25d0909c2655c16e4c104eefca6e735f8 # 1.47.0
     steps:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4

diff --git a/.github/workflows/stg_be_build_and_deploy.yml b/.github/workflows/stg_be_build_and_deploy.yml
@@ -47,7 +47,7 @@ jobs:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           context: ${{ github.workspace }}/${{ env.WORKING_DIR }}
           dockerfile: ${{ github.workspace }}/${{ env.WORKING_DIR }}/${{ env.BE_DOCKER_FILE }}
-          image_tags: "${{ github.sha }}"
+          image_tags: "${{ env.ENVIRONMENT }},${{ github.sha }}"
 
   deploy-data-tools:
     needs: build-data-tools

diff --git a/backend/data_tools/Pipfile.lock b/backend/data_tools/Pipfile.lock