feat: migrate to buf v1 and go.einride.tech

Author: odsod

Makefile

@@ -1,17 +1,14 @@
 SHELL := /bin/bash
 
 all: \
-	buf-lint \
-	buf-generate \
 	go-lint \
 	go-review \
-	buf-generate \
-	eslint \
 	go-test \
+	examples/proto \
+	eslint \
 	go-mod-tidy \
 	git-verify-nodiff
 
-include tools/buf/rules.mk
 include tools/commitlint/rules.mk
 include tools/git-verify-nodiff/rules.mk
 include tools/golangci-lint/rules.mk
@@ -29,26 +26,11 @@ go-mod-tidy:
 	$(info [$@] tidying Go module files...)
 	@go mod tidy -v
 
-.PHONY: buf-lint
-buf-lint: $(buf)
-	$(info [$@] linting protobuf schemas...)
-	@$(buf) lint
-
-protoc_gen_typescript_http := ./bin/protoc-gen-typescript-http
-export PATH := $(dir $(abspath $(protoc_gen_typescript_http))):$(PATH)
-
-.PHONY: $(protoc_gen_typescript_http)
-$(protoc_gen_typescript_http):
-	$(info [$@] building protoc-gen-typescript-http...)
-	@go build -o $@ .
+.PHONY: examples/proto
+examples/proto:
+	@make -C examples/proto
 
 .PHONY: $(eslint)
 eslint: $(eslint)
 	$(info [$@] linting typescript files...)
 	$(eslint) --config $(eslint_cwd)/.eslintrc.js --quiet "examples/proto/gen/typescript/**/*.ts"
-
-.PHONY: buf-generate
-buf-generate: $(buf) $(protoc_gen_typescript_http)
-	$(info [$@] generating protobuf stubs...)
-	@rm -rf examples/proto/gen
-	@$(buf) generate --path examples/proto/src/einride

README.md

@@ -20,7 +20,7 @@ generated code, look at [examples][examples].
 ### Install the plugin
 
 ```bash
-go get github.com/einride/protoc-gen-typescript-http
+go get go.einride.tech/protoc-gen-typescript-http
 ```
 
 Or download a prebuilt binary from [releases][releases].

buf.gen.yaml

@@ -0,0 +1,2 @@
+.build/
+.tools/*/*/

buf.lock

@@ -1,16 +1,11 @@
 buf_cwd := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
-buf := $(buf_cwd)/bin/buf
+buf_version := 1.0.0-rc10
+buf := $(buf_cwd)/$(buf_version)/bin/buf
+export PATH := $(dir $(buf)):$(PATH)
 
-buf_version := 0.39.1
+os := $(shell uname -s)-$(shell uname -m)
 
-arch = $(shell uname -s)-$(shell uname -m)
-
-# enforce x86 arch if mac m1 until tool has official support
-ifeq ($(arch),Darwin-arm64)
-arch = Darwin-x86_64
-endif
-
-buf_bin_url := https://github.com/bufbuild/buf/releases/download/v$(buf_version)/buf-$(arch)
+buf_bin_url := https://github.com/bufbuild/buf/releases/download/v$(buf_version)/buf-$(os)
 
 $(buf): $(buf_cwd)/rules.mk
 	$(info [buf] feching $(buf_version) binary...)

examples/proto/.gitignore

@@ -0,0 +1,20 @@
+clang_format_dir := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
+clang_format_version := 1.6.0
+clang_format := $(clang_format_dir)/bin/clang-format
+export PATH := $(dir $(clang_format)):$(PATH)
+
+ifeq ($(shell uname),Linux)
+clang_format_bin_path := $(clang_format_dir)/node_modules/clang-format/bin/linux_x64
+else ifeq ($(shell uname),Darwin)
+clang_format_bin_path := $(clang_format_dir)/node_modules/clang-format/bin/darwin_x64
+else
+$(error unsupported OS: $(shell uname))
+endif
+
+$(clang_format):
+	$(info [clang-format] installing version $(clang_format_version)...)
+	@npm install --no-save --no-audit --prefix $(clang_format_dir) clang-format@$(clang_format_version) &> /dev/null
+	@mkdir -p $(dir $(clang_format))
+	@ln -fs $(clang_format_bin_path)/clang-format $@
+	@chmod +x $@
+	@touch $@

tools/buf/rules.mk renamed to examples/proto/.tools/buf/rules.mk

@@ -0,0 +1,39 @@
+SHELL := /usr/bin/env bash
+
+.PHONY: all
+all: \
+	clang-format \
+	buf-lint \
+	buf-generate
+
+include .tools/buf/rules.mk
+include .tools/clang-format/rules.mk
+
+.PHONY: .build/protoc-gen-typescript-http
+.build/protoc-gen-typescript-http:
+	$(info [$@] building binary...)
+	@cd ../.. && go build -o $(abspath $@) .
+
+.PHONY: buf-lint
+buf-lint: $(buf)
+	$(info [$@] linting proto schemas...)
+	@$(buf) lint
+
+.PHONY: clang-format
+clang-format: proto_files = $(shell find einride -type f -name '*.proto')
+clang-format: $(clang_format)
+	$(info [$@] formatting proto files...)
+	@$(clang_format) \
+		-i \
+		--style='{BasedOnStyle: Google, ColumnLimit: 0, Language: Proto}' \
+		$(proto_files)
+
+protoc_plugins := \
+	.build/protoc-gen-typescript-http
+
+.PHONY: buf-generate
+buf-generate: $(buf) $(protoc_plugins)
+	$(info [$@] generating protobuf stubs...)
+	@$(buf) generate \
+		--template buf.gen.yaml \
+		--path einride

examples/proto/.tools/clang-format/rules.mk

@@ -0,0 +1,6 @@
+version: v1
+
+plugins:
+  - name: typescript-http
+    out: gen/typescript
+    path: ./.build/protoc-gen-typescript-http

examples/proto/Makefile

@@ -0,0 +1,10 @@
+# Generated by buf. DO NOT EDIT.
+version: v1
+deps:
+  - remote: buf.build
+    owner: googleapis
+    repository: googleapis
+    branch: main
+    commit: 9088184d3ed04821b7e990024ff05656
+    digest: b1---R9Xre3yvH8peoJPQ0dsUYp37KzdlBlx5fjPsYekyI=
+    create_time: 2021-12-23T15:04:49.66847Z