bill-of-materials: updates for /etcd/v3 packaging

bill-of-materials:
- update to new package names

test/updatebom.sh scripts:
- Update to the right package names
- Don't add bom tool to go.mod
release-3.5
Brandon Philips 2020-04-27 15:41:00 +00:00
parent dd21e710e1
commit 03248a9045
3 changed files with 5 additions and 3 deletions

View File

@ -315,7 +315,7 @@
]
},
{
"project": "go.etcd.io/etcd",
"project": "go.etcd.io/etcd/v3",
"licenses": [
{
"type": "Apache License 2.0",

View File

@ -7,12 +7,14 @@ if ! [[ "$0" =~ scripts/updatebom.sh ]]; then
exit 255
fi
export GO111MODULE=off # Don't add BOM tool to etcd go.mod
echo "installing 'bill-of-materials.json'"
go get -v -u github.com/coreos/license-bill-of-materials
export GO111MODULE=on
echo "generating bill-of-materials.json"
license-bill-of-materials \
--override-file ./bill-of-materials.override.json \
go.etcd.io/etcd go.etcd.io/etcd/etcdctl > bill-of-materials.json
go.etcd.io/etcd/v3 go.etcd.io/etcd/v3/etcdctl > bill-of-materials.json
echo "generated bill-of-materials.json"

2
test
View File

@ -640,7 +640,7 @@ function bom_pass {
echo "Checking bill of materials..."
license-bill-of-materials \
--override-file bill-of-materials.override.json \
go.etcd.io/etcd go.etcd.io/etcd/etcdctl >bom-now.json || true
go.etcd.io/etcd/v3 go.etcd.io/etcd/v3/etcdctl >bom-now.json || true
if ! diff bill-of-materials.json bom-now.json; then
echo "vendored licenses do not match given bill of materials"
exit 255