Skip to content

Commit cc5d241

Browse files
committed
Merge remote-tracking branch 'upstream/main'
2 parents 642775f + f19b4eb commit cc5d241

File tree

117 files changed

+3524
-1804
lines changed

Some content is hidden

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

117 files changed

+3524
-1804
lines changed

.github/ISSUE_TEMPLATE/pw-clp-request.md

+9
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,15 @@ Help desk ticket: <insert_help_desk_link>
2525
- [ ] Name of submitter (if applicable)
2626
Submitter: <insert_name>
2727

28+
- Campaign title:
29+
- Who the editor(s) will be for the Campaign Landing Page and any appropriate stakeholders for awareness:
30+
- The goals/outcomes you are looking to achieve with the campaign:
31+
- Outcome success measurement & how it will be measured (note: "Page views" is not a generally accepted success measurement):
32+
- Target Audience(s):
33+
- Campaign start/end dates:
34+
- Is this a seasonal campaign?
35+
- If not: when campaign ends, should campaign page be archived or redirected?
36+
- If redirected, where should it redirect?
2837

2938
## Acceptance criteria
3039

.github/ISSUE_TEMPLATE/taxonomy-update-term.yml

+5
Original file line numberDiff line numberDiff line change
@@ -75,5 +75,10 @@ body:
7575
- [ ] Content is reviewed by relevant stakeholders
7676
- [ ] (List any necessary review and approval steps here)
7777
- [ ] Term is published
78+
If term is part of VA Service Taxonomy & the term name changes:
79+
- [ ] Bulk resave system services to pick up name change (filtered for the old name)
80+
- [ ] Bulk Update alias for all system services (filtered for new name)
81+
- [ ] Bulk update facility services (filtered for the old name)
82+
- [ ] Bulk update alias for all facility services (filtered for new name)
7883
validations:
7984
required: true

.github/workflows/actions-metrics.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
timeout-minutes: 10
1212
steps:
1313
- name: Send GitHub Actions metrics to DataDog
14-
uses: int128/datadog-actions-metrics@6c6a657047c0452b33ec3c254009c331e47c1370 # v1.64.0
14+
uses: int128/datadog-actions-metrics@56be1c4bf92adece9d10f7fef4ba48bccf8e8c81 # v1.77.0
1515
with:
1616
datadog-api-key: ${{ secrets.DATADOG_API_KEY }}
1717
collect-job-metrics: true

.github/workflows/continuous_integration.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
uses: ./.github/actions/post-checkout
4747
- name: ReviewDog
4848
# See also `composer va:test:eslint` in composer.json
49-
uses: reviewdog/action-eslint@279acb08336462ec76183a2d9ef1dd43e4c6b391 # v1.21.0
49+
uses: reviewdog/action-eslint@5deb8e2c1d8a9bbefff4d80d6702c41c5b3729cb # v1.22.0
5050
with:
5151
reporter: github-pr-review
5252
eslint_flags: '--max-warnings 0 -c .eslintrc.json --no-eslintrc docroot/modules/custom/**/*.es6.js docroot/themes/custom/**/*.es6.js tests/cypress/**/*.js'

.github/workflows/cypress.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
NODE_TLS_REJECT_UNAUTHORIZED: 0
4848

4949
- name: Cypress run
50-
uses: cypress-io/github-action@ebe8b24c4428922d0f793a5c4c96853a633180e3 # v6.6.0
50+
uses: cypress-io/github-action@1b70233146622b69e789ccdd4f9452adc638d25a # v6.6.1
5151
with:
5252
wait-on: "${{ inputs.preview_url }}"
5353
command: 'npm run test:cypress:parallel'

.github/workflows/tugboat-pr-closed.yml

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ jobs:
1212
name: Delete Tugboat Preview
1313
steps:
1414
- name: Dispatch Tugboat Preview Deletion
15-
continue-on-error: true
1615
uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1
1716
with:
1817
script: |

.github/workflows/tugboat-pr-opened.yml

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ jobs:
1313
name: Create Tugboat Preview
1414
steps:
1515
- name: Dispatch Tugboat Preview Creation
16-
continue-on-error: true
1716
uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1
1817
with:
1918
script: |

.github/workflows/tugboat-pr-updated.yml

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ jobs:
1212
name: Rebuild Tugboat Preview
1313
steps:
1414
- name: Dispatch Tugboat Preview Rebuild
15-
continue-on-error: true
1615
uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1
1716
with:
1817
script: |

.tugboat/config.yml

+1
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,7 @@ services:
206206

207207
# Create symlink between vets-website assets and next-build
208208
# - ln -snf "${DOCROOT}/vendor/va-gov/vets-website/build/localhost/generated" "${TUGBOAT_ROOT}/next/public/generated"
209+
- mkdir -p "${TUGBOAT_ROOT}/next/public"
209210
- ln -snf "${TUGBOAT_ROOT}/vets-website/build/localhost/generated" "${TUGBOAT_ROOT}/next/public/generated"
210211

211212

.tugboat/vhost-next.conf

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
# Ignore redirecting error doc directory
3030
ProxyPass /.next/ !
3131
# Redirect requests to the running node server from next-build
32-
ProxyPass / http://localhost:3000/
33-
ProxyPassReverse / http://localhost:3000/
32+
ProxyPass / http://localhost:3999/
33+
ProxyPassReverse / http://localhost:3999/
3434

3535
# Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
3636
# error, crit, alert, emerg.

READMES/devops/aws-assets.md

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# AWS Assets
2+
3+
This is a list of some generic AWS assets that are not directly traceable to this team, i.e. they are not managed in Terraform or other IaC. The purpose of this document is to clarify ownership and collect relevant information so that these assets are more discoverable and their _raison d'être_ more transparent.
4+
5+
## IAM Users (Service Accounts)
6+
7+
The following were added in #5611 to work with certain S3 buckets; these are intended to allow transfer of files from CMS file stores to an S3 bucket designated for public access to those files. These systems are not fully in place yet, but are in progress.
8+
9+
- `svc-dsva-vagov-cms-dev-assets`
10+
- `svc-dsva-vagov-prod-cms-files`
11+
- `svc-dsva-vagov-prod-cms-test-files`
12+
- `svc-dsva-vagov-staging-cms-files`
13+
- `svc-dsva-vagov-staging-cms-test-files`
14+
15+
The following account may be necessary for GitHub Actions workflows (currently under the purview of Accelerated Publishing) to interact with AWS resources.
16+
17+
- `svc-gh-vagov-ap-user`
18+

READMES/devops/tugboat.md

+20
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,23 @@ Can only update CPU and memory at a project level, not repository level.
3333
1. `tugboat ls 5fd3b8ee7b465711575722d5 -j | grep memory` # Get current limit
3434
1. `tugboat update 5fd3b8ee7b465711575722d5 memory=16384` # Set limit to 16GB
3535
1. `tugboat ls 5fd3b8ee7b465711575722d5 -j | grep memory` # Verify new limit
36+
37+
## Tugboat Crisis Intervention
38+
39+
### Overload
40+
41+
**Symptoms**: Tugboat is slow, requests to Tugboat dashboard return 502/504 status codes, previews disappear and reappear, etc.
42+
43+
**Diagnosis**: Tugboat might be overloaded; too many previews might be running simultaneously.
44+
45+
**Verification**:
46+
47+
1. Log into the Tugboat server (`ssm-session utility tugboat auto`).
48+
2. Check system load and free memory (e.g. `top`).
49+
3. If load is incredibly high, and available memory is very low, then the Tugboat server might be dealing with too many open previews.
50+
51+
**Remediation**:
52+
53+
1. Close unused previews in the CMS/Pull Requests project. Target older previews and those corresponding to closed/merged PRs; these should be closed automatically, but there may be issues somewhere in the system that impair communication and cause these to remain open.
54+
2. Suspend older previews. This normally happens automatically (for Pull Request-based previews that haven't been touched in some period of time), but a flurry of previews might have been created inadvertently.
55+
3. Consider upscaling the Tugboat server or migrating to an alternative architecture.

0 commit comments

Comments
 (0)