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

feat: expose trivy.timeout to configure the duration to wait for scan completion #20257

Merged
merged 1 commit into from
Apr 11, 2024

Conversation

zyyw
Copy link
Contributor

@zyyw zyyw commented Apr 10, 2024

Thank you for contributing to Harbor!

Comprehensive Summary of your change

Issue being fixed

Fixes #20219

Please indicate you've done the following:

  • Well Written Title and Summary of the PR
  • Label the PR as needed. "release-note/ignore-for-release, release-note/new-feature, release-note/update, release-note/enhancement, release-note/community, release-note/breaking-change, release-note/docs, release-note/infra, release-note/deprecation"
  • Accepted the DCO. Commits without the DCO will delay acceptance.
  • Made sure tests are passing and test coverage is added if needed.
  • Considered the docs impact and opened a new docs issue or PR with docs changes if needed in website repository.

@zyyw
Copy link
Contributor Author

zyyw commented Apr 10, 2024

one example of exposing config for trivy-adapter is here:

The env.jinja file and configs.py already have the code change for SCANNER_TRIVY_TIMEOUT.

Copy link

codecov bot commented Apr 10, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 67.57%. Comparing base (b7b8847) to head (2b2e1a7).
Report is 127 commits behind head on main.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main   #20257      +/-   ##
==========================================
+ Coverage   67.56%   67.57%   +0.01%     
==========================================
  Files         991     1004      +13     
  Lines      109181   110578    +1397     
  Branches     2719     2781      +62     
==========================================
+ Hits        73768    74728     +960     
- Misses      31449    31825     +376     
- Partials     3964     4025      +61     
Flag Coverage Δ
unittests 67.57% <ø> (+0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

see 518 files with indirect coverage changes

Copy link
Contributor

@wy65701436 wy65701436 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

…an completion

Signed-off-by: Shengwen Yu <yshengwen@vmware.com>
Copy link
Contributor

@MinerYang MinerYang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@zyyw zyyw merged commit 643e84c into goharbor:main Apr 11, 2024
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

expose SCANNER_TRIVY_TIMEOUT in harbor.yml
6 participants