Merge pull request #4380 from GSA-TTS/main

GSA-TTS · Oct 12, 2024 · cf8834d · cf8834d
2 parents 549dbb9 + 5c80211
commit cf8834d
Show file tree

Hide file tree

Showing 402 changed files with 1,368,980 additions and 422,433 deletions.
diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml
@@ -39,7 +39,7 @@ jobs:
         run: docker build -t ${{ env.DOCKER_NAME }}:${{ steps.date.outputs.date }} .
 
       - name: Run Trivy vulnerability scanner
-        uses: aquasecurity/trivy-action@0.24.0
+        uses: aquasecurity/trivy-action@0.26.0
         with:
           image-ref: '${{ env.DOCKER_NAME }}:${{ steps.date.outputs.date }}'
           scan-type: 'image'
@@ -74,7 +74,7 @@ jobs:
         run: docker pull ${{ matrix.image.name }}
 
       - name: Run Trivy vulnerability scanner on Third Party Images
-        uses: aquasecurity/trivy-action@0.24.0
+        uses: aquasecurity/trivy-action@0.26.0
         with:
           image-ref: '${{ matrix.image.name }}'
           scan-type: 'image'

diff --git a/backend/audit/cross_validation/test_check_award_ref_declaration.py b/backend/audit/cross_validation/test_check_award_ref_declaration.py
@@ -14,13 +14,13 @@ def setUp(self):
         self.AWARD_MAX = 1500
         self.AUDITEE_UEI = "AAA123456BBB"
         self.award1 = {
-            "award_reference": f"AWARD-{generate_random_integer(self.AWARD_MIN,self.AWARD_MAX)}"
+            "award_reference": f"AWARD-{generate_random_integer(self.AWARD_MIN, self.AWARD_MAX)}"
         }
         self.award2 = {
-            "award_reference": f"AWARD-{generate_random_integer(self.AWARD_MIN *2,self.AWARD_MAX *2)}"
+            "award_reference": f"AWARD-{generate_random_integer(self.AWARD_MIN * 2, self.AWARD_MAX * 2)}"
         }
         self.award3 = {
-            "award_reference": f"AWARD-{generate_random_integer(self.AWARD_MIN *3,self.AWARD_MAX *3)}"
+            "award_reference": f"AWARD-{generate_random_integer(self.AWARD_MIN * 3, self.AWARD_MAX * 3)}"
         }
         self.award_with_longer_ref = {"award_reference": "AWARD-00123"}
         self.award_with_shorter_ref = {"award_reference": "AWARD-0123"}