Merge pull request #101 from stefanvanburen/svanburen/buf-v2

Bump buf config files to v2

Author: siennathesane

README.md

@@ -41,23 +41,23 @@ generation is not possible, as the manifest template is not made available to a
 remote plugin.
 
 ```yaml
-version: v1
+version: v2
 plugins:
-  - plugin: buf.build/community/neoeinstein-prost:v0.2.3
+  - remote: buf.build/community/neoeinstein-prost:v0.4.0
     out: gen/src
     opt:
       - bytes=.
       - compile_well_known_types
       - extern_path=.google.protobuf=::pbjson_types
       - file_descriptor_set
-  - plugin: buf.build/community/neoeinstein-prost-serde:v0.2.3
+  - remote: buf.build/community/neoeinstein-prost-serde:v0.3.1
     out: gen/src
-  - plugin: buf.build/community/neoeinstein-tonic:v0.3.0
+  - remote: buf.build/community/neoeinstein-tonic:v0.4.1
     out: gen/src
     opt:
       - compile_well_known_types
       - extern_path=.google.protobuf=::pbjson_types
-  - plugin: prost-crate
+  - local: protoc-gen-prost-crate
     out: gen
     strategy: all
     opt:

example/build-with-buf/buf.gen.yaml

@@ -1,6 +1,6 @@
-version: v1
+version: v2
 plugins:
-  - plugin: prost
+  - local: protoc-gen-prost
     #path: ../../target/debug/protoc-gen-prost
     out: src/gen
     opt:
@@ -9,19 +9,21 @@ plugins:
       - extern_path=.google.protobuf=::pbjson_types
       - file_descriptor_set
       - enable_type_names
-  - plugin: prost-serde
+  - local: protoc-gen-prost-serde
     #path: ../../target/debug/protoc-gen-prost-serde
     out: src/gen
-  - plugin: tonic
+  - local: protoc-gen-tonic
     #path: ../../target/debug/protoc-gen-tonic
     out: src/gen
     opt:
       - compile_well_known_types
       - extern_path=.google.protobuf=::pbjson_types
-  - plugin: prost-crate
+  - local: protoc-gen-prost-crate
     #path: ../../target/debug/protoc-gen-prost-crate
     out: .
     strategy: all
     opt:
       - include_file=src/gen/mod.rs
       - gen_crate
+inputs:
+  - directory: proto

example/build-with-buf/buf.work.yaml

@@ -1,23 +1,23 @@
-version: v1
+version: v2
 plugins:
-  - plugin: prost
+  - local: protoc-gen-prost
     #path: ../target/debug/protoc-gen-prost
     out: gen/src
     opt:
       - bytes=.
       - compile_well_known_types
       - extern_path=.google.protobuf=::pbjson_types
       - file_descriptor_set
-  - plugin: prost-serde
+  - local: protoc-gen-prost-serde
     #path: ../target/debug/protoc-gen-prost-serde
     out: gen/src
-  - plugin: tonic
+  - local: protoc-gen-tonic
     #path: ../target/debug/protoc-gen-tonic
     out: gen/src
     opt:
       - compile_well_known_types
       - extern_path=.google.protobuf=::pbjson_types
-  - plugin: prost-crate
+  - local: protoc-gen-prost-crate
     #path: ../target/debug/protoc-gen-prost-crate
     out: gen
     strategy: all

example/build-with-buf/proto/buf.yaml

@@ -1,4 +1,4 @@
-version: v1
+version: v2
 breaking:
   use:
     - FILE

proto/buf.gen.yaml

@@ -71,9 +71,9 @@ The following will just produce an include file `mod.rs` in the output `gen`
 directory without any conditional compilation feature flags:
 
 ```yaml
-version: v1
+version: v2
 plugins:
-  - plugin: prost-crate
+  - local: protoc-gen-prost-crate
     out: gen
     strategy: all
     opt:
@@ -84,14 +84,14 @@ When using the `gen_crate` option, later Rust generators should generate
 into the `src` directory which will be created by this plugin:
 
 ```yaml
-version: v1
+version: v2
 plugins:
-  - plugin: prost
+  - local: protoc-gen-prost
     out: gen/src
     opt:
       - bytes=.
       - file_descriptor_set
-  - plugin: prost-crate
+  - local: protoc-gen-prost-crate
     out: gen
     strategy: all
     opt:
@@ -103,14 +103,14 @@ push more files for output than desired. To limit the packages that get
 put into the include file, used the `only_include` option:
 
 ```yaml
-version: v1
+version: v2
 plugins:
-  - plugin: prost
+  - local: protoc-gen-prost
     out: gen/src
     opt:
       - bytes=.
       - file_descriptor_set
-  - plugin: prost-crate
+  - local: protoc-gen-prost-crate
     out: gen
     strategy: all
     opt:
@@ -128,9 +128,9 @@ so template information cannot be used. The plugin is referenced as follows:
 [1]: https://buf.build/community/neoeinstein-prost-crate
 
 ```yaml
-version: v1
+version: v2
 plugins:
-  - plugin: buf.build/community/neoeinstein-prost-crate:v0.3.1
+  - remote: buf.build/community/neoeinstein-prost-crate:v0.4.1
     out: gen
 ```
 
@@ -221,14 +221,14 @@ prost = "0.10.0"
 `buf.gen.yaml`:
 
 ```yaml
-version: v1
+version: v2
 plugins:
-  - plugin: prost
+  - local: protoc-gen-prost
     out: src
     opt:
       - bytes=.
       - file_descriptor_set
-  - plugin: prost-crate
+  - local: protoc-gen-prost-crate
     out: gen
     strategy: all
     opt:

proto/buf.yaml

@@ -97,14 +97,14 @@ When used with _buf_, options can be specified in the `buf.gen.yaml` file.
 and `extern_path=.google.protobuf=::pbjson_types` options should be specified.
 
 ```yaml
-version: v1
+version: v2
 plugins:
-  - plugin: prost
+  - local: protoc-gen-prost
     out: gen
     opt:
       - compile_well_known_types
       - extern_path=.google.protobuf=::pbjson_types
-  - plugin: prost-serde
+  - local: protoc-gen-prost-serde
     out: gen
 ```
 
@@ -116,26 +116,26 @@ for use. The plugin is referenced as follows:
 [1]: https://buf.build/community/neoeinstein-prost-serde
 
 ```yaml
-version: v1
+version: v2
 plugins:
-  - plugin: buf.build/community/neoeinstein-prost-serde:v0.2.3
+  - remote: buf.build/community/neoeinstein-prost-serde:v0.3.1
     out: gen
 ```
 
 `protoc-gen-prost-serde` is also compatible with the `protoc-gen-prost-crate`
 plugin:
 
 ```yaml
-version: v1
+version: v2
 plugins:
-  - plugin: prost
+  - local: protoc-gen-prost
     out: gen
     opt:
       - compile_well_known_types
       - extern_path=.google.protobuf=::pbjson_types
-  - plugin: prost-serde
+  - local: protoc-gen-prost-serde
     out: gen
-  - plugin: prost-crate
+  - local: protoc-gen-prost-crate
     strategy: all
     out: gen
     opt:

protoc-gen-prost-crate/README.md

@@ -75,9 +75,9 @@ A note on parameter values:
 When used with _buf_, options can be specified in the `buf.gen.yaml` file:
 
 ```yaml
-version: v1
+version: v2
 plugins:
-  - plugin: prost
+  - local: protoc-gen-prost
     out: gen
     opt:
       - bytes=.
@@ -95,9 +95,9 @@ for use. The plugin is referenced as follows:
 [1]: https://buf.build/community/neoeinstein-prost
 
 ```yaml
-version: v1
+version: v2
 plugins:
-  - plugin: buf.build/community/neoeinstein-prost:v0.2.3
+  - remote: buf.build/community/neoeinstein-prost:v0.2.3
     out: gen
 ```
 
@@ -106,14 +106,14 @@ as a distinct step, as in the following example. For more information, see
 the `protoc-gen-prost-crate` plugin.
 
 ```yaml
-version: v1
+version: v2
 plugins:
-  - plugin: prost
+  - local: protoc-gen-prost
     out: gen/src
     opt:
       - bytes=.
       - file_descriptor_set
-  - plugin: prost-crate
+  - local: protoc-gen-prost-crate
     out: gen
     strategy: all
     opt:
@@ -140,16 +140,16 @@ Within the include file:
 Here is an example for _buf_ using the `protoc-gen-prost-serde` plugin:
 
 ```yaml
-version: v1
+version: v2
 plugins:
-  - plugin: prost
+  - local: protoc-gen-prost
     out: gen/src
     opt:
       - bytes=.
       - file_descriptor_set
-  - plugin: prost-serde
+  - local: protoc-gen-prost-serde
     out: gen/src
-  - plugin: prost-crate
+  - local: protoc-gen-prost-crate
     out: gen
     strategy: all
     opt:

protoc-gen-prost-serde/README.md

@@ -95,15 +95,15 @@ protoc -I proto proto/greeter/v1/greeter.proto \
 ### Usage with _buf_
 
 When used with _buf_, options can be specified in the `buf.gen.yaml` file.
-`protoc-gen-prost-tonic` should appear as a plugin step after any
+`protoc-gen-tonic` should appear as a plugin step after any
 `protoc-gen-prost` steps.
 
 ```yaml
-version: v1
+version: v2
 plugins:
-  - plugin: prost
+  - local: protoc-gen-prost
     out: gen
-  - plugin: tonic
+  - local: protoc-gen-tonic
     out: gen
 ```
 
@@ -118,9 +118,9 @@ for use. The plugin is referenced as follows:
 [1]: https://buf.build/community/neoeinstein-tonic
 
 ```yaml
-version: v1
+version: v2
 plugins:
-  - plugin: buf.build/community/neoeinstein-tonic:v0.3.0
+  - remote: buf.build/community/neoeinstein-tonic:v0.4.1
     out: gen
 ```
 
@@ -130,21 +130,21 @@ Then you can depend on this crate from the binary that will host the server
 or use the client.
 
 ```yaml
-version: v1
+version: v2
 plugins:
-  - plugin: prost
+  - local: protoc-gen-prost
     out: gen/src
     opt:
       - compile_well_known_types
       - extern_path=.google.protobuf=::pbjson_types
-  - plugin: prost-serde
+  - local: protoc-gen-prost-serde
     out: gen/src
-  - plugin: tonic
+  - local: protoc-gen-tonic
     out: gen/src
     opt:
       - compile_well_known_types
       - extern_path=.google.protobuf=::pbjson_types
-  - plugin: prost
+  - local: protoc-gen-prost-crate
     out: gen
     opt:
       - gen_crate=Cargo.toml.tpl