Update prost and grpc-go plugins (#2120)

app-token-plugins[bot] · web-flow · commit 0a29d43f8e2e · 2025-12-01T10:03:59.000-06:00
diff --git a/plugins/community/neoeinstein-prost-crate/v0.5.0/.dockerignore b/plugins/community/neoeinstein-prost-crate/v0.5.0/.dockerignore
@@ -0,0 +1,2 @@
+*
+!Dockerfile
diff --git a/plugins/community/neoeinstein-prost-crate/v0.5.0/Dockerfile b/plugins/community/neoeinstein-prost-crate/v0.5.0/Dockerfile
@@ -0,0 +1,15 @@
+# syntax=docker/dockerfile:1.19
+FROM rust:1.91.1-alpine3.22 as builder
+RUN apk add --no-cache musl-dev
+WORKDIR /app
+ENV CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse
+RUN --mount=type=cache,target=/usr/local/cargo/registry,sharing=locked --mount=type=cache,target=/root/target \
+    cargo install protoc-gen-prost-crate --version 0.5.0 --locked --root /app
+
+FROM gcr.io/distroless/static-debian12:latest@sha256:87bce11be0af225e4ca761c40babb06d6d559f5767fbf7dc3c47f0f1a466b92c AS base
+
+FROM scratch
+COPY --link --from=base / /
+COPY --link --from=builder /app/bin/protoc-gen-prost-crate /protoc-gen-prost-crate
+USER nobody
+ENTRYPOINT ["/protoc-gen-prost-crate"]
diff --git a/plugins/community/neoeinstein-prost-crate/v0.5.0/buf.plugin.yaml b/plugins/community/neoeinstein-prost-crate/v0.5.0/buf.plugin.yaml
@@ -0,0 +1,9 @@
+version: v1
+name: buf.build/community/neoeinstein-prost-crate
+plugin_version: v0.5.0
+source_url: https://crates.io/crates/protoc-gen-prost-crate
+description: Generates an include file and cargo manifest for turn-key crates.
+output_languages:
+  - rust
+spdx_license_id: Apache-2.0
+license_url: https://github.com/neoeinstein/protoc-gen-prost/blob/protoc-gen-prost-crate-v0.5.0/LICENSE
diff --git a/plugins/community/neoeinstein-prost-serde/v0.4.0/.dockerignore b/plugins/community/neoeinstein-prost-serde/v0.4.0/.dockerignore
@@ -0,0 +1,2 @@
+*
+!Dockerfile
diff --git a/plugins/community/neoeinstein-prost-serde/v0.4.0/Dockerfile b/plugins/community/neoeinstein-prost-serde/v0.4.0/Dockerfile
@@ -0,0 +1,15 @@
+# syntax=docker/dockerfile:1.19
+FROM rust:1.91.1-alpine3.22 as builder
+RUN apk add --no-cache musl-dev
+WORKDIR /app
+ENV CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse
+RUN --mount=type=cache,target=/usr/local/cargo/registry,sharing=locked --mount=type=cache,target=/root/target \
+    cargo install protoc-gen-prost-serde --version 0.4.0 --locked --root /app
+
+FROM gcr.io/distroless/static-debian12:latest@sha256:87bce11be0af225e4ca761c40babb06d6d559f5767fbf7dc3c47f0f1a466b92c AS base
+
+FROM scratch
+COPY --link --from=base / /
+COPY --link --from=builder /app/bin/protoc-gen-prost-serde /protoc-gen-prost-serde
+USER nobody
+ENTRYPOINT ["/protoc-gen-prost-serde"]
diff --git a/plugins/community/neoeinstein-prost-serde/v0.4.0/buf.plugin.yaml b/plugins/community/neoeinstein-prost-serde/v0.4.0/buf.plugin.yaml
@@ -0,0 +1,9 @@
+version: v1
+name: buf.build/community/neoeinstein-prost-serde
+plugin_version: v0.4.0
+source_url: https://crates.io/crates/protoc-gen-prost-serde
+description: Generates serde serialization implementations that follow the conventions of protobuf-JSON.
+output_languages:
+  - rust
+spdx_license_id: Apache-2.0
+license_url: https://github.com/neoeinstein/protoc-gen-prost/blob/protoc-gen-prost-serde-v0.4.0/LICENSE
diff --git a/plugins/community/neoeinstein-prost/v0.5.0/.dockerignore b/plugins/community/neoeinstein-prost/v0.5.0/.dockerignore
@@ -0,0 +1,2 @@
+*
+!Dockerfile
diff --git a/plugins/community/neoeinstein-prost/v0.5.0/Dockerfile b/plugins/community/neoeinstein-prost/v0.5.0/Dockerfile
@@ -0,0 +1,15 @@
+# syntax=docker/dockerfile:1.19
+FROM rust:1.91.1-alpine3.22 AS builder
+RUN apk add --no-cache musl-dev
+WORKDIR /app
+ENV CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse
+RUN --mount=type=cache,target=/usr/local/cargo/registry,sharing=locked --mount=type=cache,target=/root/target \
+    cargo install protoc-gen-prost --version 0.5.0 --locked --root /app
+
+FROM gcr.io/distroless/static-debian12:latest@sha256:87bce11be0af225e4ca761c40babb06d6d559f5767fbf7dc3c47f0f1a466b92c AS base
+
+FROM scratch
+COPY --link --from=base / /
+COPY --link --from=builder /app/bin/protoc-gen-prost /protoc-gen-prost
+USER nobody
+ENTRYPOINT ["/protoc-gen-prost"]
diff --git a/plugins/community/neoeinstein-prost/v0.5.0/buf.plugin.yaml b/plugins/community/neoeinstein-prost/v0.5.0/buf.plugin.yaml
@@ -0,0 +1,32 @@
+version: v1
+name: buf.build/community/neoeinstein-prost
+plugin_version: v0.5.0
+source_url: https://github.com/neoeinstein/protoc-gen-prost
+description: Generates code using the Prost! code generation engine.
+output_languages:
+  - rust
+spdx_license_id: Apache-2.0
+license_url: https://github.com/neoeinstein/protoc-gen-prost/blob/protoc-gen-prost-v0.5.0/LICENSE
+registry:
+  cargo:
+    rust_version: ""
+    deps:
+      # Matching the versions of the prost crates used in this version of the plugin.
+      # https://github.com/neoeinstein/protoc-gen-prost/blob/protoc-gen-prost-v0.5.0/Cargo.toml#L15
+      - name: "prost"
+        req: "0.14.1"
+        # https://docs.rs/crate/prost/0.14.1/features
+        default_features: true
+      # prost-types is necessary for any module using the WKTs.
+      - name: "prost-types"
+        req: "0.14.1"
+        # https://docs.rs/crate/prost-types/0.14.1/features
+        default_features: true
+  # https://github.com/neoeinstein/protoc-gen-prost/blob/protoc-gen-prost-v0.5.0/protoc-gen-prost/README.md#options
+  opts:
+    # Includes the encoded FileDescriptorSet in the generated output for each module.
+    - file_descriptor_set
+    # Change generation of bytes type fields into Rust `bytes::Bytes` types.
+    # Dependency on `bytes` crate is added as a result of `default_features: true` on `prost` dependency.
+    # https://crates.io/crates/prost/0.14.1/dependencies
+    - bytes=.
diff --git a/plugins/community/neoeinstein-tonic/v0.5.0/.dockerignore b/plugins/community/neoeinstein-tonic/v0.5.0/.dockerignore
@@ -0,0 +1,2 @@
+*
+!Dockerfile
diff --git a/plugins/community/neoeinstein-tonic/v0.5.0/Dockerfile b/plugins/community/neoeinstein-tonic/v0.5.0/Dockerfile
@@ -0,0 +1,15 @@
+# syntax=docker/dockerfile:1.19
+FROM rust:1.91.1-alpine3.22 AS builder
+RUN apk add --no-cache musl-dev
+WORKDIR /app
+ENV CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse
+RUN --mount=type=cache,target=/usr/local/cargo/registry,sharing=locked --mount=type=cache,target=/root/target \
+    cargo install protoc-gen-tonic --version 0.5.0 --locked --root /app
+
+FROM gcr.io/distroless/static-debian12:latest@sha256:87bce11be0af225e4ca761c40babb06d6d559f5767fbf7dc3c47f0f1a466b92c AS base
+
+FROM scratch
+COPY --link --from=base / /
+COPY --link --from=builder /app/bin/protoc-gen-tonic /protoc-gen-tonic
+USER nobody
+ENTRYPOINT ["/protoc-gen-tonic"]
diff --git a/plugins/community/neoeinstein-tonic/v0.5.0/buf.plugin.yaml b/plugins/community/neoeinstein-tonic/v0.5.0/buf.plugin.yaml
@@ -0,0 +1,24 @@
+version: v1
+name: buf.build/community/neoeinstein-tonic
+plugin_version: v0.5.0
+source_url: https://crates.io/crates/protoc-gen-tonic
+description: Generates Tonic gRPC server and client code using the Prost! code generation engine.
+deps:
+  - plugin: buf.build/community/neoeinstein-prost:v0.4.0
+output_languages:
+  - rust
+spdx_license_id: Apache-2.0
+license_url: https://github.com/neoeinstein/protoc-gen-prost/blob/protoc-gen-tonic-v0.5.0/LICENSE
+registry:
+  cargo:
+    rust_version: ""
+    deps:
+      # https://github.com/neoeinstein/protoc-gen-prost/blob/protoc-gen-tonic-v0.5.0/protoc-gen-tonic/Cargo.toml#L29
+      # https://github.com/neoeinstein/protoc-gen-prost/blob/protoc-gen-tonic-v0.5.0/Cargo.toml#L19
+      - name: "tonic"
+        req: "0.14.1"
+        # https://github.com/hyperium/tonic/blob/v0.14.1/tonic/Cargo.toml#L27
+        default_features: true
+  # https://github.com/neoeinstein/protoc-gen-prost/tree/main/protoc-gen-tonic#options
+  opts:
+    - no_include=true
diff --git a/plugins/grpc/go/v1.6.0/.dockerignore b/plugins/grpc/go/v1.6.0/.dockerignore
@@ -0,0 +1,3 @@
+*
+!Dockerfile
+!separate-package.patch
diff --git a/plugins/grpc/go/v1.6.0/Dockerfile b/plugins/grpc/go/v1.6.0/Dockerfile
@@ -0,0 +1,20 @@
+# syntax=docker/dockerfile:1.19
+FROM --platform=$BUILDPLATFORM golang:1.25.4-bookworm AS build
+
+ARG TARGETOS TARGETARCH
+ENV CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH
+
+WORKDIR /tmp
+RUN git clone --depth 1 --branch cmd/protoc-gen-go-grpc/v1.6.0 https://github.com/grpc/grpc-go.git
+WORKDIR /tmp/grpc-go
+COPY separate-package.patch /tmp/grpc-go
+RUN git apply separate-package.patch
+WORKDIR /tmp/grpc-go/cmd/protoc-gen-go-grpc
+RUN --mount=type=cache,target=/go/pkg/mod \
+    go build -o protoc-gen-go-grpc -ldflags "-s -w" -trimpath
+
+FROM scratch
+COPY --from=build --link /etc/passwd /etc/passwd
+COPY --from=build --link --chown=root:root /tmp/grpc-go/cmd/protoc-gen-go-grpc/protoc-gen-go-grpc .
+USER nobody
+ENTRYPOINT [ "/protoc-gen-go-grpc" ]
diff --git a/plugins/grpc/go/v1.6.0/buf.plugin.yaml b/plugins/grpc/go/v1.6.0/buf.plugin.yaml
@@ -0,0 +1,22 @@
+version: v1
+name: buf.build/grpc/go
+plugin_version: v1.6.0
+source_url: https://github.com/grpc/grpc-go
+integration_guide_url: https://grpc.io/docs/languages/go/quickstart
+description: Generates Go client and server stubs for the gRPC framework.
+output_languages:
+  - go
+deps:
+  - plugin: buf.build/protocolbuffers/go:v1.36.10
+registry:
+  go:
+    min_version: "1.24"
+    deps:
+      - module: google.golang.org/grpc
+        version: v1.70.0
+  opts:
+    - paths=source_relative
+    - require_unimplemented_servers=false
+    - separate_package=true
+spdx_license_id: Apache-2.0
+license_url: https://github.com/grpc/grpc-go/blob/v1.6.0/LICENSE
diff --git a/plugins/grpc/go/v1.6.0/separate-package.patch b/plugins/grpc/go/v1.6.0/separate-package.patch
@@ -0,0 +1,62 @@
+diff --git a/cmd/protoc-gen-go-grpc/grpc.go b/cmd/protoc-gen-go-grpc/grpc.go
+index abc21602..7d9dd638 100644
+--- a/cmd/protoc-gen-go-grpc/grpc.go
++++ b/cmd/protoc-gen-go-grpc/grpc.go
+@@ -20,6 +20,7 @@ package main
+ 
+ import (
+ 	"fmt"
++	"path"
+ 	"strconv"
+ 	"strings"
+ 
+@@ -136,8 +137,27 @@ func generateFile(gen *protogen.Plugin, file *protogen.File) *protogen.Generated
+ 	if len(file.Services) == 0 {
+ 		return nil
+ 	}
+-	filename := file.GeneratedFilenamePrefix + "_grpc.pb.go"
+-	g := gen.NewGeneratedFile(filename, file.GoImportPath)
++	var g *protogen.GeneratedFile
++	if !*separatePackage {
++		filename := file.GeneratedFilenamePrefix + "_grpc.pb.go"
++		g = gen.NewGeneratedFile(filename, file.GoImportPath)
++	} else {
++		file.GoPackageName += "grpc"
++		dir := path.Dir(file.GeneratedFilenamePrefix)
++		base := path.Base(file.GeneratedFilenamePrefix)
++		file.GeneratedFilenamePrefix = path.Join(
++			dir,
++			string(file.GoPackageName),
++			base,
++		)
++		g = gen.NewGeneratedFile(
++			file.GeneratedFilenamePrefix+"_grpc.pb.go",
++			protogen.GoImportPath(path.Join(
++				string(file.GoImportPath),
++				string(file.GoPackageName),
++			)),
++		)
++	}
+ 	// Attach all comments associated with the syntax field.
+ 	genLeadingComments(g, file.Desc.SourceLocations().ByPath(protoreflect.SourcePath{fileDescriptorProtoSyntaxFieldNumber}))
+ 	g.P("// Code generated by protoc-gen-go-grpc. DO NOT EDIT.")
+diff --git a/cmd/protoc-gen-go-grpc/main.go b/cmd/protoc-gen-go-grpc/main.go
+index 183ba697..d0e1be60 100644
+--- a/cmd/protoc-gen-go-grpc/main.go
++++ b/cmd/protoc-gen-go-grpc/main.go
+@@ -46,6 +46,7 @@ const version = "1.5.1"
+ 
+ var requireUnimplemented *bool
+ var useGenericStreams *bool
++var separatePackage *bool
+ 
+ func main() {
+ 	showVersion := flag.Bool("version", false, "print the version and exit")
+@@ -57,6 +58,7 @@ func main() {
+ 
+ 	var flags flag.FlagSet
+ 	requireUnimplemented = flags.Bool("require_unimplemented_servers", true, "set to false to match legacy behavior")
++	separatePackage = flags.Bool("separate_package", false, "set to true to write generated files to a separate grpc package")
+ 	useGenericStreams = flags.Bool("use_generic_streams_experimental", true, "set to true to use generic types for streaming client and server objects; this flag is EXPERIMENTAL and may be changed or removed in a future release")
+ 
+ 	protogen.Options{
diff --git a/tests/testdata/buf.build/community/neoeinstein-prost-crate/v0.5.0/eliza/plugin.sum b/tests/testdata/buf.build/community/neoeinstein-prost-crate/v0.5.0/eliza/plugin.sum
@@ -0,0 +1 @@
+h1:rBU+TEo0CIQkebDtxgZpB0Xnew/CdRwXIFvXazxTpzs=
diff --git a/tests/testdata/buf.build/community/neoeinstein-prost-crate/v0.5.0/petapis/plugin.sum b/tests/testdata/buf.build/community/neoeinstein-prost-crate/v0.5.0/petapis/plugin.sum
@@ -0,0 +1 @@
+h1:ngaUPKm0sJ7hgYz9n8K5lqI+cJwijsgl3gMRpMjXpxI=
diff --git a/tests/testdata/buf.build/community/neoeinstein-prost-serde/v0.4.0/eliza/plugin.sum b/tests/testdata/buf.build/community/neoeinstein-prost-serde/v0.4.0/eliza/plugin.sum
@@ -0,0 +1 @@
+h1:ZNxQBBc5n/jUlJnRHtibCQabrWbvUn57dZRhgh/ZFGU=
diff --git a/tests/testdata/buf.build/community/neoeinstein-prost-serde/v0.4.0/petapis/plugin.sum b/tests/testdata/buf.build/community/neoeinstein-prost-serde/v0.4.0/petapis/plugin.sum
@@ -0,0 +1 @@
+h1:Tg1TcMTeHu3XKFCrz3vG3zBDSFZv3Rfdab5fBP8m6Yk=
diff --git a/tests/testdata/buf.build/community/neoeinstein-prost/v0.5.0/eliza/plugin.sum b/tests/testdata/buf.build/community/neoeinstein-prost/v0.5.0/eliza/plugin.sum
@@ -0,0 +1 @@
+h1:tr64pAOCIHHuiLdpUjq7rYpi056ec6hI6fm/WmwmOlw=
diff --git a/tests/testdata/buf.build/community/neoeinstein-prost/v0.5.0/petapis/plugin.sum b/tests/testdata/buf.build/community/neoeinstein-prost/v0.5.0/petapis/plugin.sum
@@ -0,0 +1 @@
+h1:elY1uwW/oKHbhyVnyis83ltUqT1V94F2C6ib97WgXU8=
diff --git a/tests/testdata/buf.build/community/neoeinstein-tonic/v0.5.0/eliza/plugin.sum b/tests/testdata/buf.build/community/neoeinstein-tonic/v0.5.0/eliza/plugin.sum
@@ -0,0 +1 @@
+h1:Uf2JlRN+9cwNM1REI2DZstSIRDZzcOodh2hIrRBqPHs=
diff --git a/tests/testdata/buf.build/community/neoeinstein-tonic/v0.5.0/petapis/plugin.sum b/tests/testdata/buf.build/community/neoeinstein-tonic/v0.5.0/petapis/plugin.sum
@@ -0,0 +1 @@
+h1:kb60e+hHNe5IlK3yv6dmpkNvUSAG4rRxHliDM1e5cKE=
diff --git a/tests/testdata/buf.build/grpc/go/v1.6.0/eliza/plugin.sum b/tests/testdata/buf.build/grpc/go/v1.6.0/eliza/plugin.sum
@@ -0,0 +1 @@
+h1:Tzi5juTlXQjW1iugS9zwpBp5tFRek4q5TdWjYUwlytk=
diff --git a/tests/testdata/buf.build/grpc/go/v1.6.0/petapis/plugin.sum b/tests/testdata/buf.build/grpc/go/v1.6.0/petapis/plugin.sum
@@ -0,0 +1 @@
+h1:criuHypLF9KOpiaHI6imyxkKjpxsHvEytiEahXLprDE=
