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.

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

Merge master into k8s again #16394

Closed
wants to merge 8 commits into from
Closed

Merge master into k8s again #16394

wants to merge 8 commits into from

Conversation

ericboehs
Copy link
Contributor

Thrillberg and others added 7 commits April 17, 2024 13:38
* Refactor uploads spec, simple forms

* rubocop
* Revert to original token URL in service

* Add authorized ping mock, too

* Handle Bearer Token parsing failures gracefully

* Clean up services config

* Revert some accidental deletions

* Final bit of cleanup

* Switch to correct file path

* Move authorize method to a before_action

* Update mockdata paths

* Fix some linting errors
* Add template_type method to VANotifyEmailJob

* Update direct deposit email job to accept a default parameter of nil for the direct deposit type.
* Add method to request a token from STS

* fix rubocop

* Fix tests

* Remove debugging line

* change parameter to reflect actual value

* Merge conflict fix

* remove diff file from merge conflict
Copy link

github-actions bot commented Apr 17, 2024

1 Error
🚫 This PR changes 1145 LoC (not counting whitespace/newlines).

In order to ensure each PR receives the proper attention it deserves, those exceeding
500 will not be reviewed, nor will they be allowed to merge. Please break this PR up into
smaller ones.

If you have reason to believe that this PR should be granted an exception, please see the
Submitting pull requests for approval - FAQ.

File Summary

Files

  • .github/workflows/build.yml (+182/-5)

  • .github/workflows/code_checks.yml (+0/-121)

  • .github/workflows/deploy-template.yml (+95/-0)

  • .gitignore (+1/-0)

  • Dockerfile (+53/-96)

  • Gemfile (+1/-1)

  • Makefile (+1/-1)

  • app/controllers/application_controller.rb (+0/-1)

  • app/uploaders/uploader_virus_scan.rb (+4/-3)

  • bin/deps (+1/-0)

  • bin/fake_clamdscan (+0/-5)

  • bin/test (+1/-0)

  • bin/test-setup (+2/-0)

  • clamav_tmp/1e7e39bfccbd672ca2fd00ead324b391 (+1/-0)

  • clamav_tmp/a0960199b278fd7e95f4df40f56046cd (+1/-0)

  • clamav_tmp/fe1ade8b718b283067640956690ffba6 (+1/-0)

  • config/ca-trust/README.md (+5/-1)

  • config/ca-trust/fwdproxy.crt (+24/-0)

  • config/clamd.conf (+4/-2)

  • config/freshclam.conf (+1/-1)

  • config/initializers/clamav.rb (+18/-0)

  • config/initializers/clamscan.rb (+0/-5)

  • config/initializers/datadog.rb (+0/-4)

  • config/settings.yml (+3/-0)

  • docker-compose-clamav.yml (+10/-0)

  • docker-compose-deps.yml (+8/-1)

  • docker-compose.yml (+46/-34)

  • docs/setup/hybrid.md (+40/-1)

  • docs/setup/native.md (+41/-22)

  • docs/setup/running_docker.md (+21/-0)

  • docs/setup/running_natively.md (+19/-7)

  • import-va-certs.sh (+5/-2)

  • lib/clamav/commands/patch_scan_command.rb (+43/-0)

  • lib/clamav/patch_client.rb (+76/-0)

  • lib/common/file_helpers.rb (+17/-0)

  • lib/common/models/redis_store.rb (+2/-2)

  • lib/common/virus_scan.rb (+12/-4)

  • lib/shrine/plugins/validate_virus_free.rb (+5/-3)

  • modules/simple_forms_api/spec/requests/v1/uploads_spec.rb (+2/-0)

  • spec/lib/shrine/plugins/validate_virus_free_spec.rb (+9/-23)

  • spec/models/persistent_attachments/dependency_claim_spec.rb (+5/-2)

  • spec/models/persistent_attachments/lgy_claim_spec.rb (+5/-2)

  • spec/models/persistent_attachments/pension_burial_spec.rb (+5/-2)

  • spec/requests/claim_documents_spec.rb (+2/-2)

  • spec/simplecov_helper.rb (+0/-1)

  • spec/spec_helper.rb (+0/-1)

  • spec/support/uploader_helpers.rb (+1/-7)

  • spec/uploaders/uploader_virus_scan_spec.rb (+3/-7)

    Note: We exclude files matching the following when considering PR size:

    *.csv, *.json, *.tsv, *.txt, Gemfile.lock, app/swagger, modules/mobile/docs, spec/fixtures/, spec/support/vcr_cassettes/, modules/mobile/spec/support/vcr_cassettes/, db/seeds, modules/vaos/app/docs, modules/meb_api/app/docs, modules/appeals_api/app/swagger/, *.bru
    

Big PRs are difficult to review, often become stale, and cause delays.

Generated by 🚫 Danger

@va-vsp-bot
Copy link
Collaborator

Error: A file (or its parent directories) does not have a CODEOWNERS entry. Please update the .github/CODEOWNERS file and add the entry for the Offending file:

@va-vsp-bot
Copy link
Collaborator

Error: A file (or its parent directories) was deleted but its reference still exists in CODEOWNERS. Please update the .github/CODEOWNERS file and delete the entry for the Offending file:

@ericboehs ericboehs force-pushed the eb-k8s-virus-thing-again branch from 72c07e7 to ccefb29 Compare April 17, 2024 20:53
@va-vsp-bot
Copy link
Collaborator

Error: A file (or its parent directories) does not have a CODEOWNERS entry. Please update the .github/CODEOWNERS file and add the entry for the Offending file:

@va-vsp-bot
Copy link
Collaborator

Error: A file (or its parent directories) was deleted but its reference still exists in CODEOWNERS. Please update the .github/CODEOWNERS file and delete the entry for the Offending file:

@rmtolmach
Copy link
Contributor

Not needed. This fixed it: #16393

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.