Skip to content

Commit

Permalink
Merge branch 'main' into dev-support/APPEALS-59528
Browse files Browse the repository at this point in the history
  • Loading branch information
craigrva authored Oct 23, 2024
2 parents b024f43 + 1158b8e commit c519a02
Show file tree
Hide file tree
Showing 424 changed files with 75,703 additions and 550,226 deletions.
14 changes: 7 additions & 7 deletions .github/ISSUE_TEMPLATE/tech-spec.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ assignees: ''
---

# Tech Spec Title
**Drafter**: <!-- Your name -->
**Discussion Meeting**: <!-- Date to discussion the spec as a team; send calendar invite! -->
**Drafter**: <!-- Your name -->
**Discussion Meeting**: <!-- Date to discussion the spec as a team; send calendar invite! -->

<!-- Tech specs are a lightweight format for documenting technical research and decision making. The headings below are guidelines, not rules, so modify your copy as you see fit. Especially large tech specs may require more headings and subheadings for example. Be rigorous in your research and planning, but balance that with forward progress - if something is uncertain, document that appropriately and move on if you can. Getting feedback early from team mates during tech spec writing can be helpful too.
Tech specs are considered 'done' when key stakeholders have reviewed and approved the approach. -->

## Context
<!-- Why are you creating this tech spec?
<!-- Why are you creating this tech spec?
What information helps readers understand the rest of this tech spec?
What information helps readers understand the rest of this tech spec?
Who are the stakeholders? -->

Expand All @@ -31,11 +31,11 @@ Who are the stakeholders? -->
<!-- Concerns about potential solutions. Explicitly state if they should be addressed in the chosen solution. -->

## Open Questions
<!-- Sometimes we're missing information needed to fully spec work.
<!-- Sometimes we're missing information needed to fully spec work.
What is missing? Who can answer these questions, and how might it affect the recommendation? -->

## Implementation Options
<!--
<!--
Consider multiple implementation paths.
What are their recommended action items?
These may change as feedback is given, but after the tech spec is approved these should be written as fully defined/pointed github issues.
Expand Down Expand Up @@ -66,4 +66,4 @@ How will we safely ship this work? Are there migrations, external dependencies t
- [ ] Tech spec drafter: Turn tech spec into next-step actionable tickets.
- [ ] Write tickets as is necessary
- [ ] Other developers provide more formal feedback as is necessary.
- [ ] Once the tech spec is finalized, open a PR to add it to the docs/tech-specs directory following [these instructions](https://github.com/department-of-veterans-affairs/caseflow/tree/master/docs/tech-specs/README.md)
- [ ] Once the tech spec is finalized, open a PR to add it to the docs/tech-specs directory following [these instructions](https://github.com/department-of-veterans-affairs/caseflow/tree/main/docs/tech-specs/README.md)
9 changes: 7 additions & 2 deletions .github/workflows/ecr-login.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,13 @@ jobs:
- name: retrieve ecr password and store as secret
if: steps.acquire-credentials.outcome == 'success'
run: |
pip3 install -r .github/workflows/requirements.txt
python3 .github/workflows/ecr_password_updater.py
sudo apt install python3-venv
python3 -m venv .venv
source .venv/bin/activate
pip install -r .github/workflows/requirements.txt
python .github/workflows/ecr_password_updater.py
env:
AWS_ACCESS_KEY_ID: ${{ steps.acquire-credentials.outputs.aws-access-key-id }}
AWS_SECRET_ACCESS_KEY: ${{ steps.acquire-credentials.outputs.aws-secret-access-key }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: PRs to master
on:
name: PRs to main
on:
pull_request:
branches: [master]
branches: [main]
types: [closed]
jobs:
merge-master-back-to-dev:
Expand All @@ -14,10 +14,10 @@ jobs:
run: |
git config --local user.email "jeremy.shields@va.gov"
git config --local user.name "Jeremy Shields"
- name: Merge master back to dev
- name: Merge main back to dev
run: |
git fetch --unshallow
git checkout development
git pull
git merge -Xtheirs --no-ff master -m "Auto-merge master back to dev"
git merge -Xtheirs --no-ff main -m "Auto-merge main back to dev"
git push
4 changes: 2 additions & 2 deletions .github/workflows/make-docs.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
name: Make-docs-to-webpage

# Trigger whenever changes are made to the master branch
# Trigger whenever changes are made to the main branch
on:
push:
branches:
- master
- main

jobs:
make_docs:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
awscli==1.35.2
pynacl==1.4.0
requests==2.25.1
boto3==1.17.107
boto3==1.35.36
18 changes: 18 additions & 0 deletions .reek.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ detectors:
exclude:
- Address
- Api::V3::DecisionReviews::ContestableIssueFinder#initialize
- ExternalApi::WebexService::RecordingsListResponse::Recording#initialize
DataClump:
exclude:
- ForeignKeyPolymorphicAssociationJob
Expand Down Expand Up @@ -135,6 +136,11 @@ detectors:
- ExternalApi::PexipService#send_pexip_request
- ControllerSchema#remove_unknown_keys
- BusinessLineReporter#as_csv
- Hearings::DownloadTranscriptionFileJob#build_error_explanation
- Hearings::RefreshWebexAccessTokenJob#perform
- TranscriptionFile#update_status!
- ExternalApi::WebexService#create_conference
- TranscriptionTransformer
InstanceVariableAssumption:
exclude:
- Appeal
Expand All @@ -143,6 +149,7 @@ detectors:
- Api::V3::DecisionReviews::HigherLevelReviewIntakeProcessor
- ETL::Syncer
- User
- Hearings::DownloadTranscriptionFileJob
IrresponsibleModule:
enabled: false
LongParameterList:
Expand All @@ -163,6 +170,8 @@ detectors:
- LegacyDocket#distribute_priority_appeals
- LegacyDocket#distribute_nonpriority_appeals
- ExternalApi::MPIService#search_people_info
- Hearings::FetchWebexRecordingsDetailsJob#send_file
- ExternalApi::WebexService#initialize
ManualDispatch:
exclude:
- Api::V3::DecisionReviews::IntakeError#potential_error_code
Expand All @@ -180,6 +189,7 @@ detectors:
max_allowed_nesting: 2
exclude:
- AsyncableJobsReporter
- TranscriptionTransformer#create_transcription_pages
NilCheck:
enabled: false
RepeatedConditional:
Expand All @@ -199,6 +209,8 @@ detectors:
- Veteran
- LegacyDocket
- Test::UsersController
- Fakes::WebexService
- Hearings::DownloadTranscriptionFileJob
TooManyConstants:
exclude:
- Fakes::BGSServicePOA
Expand All @@ -216,6 +228,8 @@ detectors:
- Api::V3::DecisionReviews::IntakeError
- ControllerSchema::Field
- HearingEmailStatusMailer
- ExternalApi::WebexService
- TranscriptionFileIssuesMailer
TooManyMethods:
enabled: false
TooManyStatements:
Expand Down Expand Up @@ -255,10 +269,14 @@ detectors:
- UpdatePOAConcern
- VBMSCaseflowLogger#log
- LegacyDocket
- ExternalApi::PexipService#not_found_response
- WebexConcern
UnusedParameters:
exclude:
- Docket#distribute_appeals
- HearingRequestDocket#distribute_appeals
- Fakes::WebexService#fetch_recording_details
- Fakes::WebexService#fetch_room_details


### Directory specific configuration
Expand Down
1 change: 1 addition & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@
"files.insertFinalNewline": true,
"files.trimTrailingWhitespace": true,
"git.autofetch": true,
"makefile.configureOnOpen": false,
}
2 changes: 1 addition & 1 deletion Dangerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ if git.modified_files.grep(/app\/services\//).any?
)
end

# Don't let testing shortcuts get into master by accident
# Don't let testing shortcuts get into main by accident
if `git diff #{github.base_commit} spec/ | grep -E '(:focus => true)|(focus: true)'`.length > 1
fail("focus: true is left in test")
end
Expand Down
7 changes: 5 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ gem "pdfjs_viewer-rails", git: "https://github.com/senny/pdfjs_viewer-rails.git"
# Used to build out PDF files on the backend
# https://github.com/pdfkit/pdfkit
gem "pdfkit"
gem "pg", platforms: :ruby
gem "pg", "~> 1.5.7", platforms: :ruby
# Application server: Puma
# Puma was chosen because it handles load of 40+ concurrent users better than Unicorn and Passenger
# Discussion: https://github.com/18F/college-choice/issues/597#issuecomment-139034834
Expand All @@ -74,6 +74,7 @@ gem "rack", "~> 2.2.6.2"
gem "rails", "6.1.7.7"
# Used to colorize output for rake tasks
gem "rainbow"
gem "rcredstash", "~> 1.1.0"
# React
gem "react_on_rails", "11.3.0"
gem "redis-mutex"
Expand All @@ -83,6 +84,7 @@ gem "request_store"
gem "roo", "~> 2.7"
gem "rswag-api"
gem "rswag-ui"
gem "rtf"
gem "ruby_claim_evidence_api", git: "https://github.com/department-of-veterans-affairs/ruby_claim_evidence_api.git", ref: "fed623802afe7303f4b8b5fe27cff0e903699873"
# Use SCSS for stylesheets
gem "sass-rails", "~> 5.0"
Expand All @@ -99,12 +101,13 @@ gem "tzinfo", "~> 2.0"
# Use Uglifier as compressor for JavaScript assets
gem "uglifier", ">= 1.3.0"
gem "validates_email_format_of"
gem "webvtt-ruby"
gem "ziptz"

group :production, :staging, :ssh_forwarding, :development, :test do
# Oracle DB
gem "activerecord-oracle_enhanced-adapter", "~> 6.1.0"
gem "ruby-oci8", "~> 2.2"
gem "ruby-oci8", "~> 2.2.14"
end

group :test, :development, :demo, :make_docs do
Expand Down
23 changes: 16 additions & 7 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1500,7 +1500,7 @@ GEM
crack (0.4.3)
safe_yaml (~> 1.0.0)
crass (1.0.6)
d3-rails (7.0.0)
d3-rails (7.8.5)
railties (>= 3.1)
danger (6.2.2)
claide (~> 1.0)
Expand Down Expand Up @@ -1651,8 +1651,8 @@ GEM
immigrant (0.3.6)
activerecord (>= 3.0)
jaro_winkler (1.5.6)
jmespath (1.3.1)
jquery-rails (4.5.1)
jmespath (1.6.2)
jquery-rails (4.6.0)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
Expand Down Expand Up @@ -1839,7 +1839,7 @@ GEM
cliver (~> 0.3.2)
safe_shell (>= 1.0.3, < 2.0)
pdfkit (0.8.7.2)
pg (1.1.4)
pg (1.5.7)
pluck_to_hash (1.0.2)
activerecord (>= 4.0.2)
activesupport (>= 4.0.2)
Expand Down Expand Up @@ -1898,6 +1898,10 @@ GEM
ffi (~> 1.0)
rb-readline (0.5.5)
rchardet (1.8.0)
rcredstash (1.1.0)
aws-sdk-dynamodb
aws-sdk-kms
thor
react_on_rails (11.3.0)
addressable
connection_pool
Expand Down Expand Up @@ -1974,6 +1978,7 @@ GEM
rswag-ui (2.13.0)
actionpack (>= 3.1, < 7.2)
railties (>= 3.1, < 7.2)
rtf (0.3.3)
rubocop (0.83.0)
parallel (~> 1.10)
parser (>= 2.7.0.1)
Expand All @@ -1990,7 +1995,7 @@ GEM
ruby-debug-ide (0.7.3)
rake (>= 0.8.1)
ruby-graphviz (1.2.4)
ruby-oci8 (2.2.7)
ruby-oci8 (2.2.14)
ruby-plsql (0.8.0)
ruby-prof (1.4.1)
ruby-progressbar (1.13.0)
Expand Down Expand Up @@ -2111,6 +2116,7 @@ GEM
websocket-driver (0.7.6)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
webvtt-ruby (0.4.0)
xmldsig (0.3.2)
nokogiri
xmlenc (0.8.0)
Expand Down Expand Up @@ -2201,7 +2207,7 @@ DEPENDENCIES
pdf-forms
pdfjs_viewer-rails!
pdfkit
pg
pg (~> 1.5.7)
pluck_to_hash
pry (~> 0.13.0)
pry-byebug (~> 3.9)
Expand All @@ -2211,6 +2217,7 @@ DEPENDENCIES
rails-erd
rainbow
rb-readline
rcredstash (~> 1.1.0)
react_on_rails (= 11.3.0)
redis-mutex
redis-namespace (~> 1.11.0)
Expand All @@ -2225,11 +2232,12 @@ DEPENDENCIES
rswag-api
rswag-specs
rswag-ui
rtf
rubocop (= 0.83)
rubocop-performance
rubocop-rails
ruby-debug-ide
ruby-oci8 (~> 2.2)
ruby-oci8 (~> 2.2.14)
ruby-prof (~> 1.4)
ruby_claim_evidence_api!
sass-rails (~> 5.0)
Expand All @@ -2254,6 +2262,7 @@ DEPENDENCIES
validates_email_format_of
webdrivers
webmock
webvtt-ruby
ziptz

BUNDLED WITH
Expand Down
8 changes: 4 additions & 4 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ def APP_VERSION = env.APP_VERSION ?: 'HEAD';

def DEPLOY_MESSAGE = null

// Allows appeals-deployment branch (defaults to master) to be overridden for
// Allows appeals-deployment branch (defaults to main) to be overridden for
// testing purposes
def DEPLOY_BRANCH = (env.DEPLOY_BRANCH != null) ? env.DEPLOY_BRANCH : 'master'
def DEPLOY_BRANCH = (env.DEPLOY_BRANCH != null) ? env.DEPLOY_BRANCH : 'main'

/************************ Common Pipeline boilerplate ************************/

Expand Down Expand Up @@ -43,7 +43,7 @@ node('deploy') {
checkout scm
DEPLOY_MESSAGE = sh (
// this script will:
// get the latest `deployed` release created by: https://github.com/department-of-veterans-affairs/appeals-deployment/blob/master/ansible/utility-roles/deployed-version/files/tag_deployed_commit.py
// get the latest `deployed` release created by: https://github.com/department-of-veterans-affairs/appeals-deployment/blob/main/ansible/utility-roles/deployed-version/files/tag_deployed_commit.py
// compare current HEAD commit to the last deployed release
// save the message to be announced in Slack by the pipeline
script: "git log \$(git ls-remote --tags https://${env.GIT_CREDENTIAL}@github.com/department-of-veterans-affairs/caseflow.git \
Expand Down Expand Up @@ -79,4 +79,4 @@ if (env.COMMON_PIPELINE_TASK == 'bake') {
commonPipeline.build(APP_NAME, APP_VERSION, DEPLOY_MESSAGE);
} else if (env.COMMON_PIPELINE_TASK == 'deploy'){
commonPipeline.deploy(APP_NAME, APP_VERSION, DEPLOY_MESSAGE);
}
}
6 changes: 3 additions & 3 deletions MAC_M1.md
Original file line number Diff line number Diff line change
Expand Up @@ -187,10 +187,10 @@ Running Caseflow
2. that you are using arm64 brew by doing `which brew` and ensuring the output is `/opt/homebrew/bin/brew`
3. Open caseflow in VSCode (optional), or navigate to the caseflow directory in your terminal and:
1. `brew install yarn`
4. Ensure you are on master branch and up to date by running
1. ```git checkout master```
4. Ensure you are on main branch and up to date by running
1. ```git checkout main```
2. ```git fetch```
3. ```git pull origin master```
3. ```git pull origin main```
5. Start Vacols UTM VM (if not already running)
6. run `make up-m1` to create the docker containers and volumes
7. run `make reset` to (re)create and seed the database; this takes a while (~45 minutes)
Expand Down
Loading

0 comments on commit c519a02

Please sign in to comment.