fix: fix the Go package version to v2 (#373)

suzuki-shunsuke · web-flow · commit 74fd528309d8 · 2022-12-01T18:49:39.000-08:00
* 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 &lt;suzuki.shunsuke.1989@gmail.com&gt;

* fix: fix the package version to v2

Signed-off-by: Shunsuke Suzuki &lt;suzuki.shunsuke.1989@gmail.com&gt;

* test: fix source

Signed-off-by: Shunsuke Suzuki &lt;suzuki.shunsuke.1989@gmail.com&gt;

Signed-off-by: Shunsuke Suzuki &lt;suzuki.shunsuke.1989@gmail.com&gt;
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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) {

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`
`9`	`9`	`"github.com/gorilla/mux"`
`10`	`10`
`11`		`- "github.com/slsa-framework/slsa-verifier/experimental/rest"`
	`11`	`+ "github.com/slsa-framework/slsa-verifier/v2/experimental/rest"`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`func main() {`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ import (`
`19`	`19`	`"fmt"`
`20`	`20`	`"os"`
`21`	`21`
`22`		`- "github.com/slsa-framework/slsa-verifier/cli/slsa-verifier/verify"`
	`22`	`+ "github.com/slsa-framework/slsa-verifier/v2/cli/slsa-verifier/verify"`
`23`	`23`	`"github.com/spf13/cobra"`
`24`	`24`	`)`
`25`	`25`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ import (`
`18`	`18`	`"fmt"`
`19`	`19`	`"strings"`
`20`	`20`
`21`		`- serrors "github.com/slsa-framework/slsa-verifier/errors"`
	`21`	`+ serrors "github.com/slsa-framework/slsa-verifier/v2/errors"`
`22`	`22`	`"github.com/spf13/cobra"`
`23`	`23`	`)`
`24`	`24`
Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,8 @@ import (`
`9`	`9`	`"io"`
`10`	`10`	`"net/http"`
`11`	`11`
`12`		`- "github.com/slsa-framework/slsa-verifier/options"`
`13`		`- "github.com/slsa-framework/slsa-verifier/verifiers"`
	`12`	`+ "github.com/slsa-framework/slsa-verifier/v2/options"`
	`13`	`+ "github.com/slsa-framework/slsa-verifier/v2/verifiers"`
`14`	`14`	`)`
`15`	`15`
`16`	`16`	`var errInvalid = errors.New("invalid")`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-module github.com/slsa-framework/slsa-verifier`
	`1`	`+module github.com/slsa-framework/slsa-verifier/v2`
`2`	`2`
`3`	`3`	`go 1.18`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@ package register`
`3`	`3`	`import (`
`4`	`4`	`"context"`
`5`	`5`
`6`		`- "github.com/slsa-framework/slsa-verifier/options"`
`7`		`- "github.com/slsa-framework/slsa-verifier/verifiers/utils"`
	`6`	`+ "github.com/slsa-framework/slsa-verifier/v2/options"`
	`7`	`+ "github.com/slsa-framework/slsa-verifier/v2/verifiers/utils"`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`var SLSAVerifiers = make(map[string]SLSAVerifier)`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`	`"io/fs"`
`10`	`10`	`"path"`
`11`	`11`
`12`		`- serrors "github.com/slsa-framework/slsa-verifier/errors"`
	`12`	`+ serrors "github.com/slsa-framework/slsa-verifier/v2/errors"`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`//go:embed materials/*`