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 #16576

Closed
wants to merge 2 commits into from
Closed

Merge master #16576

wants to merge 2 commits into from

Conversation

ericboehs
Copy link
Contributor

  • use clamav container for local development and review instances

  • rubocop formatting & CODEOWNERS

  • fix Dockerfile

  • update CODEOWNERS and docker-compose version for review instances

  • change docker-compose verions for review

  • fix review ports

  • update github workflows to match k8s

  • update github workflows

  • update code_checks for docker compose for tests

  • add bundle exec to setup db step in audit service tags

  • reset db in docker compose review & update audit service tag docker services

  • remove clamd and freshclam from procfile

  • add sidekiq enterprise license to test env var

  • set sidekiq license to docker build args

  • update makefile to work with new docker services

  • add clamav host & port to settings

  • add restart services to docker-compose review

  • Added virus scan to uploads spec (Added virus scan to uploads spec #16393)

  • Added virus scan to uploads spec

  • Fixing Virus scan spec

  • resolve merge conflict

  • change directory from /app to /srv/vets-api/src

  • use previous master version for RI + clam containers

  • add USER_ID to RI docker-compose

  • set working directory back to app

  • minor clean up with new line EOF & remove k8s deploy related code

  • update makefile up command with foreman

  • fix docker-compose clamav new line

  • more cleanup and rubocop formatting

  • remove redis ports from docker-compose test

  • update redis port

  • revert docker-compose test to original master

  • update api service name to web

  • rubocop formatting

  • add Procfile to CODEOWNERS

  • update CODEOWNERS

  • add secret and pki volumes back to RI

  • add some settings in review docker-compose

  • fix merge conflict mistake in Dockerfile

  • update dockerfile ruby version

  • add working directory to test docker-compose

  • update volumes in docker test

  • update shared volume in review docker compose

  • revert review docker compose changes

  • update srv/vets-api/* dir to app/*

  • update clamav to use sockets

  • remove working_dir from docker-compose test


Co-authored-by: Rachal Cassity [email protected]

Note: Delete the description statements, complete each step. None are optional, but can be justified as to why they cannot be completed as written. Provide known gaps to testing that may raise the risk of merging to production.

Summary

  • This work is behind a feature toggle (flipper): YES/NO
  • (Summarize the changes that have been made to the platform)
  • (If bug, how to reproduce)
  • (What is the solution, why is this the solution?)
  • (Which team do you work for, does your team own the maintenance of this component?)
  • (If introducing a flipper, what is the success criteria being targeted?)

Related issue(s)

  • Link to ticket created in va.gov-team repo OR screenshot of Jira ticket if your team uses Jira
  • Link to previous change of the code/bug (if applicable)
  • Link to epic if not included in ticket

Testing done

  • New code is covered by unit tests
  • Describe what the old behavior was prior to the change
  • Describe the steps required to verify your changes are working as expected. Exclusively stating 'Specs run' is NOT acceptable as appropriate testing
  • If this work is behind a flipper:
    • Tests need to be written for both the flipper on and flipper off scenarios. Docs.
    • What is the testing plan for rolling out the feature?

Screenshots

Note: Optional

What areas of the site does it impact?

(Describe what parts of the site are impacted andifcode touched other areas)

Acceptance criteria

  • I fixed|updated|added unit tests and integration tests for each feature (if applicable).
  • No error nor warning in the console.
  • Events are being sent to the appropriate logging solution
  • Documentation has been updated (link to documentation)
  • No sensitive information (i.e. PII/credentials/internal URLs/etc.) is captured in logging, hardcoded, or specs
  • Feature/bug has a monitor built into Datadog or Grafana (if applicable)
  • If app impacted requires authentication, did you login to a local build and verify all authenticated routes work as expected
  • I added a screenshot of the developed feature

Requested Feedback

(OPTIONAL)What should the reviewers know in addition to the above. Is there anything specific you wish the reviewer to assist with. Do you have any concerns with this PR, why?

* use clamav container for local development and review instances

* rubocop formatting & CODEOWNERS

* fix Dockerfile

* update CODEOWNERS and docker-compose version for review instances

* change docker-compose verions for review

* fix review ports

* update github workflows to match k8s

* update github workflows

* update code_checks for docker compose for tests

* add bundle exec to setup db step in audit service tags

* reset db in docker compose review & update audit service tag docker services

* remove clamd and freshclam from procfile

* add sidekiq enterprise license to test env var

* set sidekiq license to docker build args

* update makefile to work with new docker services

* add clamav host & port to settings

* add restart services to docker-compose review

* Added virus scan to uploads spec (#16393)

* Added virus scan to uploads spec

* Fixing Virus scan spec

* resolve merge conflict

* change directory from /app to /srv/vets-api/src

* use previous master version for RI + clam containers

* add USER_ID to RI docker-compose

* set working directory back to app

* minor clean up with new line EOF & remove k8s deploy related code

* update makefile up command with foreman

* fix docker-compose clamav new line

* more cleanup and rubocop formatting

* remove redis ports from docker-compose test

* update redis port

* revert docker-compose test to original master

* update api service name to web

* rubocop formatting

* add Procfile to CODEOWNERS

* update CODEOWNERS

* add secret and pki volumes back to RI

* add some settings in review docker-compose

* fix merge conflict mistake in Dockerfile

* update dockerfile ruby version

* add working directory to test docker-compose

* update volumes in docker test

* update shared volume in review docker compose

* revert review docker compose changes

* update srv/vets-api/* dir to app/*

* update clamav to use sockets

* remove working_dir from docker-compose test

---------

Co-authored-by: Rachal Cassity <[email protected]>
Copy link

github-actions bot commented Apr 30, 2024

1 Error
🚫 This PR changes 611 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/-120)

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

  • .gitignore (+1/-0)

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

  • bin/deps (+1/-0)

  • 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/initializers/datadog.rb (+0/-4)

  • 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/common/models/redis_store.rb (+2/-2)

    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) was deleted but its reference still exists in CODEOWNERS. Please update the .github/CODEOWNERS file and delete the entry for the Offending file:

@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:

@ericboehs ericboehs force-pushed the eb-k8s-master-merge branch from 0623661 to dbc6398 Compare April 30, 2024 15:50
@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:

@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:

@ericboehs ericboehs force-pushed the eb-k8s-master-merge branch from dbc6398 to be7a8b4 Compare April 30, 2024 15:51
@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 marked this pull request as ready for review April 30, 2024 16:06
@ericboehs ericboehs requested review from a team as code owners April 30, 2024 16:06
@ericboehs
Copy link
Contributor Author

Closed in favor of: #16577

@ericboehs ericboehs closed this Apr 30, 2024
@ericboehs ericboehs deleted the eb-k8s-master-merge branch April 30, 2024 16:34
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.

3 participants