containerd
diff --git a/‎Makefile
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎Makefile
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎Protobuild.toml
Copy file name to clipboard
+3Lines changed: 3 additions & 0 deletions b/‎Protobuild.toml
Copy file name to clipboard
+3Lines changed: 3 additions & 0 deletions
diff --git a/‎cmd/protoc-gen-go-ttrpc/generator.go
Copy file name to clipboard
+3-2Lines changed: 3 additions & 2 deletions b/‎cmd/protoc-gen-go-ttrpc/generator.go
Copy file name to clipboard
+3-2Lines changed: 3 additions & 2 deletions
diff --git a/‎cmd/protoc-gen-go-ttrpc/main.go
Copy file name to clipboard
+10-2Lines changed: 10 additions & 2 deletions b/‎cmd/protoc-gen-go-ttrpc/main.go
Copy file name to clipboard
+10-2Lines changed: 10 additions & 2 deletions
diff --git a/‎integration/streaming/test.pb.go
Copy file name to clipboard
+7-7Lines changed: 7 additions & 7 deletions b/‎integration/streaming/test.pb.go
Copy file name to clipboard
+7-7Lines changed: 7 additions & 7 deletions
@@ -145,8 +145,8 @@ install-protobuf:
 
 install-protobuild:
 	@echo "$(WHALE) $@"
-	@$(GO) install google.golang.org/protobuf/cmd/protoc-gen-go@v1.27.1
-	@$(GO) install github.com/containerd/protobuild@7e5ee24bc1f70e9e289fef15e2631eb3491320bf
+	@$(GO) install google.golang.org/protobuf/cmd/protoc-gen-go@v1.28
+	@$(GO) install github.com/containerd/protobuild@14832ccc41429f5c4f81028e5af08aa233a219cf
 
 coverage: ## generate coverprofiles from the unit tests, except tests that require root
 	@echo "$(WHALE) $@"
 
@@ -23,3 +23,6 @@ generators = ["go"]
 # enable ttrpc and disable fieldpath and grpc for the shim
 prefixes = ["github.com/containerd/ttrpc/integration/streaming"]
 generators = ["go", "go-ttrpc"]
+
+[overrides.parameters.go-ttrpc]
+prefix = "TTRPC"
@@ -90,7 +90,7 @@ func newGenerator(out *protogen.GeneratedFile) *generator {
 	return &gen
 }
 
-func generate(plugin *protogen.Plugin, input *protogen.File) error {
+func generate(plugin *protogen.Plugin, input *protogen.File, servicePrefix string) error {
 	if len(input.Services) == 0 {
 		// Only generate a Go file if the file has some services.
 		return nil
@@ -103,6 +103,7 @@ func generate(plugin *protogen.Plugin, input *protogen.File) error {
 
 	gen := newGenerator(file)
 	for _, service := range input.Services {
+		service.GoName = servicePrefix + service.GoName
 		gen.genService(service)
 	}
 	return nil
@@ -266,7 +267,7 @@ func (gen *generator) genService(service *protogen.Service) {
 		p.P()
 	}
 
-	clientStructType := strings.ToLower(clientType[:1]) + clientType[1:]
+	clientStructType := strings.ToLower(service.GoName) + "Client"
 	p.P("type ", clientStructType, " struct{")
 	p.P("client *", gen.ident.client)
 	p.P("}")
 
@@ -21,12 +21,20 @@ import (
 )
 
 func main() {
-	protogen.Options{}.Run(func(gen *protogen.Plugin) error {
+	var servicePrefix string
+	protogen.Options{
+		ParamFunc: func(name, value string) error {
+			if name == "prefix" {
+				servicePrefix = value
+			}
+			return nil
+		},
+	}.Run(func(gen *protogen.Plugin) error {
 		for _, f := range gen.Files {
 			if !f.Generate {
 				continue
 			}
-			if err := generate(gen, f); err != nil {
+			if err := generate(gen, f, servicePrefix); err != nil {
 				return err
 			}
 		}
Original file line number	Diff line number	Diff line change
`@@ -21,12 +21,20 @@ import (`
`21`	`21`	`)`
`22`	`22`
`23`	`23`	`func main() {`
`24`		`- protogen.Options{}.Run(func(gen *protogen.Plugin) error {`
	`24`	`+ var servicePrefix string`
	`25`	`+ protogen.Options{`
	`26`	`+ ParamFunc: func(name, value string) error {`
	`27`	`+ if name == "prefix" {`
	`28`	`+ servicePrefix = value`
	`29`	`+ }`
	`30`	`+ return nil`
	`31`	`+ },`
	`32`	`+ }.Run(func(gen *protogen.Plugin) error {`
`25`	`33`	`for _, f := range gen.Files {`
`26`	`34`	`if !f.Generate {`
`27`	`35`	`continue`
`28`	`36`	`}`
`29`		`- if err := generate(gen, f); err != nil {`
	`37`	`+ if err := generate(gen, f, servicePrefix); err != nil {`
`30`	`38`	`return err`
`31`	`39`	`}`
`32`	`40`	`}`