Move proto/buf to buf and add ioext.CompositeReadWriteCloser (#2749)

buf.work.yaml

@@ -1,3 +1,3 @@
 version: v1
 directories:
-  - proto/buf
+  - proto

make/buf/all.mk

@@ -123,12 +123,12 @@ bufgenerateclean:: \
 
 .PHONY: bufgenerateprotogo
 bufgenerateprotogo:
-	$(BUF_BIN) generate proto/buf --template data/template/buf.go.gen.yaml
+	$(BUF_BIN) generate proto --template data/template/buf.go.gen.yaml
 	$(BUF_BIN) generate buf.build/grpc/grpc --type grpc.reflection.v1.ServerReflection --template data/template/buf.go.gen.yaml
 
 .PHONY: bufgenerateprotogoclient
 bufgenerateprotogoclient:
-	$(BUF_BIN) generate proto/buf --template data/template/buf.go-client.gen.yaml
+	$(BUF_BIN) generate proto --template data/template/buf.go-client.gen.yaml
 
 .PHONY: bufgeneratebuflinttestdata
 bufgeneratebuflinttestdata:

private/pkg/ioext/ioext.go

@@ -60,6 +60,11 @@ func CompositeWriteCloser(writer io.Writer, closer io.Closer) io.WriteCloser {
 	return compositeWriteCloser{Writer: writer, Closer: closer}
 }
 
+// CompositeReadWriteCloser returns a io.ReadWriteCloser that is a composite of the Reader, Writer, and Closer.
+func CompositeReadWriteCloser(reader io.Reader, writer io.Writer, closer io.Closer) io.ReadWriteCloser {
+	return compositeReadWriteCloser{Reader: reader, Writer: writer, Closer: closer}
+}
+
 // ChainCloser chains the closers by calling them in order.
 func ChainCloser(closers ...io.Closer) io.Closer {
 	return chainCloser{closers: closers}
@@ -119,6 +124,12 @@ type compositeWriteCloser struct {
 	io.Closer
 }
 
+type compositeReadWriteCloser struct {
+	io.Reader
+	io.Writer
+	io.Closer
+}
+
 type chainCloser struct {
 	closers []io.Closer
 }