From 03248a90458f0179eff52d3e3a11ac43918d5b4e Mon Sep 17 00:00:00 2001
From: Brandon Philips <brandon@ifup.org>
Date: Mon, 27 Apr 2020 15:41:00 +0000
Subject: [PATCH] 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
---
 bill-of-materials.json | 2 +-
 scripts/updatebom.sh   | 4 +++-
 test                   | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/bill-of-materials.json b/bill-of-materials.json
index 6b4166847..7a233d436 100644
--- a/bill-of-materials.json
+++ b/bill-of-materials.json
@@ -315,7 +315,7 @@
 		]
 	},
 	{
-		"project": "go.etcd.io/etcd",
+		"project": "go.etcd.io/etcd/v3",
 		"licenses": [
 			{
 				"type": "Apache License 2.0",
diff --git a/scripts/updatebom.sh b/scripts/updatebom.sh
index 7602725d5..210e0e960 100755
--- a/scripts/updatebom.sh
+++ b/scripts/updatebom.sh
@@ -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"
diff --git a/test b/test
index 4d4ea9be8..08bd3e398 100755
--- a/test
+++ b/test
@@ -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