Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: fix the Go package version to v2 #373

Merged
merged 3 commits into from
Dec 2, 2022
Merged

fix: fix the Go package version to v2 #373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1900eda
fix: fix the package version to v2
suzuki-shunsuke Dec 2, 2022
6c7df96
fix: fix the package version to v2
suzuki-shunsuke Dec 2, 2022
4387593
test: fix source
suzuki-shunsuke Dec 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cli/experimental/service/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
6 changes: 3 additions & 3 deletions cli/slsa-verifier/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion cli/slsa-verifier/verify.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion cli/slsa-verifier/verify/options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
6 changes: 3 additions & 3 deletions cli/slsa-verifier/verify/verify_artifact.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
8 changes: 4 additions & 4 deletions cli/slsa-verifier/verify/verify_image.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions experimental/rest/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/slsa-framework/slsa-verifier
module github.com/slsa-framework/slsa-verifier/v2

go 1.18

Expand Down
4 changes: 2 additions & 2 deletions register/register.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion verifiers/internal/gcb/keys/keys.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/*
Expand Down
8 changes: 4 additions & 4 deletions verifiers/internal/gcb/provenance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
6 changes: 3 additions & 3 deletions verifiers/internal/gcb/provenance_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions verifiers/internal/gcb/verifier.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions verifiers/internal/gha/builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
4 changes: 2 additions & 2 deletions verifiers/internal/gha/builder_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions verifiers/internal/gha/provenance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion verifiers/internal/gha/provenance_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion verifiers/internal/gha/rekor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion verifiers/internal/gha/rekor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
10 changes: 5 additions & 5 deletions verifiers/internal/gha/verifier.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion verifiers/utils/builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion verifiers/utils/builder_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion verifiers/utils/container/container.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
12 changes: 6 additions & 6 deletions verifiers/verifier.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down