Merge pull request #361 from zoncoen/proto

chore: bump protoc* tools
zoncoen · Oct 31, 2023 · 810e749 · 810e749
2 parents 86100fa + db7733d
commit 810e749
Show file tree

Hide file tree

Showing 5 changed files with 104 additions and 44 deletions.
diff --git a/Makefile b/Makefile
@@ -22,7 +22,7 @@ $(BIN_DIR):
 	@mkdir -p $(BIN_DIR)
 
 PROTOC := $(BIN_DIR)/protoc
-PROTOC_VERSION := 21.12
+PROTOC_VERSION := 24.4
 PROTOC_OS := $(UNAME_OS)
 ifeq "$(UNAME_OS)" "Darwin"
 	PROTOC_OS = osx
@@ -41,11 +41,11 @@ $(PROTOC): | $(BIN_DIR)
 
 PROTOC_GEN_GO := $(BIN_DIR)/protoc-gen-go
 $(PROTOC_GEN_GO): | $(BIN_DIR)
-	@$(GO) install google.golang.org/protobuf/cmd/protoc-gen-go@v1.28.1
+	@$(GO) install google.golang.org/protobuf/cmd/protoc-gen-go@v1.31.0
 
 PROTOC_GEN_GO_GRPC := $(BIN_DIR)/protoc-gen-go-grpc
 $(PROTOC_GEN_GO_GRPC): | $(BIN_DIR)
-	@$(GO) install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.2.0
+	@$(GO) install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0
 
 GOPROTOYAMLTAG := $(BIN_DIR)/goprotoyamltag
 $(GOPROTOYAMLTAG): | $(BIN_DIR)

diff --git a/README.md b/README.md
@@ -21,19 +21,20 @@ You can write test scenarios as YAML files and executes them.
 
 ```yaml github.yaml
 title: get scenarigo repository
+vars:
+  user: zoncoen
+  repo: scenarigo
 steps:
-- title: GET https://api.github.com/repos/zoncoen/scenarigo
-  vars:
-    user: zoncoen
-    repo: scenarigo
+- title: get repository
   protocol: http
   request:
     method: GET
-    url: "https://api.github.com/repos/{{vars.user}}/{{vars.repo}}"
+    url: 'https://api.github.com/repos/{{vars.user}}/{{vars.repo}}'
   expect:
     code: OK
     body:
-      name: "{{vars.repo}}"
+      id: '{{int($) > 0}}'
+      name: '{{vars.repo}}'
 ```
 
 ## Installation

diff --git a/testdata/gen/pb/test/test.pb.go b/testdata/gen/pb/test/test.pb.go
diff --git a/testdata/gen/pb/test/test_grpc.pb.go b/testdata/gen/pb/test/test_grpc.pb.go
diff --git a/testdata/proto/test/test.proto b/testdata/proto/test/test.proto
@@ -30,7 +30,11 @@ message EchoResponse {
     string message_body = 2;
     int64 received_at = 3;
     UserType user_type = 4;
-    State state = 5;
+    oneof user_id {
+        string customer_id = 5;
+        string staff_id = 6;
+    }
+    State state = 7;
     StringValue nullable_string = 11;
 }