remove github.com/golang/protobuf usage

container-storage-interface · Feb 8, 2024 · 0b3725b · 0b3725b
1 parent 92cd21c
commit 0b3725b
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 37 deletions.
diff --git a/go.mod b/go.mod
@@ -3,12 +3,12 @@ module github.com/container-storage-interface/spec
 go 1.18
 
 require (
-	github.com/golang/protobuf v1.5.3
 	google.golang.org/grpc v1.57.0
 	google.golang.org/protobuf v1.32.0
 )
 
 require (
+	github.com/golang/protobuf v1.5.3 // indirect
 	golang.org/x/net v0.10.0 // indirect
 	golang.org/x/sys v0.8.0 // indirect
 	golang.org/x/text v0.9.0 // indirect

diff --git a/lib/go/Makefile b/lib/go/Makefile
@@ -79,8 +79,8 @@ $(CSI_GO_TMP) $(CSI_GRPC_TMP): INCLUDE := -I../.. -I$(PROTOC_TMP_DIR)/include
 $(CSI_GO_TMP) $(CSI_GRPC_TMP): $(CSI_PROTO) | $(PROTOC)
 	@mkdir -p "$(@D)"
 	$(PROTOC) $(INCLUDE) --go-grpc_out=$(CSI_BUILD) --go_out=$(CSI_BUILD) \
-		--go_opt=Mgoogle/protobuf/descriptor.proto=github.com/golang/protobuf/protoc-gen-go/descriptor \
-		--go_opt=Mgoogle/protobuf/wrappers.proto=github.com/golang/protobuf/ptypes/wrappers \
+		--go_opt=Mgoogle/protobuf/descriptor.proto=google.golang.org/protobuf/types/descriptorpb \
+		--go_opt=Mgoogle/protobuf/wrappers.proto=google.golang.org/protobuf/types/known/wrapperspb \
 		"$(<F)"
 
 # The temp language bindings are compared to the ones that are

diff --git a/lib/go/csi/csi.pb.go b/lib/go/csi/csi.pb.go