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(ubuntu): Expose Ubuntu fix status. #7020

Open
wants to merge 21 commits into
base: main
Choose a base branch
from

Conversation

skahn007gl
Copy link

Description

Supporting PR for TrivyDB PR407 as requested in comment by @knqyf263

Related PRs

Remove this section if you don't have related PRs.

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).

@skahn007gl skahn007gl changed the title feat(Ubuntu): Expose Ubuntu fix status. feat(ubuntu): Expose Ubuntu fix status. Jun 26, 2024
@skahn007gl
Copy link
Author

Hey @knqyf263
Test's are passing with Status added.
I was a bit surprised I did not need to add the status field into the test data, but i introduced failures to observe the status field is being populated.

Please kick off a test run & review when you can.

Thanks for holding my hand through this while I learned how these tests worked.

@DmitriyLewen
Copy link
Contributor

Hello @skahn007gl

Please run go mod edit -replace github.com/aquasecurity/trivy-db=github.com/skahn007gl/trivy-db@9bdfe07de664866c0d889b2d1f8d6ecc11b640ad (this is latest commit from aquasecurity/trivy-db#407) and go mod tidy + push changes of go.mod and go.sum files.
This is necessary to ensure that changes to Trivy-db don't break Trivy.

And resolve the conflict with the file integration/testdata/fixtures/db/vulnerability.yaml.

Regards, Dmitriy

@skahn007gl skahn007gl force-pushed the skahngl-supporting-Ptrivydb-PR407 branch 2 times, most recently from ec9de25 to 499833c Compare July 23, 2024 07:46
@skahn007gl skahn007gl force-pushed the skahngl-supporting-Ptrivydb-PR407 branch from 499833c to c0eff22 Compare July 23, 2024 12:07
@skahn007gl
Copy link
Author

Apologies @chen-keinan, @simar7, @nikpivkin.
You are not required to review this PR, the request was made in error.

@skahn007gl
Copy link
Author

Hello @DmitriyLewen
I have updated go.mod to target the latest commit for PR407
Fixed up the test error in PR407 to.

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.

@skahn007gl sorry for delay.

Resolve conflict with go.mod file, please.

@skahn007gl
Copy link
Author

@skahn007gl sorry for delay.

Resolve conflict with go.mod file, please.

Hi @DmitriyLewen, sorry for the delay on my side.
Can you kick off a test run and re-review this when you have time.

@skahn007gl
Copy link
Author

Hey @knqyf263 Thank you for kicking off a test run.
I will look into the failing test now :)

@skahn007gl
Copy link
Author

Hi @knqyf263 Please kick off another test run.
The failing test was new to me as it was not included in mage test:integration, I have updated pr.md to include mage test:vm

@skahn007gl
Copy link
Author

Hi @DmitriyLewen @knqyf263
All checks are now passing, can we proceed to Merging?

Can you please kick off a test run on aquasecurity/trivy-db#407

@skahn007gl
Copy link
Author

@knqyf263 I have updated this PR to match removing ignored from trivy-db PR

go.mod Outdated
@@ -414,7 +414,7 @@ require (
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
)

replace github.com/aquasecurity/trivy-db => github.com/skahn007gl/trivy-db v0.0.0-20240723121440-a488d7f107fe
replace github.com/aquasecurity/trivy-db => github.com/skahn007gl/trivy-db v0.0.0-20240905044623-a3e59a1f3feb
Copy link
Collaborator

Choose a reason for hiding this comment

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

You can point to aquasecurity/trivy-db@42b851c now.

@knqyf263
Copy link
Collaborator

We had a critical problem and reverted the commit in trivy-db. We need to rethink about implementation in trivy-db.

@skahn007gl
Copy link
Author

We had a critical problem and reverted the commit in trivy-db. We need to rethink about implementation in trivy-db.

As it is a type error, we could convert trivy-db to use the string value instead.

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