replace archived repo in BOM check

Signed-off-by: Tessa Pham <[email protected]>
etcd-io · Nov 7, 2023 · c4499ad · c4499ad
1 parent 7e00a1e
commit c4499ad
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/scripts/test.sh b/scripts/test.sh
@@ -502,7 +502,7 @@ function bom_pass {
   run cp go.sum go.sum.tmp || return 2
   run cp go.mod go.mod.tmp || return 2
 
-  output=$(GOFLAGS=-mod=mod run_go_tool github.com/coreos/license-bill-of-materials \
+  output=$(GOFLAGS=-mod=mod run_go_tool github.com/appscodelabs/license-bill-of-materials \
     --override-file ./bill-of-materials.override.json \
     "${modules[@]}")
   code="$?"
@@ -652,7 +652,7 @@ function run_pass {
   local pass="${1}"
   shift 1
   log_callout -e "\\n'${pass}' started at $(date)"
-  if "${pass}_pass" "$@" ; then
+  if "${pass}_pass" "${@}" ; then
     log_success "'${pass}' PASSED and completed at $(date)"
     return 0
   else
@@ -668,7 +668,7 @@ function run_pass {
 log_callout "Starting at: $(date)"
 fail_flag=false
 for pass in $PASSES; do
-  if run_pass "${pass}" "${@}"; then
+  if run_pass "${pass}" "$@"; then
     continue
   else
     fail_flag=true

diff --git a/scripts/updatebom.sh b/scripts/updatebom.sh
@@ -14,7 +14,7 @@ function bom_fixlet {
   # shellcheck disable=SC2207
   modules=($(modules_exp))
 
-  if GOFLAGS=-mod=mod run_go_tool "github.com/coreos/license-bill-of-materials" \
+  if GOFLAGS=-mod=mod run_go_tool "github.com/appscodelabs/license-bill-of-materials" \
       --override-file ./bill-of-materials.override.json \
       "${modules[@]}" > ./bill-of-materials.json.tmp; then
     cp ./bill-of-materials.json.tmp ./bill-of-materials.json

diff --git a/tools/mod/go.mod b/tools/mod/go.mod
@@ -4,9 +4,9 @@ go 1.21
 
 require (
 	github.com/alexfalkowski/gocovmerge v1.2.2
+	github.com/appscodelabs/license-bill-of-materials v0.0.0-20220707232035-6018e0c5287c
 	github.com/chzchzchz/goword v0.0.0-20170907005317-a9744cb52b03
 	github.com/cloudflare/cfssl v1.6.4
-	github.com/coreos/license-bill-of-materials v0.0.0-20190913234955-13baff47494e
 	github.com/gogo/protobuf v1.3.2
 	github.com/google/addlicense v1.1.1
 	github.com/google/yamlfmt v0.10.0

diff --git a/tools/mod/go.sum b/tools/mod/go.sum
@@ -14,6 +14,8 @@ github.com/alecthomas/repr v0.2.0 h1:HAzS41CIzNW5syS8Mf9UwXhNH1J9aix/BvDRf1Ml2Yk
 github.com/alecthomas/repr v0.2.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
 github.com/alexfalkowski/gocovmerge v1.2.2 h1:u/bWOCfOg0i4EUGOgdNrIVohqkY+kx9h7lGcStWepyk=
 github.com/alexfalkowski/gocovmerge v1.2.2/go.mod h1:CzvCVcq2uBcjYM7V37cKG8+g74O4wPpUzPqFCwNDrMU=
+github.com/appscodelabs/license-bill-of-materials v0.0.0-20220707232035-6018e0c5287c h1:xv0ICJ4AO52aNZ+vI2KFUYZBMh7dHvROixZ1vzMMfu8=
+github.com/appscodelabs/license-bill-of-materials v0.0.0-20220707232035-6018e0c5287c/go.mod h1:Y5/1I+0gnnhHKyX4z65mgaGTJ08tnz9WUgkoymA/cws=
 github.com/bitfield/gotestdox v0.2.1 h1:Zj8IMLAO5/oiAKoMmtN96eyFiPZraJRTH2p0zDgtxc0=
 github.com/bitfield/gotestdox v0.2.1/go.mod h1:D+gwtS0urjBrzguAkTM2wodsTQYFHdpx8eqRJ3N+9pY=
 github.com/bmatcuk/doublestar/v4 v4.0.2/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=

diff --git a/tools/mod/tools.go b/tools/mod/tools.go
@@ -22,10 +22,10 @@ package tools
 
 import (
 	_ "github.com/alexfalkowski/gocovmerge"
+	_ "github.com/appscodelabs/license-bill-of-materials"
 	_ "github.com/chzchzchz/goword"
 	_ "github.com/cloudflare/cfssl/cmd/cfssl"
 	_ "github.com/cloudflare/cfssl/cmd/cfssljson"
-	_ "github.com/coreos/license-bill-of-materials"
 	_ "github.com/google/addlicense"
 	_ "github.com/google/yamlfmt/cmd/yamlfmt"
 	_ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-grpc-gateway"