Merge branch 'main' into OPS-310/3232_CAN_budget_card

HHS · Jan 13, 2025 · 66a21c5 · 66a21c5
2 parents ce456c2 + ef82ef6
commit 66a21c5
Show file tree

Hide file tree

Showing 11 changed files with 73 additions and 73 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/actions/tf-plan/action.yaml b/.github/actions/tf-plan/action.yaml
@@ -91,7 +91,7 @@ runs:
 
     - name: Save Artifact
       id: save-artifact
-      uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
+      uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
       with:
         name: ${{ inputs.pr_id }}-${{ steps.get-tf-dir.outputs.tf_dir }}-tf-plan
         path: ${{ inputs.terraform_directory }}/tfplan

diff --git a/.github/workflows/build_data_tools.yml b/.github/workflows/build_data_tools.yml
@@ -49,7 +49,7 @@ jobs:
 
         # https://github.com/docker/build-push-action/
       - name: Build and push Docker image
-        uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 # v6.10.0
+        uses: docker/build-push-action@b32b51a8eda65d6793cd0494a773d4f6bcef32dc # v6.11.0
         with:
           context: "{{defaultContext}}:backend" # https://github.com/docker/build-push-action#git-context
           push: true

diff --git a/.github/workflows/e2e_test_reusable.yml b/.github/workflows/e2e_test_reusable.yml
@@ -70,7 +70,7 @@ jobs:
       # Upload Cypress screenshots as artifact if a test fails
       - name: Upload screenshots if failure
         if: failure() # This step will run only if the previous step fails
-        uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4
+        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4
         with:
           path: frontend/cypress/${{ steps.get-filename.outputs.TEST_FILE }}/screenshots # Update this path based on your project structure
           name: cypress-screenshots
@@ -85,7 +85,7 @@ jobs:
       # Upload logs as artifact
       - name: Upload logs as artifact
         if: always() # Ensure this runs, even if E2E fails
-        uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4
+        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4
         with:
           # Set the path to the log file
           path: full-stack-logs-${{ steps.get-filename.outputs.TEST_FILE }}.log

diff --git a/.github/workflows/nightly_scans.yml b/.github/workflows/nightly_scans.yml
@@ -34,6 +34,6 @@ jobs:
         uses: SvanBoxel/zaproxy-to-ghas@cfc77481d74a17a4c3d6b753aa9d7abef453d501 # v1.0.2
 
       - name: Upload SARIF file
-        uses: github/codeql-action/upload-sarif@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3
+        uses: github/codeql-action/upload-sarif@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3
         with:
           sarif_file: results.sarif
diff --git a/.github/workflows/security_codeql.yml b/.github/workflows/security_codeql.yml
@@ -22,7 +22,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3
+        uses: github/codeql-action/init@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3
         with:
           languages: javascript, python
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -33,4 +33,4 @@ jobs:
           queries: +security-extended
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3
+        uses: github/codeql-action/analyze@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3
diff --git a/.github/workflows/security_semgrep.yml b/.github/workflows/security_semgrep.yml
@@ -25,7 +25,7 @@ jobs:
           SEMGREP_RULES: "p/default"
 
       - name: Upload SARIF file for GitHub Advanced Security Dashboard
-        uses: github/codeql-action/upload-sarif@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3
+        uses: github/codeql-action/upload-sarif@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3
         with:
           sarif_file: ${{ env.SEMGREP_TO_UPLOAD }}
         if: always()
diff --git a/backend/data_tools/Pipfile b/backend/data_tools/Pipfile
@@ -12,7 +12,7 @@ cfenv = "==0.5.3"
 typing-extensions = "==4.12.2"
 desert = "2022.9.22"
 sqlalchemy-continuum = "==1.4.2"
-marshmallow-sqlalchemy = "==1.1.0"
+marshmallow-sqlalchemy = "==1.2.0"
 marshmallow-enum = "==1.5.1"
 alembic = "==1.14.0"
 alembic-postgresql-enum = "==1.5.0"

diff --git a/backend/data_tools/Pipfile.lock b/backend/data_tools/Pipfile.lock
diff --git a/backend/ops_api/Pipfile b/backend/ops_api/Pipfile
@@ -18,7 +18,7 @@ loguru = "==0.7.3"
 markupsafe = "==3.0.2"
 marshmallow-dataclass = "==8.7.1"
 marshmallow-enum = "==1.5.1"
-marshmallow-sqlalchemy = "==1.1.0"
+marshmallow-sqlalchemy = "==1.2.0"
 mypy = "==1.14.1"
 psycopg2-binary = "==2.9.10"
 PyYAML = "==6.0.2"

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