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(suse): added SUSE Linux Enterprise Micro support #7294

Merged
merged 4 commits into from
Sep 29, 2024

Conversation

msmeissn
Copy link
Contributor

@msmeissn msmeissn commented Aug 1, 2024

This adds support for the SUSE Linux Enterprise Micro family.

#7221

Description

Related issues

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).
  • [-] 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).

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.

Hello @msmeissn
Thanks for your work!

i left a comments.
also:

  • bump trivy-db version
  • update PR title scope (feat(suse): ...)
  • update purl package
    • perhaps we need to use short name (as for SLES) in distro qualifier
    • add micro in purlType() function

pkg/fanal/analyzer/os/release/release.go Show resolved Hide resolved
@msmeissn msmeissn changed the title feat(slemicro): added SUSE Linux Enterprise Micro support feat(suse): added SUSE Linux Enterprise Micro support Aug 15, 2024
@msmeissn
Copy link
Contributor Author

(i am on vacation currently, so a bit delayed progress)

@knqyf263
Copy link
Collaborator

So we are. Take your time.
#7303

@msmeissn msmeissn force-pushed the main branch 4 times, most recently from 396d19f to 5ae1927 Compare September 13, 2024 12:51
@msmeissn msmeissn force-pushed the main branch 8 times, most recently from c4eda8c to 1ab5a71 Compare September 19, 2024 16:19
@msmeissn
Copy link
Contributor Author

I think I now have it in shape including testcases.

This adds support for the SUSE Linux Enterprise Micro family.

This also fixes also purl logic for SUSE and openSUSE to match standard
expectations better.

aquasecurity#7221

Signed-off-by: Marcus Meissner <meissner@suse.de>
@msmeissn
Copy link
Contributor Author

FWIW for purl i also aligned more with SUSE internal purl guidance, that opensuse distros have "opensuse" as main target, and "suse" for all the SUSE Linux Enterprise ones

Copy link
Collaborator

@knqyf263 knqyf263 left a comment

Choose a reason for hiding this comment

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

Looks perfect to me. I left one comment for our convenience.

The tests are failing due to #7538. It's not relevant to this PR.

pkg/fanal/test/integration/library_test.go Outdated Show resolved Hide resolved
Signed-off-by: knqyf263 <knqyf263@gmail.com>
@knqyf263 knqyf263 added this pull request to the merge queue Sep 27, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Sep 27, 2024
@knqyf263 knqyf263 added this pull request to the merge queue Sep 29, 2024
Merged via the queue into aquasecurity:main with commit efdb68d Sep 29, 2024
17 checks passed
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.

feat(slemicro): Add support for the SUSE Linux Enterprise Micro family
3 participants