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.

Sign up for GitHub

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

2024-10-12 | MAIN --> PROD | DEV (5c80211) --> STAGING #4380

Merged
merged 5 commits into from
Oct 12, 2024
Merged

2024-10-12 | MAIN --> PROD | DEV (5c80211) --> STAGING #4380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ad9a04d
Maintenance mode toggle (#4365)
rnovak338 Oct 9, 2024
e7ad09c
NPM Dependency Updates 10/09/2024 (#4369)
jperson1 Oct 10, 2024
6a910ec
Bump trivy to 0.26.0 (#4364)
asteel-gsa Oct 11, 2024
ac78e19
Allowing users to delete audit editors (#4359)
phildominguez-gsa Oct 11, 2024
5c80211
4326 automate conversion of workbooks to ir json and update test logi…
sambodeme Oct 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions .github/workflows/trivy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand Down
6 changes: 3 additions & 3 deletions backend/audit/cross_validation/test_check_award_ref_declaration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
Expand Down
Loading
Loading