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 <suzuki.shunsuke.1989@gmail.com>

* fix: fix the package version to v2

Signed-off-by: Shunsuke Suzuki <suzuki.shunsuke.1989@gmail.com>

* test: fix source

Signed-off-by: Shunsuke Suzuki <suzuki.shunsuke.1989@gmail.com>

Signed-off-by: Shunsuke Suzuki <suzuki.shunsuke.1989@gmail.com>
This commit is contained in:
Shunsuke Suzuki
2022-12-01 18:49:39 -08:00
committed by GitHub
parent 128324f488
commit 74fd528309
24 changed files with 55 additions and 55 deletions
+1 -1
View File
@@ -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() {
+3 -3
View File
@@ -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 {
+1 -1
View File
@@ -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"
)
+1 -1
View File
@@ -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"
)
+3 -3
View File
@@ -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.
+4 -4
View File
@@ -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)
+2 -2
View File
@@ -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")
+1 -1
View File
@@ -1,4 +1,4 @@
module github.com/slsa-framework/slsa-verifier
module github.com/slsa-framework/slsa-verifier/v2
go 1.18
+2 -2
View File
@@ -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)
+1 -1
View File
@@ -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/*
+4 -4
View File
@@ -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{
+3 -3
View File
@@ -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
+5 -5
View File
@@ -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"
+3 -3
View File
@@ -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 (
+2 -2
View File
@@ -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) {
+2 -2
View File
@@ -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
+1 -1
View File
@@ -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) {
+1 -1
View File
@@ -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 (
+1 -1
View File
@@ -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 {
+5 -5
View File
@@ -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"
+1 -1
View File
@@ -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 {
+1 -1
View File
@@ -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) {
+1 -1
View File
@@ -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) {
+6 -6
View File
@@ -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) {