Skip to content

Commit f205be5

Browse files
committed
remove github.com/golang/protobuf usage
1 parent 2862f99 commit f205be5

File tree

4 files changed

+42
-42
lines changed

4 files changed

+42
-42
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.31.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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export GOPATH
2121

2222
# Only set PROTOC_VER if it has an empty value.
2323
ifeq (,$(strip $(PROTOC_VER)))
24-
PROTOC_VER := 24.3
24+
PROTOC_VER := 25.2
2525
endif
2626

2727
PROTOC_OS := $(shell uname -s)
@@ -43,7 +43,7 @@ PROTOC_TMP_DIR := .protoc
4343
PROTOC_TMP_BIN := $(PROTOC_TMP_DIR)/bin/protoc
4444

4545
$(PROTOC):
46-
-go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.31.0 && \
46+
-go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.32.0 && \
4747
go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0 && \
4848
mkdir -p "$(PROTOC_TMP_DIR)" && \
4949
curl -L $(PROTOC_URL) -o "$(PROTOC_TMP_DIR)/$(PROTOC_ZIP)" && \
@@ -79,8 +79,8 @@ $(CSI_GO_TMP) $(CSI_GRPC_TMP): INCLUDE := -I$(GOPATH)/src -I$(PROTOC_TMP_DIR)/in
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
"$(CSI_PKG_ROOT)/$(<F)"
8585

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

lib/go/csi/csi.pb.go

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

lib/go/csi/csi_grpc.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)