Skip to content

Commit 525482c

Browse files
authored
Merge pull request #2285 from GSA/main
02/24/2025 Prod Deploy
2 parents 1d4bd57 + 02f39bd commit 525482c

File tree

70 files changed

+1762
-2485
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+1762
-2485
lines changed

.ds.baseline

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -555,15 +555,15 @@
555555
"filename": "tests/app/main/views/test_register.py",
556556
"hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
557557
"is_verified": false,
558-
"line_number": 200,
558+
"line_number": 199,
559559
"is_secret": false
560560
},
561561
{
562562
"type": "Secret Keyword",
563563
"filename": "tests/app/main/views/test_register.py",
564564
"hashed_secret": "bb5b7caa27d005d38039e3797c3ddb9bcd22c3c8",
565565
"is_verified": false,
566-
"line_number": 273,
566+
"line_number": 272,
567567
"is_secret": false
568568
}
569569
],
@@ -684,5 +684,5 @@
684684
}
685685
]
686686
},
687-
"generated_at": "2025-01-13T20:16:58Z"
687+
"generated_at": "2025-02-03T17:01:06Z"
688688
}

.github/ISSUE_TEMPLATE/issue_template.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,17 @@ body:
6464
validations:
6565
required: false
6666

67+
- type: markdown
68+
attributes:
69+
value: '**Accessibility:**'
70+
- type: textarea
71+
id: accessibility
72+
attributes:
73+
label: "List any specific accessibility guidance or tests that need to be considered for this user story."
74+
description: "List what type of accessibility tests need to pass."
75+
validations:
76+
required: false
77+
6778
- type: markdown
6879
attributes:
6980
value: '**Notes:**'

.github/pull_request_template.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,10 @@ Please enter a detailed description here.
2020
* Consideration 1
2121
* Consideration 2
2222
* Consideration ...
23+
24+
## A11y Checks (if applicable)
25+
26+
* Double check work is getting picked up by the automated E2E tests
27+
* Conduct browser-based tests through [AxeDevTools](https://www.deque.com/axe/devtools/) and [WAVE](https://wave.webaim.org/)
28+
* Review the [Manual Checklist](https://docs.google.com/document/d/192bBXStebdXWtYhZQ73qaWMJhGcuSB1W6c9YBXhWZvc/edit?usp=sharing)
29+
* Make sure there are no linting errors in VSCode or other IDE of choice

.github/workflows/checks.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ env:
1010
FLASK_APP: application.py
1111
WERKZEUG_DEBUG_PIN: off
1212
REDIS_ENABLED: 0
13-
NODE_VERSION: 16.15.1
13+
NODE_VERSION: 22.3.0
1414
AWS_US_TOLL_FREE_NUMBER: "+18556438890"
1515
ADMIN_BASE_URL: http://localhost:6012
1616

@@ -38,10 +38,10 @@ jobs:
3838
output: report-markdown
3939
annotations: failed-tests
4040
prnumber: ${{ steps.findPr.outputs.number }}
41-
- name: Run style checks
42-
run: poetry run flake8 .
4341
- name: Check imports alphabetized
4442
run: poetry run isort --check-only ./app ./tests
43+
- name: Run style checks
44+
run: poetry run flake8 .
4545
- name: Check dead code
4646
run: make dead-code
4747
- name: Run js tests
@@ -139,7 +139,7 @@ jobs:
139139
- uses: ./.github/actions/setup-project
140140
- name: Create requirements.txt
141141
run: poetry export --without-hashes --format=requirements.txt > requirements.txt
142-
- uses: pypa/gh-action-pip-audit@v1.0.8
142+
- uses: pypa/gh-action-pip-audit@v1.1.0
143143
with:
144144
inputs: requirements.txt
145145
ignore-vulns: |
@@ -165,8 +165,9 @@ jobs:
165165
run: make run-flask &
166166
env:
167167
NOTIFY_ENVIRONMENT: scanning
168+
FEATURE_ABOUT_PAGE_ENABLED: true
168169
- name: Run OWASP Baseline Scan
169-
uses: zaproxy/action-baseline@v0.9.0
170+
uses: zaproxy/action-baseline@v0.14.0
170171
with:
171172
docker_name: "ghcr.io/zaproxy/zaproxy:weekly"
172173
target: "http://localhost:6012"

.github/workflows/daily_checks.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ env:
1616
FLASK_APP: application.py
1717
WERKZEUG_DEBUG_PIN: off
1818
REDIS_ENABLED: 0
19-
NODE_VERSION: 16.15.1
19+
NODE_VERSION: 22.3.0
2020

2121
jobs:
2222
dependency-audits:
@@ -26,7 +26,7 @@ jobs:
2626
- uses: ./.github/actions/setup-project
2727
- name: Create requirements.txt
2828
run: poetry export --without-hashes --format=requirements.txt > requirements.txt
29-
- uses: pypa/gh-action-pip-audit@v1.0.6
29+
- uses: pypa/gh-action-pip-audit@v1.1.0
3030
with:
3131
inputs: requirements.txt
3232
- name: Run npm audit
@@ -50,7 +50,7 @@ jobs:
5050
env:
5151
NOTIFY_ENVIRONMENT: scanning
5252
- name: Run OWASP Full Scan
53-
uses: zaproxy/action-full-scan@v0.7.0
53+
uses: zaproxy/action-full-scan@v0.12.0
5454
with:
5555
docker_name: 'ghcr.io/zaproxy/zaproxy:weekly'
5656
target: 'http://localhost:6012'

.github/workflows/deploy-demo.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,17 @@ jobs:
1616
with:
1717
fetch-depth: 2
1818

19+
# Looks like we need to install Terraform ourselves now!
20+
# https://github.com/actions/runner-images/issues/10796#issuecomment-2417064348
21+
- name: Setup Terraform
22+
uses: hashicorp/setup-terraform@v3
23+
with:
24+
terraform_version: "^1.7.5"
25+
terraform_wrapper: false
26+
1927
- name: Check for changes to Terraform
2028
id: changed-terraform-files
21-
uses: tj-actions/changed-files@v44
29+
uses: tj-actions/changed-files@v45
2230
with:
2331
files: |
2432
terraform/demo/**
@@ -93,7 +101,7 @@ jobs:
93101
94102
- name: Check for changes to egress config
95103
id: changed-egress-config
96-
uses: tj-actions/changed-files@v44
104+
uses: tj-actions/changed-files@v45
97105
with:
98106
files: |
99107
deploy-config/egress_proxy/notify-admin-demo.*.acl

.github/workflows/deploy-prod.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,17 @@ jobs:
1616
with:
1717
fetch-depth: 2
1818

19+
# Looks like we need to install Terraform ourselves now!
20+
# https://github.com/actions/runner-images/issues/10796#issuecomment-2417064348
21+
- name: Setup Terraform
22+
uses: hashicorp/setup-terraform@v3
23+
with:
24+
terraform_version: "^1.7.5"
25+
terraform_wrapper: false
26+
1927
- name: Check for changes to Terraform
2028
id: changed-terraform-files
21-
uses: tj-actions/changed-files@v44
29+
uses: tj-actions/changed-files@v45
2230
with:
2331
files: |
2432
terraform/production/**
@@ -93,7 +101,7 @@ jobs:
93101
94102
- name: Check for changes to egress config
95103
id: changed-egress-config
96-
uses: tj-actions/changed-files@v44
104+
uses: tj-actions/changed-files@v45
97105
with:
98106
files: |
99107
deploy-config/egress_proxy/notify-admin-production.*.acl

.github/workflows/deploy.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,17 @@ jobs:
2121
with:
2222
fetch-depth: 2
2323

24+
# Looks like we need to install Terraform ourselves now!
25+
# https://github.com/actions/runner-images/issues/10796#issuecomment-2417064348
26+
- name: Setup Terraform
27+
uses: hashicorp/setup-terraform@v3
28+
with:
29+
terraform_version: "^1.7.5"
30+
terraform_wrapper: false
31+
2432
- name: Check for changes to Terraform
2533
id: changed-terraform-files
26-
uses: tj-actions/changed-files@v44
34+
uses: tj-actions/changed-files@v45
2735
with:
2836
files: |
2937
terraform/staging/**
@@ -100,7 +108,7 @@ jobs:
100108
101109
- name: Check for changes to egress config
102110
id: changed-egress-config
103-
uses: tj-actions/changed-files@v44
111+
uses: tj-actions/changed-files@v45
104112
with:
105113
files: |
106114
deploy-config/egress_proxy/notify-admin-staging.*.acl

.github/workflows/drift.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,14 @@ jobs:
1515
- name: Checkout
1616
uses: actions/checkout@v4
1717

18+
# Looks like we need to install Terraform ourselves now!
19+
# https://github.com/actions/runner-images/issues/10796#issuecomment-2417064348
20+
- name: Setup Terraform
21+
uses: hashicorp/setup-terraform@v3
22+
with:
23+
terraform_version: "^1.7.5"
24+
terraform_wrapper: false
25+
1826
- name: Check for drift
1927
uses: dflook/terraform-check@v1
2028
env:
@@ -35,6 +43,14 @@ jobs:
3543
with:
3644
ref: 'production'
3745

46+
# Looks like we need to install Terraform ourselves now!
47+
# https://github.com/actions/runner-images/issues/10796#issuecomment-2417064348
48+
- name: Setup Terraform
49+
uses: hashicorp/setup-terraform@v3
50+
with:
51+
terraform_version: "^1.7.5"
52+
terraform_wrapper: false
53+
3854
- name: Check for drift
3955
uses: dflook/terraform-check@v1
4056
env:
@@ -55,6 +71,14 @@ jobs:
5571
with:
5672
ref: 'production'
5773

74+
# Looks like we need to install Terraform ourselves now!
75+
# https://github.com/actions/runner-images/issues/10796#issuecomment-2417064348
76+
- name: Setup Terraform
77+
uses: hashicorp/setup-terraform@v3
78+
with:
79+
terraform_version: "^1.7.5"
80+
terraform_wrapper: false
81+
5882
- name: Check for drift
5983
uses: dflook/terraform-check@v1
6084
env:

.github/workflows/terraform-demo.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,14 @@ jobs:
1818
- name: Checkout
1919
uses: actions/checkout@v4
2020

21+
# Looks like we need to install Terraform ourselves now!
22+
# https://github.com/actions/runner-images/issues/10796#issuecomment-2417064348
23+
- name: Setup Terraform
24+
uses: hashicorp/setup-terraform@v3
25+
with:
26+
terraform_version: "^1.7.5"
27+
terraform_wrapper: false
28+
2129
- name: Terraform format
2230
id: format
2331
run: terraform fmt -check
@@ -51,7 +59,7 @@ jobs:
5159

5260
# inspiration: https://learn.hashicorp.com/tutorials/terraform/github-actions#review-actions-workflow
5361
- name: Update PR
54-
uses: actions/github-script@v6
62+
uses: actions/github-script@v7
5563
# we would like to update the PR even when a prior step failed
5664
if: ${{ always() }}
5765
with:

0 commit comments

Comments
 (0)