deftree 清理

.goreleaser.yml

@@ -34,8 +34,8 @@ brews:
     # Packages your package depends on.
     dependencies:
       - name: protobuf
-      - name: protoc-gen-gogo
-      - name: protoc-gen-gogofaster
+      - name: protoc-gen-go
+      - name: protoc-gen-gofaster
 
     # So you can `brew test` your formula.
     # Default is empty.

Dockerfile

@@ -11,7 +11,7 @@ LABEL maintainer="[email protected]"
 
 RUN apk update && apk upgrade && apk add --no-cache protobuf git
 
-RUN go version && go get -u -v github.com/gogo/protobuf/protoc-gen-gogofaster
+RUN go version && go get -u -v github.com/golang/protobuf/protoc-gen-gofaster
 
 COPY ./ $GOPATH/src/github.com/teamlint/baron
 

Makefile

@@ -9,9 +9,9 @@ VERSION_DATE := $(shell $(MAKEFILE_PATH)/commit_date.sh)
 default: baron
 
 dependencies:
-	go get -u github.com/gogo/protobuf/protoc-gen-gogo@21df5aa0e680850681b8643f0024f92d3b09930c
-	go get -u github.com/gogo/protobuf/protoc-gen-gogofaster@21df5aa0e680850681b8643f0024f92d3b09930c
-	go get -u github.com/gogo/protobuf/proto@21df5aa0e680850681b8643f0024f92d3b09930c
+	go get -u github.com/golang/protobuf/protoc-gen-go@21df5aa0e680850681b8643f0024f92d3b09930c
+	go get -u github.com/golang/protobuf/protoc-gen-gofaster@21df5aa0e680850681b8643f0024f92d3b09930c
+	go get -u github.com/golang/protobuf/proto@21df5aa0e680850681b8643f0024f92d3b09930c
 	go get -u github.com/kevinburke/go-bindata/go-bindata
 
 # Generate go files containing the all template files in []byte form

README.md

@@ -78,12 +78,11 @@ if oneofType.Type.Enum == nil && oneofType.Type.Map == nil {
 ```
 
 ## TODO
-- 清理protoc-gen-gogo插件相关引用
-- 支持标量切片类型
+- 清理protoc-gen-go插件相关引用
+- 完善 deftree/googlethirdparty
 - server 增加初始化方法
 - HTTP Transport 是否考虑使用[gRPC Gateway](https://github.com/grpc-ecosystem/grpc-gateway) 替换?
-  gGRPC Gateway使用自有mux提供服务, 不能再使用 Go-kit 的http传输
-- 不覆盖代码
+- 支持标量切片类型
 
 ## 参考
 - https://github.com/solo726/bookinfo 使用go-kit实现微服务,truss自动生成go-kit代码

Taskfile.yml

@@ -133,3 +133,15 @@ tasks:
     cmds:
       - go run main.go 
     silent: false
+
+  test:
+    desc: 'baron test generator'
+    dir: ./_example
+    cmds: 
+      - rm -rf ./start/start.pb.go
+      - rm -rf ./start/start_grpc.pb.go
+      - rm -rf ./start/start.pb.baron.go
+      - task: install
+      - task: gen-start
+      - task: run-start
+    silent: false

cmd/_integration-tests/transport/http_test.go

@@ -18,7 +18,7 @@ import (
 	pb "github.com/teamlint/baron/cmd/_integration-tests/transport/proto"
 	httpclient "github.com/teamlint/baron/cmd/_integration-tests/transport/transportpermutations-service/svc/client/http"
 
-	"github.com/gogo/protobuf/jsonpb"
+	"github.com/golang/protobuf/jsonpb"
 	"github.com/moul/http2curl"
 	"github.com/pkg/errors"