chore: upgrade buf config to v2 to fix everything

Author: seanmcgary

Makefile

@@ -7,28 +7,35 @@ PROTO_OPTS=--proto_path=protos --go_out=paths=source_relative:protos
 
 all: build
 
-deps: deps/go
+.PHONY: deps/system
+deps/system:
 	./scripts/installDeps.sh
 
+.PHONY: deps/local-plugin
+deps/local-plugin:
+	git submodule update --init --recursive
+	cd buf-plugin-openapi && make clean install
+
+
 .PHONY: deps/dev
-deps/dev:
+deps/dev: deps/system deps/local-plugin
+	${GO} get google.golang.org/protobuf/cmd/protoc-gen-go
+	${GO} get google.golang.org/grpc/cmd/protoc-gen-go-grpc
+	${GO} get github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-grpc-gateway
 	${GO} get github.com/grpc-ecosystem/protoc-gen-grpc-gateway-ts
-	cd protos && buf dep update
+	${GO} get github.com/akuity/grpc-gateway-client/protoc-gen-grpc-gateway-client@latest
+	buf dep update
 
-.PHONY: deps
+.PHONY: deps/go
 deps/go:
 	${GO} mod tidy
 	npm install
 
-pre-build:
-	git submodule update --init --recursive
-	cd buf-plugin-openapi && make clean install
-
 .PHONY: proto
-proto: pre-build
+proto:
 	rm -rf gen/python || true
 	rm -rf gen/pre-python || true
-	buf generate protos
+	buf generate
 	# ./scripts/generatePipModule.sh
 	# mkdir gen/openapiv3 || true
 	# ./node_modules/.bin/swagger2openapi --outfile gen/openapiv3/openapi.yaml gen/openapiv2/apidocs.swagger.json

buf.gen.yaml

@@ -1,41 +1,27 @@
-version: v1
+version: v2
+clean: true
 managed:
   enabled: true
 plugins:
   # Generate Go code for annotations in OpenAPI plugin
-  - plugin: go
+  - local: protoc-gen-go
     out: gen/protos
     opt: paths=source_relative
-  - plugin: go-grpc
+  - local: protoc-gen-go-grpc
     out: gen/protos
     opt: paths=source_relative,require_unimplemented_servers=false
-  - plugin: grpc-gateway
+  - local: protoc-gen-grpc-gateway
     out: gen/protos
     opt: paths=source_relative
-  - plugin: openapiv2
-    out: gen/openapiv2
-    opt: allow_merge=true,merge_file_name=apidocs
-    strategy: all
-    # https://grpc-ecosystem.github.io/grpc-gateway/docs/mapping/customizing_openapi_output/#merging-output
-  - plugin: grpc-gateway-ts
+  - local: protoc-gen-grpc-gateway-ts
     out: gen/api-ts
-  - name: gateway-client
-    path: protoc-gen-grpc-gateway-client
+  - local: protoc-gen-grpc-gateway-client
     out: gen/protos
     opt:
       - paths=source_relative
-  - plugin: buf-plugin-openapi
+  - local: buf-plugin-openapi
     out: gen/openapi
     strategy: all
     opt:
       - emit_defaults=true
       - json_names_for_fields=true
-###############################################################################
-# Unused
-###############################################################################
-  # - plugin: buf.build/protocolbuffers/python
-  #   out: gen/pre-python
-  # - plugin: buf.build/grpc/python
-  #   out: gen/pre-python
-  # - plugin: buf.build/community/google-gnostic-openapi
-  #   out: gen/openapi

buf.lock

@@ -0,0 +1,9 @@
+# Generated by buf. DO NOT EDIT.
+version: v2
+deps:
+  - name: buf.build/googleapis/googleapis
+    commit: 61b203b9a9164be9a834f58c37be6f62
+    digest: b5:7811a98b35bd2e4ae5c3ac73c8b3d9ae429f3a790da15de188dc98fc2b77d6bb10e45711f14903af9553fa9821dff256054f2e4b7795789265bc476bec2f088c
+  - name: buf.build/grpc-ecosystem/grpc-gateway
+    commit: 4c5ba75caaf84e928b7137ae5c18c26a
+    digest: b5:c113e62fb3b29289af785866cae062b55ec8ae19ab3f08f3004098928fbca657730a06810b2012951294326b95669547194fa84476b9e9b688d4f8bf77a0691d

buf.work.yaml

@@ -0,0 +1,10 @@
+version: v2
+
+modules:
+  - path: protos
+  - path: submodules/protobuf-libs/protos
+
+deps:
+  - buf.build/googleapis/googleapis
+  - buf.build/grpc-ecosystem/grpc-gateway
+#  - buf.build/layr-labs/protobuf-libs

buf.yaml

@@ -0,0 +1 @@
+export default {}