Merge pull request #4 from sysulq/feat/v2

feat: upgrade protobuf to v2
go-kod · Jul 25, 2024 · 2ffc7e5 · 2ffc7e5
2 parents e342431 + f5c5956
commit 2ffc7e5
Show file tree

Hide file tree

Showing 49 changed files with 5,115 additions and 3,353 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -10,7 +10,10 @@
             "request": "launch",
             "mode": "auto",
             "cwd": "${workspaceFolder}",
-            "args":["-config", "example/gateway/config.yaml"],
+            "env": {
+                "KOD_CONFIG": "${workspaceFolder}/example/gateway/config.yaml",
+                "KOD_NAME": "gateway"
+            },
             "program": "./cmd/gateway"
         },
         {
@@ -19,6 +22,9 @@
             "request": "launch",
             "mode": "auto",
             "cwd": "${workspaceFolder}",
+            "env": {
+                "KOD_NAME": "optionsserver"
+            },
             "program": "./example/gateway/optionsserver"
         },
         {
@@ -27,6 +33,9 @@
             "request": "launch",
             "mode": "auto",
             "cwd": "${workspaceFolder}",
+            "env": {
+                "KOD_NAME": "constructsserver"
+            },
             "program": "./example/gateway/constructsserver"
         }
     ],

diff --git a/Taskfile.yaml b/Taskfile.yaml
@@ -46,7 +46,7 @@ tasks:
       - coverage.out
   test:coverage:
     cmds:
-      - cat coverage.out | egrep -v "kod_|.pb.go|_test.go|example/gateway|/test|main.go" > coverage.out.tmp
+      - cat coverage.out | egrep -v "kod_|.pb.go|_test.go|example/gateway|/test|main.go|pkg/generator" > coverage.out.tmp
       - mv coverage.out.tmp coverage.out
       - go tool cover -func=coverage.out
     deps:

diff --git a/api/graphql/v1/extend.pb.go b/api/graphql/v1/extend.pb.go
diff --git a/api/graphql/v1/extend.proto b/api/graphql/v1/extend.proto
@@ -27,18 +27,14 @@ extend google.protobuf.OneofOptions {
 message Oneof {
     // ignore the oneof
     bool ignore = 1;
-    // name of the oneof
-    string name = 2;
 }
 
 // The options for the field
 message Field {
     // required the field is required
     bool required = 1;
-    // name of the field
-    string name = 2;
     // ignore the field
-    bool ignore = 3;
+    bool ignore = 2;
 }
 
 // The options for the rpc