From c4499adfd5b42a839dbe60c5d1a01c075152e3ac Mon Sep 17 00:00:00 2001 From: Tessa Pham Date: Tue, 7 Nov 2023 17:41:11 -0600 Subject: [PATCH] replace archived repo in BOM check Signed-off-by: Tessa Pham --- scripts/test.sh | 6 +++--- scripts/updatebom.sh | 2 +- tools/mod/go.mod | 2 +- tools/mod/go.sum | 2 ++ tools/mod/tools.go | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/scripts/test.sh b/scripts/test.sh index f9cc0fb23..bab7b751a 100755 --- 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 index 784c65fc3..dd482a325 100755 --- 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 index c662f3537..b4894b362 100644 --- 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 index d552ff65b..de3f52e58 100644 --- 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 index f94508941..6fb797f6d 100644 --- 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"