Skip to content

Commit 0b3725b

Browse files
committed
remove github.com/golang/protobuf usage
1 parent 92cd21c commit 0b3725b

File tree

3 files changed

+37
-37
lines changed

3 files changed

+37
-37
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ module github.com/container-storage-interface/spec
33
go 1.18
44

55
require (
6-
github.com/golang/protobuf v1.5.3
76
google.golang.org/grpc v1.57.0
87
google.golang.org/protobuf v1.32.0
98
)
109

1110
require (
11+
github.com/golang/protobuf v1.5.3 // indirect
1212
golang.org/x/net v0.10.0 // indirect
1313
golang.org/x/sys v0.8.0 // indirect
1414
golang.org/x/text v0.9.0 // indirect

lib/go/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ $(CSI_GO_TMP) $(CSI_GRPC_TMP): INCLUDE := -I../.. -I$(PROTOC_TMP_DIR)/include
7979
$(CSI_GO_TMP) $(CSI_GRPC_TMP): $(CSI_PROTO) | $(PROTOC)
8080
@mkdir -p "$(@D)"
8181
$(PROTOC) $(INCLUDE) --go-grpc_out=$(CSI_BUILD) --go_out=$(CSI_BUILD) \
82-
--go_opt=Mgoogle/protobuf/descriptor.proto=github.com/golang/protobuf/protoc-gen-go/descriptor \
83-
--go_opt=Mgoogle/protobuf/wrappers.proto=github.com/golang/protobuf/ptypes/wrappers \
82+
--go_opt=Mgoogle/protobuf/descriptor.proto=google.golang.org/protobuf/types/descriptorpb \
83+
--go_opt=Mgoogle/protobuf/wrappers.proto=google.golang.org/protobuf/types/known/wrapperspb \
8484
"$(<F)"
8585

8686
# The temp language bindings are compared to the ones that are

lib/go/csi/csi.pb.go

Lines changed: 34 additions & 34 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)