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: cyclondx sbom custom property support #4688

Merged
merged 7 commits into from
Jun 22, 2023

Conversation

chen-keinan
Copy link
Contributor

Description

cyclonedx custom property support

Related issues

Checklist

@chen-keinan chen-keinan changed the title feat: custom property support feat: cyclondx sbom custom property support Jun 21, 2023
@chen-keinan chen-keinan marked this pull request as ready for review June 21, 2023 13:54
pkg/k8s/scanner/scanner.go Outdated Show resolved Hide resolved
pkg/sbom/cyclonedx/core/cyclonedx.go Outdated Show resolved Hide resolved
pkg/sbom/cyclonedx/core/cyclonedx.go Outdated Show resolved Hide resolved
@chen-keinan
Copy link
Contributor Author

Comments has been addressed

@knqyf263 knqyf263 added this pull request to the merge queue Jun 22, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to a conflict with the base branch Jun 22, 2023
@knqyf263
Copy link
Collaborator

@chen-keinan I've merged another PR, and it's conflicting now. Can you please resolve it?

Signed-off-by: chenk <hen.keinan@gmail.com>
Signed-off-by: chenk <hen.keinan@gmail.com>
Signed-off-by: chenk <hen.keinan@gmail.com>
Signed-off-by: chenk <hen.keinan@gmail.com>
Signed-off-by: chenk <hen.keinan@gmail.com>
Signed-off-by: chenk <hen.keinan@gmail.com>
Signed-off-by: chenk <hen.keinan@gmail.com>
@knqyf263 knqyf263 enabled auto-merge June 22, 2023 08:26
@knqyf263 knqyf263 added this pull request to the merge queue Jun 22, 2023
Merged via the queue into aquasecurity:main with commit e3d10d2 Jun 22, 2023
12 checks passed
AnaisUrlichs pushed a commit to AnaisUrlichs/trivy that referenced this pull request Aug 10, 2023
* feat: custom property support

Signed-off-by: chenk <hen.keinan@gmail.com>

* feat: custom property support

Signed-off-by: chenk <hen.keinan@gmail.com>

* feat: custom property support

Signed-off-by: chenk <hen.keinan@gmail.com>

* feat: custom property support

Signed-off-by: chenk <hen.keinan@gmail.com>

* feat: custom property support

Signed-off-by: chenk <hen.keinan@gmail.com>

* feat: custom property support

Signed-off-by: chenk <hen.keinan@gmail.com>

* feat: custom property support

Signed-off-by: chenk <hen.keinan@gmail.com>

---------

Signed-off-by: chenk <hen.keinan@gmail.com>
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.

cycloneDX - kubernetes bill of materials support
2 participants