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.

Sign up for GitHub

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

Jump to bottom

feat(repo): support local repositories #4890

Merged
merged 7 commits into from
Jul 31, 2023
Merged

feat(repo): support local repositories #4890

merged 7 commits into from
Jul 31, 2023

Conversation

knqyf263
Copy link
Collaborator

Description

trivy repo now scans local repositories as well as remote repositories.

Usage

$ trivy repo --scanners vuln /path/to/repo

It is equivalent to trivy fs.

Related issues

Checklist

  • I've read the guidelines for contributing to this repository.
  • I've followed the conventions in the PR title.
  • I've added tests that prove my fix is effective or that my feature works.
  • I've updated the documentation with the relevant information (if needed).
  • I've added usage information (if the PR introduces new options)
  • I've included a "before" and "after" example to the description (if the PR is a user interface change).

@knqyf263 knqyf263 self-assigned this Jul 30, 2023
@knqyf263 knqyf263 requested a review from DmitriyLewen July 30, 2023 13:14
@knqyf263 knqyf263 marked this pull request as ready for review July 30, 2023 14:14
DmitriyLewen
DmitriyLewen reviewed Jul 31, 2023
View reviewed changes
Copy link
Contributor

@DmitriyLewen DmitriyLewen left a comment •
edited
Loading

Choose a reason for hiding this comment

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

LGTM.
I understand that we are using fs Artifact for repo mode and it looks like there is no case we could miss for fs mode, but maybe we want to use args.command == 'fs' for some test cases?

@knqyf263 wdty?

@knqyf263
Copy link
Collaborator Author

but maybe we want to use args.command == 'fs' for some test cases?

Do you mean integration tests?

@DmitriyLewen
Copy link
Contributor

right.

@knqyf263
Copy link
Collaborator Author

@DmitriyLewen Added in d35fa12. I'm not sure if it will pass tests, but does it answer your question?

@DmitriyLewen
Copy link
Contributor

yes. Thanks!

DmitriyLewen
DmitriyLewen approved these changes Jul 31, 2023
View reviewed changes
Copy link
Contributor

@DmitriyLewen DmitriyLewen left a comment

Choose a reason for hiding this comment

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

LGTM

@knqyf263 knqyf263 enabled auto-merge July 31, 2023 11:15
@knqyf263 knqyf263 added this pull request to the merge queue Jul 31, 2023
Merged via the queue into aquasecurity:main with commit d19c7d9 Jul 31, 2023
@knqyf263 knqyf263 deleted the fs_repo branch July 31, 2023 11:48
AnaisUrlichs pushed a commit to AnaisUrlichs/trivy that referenced this pull request Aug 10, 2023
@knqyf263 @AnaisUrlichs
feat(repo): support local repositories (aquasecurity#4890)
b36a72f 
* feat(repo): support local repositories

* fix tests

* test: fix client/server tests

* docs: update

* test: add fs tests

* test: do not update golden files if overridden

* docs: remove a comment about fs deprecation
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DmitriyLewen DmitriyLewen DmitriyLewen approved these changes

Assignees

@knqyf263 knqyf263

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Enhance trivy repo for local and remote code repository scanning
2 participants
@knqyf263 @DmitriyLewen