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

[SBOM] Keep layer info in SBOM components #32435

Merged
merged 19 commits into from
Dec 24, 2024
Merged

[SBOM] Keep layer info in SBOM components #32435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
76ac638
Keep layers information
lebauce Nov 26, 2024
6705072
Bump trivy fork
lebauce Dec 20, 2024
0a1b21e
Update licenses
lebauce Dec 23, 2024
7340b45
Allow single quote in names
lebauce Dec 23, 2024
bd74f5a
Make it work for CRI-O
lebauce Dec 23, 2024
75c54ce
Add missing file header
lebauce Dec 23, 2024
b73d8c8
Add sha256 prefix to diff ID for CRI-O
lebauce Dec 23, 2024
9c99405
Fix build tags
lebauce Dec 23, 2024
ce29262
Make linters happy
lebauce Dec 23, 2024
b137828
Remove commented out lines
lebauce Dec 23, 2024
4b46f2c
Remove dependency on github.com/google/licenseclassifier/v2
lebauce Dec 23, 2024
f528bbf
Use crio build tag
lebauce Dec 23, 2024
f92329a
Address comments
lebauce Dec 23, 2024
6b293a6
Fix comment regarding trivy fork
lebauce Dec 23, 2024
78c8a35
Restore default scan timeout to 30 seconds
lebauce Dec 23, 2024
71e2d5e
Fix licenses
lebauce Dec 23, 2024
3114807
Use fs.WalkDir instead of filepath.WalkDir
lebauce Dec 23, 2024
ea04a33
Bump trivy fork
lebauce Dec 23, 2024
10f2df4
Fix support for CRI-O
lebauce Dec 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions .copyright-overrides.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,3 +378,15 @@ github.com/GoogleCloudPlatform/grpc-gcp-go/grpcgcp/multiendpoint: Copyright 2024
github.com/NVIDIA/go-nvml/*: Copyright 2023 NVIDIA CORPORATION

github.com/jonboulle/clockwork: Copyright 2014 Nell Boulle

github.com/nozzle/throttler: Copyright 2018 Derek Perkins
github.com/openvex/discovery/*: Copyright 2023 The OpenVEX Authors
github.com/sassoftware/relic/*: Copyright (c) SAS Institute Inc.
github.com/transparency-dev/merkle: Copyright 2017 Google LLC. All Rights Reserved.
github.com/transparency-dev/merkle/compact: Copyright 2019 Google LLC. All Rights Reserved.
github.com/transparency-dev/merkle/proof:
- Copyright 2017 Google LLC. All Rights Reserved.
- Copyright 2022 Google LLC. All Rights Reserved.
github.com/transparency-dev/merkle/rfc6962: Copyright 2016 Google LLC. All Rights Reserved.

gopkg.in/go-jose/go-jose.v2: Copyright 2014 Square Inc.
lebauce marked this conversation as resolved.
Show resolved Hide resolved
165 changes: 147 additions & 18 deletions LICENSE-3rdparty.csv
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions comp/api/authtoken/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,13 +87,13 @@ require (
github.com/hectane/go-acl v0.0.0-20230122075934-ca0b05cb1adb // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect
github.com/lufia/plan9stats v0.0.0-20220913051719-115f729f3c8c // indirect
github.com/lufia/plan9stats v0.0.0-20240226150601-1dcf7310316a // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c // indirect
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
github.com/pelletier/go-toml v1.9.5 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
github.com/shirou/gopsutil/v4 v4.24.11 // indirect
github.com/spf13/afero v1.11.0 // indirect
github.com/spf13/cast v1.7.0 // indirect
Expand Down
9 changes: 4 additions & 5 deletions comp/api/authtoken/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions comp/core/config/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,14 +78,14 @@ require (
github.com/hectane/go-acl v0.0.0-20230122075934-ca0b05cb1adb // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect
github.com/lufia/plan9stats v0.0.0-20220913051719-115f729f3c8c // indirect
github.com/lufia/plan9stats v0.0.0-20240226150601-1dcf7310316a // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c // indirect
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/pelletier/go-toml v1.9.5 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
github.com/prometheus/client_golang v1.20.5 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.60.1 // indirect
Expand Down
9 changes: 4 additions & 5 deletions comp/core/config/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions comp/core/log/impl-trace/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,13 +87,13 @@ require (
github.com/hectane/go-acl v0.0.0-20230122075934-ca0b05cb1adb // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect
github.com/lufia/plan9stats v0.0.0-20220913051719-115f729f3c8c // indirect
github.com/lufia/plan9stats v0.0.0-20240226150601-1dcf7310316a // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c // indirect
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
github.com/pelletier/go-toml v1.9.5 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
github.com/shirou/gopsutil/v4 v4.24.11 // indirect
github.com/spf13/afero v1.11.0 // indirect
github.com/spf13/cast v1.7.0 // indirect
Expand Down
9 changes: 4 additions & 5 deletions comp/core/log/impl-trace/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions comp/core/log/impl/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,13 @@ require (
github.com/hectane/go-acl v0.0.0-20230122075934-ca0b05cb1adb // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect
github.com/lufia/plan9stats v0.0.0-20220913051719-115f729f3c8c // indirect
github.com/lufia/plan9stats v0.0.0-20240226150601-1dcf7310316a // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c // indirect
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
github.com/pelletier/go-toml v1.9.5 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
github.com/shirou/gopsutil/v4 v4.24.11 // indirect
github.com/spf13/afero v1.11.0 // indirect
github.com/spf13/cast v1.7.0 // indirect
Expand Down
9 changes: 4 additions & 5 deletions comp/core/log/impl/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions comp/core/log/mock/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading