anchore
Add license filename used by github.com/grafana/tempo
Certain bits of grafana/tempo remain licensed as Apache License 2.0. Add the license file name used.
Example: https://github.com/grafana/tempo/blob/main/pkg/tempopb/LICENSE_APACHE2
Description
The go module github.com/grafana/tempo is currently only classified as AGPLv3.0. However certain import paths are still available as Apache License 2.0. Add the filename used by Tempo to the list of licenses.
- Fixes
Type of change
- [x] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (please discuss with the team first; Syft is 1.0 software and we won't accept breaking changes without going to 2.0)
- [ ] Documentation (updates the documentation)
- [ ] Chore (improve the developer experience, fix a test flake, etc, without changing the visible behavior of Syft)
- [ ] Performance (make Syft run faster or use less memory, without changing visible behavior much)
Checklist:
- [ ] I have added unit tests that cover changed behavior
- [ ] I have tested my code in common scenarios and confirmed there are no regressions
- [ ] I have added comments to my code, particularly in hard-to-understand sections
Thanks @zecke for the contribution here!
Is there an image or scan target you have that shows this change includes the new license for grafana/tempo.
I'm happy to add this in, just want to make sure this is working as you intended as far as detecting the new license.
Thanks @zecke for the contribution here!
Is there an image or scan target you have that shows this change includes the new license for
grafana/tempo.I'm happy to add this in, just want to make sure this is working as you intended as far as detecting the new license.
rm -rf ~/Library/Caches/syft/golang
go run ./cmd/syft scan -vv docker:grafana/grafana-oss:12.0.1 -o json > after.json
...
diff -u before.json after.json
@@ -16682,7 +16682,15 @@
"spdxExpression": "Apache-2.0",
"type": "concluded",
"urls": [
- "https://proxy.golang.org/github.com/grafana/loki/v3/@v/v3.2.1.zip#github.com/grafana/loki/[email protected]/clients/cmd/fluentd/LICENSE"
+ "https://proxy.golang.org/github.com/grafana/loki/v3/@v/v3.2.1.zip#github.com/grafana/loki/[email protected]/clients/LICENSE_APACHE2",
+ "https://proxy.golang.org/github.com/grafana/loki/v3/@v/v3.2.1.zip#github.com/grafana/loki/[email protected]/clients/cmd/fluentd/LICENSE",
+ "https://proxy.golang.org/github.com/grafana/loki/v3/@v/v3.2.1.zip#github.com/grafana/loki/[email protected]/pkg/ingester/wal/LICENSE_APACHE2",
+ "https://proxy.golang.org/github.com/grafana/loki/v3/@v/v3.2.1.zip#github.com/grafana/loki/[email protected]/pkg/loghttp/LICENSE_APACHE2",
+ "https://proxy.golang.org/github.com/grafana/loki/v3/@v/v3.2.1.zip#github.com/grafana/loki/[email protected]/pkg/logproto/LICENSE_APACHE2",
+ "https://proxy.golang.org/github.com/grafana/loki/v3/@v/v3.2.1.zip#github.com/grafana/loki/[email protected]/pkg/logqlmodel/LICENSE_APACHE2",
+ "https://proxy.golang.org/github.com/grafana/loki/v3/@v/v3.2.1.zip#github.com/grafana/loki/[email protected]/pkg/util/LICENSE_APACHE2",
+ "https://proxy.golang.org/github.com/grafana/loki/v3/@v/v3.2.1.zip#github.com/grafana/loki/[email protected]/production/LICENSE_APACHE2",
+ "https://proxy.golang.org/github.com/grafana/loki/v3/@v/v3.2.1.zip#github.com/grafana/loki/[email protected]/tools/LICENSE_APACHE2"
],
"locations": []
},
@@ -17004,7 +17012,7 @@
}
},
{
- "id": "edb2513afd3875fd",
+ "id": "1a53765cb7e86ab0",
"name": "github.com/grafana/tempo",
"version": "v1.5.1-0.20241001135150-ed943d7a56b2",
"type": "go-module",
@@ -17028,6 +17036,17 @@
"https://proxy.golang.org/github.com/grafana/tempo/@v/v1.5.1-0.20241001135150-ed943d7a56b2.zip#github.com/grafana/[email protected]/LICENSE"
],
"locations": []
+ },
+ {
+ "value": "Apache-2.0",
+ "spdxExpression": "Apache-2.0",
+ "type": "concluded",
+ "urls": [
+ "https://proxy.golang.org/github.com/grafana/tempo/@v/v1.5.1-0.20241001135150-ed943d7a56b2.zip#github.com/grafana/[email protected]/cmd/tempo-query/LICENSE_APACHE2",
+ "https://proxy.golang.org/github.com/grafana/tempo/@v/v1.5.1-0.20241001135150-ed943d7a56b2.zip#github.com/grafana/[email protected]/operations/LICENSE_APACHE2",
+ "https://proxy.golang.org/github.com/grafana/tempo/@v/v1.5.1-0.20241001135150-ed943d7a56b2.zip#github.com/grafana/[email protected]/pkg/tempopb/LICENSE_APACHE2"
+ ],
+ "locations": []
}