Skip to content

Commit

Permalink
Resolves merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
@stiehlrod
stiehlrod committed Jan 8, 2025
2 parents 0e97100 + da84163 commit 08496a0
Show file tree
Hide file tree
Showing 277 changed files with 3,505 additions and 6,362 deletions.
5 changes: 0 additions & 5 deletions .github/CODEOWNERS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -833,7 +833,6 @@ docs/setup/running_docker.md @department-of-veterans-affairs/backend-review-grou
docs/setup/running_natively.md @department-of-veterans-affairs/backend-review-group @department-of-veterans-affairs/va-api-engineers
docs/setup/setup_with_binstubs.md @department-of-veterans-affairs/backend-review-group @department-of-veterans-affairs/va-api-engineers
docs/setup/codespaces.md @department-of-veterans-affairs/backend-review-group @department-of-veterans-affairs/cto-engineers
docs/setup/va_forms.md @department-of-veterans-affairs/platform-va-product-forms @department-of-veterans-affairs/backend-review-group @department-of-veterans-affairs/va-api-engineers
docs/setup/virtual_machine_access.md @department-of-veterans-affairs/backend-review-group @department-of-veterans-affairs/va-api-engineers
.github @department-of-veterans-affairs/backend-review-group
lib @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
Expand Down Expand Up @@ -1060,7 +1059,6 @@ modules/my_health/spec/request/v1/prescriptions_request_spec.rb @department-of-v
modules/representation_management @department-of-veterans-affairs/backend-review-group @department-of-veterans-affairs/accredited-representation-management
modules/simple_forms_api @department-of-veterans-affairs/platform-va-product-forms @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
modules/test_user_dashboard @department-of-veterans-affairs/qa-standards @department-of-veterans-affairs/backend-review-group
modules/va_forms @department-of-veterans-affairs/lighthouse-banana-peels @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
modules/va_notify @department-of-veterans-affairs/va-notify-write @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
modules/vaos @department-of-veterans-affairs/vfs-vaos @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
modules/vaos/app/services/vaos/v2 @department-of-veterans-affairs/vfs-vaos @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
Expand Down Expand Up @@ -1944,7 +1942,6 @@ spec/support/schemas_camelized/all_triage_teams.json @department-of-veterans-aff
spec/support/schemas_camelized/user_loa1.json @department-of-veterans-affairs/octo-identity
spec/support/schemas_camelized/user_loa3.json @department-of-veterans-affairs/octo-identity
spec/support/schemas_camelized/user_preferences.json @department-of-veterans-affairs/octo-identity
spec/support/schemas_camelized/va_forms @department-of-veterans-affairs/platform-va-product-forms @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
spec/support/schemas_camelized/vaos @department-of-veterans-affairs/vfs-vaos @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
spec/support/schemas_camelized/va_profile @department-of-veterans-affairs/vfs-authenticated-experience-backend @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
spec/support/schemas_camelized/veteran_verification @department-of-veterans-affairs/vfs-authenticated-experience-backend @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
Expand Down Expand Up @@ -2023,7 +2020,6 @@ spec/support/schemas/all_triage_teams.json @department-of-veterans-affairs/vfs-m
spec/support/schemas/upload_supporting_evidence.json @department-of-veterans-affairs/Disability-Experience @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
spec/support/schemas/user_loa1.json @department-of-veterans-affairs/octo-identity
spec/support/schemas/user_loa3.json @department-of-veterans-affairs/octo-identity
spec/support/schemas/va_forms @department-of-veterans-affairs/platform-va-product-forms @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
spec/support/schemas/vaos @department-of-veterans-affairs/vfs-vaos @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
spec/support/schemas/va_profile @department-of-veterans-affairs/vfs-authenticated-experience-backend @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
spec/support/schemas/veteran_verification @department-of-veterans-affairs/vfs-authenticated-experience-backend @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
Expand Down Expand Up @@ -2140,7 +2136,6 @@ spec/support/vcr_cassettes/token_validation @department-of-veterans-affairs/ligh
spec/support/vcr_cassettes/travel_pay @department-of-veterans-affairs/travel-pay-integration @department-of-veterans-affairs/backend-review-group
spec/support/vcr_cassettes/uploads/validate_document.yml @department-of-veterans-affairs/pension-and-burials @department-of-veterans-affairs/backend-review-group
spec/spupport/vcr_cassettes/user/get_facilities_empty.yml @department-of-veterans-affairs/vfs-facilities-frontend @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
spec/support/vcr_cassettes/va_forms @department-of-veterans-affairs/platform-va-product-forms @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
spec/support/vcr_cassettes/va_notify @department-of-veterans-affairs/va-notify-write @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
spec/support/vcr_cassettes/vaos @department-of-veterans-affairs/vfs-vaos @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
spec/support/vcr_cassettes/va_profile @department-of-veterans-affairs/vfs-authenticated-experience-backend @department-of-veterans-affairs/va-api-engineers @department-of-veterans-affairs/backend-review-group
Expand Down
5 changes: 2 additions & 3 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ path 'modules' do
gem 'simple_forms_api'
gem 'test_user_dashboard'
gem 'travel_pay'
gem 'va_forms'
gem 'va_notify'
gem 'vaos'
gem 'vba_documents'
Expand Down Expand Up @@ -64,9 +63,9 @@ gem 'combine_pdf'
gem 'config'
gem 'connect_vbms', git: 'https://github.com/adhocteam/connect_vbms', tag: 'v2.1.1', require: 'vbms'
gem 'csv'
gem 'datadog'
gem 'date_validator'
gem 'ddtrace'
gem 'dogstatsd-ruby', '5.6.3'
gem 'dogstatsd-ruby'
gem 'dry-struct'
gem 'dry-types'
gem 'ethon', '>=0.13.0'
Expand Down
117 changes: 57 additions & 60 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,10 +125,6 @@ PATH
test_user_dashboard (0.1.0)
rails
travel_pay (0.1.0)
va_forms (0.0.1)
faraday
nokogiri
sidekiq
va_notify (0.1.0)
vaos (0.1.0)
sidekiq
Expand All @@ -154,7 +150,7 @@ GEM
GEM
remote: https://rubygems.org/
specs:
Ascii85 (1.1.0)
Ascii85 (2.0.1)
aasm (5.5.0)
concurrent-ruby (~> 1.0)
actioncable (7.2.2.1)
Expand Down Expand Up @@ -210,7 +206,7 @@ GEM
activemodel (= 7.2.2.1)
activesupport (= 7.2.2.1)
timeout (>= 0.4.0)
activerecord-import (1.8.1)
activerecord-import (2.0.0)
activerecord (>= 4.2)
activerecord-postgis-adapter (10.0.1)
activerecord (~> 7.2.0)
Expand Down Expand Up @@ -241,21 +237,22 @@ GEM
base64
gyoku (>= 0.4.0)
nokogiri
argon2-kdf (0.2.0)
argon2-kdf (0.3.0)
fiddle
ast (2.4.2)
attr_extras (7.1.0)
awesome_print (1.9.2)
aws-eventstream (1.3.0)
aws-partitions (1.1022.0)
aws-sdk-core (3.214.0)
aws-partitions (1.1031.0)
aws-sdk-core (3.214.1)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.992.0)
aws-sigv4 (~> 1.9)
jmespath (~> 1, >= 1.6.1)
aws-sdk-kms (1.96.0)
aws-sdk-core (~> 3, >= 3.210.0)
aws-sigv4 (~> 1.5)
aws-sdk-s3 (1.176.1)
aws-sdk-s3 (1.177.0)
aws-sdk-core (~> 3, >= 3.210.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.5)
Expand Down Expand Up @@ -329,7 +326,7 @@ GEM
config (5.5.2)
deep_merge (~> 1.2, >= 1.2.1)
ostruct
connection_pool (2.4.1)
connection_pool (2.5.0)
content_disposition (1.0.0)
cork (0.3.0)
colored2 (~> 3.1)
Expand Down Expand Up @@ -360,21 +357,18 @@ GEM
activerecord (>= 5.a)
database_cleaner-core (~> 2.0.0)
database_cleaner-core (2.0.1)
datadog-ci (0.8.3)
datadog (2.8.0)
datadog-ruby_core_source (~> 3.3)
libdatadog (~> 14.3.1.1.0)
libddwaf (~> 1.18.0.0.0)
msgpack
datadog-ruby_core_source (3.3.7)
date (3.4.1)
date (3.4.1-java)
date_time_precision (0.8.1)
date_validator (0.12.0)
activemodel (>= 3)
activesupport (>= 3)
ddtrace (1.23.2)
datadog-ci (~> 0.8.1)
debase-ruby_core_source (= 3.3.1)
libdatadog (~> 7.0.0.1.0)
libddwaf (~> 1.14.0.0.0)
msgpack
debase-ruby_core_source (3.3.1)
debug (1.10.0)
irb (~> 1.10)
reline (>= 0.3.8)
Expand All @@ -384,22 +378,24 @@ GEM
thread_safe (~> 0.3, >= 0.3.1)
diff-lcs (1.5.1)
docile (1.4.0)
dogstatsd-ruby (5.6.3)
dogstatsd-ruby (5.6.4)
domain_name (0.6.20240107)
down (5.4.2)
addressable (~> 2.8)
drb (2.2.1)
dry-configurable (1.1.0)
dry-core (~> 1.0, < 2)
zeitwerk (~> 2.6)
dry-core (1.0.1)
dry-core (1.1.0)
concurrent-ruby (~> 1.0)
logger
zeitwerk (~> 2.6)
dry-inflector (1.0.0)
dry-inflector (1.2.0)
dry-initializer (3.1.1)
dry-logic (1.5.0)
dry-logic (1.6.0)
bigdecimal
concurrent-ruby (~> 1.0)
dry-core (~> 1.0, < 2)
dry-core (~> 1.1)
zeitwerk (~> 2.6)
dry-schema (1.13.4)
concurrent-ruby (~> 1.0)
Expand All @@ -409,12 +405,12 @@ GEM
dry-logic (>= 1.4, < 2)
dry-types (>= 1.7, < 2)
zeitwerk (~> 2.6)
dry-struct (1.6.0)
dry-core (~> 1.0, < 2)
dry-types (>= 1.7, < 2)
dry-struct (1.7.0)
dry-core (~> 1.1)
dry-types (~> 1.8)
ice_nine (~> 0.11)
zeitwerk (~> 2.6)
dry-types (1.7.2)
dry-types (1.8.0)
bigdecimal (~> 3.0)
concurrent-ruby (~> 1.0)
dry-core (~> 1.0)
Expand Down Expand Up @@ -449,8 +445,8 @@ GEM
faraday (>= 0.8)
faraday-httpclient (2.0.1)
httpclient (>= 2.2)
faraday-multipart (1.0.4)
multipart-post (~> 2)
faraday-multipart (1.1.0)
multipart-post (~> 2.0)
faraday-net_http (3.1.1)
net-http
faraday-retry (2.2.1)
Expand Down Expand Up @@ -481,6 +477,7 @@ GEM
date_time_precision (>= 0.8)
mime-types (>= 3.0)
nokogiri (>= 1.11.4)
fiddle (1.1.6)
fitbit_api (1.0.0)
oauth2 (~> 2.0)
flipper (1.3.2)
Expand Down Expand Up @@ -535,13 +532,8 @@ GEM
google-cloud-env (2.2.1)
faraday (>= 1.0, < 3.a)
google-logging-utils (0.1.0)
google-protobuf (4.28.3)
bigdecimal
rake (>= 13)
google-protobuf (4.28.3-java)
google-protobuf (4.29.2)
bigdecimal
ffi (~> 1)
ffi-compiler (~> 1)
rake (>= 13)
googleauth (1.12.2)
faraday (>= 1.0, < 3.a)
Expand Down Expand Up @@ -576,7 +568,7 @@ GEM
hashdiff (1.1.1)
hashery (2.1.2)
hashie (5.0.0)
hexapdf (1.0.0)
hexapdf (1.0.3)
cmdparse (~> 3.0, >= 3.0.3)
geom2d (~> 0.4, >= 0.4.1)
openssl (>= 2.2.1)
Expand Down Expand Up @@ -610,11 +602,12 @@ GEM
iso_country_codes (0.7.8)
jar-dependencies (0.5.1)
jmespath (1.6.2)
jruby-openssl (0.15.1-java)
jruby-openssl (0.15.2-java)
json (2.9.1)
json (2.9.1-java)
json-schema (5.1.0)
json-schema (5.1.1)
addressable (~> 2.8)
bigdecimal (~> 3.1)
json_schema (0.21.0)
json_schemer (2.3.0)
bigdecimal
Expand All @@ -625,7 +618,7 @@ GEM
jsonapi-serializer (2.2.0)
activesupport (>= 4.2)
jwe (0.4.0)
jwt (2.9.3)
jwt (2.10.1)
base64
kms_encrypted (1.6.0)
activesupport (>= 6.1)
Expand All @@ -634,18 +627,20 @@ GEM
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
language_server-protocol (3.17.0.3)
libdatadog (7.0.0.1.0)
libdatadog (7.0.0.1.0-aarch64-linux)
libdatadog (7.0.0.1.0-x86_64-linux)
libddwaf (1.14.0.0.0)
libdatadog (14.3.1.1.0)
libdatadog (14.3.1.1.0-aarch64-linux)
libdatadog (14.3.1.1.0-x86_64-linux)
libddwaf (1.18.0.0.0)
ffi (~> 1.0)
libddwaf (1.14.0.0.0-aarch64-linux)
libddwaf (1.18.0.0.0-aarch64-linux)
ffi (~> 1.0)
libddwaf (1.14.0.0.0-java)
libddwaf (1.18.0.0.0-java)
ffi (~> 1.0)
libddwaf (1.14.0.0.0-x86_64-linux)
libddwaf (1.18.0.0.0-x86_64-linux)
ffi (~> 1.0)
liquid (5.5.1)
liquid (5.6.0)
bigdecimal
strscan
listen (3.8.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
Expand Down Expand Up @@ -679,8 +674,8 @@ GEM
minitest (5.25.4)
mock_redis (0.49.0)
redis (~> 5)
msgpack (1.7.2)
msgpack (1.7.2-java)
msgpack (1.7.5)
msgpack (1.7.5-java)
multi_json (1.15.0)
multi_xml (0.6.0)
multipart-post (2.4.1)
Expand Down Expand Up @@ -731,7 +726,7 @@ GEM
octokit (9.2.0)
faraday (>= 1, < 3)
sawyer (~> 0.9)
oj (3.16.7)
oj (3.16.9)
bigdecimal (>= 3.0)
ostruct (>= 0.2)
okcomputer (1.18.5)
Expand All @@ -740,14 +735,15 @@ GEM
rails (>= 4.0)
open4 (1.3.4)
openapi_parser (2.1.0)
openssl (3.2.0)
openssl (3.2.0-java)
openssl (3.3.0)
openssl (3.3.0-java)
jruby-openssl (~> 0.14)
operating_hours (0.1.0)
optimist (3.2.0)
os (1.1.4)
ostruct (0.6.1)
ox (2.14.18)
ox (2.14.19)
bigdecimal (>= 3.0)
parallel (1.26.3)
parallel_tests (4.7.2)
parallel
Expand All @@ -763,8 +759,8 @@ GEM
safe_shell (>= 1.0.3, < 2.0)
pdf-inspector (1.3.0)
pdf-reader (>= 1.0, < 3.0.a)
pdf-reader (2.12.0)
Ascii85 (~> 1.0)
pdf-reader (2.13.0)
Ascii85 (>= 1.0, < 3.0, != 2.0.0)
afm (~> 0.2.1)
hashery (~> 2.0)
ruby-rc4
Expand All @@ -780,7 +776,7 @@ GEM
matrix (~> 0.4)
pdf-core (~> 0.10.0)
ttfunk (~> 1.8)
prawn-markup (1.0.0)
prawn-markup (1.0.1)
nokogiri
prawn
prawn-table
Expand Down Expand Up @@ -1060,6 +1056,8 @@ GEM
stringio (3.1.2)
strong_migrations (2.1.0)
activerecord (>= 6.1)
strscan (3.1.2)
strscan (3.1.2-java)
super_diff (0.14.0)
attr_extras (>= 6.2.4)
diff-lcs
Expand Down Expand Up @@ -1186,13 +1184,13 @@ DEPENDENCIES
csv
danger
database_cleaner
datadog
date_validator
ddtrace
debts_api!
debug
decision_reviews!
dhp_connected_devices!
dogstatsd-ruby (= 5.6.3)
dogstatsd-ruby
dry-struct
dry-types
ethon (>= 0.13.0)
Expand Down Expand Up @@ -1338,7 +1336,6 @@ DEPENDENCIES
travel_pay!
tzinfo-data
utf8-cleaner
va_forms!
va_notify!
vaos!
vba_documents!
Expand Down
2 changes: 1 addition & 1 deletion Rakefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.

require 'rake'
require 'ddtrace'
require 'datadog'
require_relative 'config/application'

Datadog.configure do |c|
Expand Down
Loading

0 comments on commit 08496a0

Please sign in to comment.