Update to use the new protobuf library (#908)

* Update to use the new protobuf library * Update protoc deps * Update grpc build steps * Fix the protoc generate command * Use any patch version * Remove the protoc version from workflows entirely * Update protoc gen
stripe · Jul 18, 2022 · e8a7031 · e8a7031
1 parent d2911f2
commit e8a7031
Show file tree

Hide file tree

Showing 19 changed files with 698 additions and 675 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -27,8 +27,9 @@ jobs:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
     - name: Install protoc deps
       run: |
-        go get github.com/golang/protobuf/protoc-gen-go
-        go get github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc@v1.5.1
+        go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.28
+        go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.2
+        go install github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc@v1.5.1
       shell: bash
     - name: Run Tests
       run: make ci

diff --git a/Makefile b/Makefile
@@ -120,7 +120,8 @@ clean:
 
 # Handle all protobuf generation.
 protoc:
-	@go get github.com/golang/protobuf/protoc-gen-go
+	@go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.28
+	@go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.2
 	@go get github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc
 	@go mod tidy
 	make protoc-gen-all
@@ -140,8 +141,10 @@ protoc-gen-all: protoc-gen-code protoc-gen-docs
 # Generate protobuf go code
 protoc-gen-code:
 	@protoc \
-		--go_out=plugins=grpc:./rpc \
+		--go_out=./rpc \
 		--go_opt=module=github.com/stripe/stripe-cli/rpc \
+		--go-grpc_out=require_unimplemented_servers=false:./rpc \
+		--go-grpc_opt=module=github.com/stripe/stripe-cli/rpc \
 		--proto_path ./rpc \
 		./rpc/*.proto \
 	|| (printf ${PROTOC_FAILURE_MESSAGE}; exit 1)

diff --git a/rpc/commands.pb.go b/rpc/commands.pb.go
diff --git a/rpc/commands_grpc.pb.go b/rpc/commands_grpc.pb.go
diff --git a/rpc/common.pb.go b/rpc/common.pb.go
diff --git a/rpc/events_resend.pb.go b/rpc/events_resend.pb.go
diff --git a/rpc/fixtures.pb.go b/rpc/fixtures.pb.go
diff --git a/rpc/listen.pb.go b/rpc/listen.pb.go
diff --git a/rpc/login.pb.go b/rpc/login.pb.go
diff --git a/rpc/login_status.pb.go b/rpc/login_status.pb.go
diff --git a/rpc/logs_tail.pb.go b/rpc/logs_tail.pb.go
diff --git a/rpc/sample_configs.pb.go b/rpc/sample_configs.pb.go
diff --git a/rpc/sample_create.pb.go b/rpc/sample_create.pb.go
diff --git a/rpc/samples_list.pb.go b/rpc/samples_list.pb.go
diff --git a/rpc/trigger.pb.go b/rpc/trigger.pb.go
diff --git a/rpc/triggers_list.pb.go b/rpc/triggers_list.pb.go
diff --git a/rpc/version.pb.go b/rpc/version.pb.go
diff --git a/rpc/webhook_endpoint_create.pb.go b/rpc/webhook_endpoint_create.pb.go
diff --git a/rpc/webhook_endpoints_list.pb.go b/rpc/webhook_endpoints_list.pb.go