Bumping buf to v2 to build correctly and removing out of date or unused dependencies

Makefile

@@ -37,6 +37,7 @@ ARANGODB_NS=arangodb
 
 DOCKER=docker
 PROTOC=protoc
+BUF_CONTAINER=buf:local
 
 export
 
@@ -122,7 +123,6 @@ install-lint-tools:
 	@go install github.com/kisielk/errcheck@latest
 	@go install github.com/rhysd/actionlint/cmd/actionlint@latest
 	@go install github.com/client9/misspell/cmd/misspell@latest
-	@go install github.com/bufbuild/buf/cmd/[email protected]
 	@npm ci
 
 install-go-test-tools:
@@ -140,10 +140,6 @@ migration-tests: cmd/draconctl/bin
 
 test: go-tests migration-tests
 
-fmt-proto:
-	@echo "Tidying up Proto files"
-	@buf format -w ./api/proto
-
 install-go-fmt-tools:
 	@go install github.com/bufbuild/buf/cmd/[email protected]
 	@go install golang.org/x/tools/cmd/goimports@latest
@@ -315,9 +311,35 @@ dev-deploy: deploy-cluster dev-infra dev-dracon
 dev-teardown:
 	@kind delete clusters dracon-demo
 
-generate-protos: install-lint-tools
-	@echo "Generating Protos"
-	@buf generate
+build-buf-container:
+	$(DOCKER) build . -t $(BUF_CONTAINER) -f containers/Dockerfile.buf
+
+run-buf: build-buf-container
+	$(eval BUF_TMP_DP_FOLDER:=buf-tmp)
+	@if [ ! -d "$(BUF_TMP_DP_FOLDER)" ]; then mkdir $(BUF_TMP_DP_FOLDER); fi
+	$(DOCKER) run \
+		--volume "$(shell pwd):/workspace" \
+		--volume $(BUF_TMP_DP_FOLDER):/tmp \
+		--workdir /workspace \
+		$(BUF_CONTAINER) \
+		$(ARGS)
+	@rm -rf $(BUF_TMP_DP_FOLDER)
+
+fmt-proto: build-buf-container
+	@echo "Tidying up Proto files"
+	$(MAKE) run-buf ARGS="format -w --exclude-path vendor/"
+
+lint-proto: build-buf-container
+	@echo "Linting Proto files"
+	$(MAKE) run-buf ARGS="lint --exclude-path vendor/"
+
+generate-proto: build-buf-container
+	@echo "Generating Proto files"
+	$(MAKE) run-buf ARGS="generate"
+
+dep-update-proto: build-buf-container
+	@echo "Updating buf.lock deps"
+	$(MAKE) run-buf ARGS="dep update"
 
 ########################################
 ########### RELEASE UTILITIES ##########

api/proto/v1/engine.proto

@@ -21,7 +21,7 @@ message ScanInfo {
   map<string, string> scan_tags = 3;
 }
 
-/* LaunchToolReponse consists of a response built by a producer,
+/* LaunchToolResponse consists of a response built by a producer,
  * to be interpreted by a consumer */
 message LaunchToolResponse {
   // The scan information, see above for details

buf.lock

@@ -1,11 +1,2 @@
 # Generated by buf. DO NOT EDIT.
-version: v1
-deps:
-  - remote: buf.build
-    owner: googleapis
-    repository: googleapis
-    commit: 75b4300737fb4efca0831636be94e517
-  - remote: buf.build
-    owner: grpc-ecosystem
-    repository: grpc-gateway
-    commit: a1ecdc58eccd49aa8bea2a7a9022dc27
+version: v2

buf.yaml

@@ -1,20 +1,12 @@
 ---
-version: v1
+version: v2
 lint:
   use:
-    - DEFAULT
+    - STANDARD
     - COMMENTS
     - UNARY_RPC
     - PACKAGE_NO_IMPORT_CYCLE
   except:
     # we use Please to run protoc where we only need the last part of the
     # package name to match the directory name.
     - PACKAGE_DIRECTORY_MATCH
-
-deps:
-  # buf requires us to add the third party protos here as deps.
-  # Run:
-  # $ ./pleasew run "//third_party/binary/bufbuild/buf:buf|buf" -- mod update
-  # when you update this to update the lock file.
-  - buf.build/googleapis/googleapis
-  - buf.build/grpc-ecosystem/grpc-gateway

containers/Dockerfile.buf

@@ -0,0 +1,14 @@
+# Setup Go alpine to install buf protoc-gen-go plugin.
+# At the time of this changes, the buf image doesn't have a way to customise the plugins, so this is a more concise
+# solution.
+FROM golang:alpine AS golang
+ENV GO111MODULE=on
+RUN go install github.com/bufbuild/buf/cmd/[email protected]
+RUN go install google.golang.org/protobuf/cmd/[email protected]
+
+# Wrap everything together in a scratch container to do all things buf.
+FROM scratch
+COPY --from=golang /go/bin/buf /go/bin/buf
+COPY --from=golang /go/bin/protoc-gen-go /go/bin/protoc-gen-go
+ENV PATH="/go/bin:${PATH}"
+ENTRYPOINT ["/go/bin/buf"]

go.mod

@@ -30,8 +30,9 @@ require (
 	go.mongodb.org/mongo-driver v1.10.0
 	golang.org/x/crypto v0.18.0
 	golang.org/x/oauth2 v0.16.0
+	golang.org/x/sync v0.6.0
 	google.golang.org/api v0.156.0
-	google.golang.org/protobuf v1.34.1
+	google.golang.org/protobuf v1.35.1
 	helm.sh/helm/v3 v3.14.4
 	k8s.io/api v0.29.0
 	k8s.io/apimachinery v0.29.0
@@ -77,7 +78,7 @@ require (
 	github.com/goccy/go-json v0.9.11 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/google/btree v1.0.1 // indirect
 	github.com/google/cel-go v0.20.0 // indirect
@@ -142,7 +143,6 @@ require (
 	golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc // indirect
 	golang.org/x/mod v0.14.0 // indirect
 	golang.org/x/net v0.20.0 // indirect
-	golang.org/x/sync v0.6.0 // indirect
 	golang.org/x/term v0.16.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
 	golang.org/x/tools v0.16.1 // indirect