From 0539f6f3dcb71e8341579d240175cb118231a942 Mon Sep 17 00:00:00 2001 From: Hidde Beydals Date: Wed, 25 May 2022 10:06:49 +0200 Subject: [PATCH] Drop deprecated github.com/golang/protobuf Signed-off-by: Hidde Beydals --- go.mod | 4 ++-- internal/sops/gcpkms/mock_kms_server_test.go | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 9527b021..8a50384d 100644 --- a/go.mod +++ b/go.mod @@ -28,7 +28,6 @@ require ( github.com/fluxcd/pkg/testserver v0.2.0 github.com/fluxcd/pkg/untar v0.1.0 github.com/fluxcd/source-controller/api v0.24.4 - github.com/golang/protobuf v1.5.2 github.com/hashicorp/go-retryablehttp v0.7.1 github.com/hashicorp/vault/api v1.5.0 github.com/onsi/gomega v1.19.0 @@ -39,6 +38,7 @@ require ( google.golang.org/api v0.81.0 google.golang.org/genproto v0.0.0-20220525015930-6ca3db687a9d google.golang.org/grpc v1.46.2 + google.golang.org/protobuf v1.28.0 k8s.io/api v0.24.0 k8s.io/apiextensions-apiserver v0.24.0 k8s.io/apimachinery v0.24.0 @@ -121,6 +121,7 @@ require ( github.com/golang-jwt/jwt v3.2.1+incompatible // indirect github.com/golang-jwt/jwt/v4 v4.3.0 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect + github.com/golang/protobuf v1.5.2 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/btree v1.0.1 // indirect github.com/google/gnostic v0.5.7-v3refs // indirect @@ -204,7 +205,6 @@ require ( golang.org/x/time v0.0.0-20220224211638-0e9765cccd65 // indirect gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/protobuf v1.28.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.66.4 // indirect gopkg.in/square/go-jose.v2 v2.6.0 // indirect diff --git a/internal/sops/gcpkms/mock_kms_server_test.go b/internal/sops/gcpkms/mock_kms_server_test.go index ec85d673..fa8ad3b6 100644 --- a/internal/sops/gcpkms/mock_kms_server_test.go +++ b/internal/sops/gcpkms/mock_kms_server_test.go @@ -24,16 +24,16 @@ import ( "io" "strings" - "github.com/golang/protobuf/proto" - "github.com/golang/protobuf/ptypes" kmspb "google.golang.org/genproto/googleapis/cloud/kms/v1" + "google.golang.org/protobuf/proto" + "google.golang.org/protobuf/types/known/anypb" status "google.golang.org/genproto/googleapis/rpc/status" "google.golang.org/grpc/metadata" ) var _ = io.EOF -var _ = ptypes.MarshalAny +var _ = anypb.New var _ status.Status type mockKeyManagementServer struct {