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: report scanner raw output #1753

Merged
merged 19 commits into from
Jun 6, 2024
Merged

feat: report scanner raw output #1753

merged 19 commits into from
Jun 6, 2024

Conversation

csatib02
Copy link
Member

@csatib02 csatib02 commented May 29, 2024 •
edited by adamtagscherer

Description

  • A new result type is defined rawJSON, which is the raw data returned by KICS.
  • The raw results are also appended to the result kics.json besides VMClarityData.
  • A new E2E test is added that uses only the families manager to get the raw data.
  • VMClarity E2E tests are still successful and the raw data isn't propagated back to the apiserver.

Type of Change

[ ] Bug Fix
[X] New Feature
[ ] Breaking Change
[ ] Refactor
[ ] Documentation
[ ] Other (please describe)

Checklist

  • I have read the contributing guidelines
  • Existing issues have been referenced (where applicable)
  • I have verified this change is not present in other open pull requests
  • Functionality is documented
  • All code style checks pass
  • New code contribution is covered by automated tests
  • All new and existing tests pass

@csatib02 csatib02 requested a review from a team as a code owner May 29, 2024 13:04
@csatib02 csatib02 added enhancement New feature or request go Pull requests that update Go code scanner-config Issues related to scanner configuration labels May 29, 2024
@csatib02 csatib02 force-pushed the feat/enable-rawoutput-format branch 2 times, most recently from 6e91297 to a507458 Compare May 29, 2024 13:17
@github-actions GitHub Actions

This comment has been minimized.

Sign in to view
@csatib02 csatib02 marked this pull request as draft May 29, 2024 14:17
@csatib02 csatib02 force-pushed the feat/enable-rawoutput-format branch 6 times, most recently from 63b7155 to 82323c5 Compare June 1, 2024 11:26
@github-actions GitHub Actions

This comment has been minimized.

Sign in to view
@csatib02 csatib02 force-pushed the feat/enable-rawoutput-format branch 2 times, most recently from c5351be to c81862b Compare June 1, 2024 12:48
@github-actions GitHub Actions

This comment has been minimized.

Sign in to view
@ramizpolic ramizpolic changed the title feat: enable rawoutput format feat: report scanner raw output Jun 3, 2024
@github-actions GitHub Actions

This comment has been minimized.

Sign in to view
@csatib02 csatib02 force-pushed the feat/enable-rawoutput-format branch from fd99969 to 45b186f Compare June 3, 2024 08:04
@github-actions GitHub Actions

This comment has been minimized.

Sign in to view
@github-actions GitHub Actions

This comment has been minimized.

Sign in to view
@csatib02 csatib02 marked this pull request as ready for review June 3, 2024 13:07
ramizpolic
ramizpolic requested changes Jun 3, 2024
View reviewed changes
e2e/kics_test.go Outdated Show resolved Hide resolved
e2e/kics_test.go Outdated Show resolved Hide resolved
scanner/families/plugins/runner/runner.go Outdated Show resolved Hide resolved
e2e/kics_test.go Outdated Show resolved Hide resolved
@github-actions GitHub Actions

This comment has been minimized.

Sign in to view
@csatib02 csatib02 force-pushed the feat/enable-rawoutput-format branch from bb49122 to 8e729fb Compare June 4, 2024 12:15
@csatib02 csatib02 force-pushed the feat/enable-rawoutput-format branch from 260dbd5 to 3846736 Compare June 5, 2024 13:58
@github-actions GitHub Actions

This comment has been minimized.

Sign in to view
@csatib02 csatib02 requested a review from ramizpolic June 5, 2024 14:22
csatib02 and others added 18 commits June 5, 2024 16:27
@csatib02 @adamtagscherer
feat: enable rawoutput format
a43d033 
Signed-off-by: Bence Csati <bcsati@cisco.com>
Co-authored-by: Adam Tagscherer <atagsche@cisco.com>
@adamtagscherer @csatib02
feat: propagate raw data to scanner families
a0bfc7c 
Signed-off-by: Adam Tagscherer <atagsche@cisco.com>
Co-authored-by: Bence Csati <bcsati@cisco.com>>
@csatib02 @adamtagscherer
feat: add test for plugins in family manager
b8d0ca9 
Signed-off-by: Bence Csati <bcsati@cisco.com>
Co-authored-by: Adam Tagscherer <atagsche@cisco.com>
@adamtagscherer @csatib02
test: add e2e test instead of integration
9652337 
Signed-off-by: Adam Tagscherer <atagsche@cisco.com>
Co-authored-by: Bence Csati <bcsati@cisco.com>
@adamtagscherer @csatib02
test: change e2e test
e20a98e
@adamtagscherer @csatib02
chore: rebase and reload deps + go mod tidy
2f2f83b 
Signed-off-by: Bence Csati <bcsati@cisco.com>
@csatib02
chore: factor out consts
5171e25
@csatib02
chore: install btrfs before running e2e tests
7826f30 
Signed-off-by: Bence Csati <bcsati@cisco.com>
@csatib02
chore: unify e2e kics plugin image env-var name
18343f2 
Signed-off-by: Bence Csati <bcsati@cisco.com>
@csatib02
fix: remarks
47f74c6 
Signed-off-by: Bence Csati <bcsati@cisco.com>
@csatib02
fix: lint
545f1b0 
Signed-off-by: Bence Csati <bcsati@cisco.com>
@csatib02
chore: go mod tidy
3cc11d4 
Signed-off-by: Bence Csati <bcsati@cisco.com>
@csatib02
fix: remarks
21d8855 
Signed-off-by: Bence Csati <bcsati@cisco.com>
@csatib02
fix: go mod tidy
dda807c 
Signed-off-by: Bence Csati <bcsati@cisco.com>
@csatib02 @adamtagscherer
chore: nit
0604e86 
Signed-off-by: Bence Csati <bcsati@cisco.com>
Co-authored-by: Adam Tagscherer <atagsche@cisco.com>
@csatib02
fix: linter
b76ca41 
Signed-off-by: Bence Csati <bcsati@cisco.com>
@adamtagscherer @csatib02
test: fix kics test
4125f4f
@csatib02
chore: go mod tidy
151cf52 
Signed-off-by: Bence Csati <bcsati@cisco.com>
@csatib02 csatib02 force-pushed the feat/enable-rawoutput-format branch from fd2e69d to 151cf52 Compare June 5, 2024 14:27
@csatib02
chore: make generate
0fb08aa 
Signed-off-by: Bence Csati <bcsati@cisco.com>
@github-actions GitHub Actions
Copy link

github-actions bot commented Jun 5, 2024

Hey!

Your images are ready:

  • ghcr.io/openclarity/vmclarity-apiserver-dev:pr1753-ec74dafabfdd9e7e7e83a5d8d639188603e8fdd3
  • ghcr.io/openclarity/vmclarity-cli-dev:pr1753-ec74dafabfdd9e7e7e83a5d8d639188603e8fdd3
  • ghcr.io/openclarity/vmclarity-cr-discovery-server-dev:pr1753-ec74dafabfdd9e7e7e83a5d8d639188603e8fdd3
  • ghcr.io/openclarity/vmclarity-orchestrator-dev:pr1753-ec74dafabfdd9e7e7e83a5d8d639188603e8fdd3
  • ghcr.io/openclarity/vmclarity-plugin-kics-dev:pr1753-ec74dafabfdd9e7e7e83a5d8d639188603e8fdd3
  • ghcr.io/openclarity/vmclarity-ui-dev:pr1753-ec74dafabfdd9e7e7e83a5d8d639188603e8fdd3
  • ghcr.io/openclarity/vmclarity-ui-backend-dev:pr1753-ec74dafabfdd9e7e7e83a5d8d639188603e8fdd3

@csatib02 csatib02 added this pull request to the merge queue Jun 6, 2024
Merged via the queue into main with commit d645e49 Jun 6, 2024
40 checks passed
@csatib02 csatib02 deleted the feat/enable-rawoutput-format branch June 6, 2024 09:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ramizpolic ramizpolic ramizpolic approved these changes

Assignees

@adamtagscherer adamtagscherer

@csatib02 csatib02

Labels
enhancement New feature or request go Pull requests that update Go code scanner-config Issues related to scanner configuration
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@csatib02 @ramizpolic @adamtagscherer