Upgrade to latest protoc

Signed-off-by: Dimitri John Ledkov <[email protected]>

Author: xnox

.github/workflows/repo-quality.yaml

@@ -69,7 +69,7 @@ jobs:
       - name: Install go grpc protoc generator
         run: |
           cd ..
-          GO111MODULE=on go get github.com/golang/protobuf/protoc-gen-go && \
+          GO111MODULE=on go get google.golang.org/protobuf/cmd/protoc-gen-go && \
             go get google.golang.org/grpc/cmd/protoc-gen-go-grpc
           cd -
       - name: Check generated files

internal/streamlogger/generator.go

@@ -89,12 +89,18 @@ func main() {
 
 	src := args[1]
 	dest := fmt.Sprintf("%s.streamlogger.go", strings.TrimSuffix(src, ".pb.go"))
+	srcgrpc := fmt.Sprintf("%s_grpc.pb.go", strings.TrimSuffix(src, ".pb.go"))
 
 	fset := token.NewFileSet()
 	f, err := parser.ParseFile(fset, src, nil, parser.ParseComments)
 	if err != nil {
 		log.Fatalf("coudln't parse file: %v", err)
 	}
+	fgrpc, err := parser.ParseFile(fset, srcgrpc, nil, parser.ParseComments)
+	if err != nil {
+		log.Fatalf("coudln't parse file: %v", err)
+	}
+	f.Decls = append(f.Decls, fgrpc.Decls...)
 
 	// Package name
 	data := pbData{
@@ -191,6 +197,10 @@ func main() {
 						function := callFunc.Names[0].Name
 
 						fields := callFunc.Type.(*ast.FuncType).Params.List
+
+						if (len(fields) != 2) {
+							continue
+						}
 						reqType := fields[0].Type.(*ast.StarExpr).X.(*ast.Ident).Name
 						origStream := fields[1].Type.(*ast.Ident).Name
 

zsys.go

@@ -13,7 +13,7 @@ import (
 	"google.golang.org/grpc"
 )
 
-//go:generate sh -c "if go run internal/generators/can_modify_repo.go 2>/dev/null; then PATH=\"$PATH:`go env GOPATH`/bin\" protoc --go_out=plugins=grpc:. zsys.proto; fi"
+//go:generate sh -c "if go run internal/generators/can_modify_repo.go 2>/dev/null; then PATH=\"$PATH:`go env GOPATH`/bin\" protoc --go_out=. --go_opt=paths=source_relative --go-grpc_out=. --go-grpc_opt=paths=source_relative zsys.proto; fi"
 // Takes output of protoc for second streamlogger generation.
 //go:generate go run internal/streamlogger/generator.go -- zsys.pb.go