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

refactor(sbom): use intermediate representation for SPDX #6310

Merged
merged 10 commits into from Mar 18, 2024
Merged

refactor(sbom): use intermediate representation for SPDX #6310

merged 10 commits into from Mar 18, 2024

Conversation

knqyf263
Copy link
Collaborator

Description

This PR is leftover from #6240. It changes to use intermediate representation (core.BOM) introduced in #6240 for SPDX as well as CycloneDX.

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

@knqyf263
refactor(sbom): encode SPDX
08d67e7 
Signed-off-by: knqyf263 <knqyf263@gmail.com>
@knqyf263
refactor(sbom): decode SPDX
308348a 
Signed-off-by: knqyf263 <knqyf263@gmail.com>
@knqyf263
test(integration): fix golden
5b3479f 
Signed-off-by: knqyf263 <knqyf263@gmail.com>
@knqyf263 knqyf263 self-assigned this Mar 13, 2024
@knqyf263
refactor: add a flag to enable BOM-Ref generation
3166f73 
Signed-off-by: knqyf263 <knqyf263@gmail.com>
@knqyf263
test(integration): update element IDs in SPDX
fcd7154 
Signed-off-by: knqyf263 <knqyf263@gmail.com>
@knqyf263
fix: calc verification code from respective files
a14c913 
Signed-off-by: knqyf263 <knqyf263@gmail.com>
@knqyf263 knqyf263 marked this pull request as ready for review March 13, 2024 09:20
DmitriyLewen
DmitriyLewen reviewed Mar 13, 2024
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.

@knqyf263 left comments. Take a look, please.

integration/testdata/fluentd-multiple-lockfiles.cdx.json.golden Show resolved Hide resolved
pkg/fanal/analyzer/sbom/sbom_test.go Outdated Show resolved Hide resolved
pkg/sbom/io/decode.go Show resolved Hide resolved
pkg/sbom/io/decode.go Show resolved Hide resolved
integration/testdata/conda-spdx.json.golden Outdated Show resolved Hide resolved
pkg/sbom/spdx/unmarshal.go Show resolved Hide resolved
pkg/sbom/io/decode.go Show resolved Hide resolved
@knqyf263 knqyf263 added this pull request to the merge queue Mar 18, 2024
Merged via the queue into aquasecurity:main with commit ab74caa Mar 18, 2024
12 checks passed
@knqyf263 knqyf263 deleted the refactor/spdx branch March 18, 2024 09:13
@DmitriyLewen DmitriyLewen mentioned this pull request Mar 21, 2024
Closed
2 tasks
@itaysk itaysk mentioned this pull request Apr 7, 2024
Open
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

@chen-keinan chen-keinan Awaiting requested review from chen-keinan chen-keinan is a code owner

Assignees

@knqyf263 knqyf263

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@knqyf263 @DmitriyLewen