Merge pull request #95 from uw-labs/proto-v2

Regenerate protos using the v2 api and buf.

Author: SpeedyCoder

.circleci/config.yml

@@ -2,13 +2,11 @@ version: 2
 
 jobs:
   test:
-    working_directory: /go/src/github.com/uw-labs/proximo
     docker:
-    - image: circleci/golang:1.13
-      environment:
-        GO111MODULE: "on"
+      - image: circleci/golang:1
     steps:
     - checkout
+    - run: make protos && git add --all && git diff --staged --exit-code
     - run: go test -v -race -cover ./...
     - run: go build -o ./bin/server ./cmd/proximo-server
     - run: go build -o ./bin/client ./cmd/proximo-client

Makefile

@@ -0,0 +1,10 @@
+
+install-tools:
+	go install \
+		google.golang.org/protobuf/cmd/protoc-gen-go \
+		google.golang.org/grpc/cmd/protoc-gen-go-grpc \
+		github.com/bufbuild/buf/cmd/buf
+
+protos: install-tools
+	rm -rf gen && buf generate --config buf.yaml --template buf.gen.yaml
+	go mod tidy

buf.gen.yaml

@@ -0,0 +1,10 @@
+version: v1beta1
+plugins:
+  - name: go
+    out: proto
+    opt: paths=source_relative
+  - name: go-grpc
+    out: proto
+    opt:
+      - paths=source_relative
+      - require_unimplemented_servers=false

buf.yaml

@@ -0,0 +1,8 @@
+version: v1beta1
+name: buf.build/uw-labs/proximo
+build:
+  roots:
+    - proto
+breaking:
+  use:
+    - FILE

go.mod

@@ -3,17 +3,18 @@ module github.com/uw-labs/proximo
 go 1.12
 
 require (
-	github.com/golang/protobuf v1.3.2
+	github.com/bufbuild/buf v0.44.0
 	github.com/grpc-ecosystem/go-grpc-middleware v1.2.0
 	github.com/jawher/mow.cli v1.1.0
 	github.com/nats-io/stan.go v0.5.0
 	github.com/pkg/errors v0.9.1
-	github.com/stretchr/testify v1.4.0
+	github.com/stretchr/testify v1.7.0
 	github.com/urfave/cli v1.22.2
 	github.com/uw-labs/substrate v0.0.0-20200423155849-5805738940ec
 	github.com/uw-labs/sync v0.0.0-20190307114256-1bb306bf6e71
-	golang.org/x/crypto v0.0.0-20200210222208-86ce3cb69678
-	golang.org/x/net v0.0.0-20200202094626-16171245cfb2
-	google.golang.org/grpc v1.27.0
-	gopkg.in/yaml.v2 v2.2.8
+	golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
+	google.golang.org/grpc v1.40.0-dev.0.20210623211556-d9eb12feed7a
+	google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0
+	google.golang.org/protobuf v1.27.1
+	gopkg.in/yaml.v2 v2.4.0
 )