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

Break dependency on old chainguard/vex module #2

Merged
merged 3 commits into from
Jan 11, 2023
Merged

Break dependency on old chainguard/vex module #2

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
46f9220
Pull openvex/vex @ HEAD
puerco Jan 11, 2023
f32c652
Shift dependency to openvex/vex
puerco Jan 11, 2023
0c54901
Update README to openvex org and latest features
puerco Jan 11, 2023
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 go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ module github.com/openvex/vexctl
go 1.19

require (
chainguard.dev/vex v0.1.0
github.com/google/go-containerregistry v0.12.1
github.com/openvex/vex v0.1.1-0.20230110080744-b295df0b0ef1
github.com/owenrumney/go-sarif v1.1.1
github.com/secure-systems-lab/go-securesystemslib v0.4.0
github.com/sigstore/cosign v1.13.1
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ bazil.org/fuse v0.0.0-20180421153158-65cc252bf669/go.mod h1:Xbm+BRKSBEpa4q4hTSxo
bitbucket.org/creachadair/shell v0.0.6/go.mod h1:8Qqi/cYk7vPnsOePHroKXDJYmb5x7ENhtiFtfZq8K+M=
bitbucket.org/creachadair/shell v0.0.7 h1:Z96pB6DkSb7F3Y3BBnJeOZH2gazyMTWlvecSD4vDqfk=
bitbucket.org/creachadair/shell v0.0.7/go.mod h1:oqtXSSvSYr4624lnnabXHaBsYW6RD80caLi2b3hJk0U=
chainguard.dev/vex v0.1.0 h1:nxOUH65+OjBQ2Vph+8u5qpf7YRyT2XUtLnp27Q43XcM=
chainguard.dev/vex v0.1.0/go.mod h1:uNzgmAtDI3UkKkzJrVetp5bq6bpJ5vvYU4JybJxaF6I=
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
Expand Down Expand Up @@ -1039,6 +1037,8 @@ github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFSt
github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs=
github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
github.com/openvex/vex v0.1.1-0.20230110080744-b295df0b0ef1 h1:MlPltqDIi3Q2eshmLhJ7Hhvne4mR2lGnvb7z+rC5Akk=
github.com/openvex/vex v0.1.1-0.20230110080744-b295df0b0ef1/go.mod h1:I3ZjbXZAjc3jM+qCXhA3lu0neNmPEzpH8ZwAjfW4TG0=
github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod h1:/wsWhb9smxSfWAKL3wpBW7V8scJMt8N8gnaMCS9E/cA=
github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw=
github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4=
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/attest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"fmt"
"os"

"chainguard.dev/vex/pkg/ctl"
"github.com/openvex/vexctl/pkg/ctl"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (

"github.com/spf13/cobra"

"chainguard.dev/vex/pkg/vex"
"github.com/openvex/vex/pkg/vex"
)

type createOptions struct {
Expand Down
7 changes: 4 additions & 3 deletions internal/cmd/filter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,10 @@ import (

"github.com/spf13/cobra"

"chainguard.dev/vex/pkg/ctl"
"chainguard.dev/vex/pkg/sarif"
"chainguard.dev/vex/pkg/vex"
"github.com/openvex/vex/pkg/sarif"
"github.com/openvex/vex/pkg/vex"

"github.com/openvex/vexctl/pkg/ctl"
)

type filterOptions struct {
Expand Down
5 changes: 3 additions & 2 deletions internal/cmd/merge.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@ import (

"github.com/spf13/cobra"

"chainguard.dev/vex/pkg/ctl"
"chainguard.dev/vex/pkg/vex"
"github.com/openvex/vex/pkg/vex"

"github.com/openvex/vexctl/pkg/ctl"
)

type mergeOptions struct {
Expand Down
6 changes: 3 additions & 3 deletions pkg/ctl/ctl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
"context"
"fmt"

"chainguard.dev/vex/pkg/attestation"
"chainguard.dev/vex/pkg/sarif"
"chainguard.dev/vex/pkg/vex"
"github.com/openvex/vex/pkg/attestation"
"github.com/openvex/vex/pkg/sarif"
"github.com/openvex/vex/pkg/vex"
)

type VexCtl struct {
Expand Down
4 changes: 2 additions & 2 deletions pkg/ctl/ctl_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (

"github.com/stretchr/testify/require"

"chainguard.dev/vex/pkg/sarif"
"chainguard.dev/vex/pkg/vex"
"github.com/openvex/vex/pkg/sarif"
"github.com/openvex/vex/pkg/vex"
)

func TestVexReport(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions pkg/ctl/implementation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ import (
"github.com/sirupsen/logrus"
"sigs.k8s.io/release-utils/util"

"chainguard.dev/vex/pkg/attestation"
"chainguard.dev/vex/pkg/sarif"
"chainguard.dev/vex/pkg/vex"
"github.com/openvex/vex/pkg/attestation"
"github.com/openvex/vex/pkg/sarif"
"github.com/openvex/vex/pkg/vex"
)

const IntotoPayloadType = "application/vnd.in-toto+json"
Expand Down