get rid of remaining github.com/golang/protobuf

Author: huww98

go.mod

@@ -4,7 +4,6 @@ go 1.22.5
 
 require (
 	github.com/container-storage-interface/spec v1.10.0
-	github.com/golang/protobuf v1.5.4
 	github.com/stretchr/testify v1.9.0
 	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0
 	go.opentelemetry.io/otel/trace v1.28.0
@@ -30,6 +29,7 @@ require (
 	github.com/go-openapi/swag v0.22.4 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
+	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/gnostic-models v0.6.8 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect

protosanitizer/protosanitizer_test.go

@@ -21,9 +21,9 @@ import (
 	"testing"
 
 	"github.com/container-storage-interface/spec/lib/go/csi"
-	"github.com/golang/protobuf/proto"
 	"github.com/kubernetes-csi/csi-lib-utils/protosanitizer/test/csitest"
 	"github.com/stretchr/testify/assert"
+	"google.golang.org/protobuf/proto"
 )
 
 func TestStripSecrets(t *testing.T) {

rpc/common_test.go

@@ -30,9 +30,9 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
+	"google.golang.org/protobuf/types/known/wrapperspb"
 
 	"github.com/container-storage-interface/spec/lib/go/csi"
-	"github.com/golang/protobuf/ptypes/wrappers"
 	"github.com/kubernetes-csi/csi-lib-utils/connection"
 	"github.com/kubernetes-csi/csi-lib-utils/metrics"
 	"github.com/stretchr/testify/require"
@@ -513,7 +513,7 @@ func TestProbeForever(t *testing.T) {
 			probeCalls: []probeCall{
 				{
 					response: &csi.ProbeResponse{
-						Ready: &wrappers.BoolValue{Value: true},
+						Ready: &wrapperspb.BoolValue{Value: true},
 					},
 				},
 			},
@@ -562,7 +562,7 @@ func TestProbeForever(t *testing.T) {
 				},
 				{
 					response: &csi.ProbeResponse{
-						Ready: &wrappers.BoolValue{Value: true},
+						Ready: &wrapperspb.BoolValue{Value: true},
 					},
 				},
 			},
@@ -573,7 +573,7 @@ func TestProbeForever(t *testing.T) {
 			probeCalls: []probeCall{
 				{
 					response: &csi.ProbeResponse{
-						Ready: &wrappers.BoolValue{Value: false},
+						Ready: &wrapperspb.BoolValue{Value: false},
 					},
 				},
 				{
@@ -587,17 +587,17 @@ func TestProbeForever(t *testing.T) {
 			probeCalls: []probeCall{
 				{
 					response: &csi.ProbeResponse{
-						Ready: &wrappers.BoolValue{Value: false},
+						Ready: &wrapperspb.BoolValue{Value: false},
 					},
 				},
 				{
 					response: &csi.ProbeResponse{
-						Ready: &wrappers.BoolValue{Value: false},
+						Ready: &wrapperspb.BoolValue{Value: false},
 					},
 				},
 				{
 					response: &csi.ProbeResponse{
-						Ready: &wrappers.BoolValue{Value: true},
+						Ready: &wrapperspb.BoolValue{Value: true},
 					},
 				},
 			},