Skip to content

Commit 4a29ebc

Browse files
build(deps): migrate protovalidate to v1.1.0 and upgrade cosign to v3 (#2618)
Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: Miguel Martinez <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent 8ba0d55 commit 4a29ebc

File tree

176 files changed

+18371
-16203
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

176 files changed

+18371
-16203
lines changed

app/artifact-cas/api/buf.gen.yaml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
1-
version: v1
1+
version: v2
22
plugins:
3-
- name: go
3+
- local: protoc-gen-go
44
out: .
55
opt: paths=source_relative
6-
- name: go-errors
6+
- local: protoc-gen-go-errors
77
out: .
88
opt: paths=source_relative
9-
- name: go-grpc
9+
- local: protoc-gen-go-grpc
1010
out: .
11-
opt:
12-
- paths=source_relative
13-
- name: go-http
11+
opt: paths=source_relative
12+
- local: protoc-gen-go-http
1413
out: .
1514
opt: paths=source_relative

app/artifact-cas/api/buf.lock

Lines changed: 0 additions & 18 deletions
This file was deleted.

app/artifact-cas/api/buf.yaml

Lines changed: 0 additions & 10 deletions
This file was deleted.

app/artifact-cas/cmd/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"os"
2121
"time"
2222

23-
"github.com/bufbuild/protovalidate-go"
23+
"buf.build/go/protovalidate"
2424
"github.com/getsentry/sentry-go"
2525

2626
"github.com/chainloop-dev/chainloop/app/artifact-cas/internal/conf"
@@ -145,7 +145,7 @@ func main() {
145145
}
146146
}
147147

148-
func newProtoValidator() (*protovalidate.Validator, error) {
148+
func newProtoValidator() (protovalidate.Validator, error) {
149149
return protovalidate.New()
150150
}
151151

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
version: v1
1+
version: v2
22
plugins:
3-
- name: go
3+
- local: protoc-gen-go
44
out: .
55
opt: paths=source_relative

app/artifact-cas/internal/conf/buf.lock

Lines changed: 0 additions & 12 deletions
This file was deleted.

app/artifact-cas/internal/conf/buf.yaml

Lines changed: 0 additions & 13 deletions
This file was deleted.

app/artifact-cas/internal/server/grpc.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import (
3535
"github.com/prometheus/client_golang/prometheus"
3636
"google.golang.org/genproto/googleapis/bytestream"
3737

38-
"github.com/bufbuild/protovalidate-go"
38+
"buf.build/go/protovalidate"
3939
"github.com/go-kratos/kratos/v2/log"
4040
"github.com/go-kratos/kratos/v2/middleware/logging"
4141
"github.com/go-kratos/kratos/v2/middleware/recovery"
@@ -49,7 +49,7 @@ import (
4949
)
5050

5151
// NewGRPCServer new a gRPC server.
52-
func NewGRPCServer(c *conf.Server, authConf *conf.Auth, byteService *service.ByteStreamService, rSvc *service.ResourceService, providers backend.Providers, validator *protovalidate.Validator, logger log.Logger) (*grpc.Server, error) {
52+
func NewGRPCServer(c *conf.Server, authConf *conf.Auth, byteService *service.ByteStreamService, rSvc *service.ResourceService, providers backend.Providers, validator protovalidate.Validator, logger log.Logger) (*grpc.Server, error) {
5353
log := log.NewHelper(logger)
5454
// Load the key on initialization instead of on every request
5555
// TODO: implement jwks endpoint

app/cli/pkg/action/attestation_verify.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222

2323
pb "github.com/chainloop-dev/chainloop/app/controlplane/api/controlplane/v1"
2424
"github.com/chainloop-dev/chainloop/pkg/attestation/verifier"
25-
"github.com/sigstore/cosign/v2/pkg/blob"
25+
"github.com/sigstore/cosign/v3/pkg/blob"
2626
"google.golang.org/grpc/codes"
2727
"google.golang.org/grpc/status"
2828
)

app/cli/pkg/action/workflow_run_describe.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ import (
2929
"github.com/chainloop-dev/chainloop/pkg/attestation/verifier"
3030
intoto "github.com/in-toto/attestation/go/v1"
3131
"github.com/secure-systems-lab/go-securesystemslib/dsse"
32-
"github.com/sigstore/cosign/v2/pkg/blob"
33-
"github.com/sigstore/cosign/v2/pkg/cosign"
34-
sigs "github.com/sigstore/cosign/v2/pkg/signature"
32+
"github.com/sigstore/cosign/v3/pkg/blob"
33+
"github.com/sigstore/cosign/v3/pkg/cosign"
34+
sigs "github.com/sigstore/cosign/v3/pkg/signature"
3535
"github.com/sigstore/sigstore/pkg/cryptoutils"
3636
"github.com/sigstore/sigstore/pkg/signature"
3737
sigdsee "github.com/sigstore/sigstore/pkg/signature/dsse"

0 commit comments

Comments
 (0)