github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Update protobuild to build ttrpc services

Browse Source 
Signed-off-by: Derek McGowan <derek@mcg.dev>
This commit is contained in:
Derek McGowan
2024-02-21 10:29:19 -08:00
parent 4510ca3db1
commit 65031eadec
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
api/Protobuild.toml
View File

@@ -1,5 +1,5 @@
version = "2" version = "2"
generators = ["go", "go-grpc"] generators = ["go", "go-grpc", "go-ttrpc"]
# Control protoc include paths. Below are usually some good defaults, but feel # Control protoc include paths. Below are usually some good defaults, but feel
# free to try it without them if it works for your project. # free to try it without them if it works for your project.
@@ -18,14 +18,23 @@ generators = ["go", "go-grpc"]
[packages] [packages]
"google/rpc/status.proto" = "google.golang.org/genproto/googleapis/rpc/status" "google/rpc/status.proto" = "google.golang.org/genproto/googleapis/rpc/status"
[parameters.go-ttrpc]
prefix = "TTRPC"
[[overrides]] [[overrides]]
prefixes = ["github.com/containerd/containerd/api/events"] prefixes = ["github.com/containerd/containerd/api/events"]
generators = ["go", "go-ttrpc", "go-fieldpath"] generators = ["go", "go-ttrpc", "go-fieldpath"]
[overrides.parameters.go-ttrpc]
prefix = ""
[[overrides]] [[overrides]]
prefixes = ["github.com/containerd/containerd/api/services/ttrpc/events/v1"] prefixes = ["github.com/containerd/containerd/api/services/ttrpc/events/v1"]
generators = ["go", "go-ttrpc"] generators = ["go", "go-ttrpc"]
[overrides.parameters.go-ttrpc]
prefix = ""
[[overrides]] [[overrides]]
# enable ttrpc and disable fieldpath and grpc for the shim # enable ttrpc and disable fieldpath and grpc for the shim
prefixes = [ prefixes = [
@@ -33,24 +42,21 @@ prefixes = [
] ]
generators = ["go", "go-ttrpc"] generators = ["go", "go-ttrpc"]
[overrides.parameters.go-ttrpc]
prefix = ""
[[overrides]] [[overrides]]
prefixes = [ prefixes = [
"github.com/containerd/containerd/api/runtime/sandbox/v1", "github.com/containerd/containerd/api/runtime/sandbox/v1",
] ]
generators = ["go", "go-ttrpc", "go-grpc"] generators = ["go", "go-ttrpc", "go-grpc"]
[overrides.parameters.go-ttrpc]
prefix = "TTRPC"
[[overrides]] [[overrides]]
prefixes = [ prefixes = [
"github.com/containerd/containerd/api/runtime/task/v3", "github.com/containerd/containerd/api/runtime/task/v3",
] ]
generators = ["go", "go-ttrpc", "go-grpc"] generators = ["go", "go-ttrpc", "go-grpc"]
[overrides.parameters.go-ttrpc]
prefix = "TTRPC"
# Aggregrate the API descriptors to lock down API changes. # Aggregrate the API descriptors to lock down API changes.
[[descriptors]] [[descriptors]]
prefix = "github.com/containerd/containerd/api" prefix = "github.com/containerd/containerd/api"

2
script/setup/install-dev-tools
View File

@@ -26,4 +26,4 @@ go install github.com/cpuguy83/go-md2man/v2@v2.0.2
go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.54.2 go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.54.2
go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.28 go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.28
go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.2 go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.2
go install github.com/containerd/ttrpc/cmd/protoc-gen-go-ttrpc@5cc9169d1fc1a8292866224ae09dc47827801874 go install github.com/containerd/ttrpc/cmd/protoc-gen-go-ttrpc@faba5896a9c4d7b65495cb9b2c02531feb1434d6