Add name property to rpc (#17)

krzko · Aug 2, 2021 · f9219d7 · f9219d7
1 parent 1a0cdc9
commit f9219d7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -5,7 +5,7 @@ EXECUTABLE:=proto2yaml
 DOCKER_REGISTRY:=ghcr.io
 DOCKER_USER:=krzko
 
-VERSION:=v0.0.3
+VERSION:=v0.0.4
 COMMIT=$(shell git describe --tags --always --long)
 NOW=$(shell date +'%Y%m%d')
 

diff --git a/cmd/proto2yaml/main.go b/cmd/proto2yaml/main.go
@@ -33,8 +33,12 @@ type PackageItem struct {
 	Services []ServiceItem `json:"services" yaml:"services"`
 }
 type ServiceItem struct {
-	Service string   `json:"service" yaml:"service"`
-	RPCs    []string `json:"rpc" yaml:"rpc"`
+	Service string    `json:"service" yaml:"service"`
+	RPCs    []RPCItem `json:"rpc" yaml:"rpc"`
+}
+
+type RPCItem struct {
+	Name string `json:"name" yaml:"name"`
 }
 
 func main() {
@@ -541,12 +545,12 @@ func generateExport(files, filter []string, filterType string) (*ProtoExport, er
 
 							i, check := findService(pe.Packages[index].Services, parent.Name)
 							if check {
-								pe.Packages[index].Services[i].RPCs = append(pe.Packages[index].Services[i].RPCs, rpc.Name)
+								pe.Packages[index].Services[i].RPCs = append(pe.Packages[index].Services[i].RPCs, RPCItem{Name: rpc.Name})
 							} else {
 								// Add service and rpc
 								pe.Packages[index].Services = append(pe.Packages[index].Services, ServiceItem{
 									Service: parent.Name,
-									RPCs:    []string{rpc.Name},
+									RPCs:    []RPCItem{RPCItem{Name: rpc.Name}},
 								})
 							}
 						}))
@@ -594,12 +598,12 @@ func generateExport(files, filter []string, filterType string) (*ProtoExport, er
 
 									i, check := findService(pe.Packages[index].Services, parent.Name)
 									if check {
-										pe.Packages[index].Services[i].RPCs = append(pe.Packages[index].Services[i].RPCs, rpc.Name)
+										pe.Packages[index].Services[i].RPCs = append(pe.Packages[index].Services[i].RPCs, RPCItem{Name: rpc.Name})
 									} else {
 										// Add service and rpc
 										pe.Packages[index].Services = append(pe.Packages[index].Services, ServiceItem{
 											Service: parent.Name,
-											RPCs:    []string{rpc.Name},
+											RPCs:    []RPCItem{RPCItem{Name: rpc.Name}},
 										})
 									}
 								}))
@@ -639,12 +643,12 @@ func generateExport(files, filter []string, filterType string) (*ProtoExport, er
 
 					i, check := findService(pe.Packages[index].Services, parent.Name)
 					if check {
-						pe.Packages[index].Services[i].RPCs = append(pe.Packages[index].Services[i].RPCs, rpc.Name)
+						pe.Packages[index].Services[i].RPCs = append(pe.Packages[index].Services[i].RPCs, RPCItem{Name: rpc.Name})
 					} else {
 						// Add service and rpc
 						pe.Packages[index].Services = append(pe.Packages[index].Services, ServiceItem{
 							Service: parent.Name,
-							RPCs:    []string{rpc.Name},
+							RPCs:    []RPCItem{RPCItem{Name: rpc.Name}},
 						})
 					}
 				}))