From 74fd528309d8c34975a644855423fa49cba4eedf Mon Sep 17 00:00:00 2001 From: Shunsuke Suzuki Date: Fri, 2 Dec 2022 11:49:39 +0900 Subject: [PATCH] fix: fix the Go package version to v2 (#373) * fix: fix the package version to v2 ``` git ls-files | grep ".go$" | xargs -n 1 gsed -i "s|github.com/slsa-framework/slsa-verifier|github.com/slsa-framework/slsa-verifier/v2|g" ``` Signed-off-by: Shunsuke Suzuki * fix: fix the package version to v2 Signed-off-by: Shunsuke Suzuki * test: fix source Signed-off-by: Shunsuke Suzuki Signed-off-by: Shunsuke Suzuki --- cli/experimental/service/main.go | 2 +- cli/slsa-verifier/main_test.go | 6 +++--- cli/slsa-verifier/verify.go | 2 +- cli/slsa-verifier/verify/options.go | 2 +- cli/slsa-verifier/verify/verify_artifact.go | 6 +++--- cli/slsa-verifier/verify/verify_image.go | 8 ++++---- experimental/rest/service.go | 4 ++-- go.mod | 2 +- register/register.go | 4 ++-- verifiers/internal/gcb/keys/keys.go | 2 +- verifiers/internal/gcb/provenance.go | 8 ++++---- verifiers/internal/gcb/provenance_test.go | 6 +++--- verifiers/internal/gcb/verifier.go | 10 +++++----- verifiers/internal/gha/builder.go | 6 +++--- verifiers/internal/gha/builder_test.go | 4 ++-- verifiers/internal/gha/provenance.go | 4 ++-- verifiers/internal/gha/provenance_test.go | 2 +- verifiers/internal/gha/rekor.go | 2 +- verifiers/internal/gha/rekor_test.go | 2 +- verifiers/internal/gha/verifier.go | 10 +++++----- verifiers/utils/builder.go | 2 +- verifiers/utils/builder_test.go | 2 +- verifiers/utils/container/container.go | 2 +- verifiers/verifier.go | 12 ++++++------ 24 files changed, 55 insertions(+), 55 deletions(-) diff --git a/cli/experimental/service/main.go b/cli/experimental/service/main.go index ad5c896..1bfd794 100644 --- a/cli/experimental/service/main.go +++ b/cli/experimental/service/main.go @@ -8,7 +8,7 @@ import ( "github.com/gorilla/mux" - "github.com/slsa-framework/slsa-verifier/experimental/rest" + "github.com/slsa-framework/slsa-verifier/v2/experimental/rest" ) func main() { diff --git a/cli/slsa-verifier/main_test.go b/cli/slsa-verifier/main_test.go index 41c3930..5e24d5e 100644 --- a/cli/slsa-verifier/main_test.go +++ b/cli/slsa-verifier/main_test.go @@ -19,9 +19,9 @@ import ( "github.com/sigstore/cosign/pkg/oci" "github.com/sigstore/cosign/pkg/oci/layout" - "github.com/slsa-framework/slsa-verifier/cli/slsa-verifier/verify" - serrors "github.com/slsa-framework/slsa-verifier/errors" - "github.com/slsa-framework/slsa-verifier/verifiers/utils/container" + "github.com/slsa-framework/slsa-verifier/v2/cli/slsa-verifier/verify" + serrors "github.com/slsa-framework/slsa-verifier/v2/errors" + "github.com/slsa-framework/slsa-verifier/v2/verifiers/utils/container" ) func errCmp(e1, e2 error) bool { diff --git a/cli/slsa-verifier/verify.go b/cli/slsa-verifier/verify.go index 54a5732..f88fef7 100644 --- a/cli/slsa-verifier/verify.go +++ b/cli/slsa-verifier/verify.go @@ -19,7 +19,7 @@ import ( "fmt" "os" - "github.com/slsa-framework/slsa-verifier/cli/slsa-verifier/verify" + "github.com/slsa-framework/slsa-verifier/v2/cli/slsa-verifier/verify" "github.com/spf13/cobra" ) diff --git a/cli/slsa-verifier/verify/options.go b/cli/slsa-verifier/verify/options.go index c5c4796..9af23e5 100644 --- a/cli/slsa-verifier/verify/options.go +++ b/cli/slsa-verifier/verify/options.go @@ -18,7 +18,7 @@ import ( "fmt" "strings" - serrors "github.com/slsa-framework/slsa-verifier/errors" + serrors "github.com/slsa-framework/slsa-verifier/v2/errors" "github.com/spf13/cobra" ) diff --git a/cli/slsa-verifier/verify/verify_artifact.go b/cli/slsa-verifier/verify/verify_artifact.go index 2866455..cf7b623 100644 --- a/cli/slsa-verifier/verify/verify_artifact.go +++ b/cli/slsa-verifier/verify/verify_artifact.go @@ -22,9 +22,9 @@ import ( "io" "os" - "github.com/slsa-framework/slsa-verifier/options" - "github.com/slsa-framework/slsa-verifier/verifiers" - "github.com/slsa-framework/slsa-verifier/verifiers/utils" + "github.com/slsa-framework/slsa-verifier/v2/options" + "github.com/slsa-framework/slsa-verifier/v2/verifiers" + "github.com/slsa-framework/slsa-verifier/v2/verifiers/utils" ) // Note: nil branch, tag, version-tag and builder-id means we ignore them during verification. diff --git a/cli/slsa-verifier/verify/verify_image.go b/cli/slsa-verifier/verify/verify_image.go index 53de39c..3dfe14e 100644 --- a/cli/slsa-verifier/verify/verify_image.go +++ b/cli/slsa-verifier/verify/verify_image.go @@ -19,10 +19,10 @@ import ( "fmt" "os" - "github.com/slsa-framework/slsa-verifier/options" - "github.com/slsa-framework/slsa-verifier/verifiers" - "github.com/slsa-framework/slsa-verifier/verifiers/utils" - "github.com/slsa-framework/slsa-verifier/verifiers/utils/container" + "github.com/slsa-framework/slsa-verifier/v2/options" + "github.com/slsa-framework/slsa-verifier/v2/verifiers" + "github.com/slsa-framework/slsa-verifier/v2/verifiers/utils" + "github.com/slsa-framework/slsa-verifier/v2/verifiers/utils/container" ) type ComputeDigestFn func(string) (string, error) diff --git a/experimental/rest/service.go b/experimental/rest/service.go index cfe2df2..ab1d913 100644 --- a/experimental/rest/service.go +++ b/experimental/rest/service.go @@ -9,8 +9,8 @@ import ( "io" "net/http" - "github.com/slsa-framework/slsa-verifier/options" - "github.com/slsa-framework/slsa-verifier/verifiers" + "github.com/slsa-framework/slsa-verifier/v2/options" + "github.com/slsa-framework/slsa-verifier/v2/verifiers" ) var errInvalid = errors.New("invalid") diff --git a/go.mod b/go.mod index 4b66009..5eae8e0 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/slsa-framework/slsa-verifier +module github.com/slsa-framework/slsa-verifier/v2 go 1.18 diff --git a/register/register.go b/register/register.go index 71d8a93..d3eb53a 100644 --- a/register/register.go +++ b/register/register.go @@ -3,8 +3,8 @@ package register import ( "context" - "github.com/slsa-framework/slsa-verifier/options" - "github.com/slsa-framework/slsa-verifier/verifiers/utils" + "github.com/slsa-framework/slsa-verifier/v2/options" + "github.com/slsa-framework/slsa-verifier/v2/verifiers/utils" ) var SLSAVerifiers = make(map[string]SLSAVerifier) diff --git a/verifiers/internal/gcb/keys/keys.go b/verifiers/internal/gcb/keys/keys.go index e7d8367..93aad6b 100644 --- a/verifiers/internal/gcb/keys/keys.go +++ b/verifiers/internal/gcb/keys/keys.go @@ -9,7 +9,7 @@ import ( "io/fs" "path" - serrors "github.com/slsa-framework/slsa-verifier/errors" + serrors "github.com/slsa-framework/slsa-verifier/v2/errors" ) //go:embed materials/* diff --git a/verifiers/internal/gcb/provenance.go b/verifiers/internal/gcb/provenance.go index 6477d37..f026127 100644 --- a/verifiers/internal/gcb/provenance.go +++ b/verifiers/internal/gcb/provenance.go @@ -15,10 +15,10 @@ import ( intoto "github.com/in-toto/in-toto-golang/in_toto" dsselib "github.com/secure-systems-lab/go-securesystemslib/dsse" - serrors "github.com/slsa-framework/slsa-verifier/errors" - "github.com/slsa-framework/slsa-verifier/options" - "github.com/slsa-framework/slsa-verifier/verifiers/internal/gcb/keys" - "github.com/slsa-framework/slsa-verifier/verifiers/utils" + serrors "github.com/slsa-framework/slsa-verifier/v2/errors" + "github.com/slsa-framework/slsa-verifier/v2/options" + "github.com/slsa-framework/slsa-verifier/v2/verifiers/internal/gcb/keys" + "github.com/slsa-framework/slsa-verifier/v2/verifiers/utils" ) var GCBBuilderIDs = []string{ diff --git a/verifiers/internal/gcb/provenance_test.go b/verifiers/internal/gcb/provenance_test.go index a7505c2..dd5013f 100644 --- a/verifiers/internal/gcb/provenance_test.go +++ b/verifiers/internal/gcb/provenance_test.go @@ -10,9 +10,9 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - serrors "github.com/slsa-framework/slsa-verifier/errors" - "github.com/slsa-framework/slsa-verifier/options" - "github.com/slsa-framework/slsa-verifier/verifiers/utils" + serrors "github.com/slsa-framework/slsa-verifier/v2/errors" + "github.com/slsa-framework/slsa-verifier/v2/options" + "github.com/slsa-framework/slsa-verifier/v2/verifiers/utils" ) // This function sets the statement of the proveannce, as if diff --git a/verifiers/internal/gcb/verifier.go b/verifiers/internal/gcb/verifier.go index 522e8af..d79733a 100644 --- a/verifiers/internal/gcb/verifier.go +++ b/verifiers/internal/gcb/verifier.go @@ -3,11 +3,11 @@ package gcb import ( "context" - serrors "github.com/slsa-framework/slsa-verifier/errors" - "github.com/slsa-framework/slsa-verifier/options" - register "github.com/slsa-framework/slsa-verifier/register" - _ "github.com/slsa-framework/slsa-verifier/verifiers/internal/gcb/keys" - "github.com/slsa-framework/slsa-verifier/verifiers/utils" + serrors "github.com/slsa-framework/slsa-verifier/v2/errors" + "github.com/slsa-framework/slsa-verifier/v2/options" + register "github.com/slsa-framework/slsa-verifier/v2/register" + _ "github.com/slsa-framework/slsa-verifier/v2/verifiers/internal/gcb/keys" + "github.com/slsa-framework/slsa-verifier/v2/verifiers/utils" ) const VerifierName = "GCB" diff --git a/verifiers/internal/gha/builder.go b/verifiers/internal/gha/builder.go index 1f49936..645da8f 100644 --- a/verifiers/internal/gha/builder.go +++ b/verifiers/internal/gha/builder.go @@ -8,9 +8,9 @@ import ( "golang.org/x/mod/semver" - serrors "github.com/slsa-framework/slsa-verifier/errors" - "github.com/slsa-framework/slsa-verifier/options" - "github.com/slsa-framework/slsa-verifier/verifiers/utils" + serrors "github.com/slsa-framework/slsa-verifier/v2/errors" + "github.com/slsa-framework/slsa-verifier/v2/options" + "github.com/slsa-framework/slsa-verifier/v2/verifiers/utils" ) var ( diff --git a/verifiers/internal/gha/builder_test.go b/verifiers/internal/gha/builder_test.go index 90940d5..8dac4bd 100644 --- a/verifiers/internal/gha/builder_test.go +++ b/verifiers/internal/gha/builder_test.go @@ -6,8 +6,8 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - serrors "github.com/slsa-framework/slsa-verifier/errors" - "github.com/slsa-framework/slsa-verifier/options" + serrors "github.com/slsa-framework/slsa-verifier/v2/errors" + "github.com/slsa-framework/slsa-verifier/v2/options" ) func Test_VerifyWorkflowIdentity(t *testing.T) { diff --git a/verifiers/internal/gha/provenance.go b/verifiers/internal/gha/provenance.go index 5b17947..6a471e5 100644 --- a/verifiers/internal/gha/provenance.go +++ b/verifiers/internal/gha/provenance.go @@ -17,8 +17,8 @@ import ( "github.com/sigstore/rekor/pkg/generated/models" "github.com/slsa-framework/slsa-github-generator/signing/envelope" - serrors "github.com/slsa-framework/slsa-verifier/errors" - "github.com/slsa-framework/slsa-verifier/options" + serrors "github.com/slsa-framework/slsa-verifier/v2/errors" + "github.com/slsa-framework/slsa-verifier/v2/options" ) // SignedAttestation contains a signed DSSE envelope diff --git a/verifiers/internal/gha/provenance_test.go b/verifiers/internal/gha/provenance_test.go index aebc542..86ffe23 100644 --- a/verifiers/internal/gha/provenance_test.go +++ b/verifiers/internal/gha/provenance_test.go @@ -9,7 +9,7 @@ import ( intoto "github.com/in-toto/in-toto-golang/in_toto" slsa "github.com/in-toto/in-toto-golang/in_toto/slsa_provenance/v0.2" - serrors "github.com/slsa-framework/slsa-verifier/errors" + serrors "github.com/slsa-framework/slsa-verifier/v2/errors" ) func provenanceFromBytes(payload []byte) (*intoto.ProvenanceStatement, error) { diff --git a/verifiers/internal/gha/rekor.go b/verifiers/internal/gha/rekor.go index 1e23648..e1e1452 100644 --- a/verifiers/internal/gha/rekor.go +++ b/verifiers/internal/gha/rekor.go @@ -31,7 +31,7 @@ import ( "github.com/sigstore/sigstore/pkg/signature/dsse" "github.com/slsa-framework/slsa-github-generator/signing/envelope" - serrors "github.com/slsa-framework/slsa-verifier/errors" + serrors "github.com/slsa-framework/slsa-verifier/v2/errors" ) const ( diff --git a/verifiers/internal/gha/rekor_test.go b/verifiers/internal/gha/rekor_test.go index 2182d20..804987e 100644 --- a/verifiers/internal/gha/rekor_test.go +++ b/verifiers/internal/gha/rekor_test.go @@ -9,7 +9,7 @@ import ( "github.com/sigstore/rekor/pkg/generated/client" "github.com/sigstore/rekor/pkg/generated/client/index" - serrors "github.com/slsa-framework/slsa-verifier/errors" + serrors "github.com/slsa-framework/slsa-verifier/v2/errors" ) type searchResult struct { diff --git a/verifiers/internal/gha/verifier.go b/verifiers/internal/gha/verifier.go index d6a0230..0a7bcd3 100644 --- a/verifiers/internal/gha/verifier.go +++ b/verifiers/internal/gha/verifier.go @@ -13,11 +13,11 @@ import ( "github.com/sigstore/cosign/pkg/cosign" "github.com/sigstore/rekor/pkg/client" - serrors "github.com/slsa-framework/slsa-verifier/errors" - "github.com/slsa-framework/slsa-verifier/options" - "github.com/slsa-framework/slsa-verifier/register" - "github.com/slsa-framework/slsa-verifier/verifiers/utils" - "github.com/slsa-framework/slsa-verifier/verifiers/utils/container" + serrors "github.com/slsa-framework/slsa-verifier/v2/errors" + "github.com/slsa-framework/slsa-verifier/v2/options" + "github.com/slsa-framework/slsa-verifier/v2/register" + "github.com/slsa-framework/slsa-verifier/v2/verifiers/utils" + "github.com/slsa-framework/slsa-verifier/v2/verifiers/utils/container" ) const VerifierName = "GHA" diff --git a/verifiers/utils/builder.go b/verifiers/utils/builder.go index 990284b..f5443c9 100644 --- a/verifiers/utils/builder.go +++ b/verifiers/utils/builder.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - serrors "github.com/slsa-framework/slsa-verifier/errors" + serrors "github.com/slsa-framework/slsa-verifier/v2/errors" ) type TrustedBuilderID struct { diff --git a/verifiers/utils/builder_test.go b/verifiers/utils/builder_test.go index 0ce6c9e..fa51111 100644 --- a/verifiers/utils/builder_test.go +++ b/verifiers/utils/builder_test.go @@ -7,7 +7,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - serrors "github.com/slsa-framework/slsa-verifier/errors" + serrors "github.com/slsa-framework/slsa-verifier/v2/errors" ) func Test_ParseBuilderID(t *testing.T) { diff --git a/verifiers/utils/container/container.go b/verifiers/utils/container/container.go index c704704..2d89ab6 100644 --- a/verifiers/utils/container/container.go +++ b/verifiers/utils/container/container.go @@ -7,7 +7,7 @@ import ( "github.com/google/go-containerregistry/pkg/crane" crname "github.com/google/go-containerregistry/pkg/name" - serrors "github.com/slsa-framework/slsa-verifier/errors" + serrors "github.com/slsa-framework/slsa-verifier/v2/errors" ) func GetImageDigest(image string) (string, error) { diff --git a/verifiers/verifier.go b/verifiers/verifier.go index e7e5204..e8ce53f 100644 --- a/verifiers/verifier.go +++ b/verifiers/verifier.go @@ -4,12 +4,12 @@ import ( "context" "fmt" - serrors "github.com/slsa-framework/slsa-verifier/errors" - "github.com/slsa-framework/slsa-verifier/options" - "github.com/slsa-framework/slsa-verifier/register" - _ "github.com/slsa-framework/slsa-verifier/verifiers/internal/gcb" - "github.com/slsa-framework/slsa-verifier/verifiers/internal/gha" - "github.com/slsa-framework/slsa-verifier/verifiers/utils" + serrors "github.com/slsa-framework/slsa-verifier/v2/errors" + "github.com/slsa-framework/slsa-verifier/v2/options" + "github.com/slsa-framework/slsa-verifier/v2/register" + _ "github.com/slsa-framework/slsa-verifier/v2/verifiers/internal/gcb" + "github.com/slsa-framework/slsa-verifier/v2/verifiers/internal/gha" + "github.com/slsa-framework/slsa-verifier/v2/verifiers/utils" ) func getVerifier(builderOpts *options.BuilderOpts) (register.SLSAVerifier, error) {