Skip to content

Commit

Permalink
remove github.com/golang/protobuf usage
Browse files Browse the repository at this point in the history
  • Loading branch information
huww98 committed Feb 1, 2024
1 parent 2862f99 commit f205be5
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 42 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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.31.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
Expand Down
8 changes: 4 additions & 4 deletions lib/go/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export GOPATH

# Only set PROTOC_VER if it has an empty value.
ifeq (,$(strip $(PROTOC_VER)))
PROTOC_VER := 24.3
PROTOC_VER := 25.2
endif

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

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

# The temp language bindings are compared to the ones that are
Expand Down
72 changes: 36 additions & 36 deletions lib/go/csi/csi.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/go/csi/csi_grpc.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit f205be5

Please sign in to comment.