Merge pull request #26 from dpakach/go-protobuf-v3

Go protobuf v2

.github/workflows/go.yml

@@ -16,7 +16,7 @@ jobs:
     - name: Set up Go 1.x
       uses: actions/setup-go@v2
       with:
-        go-version: 1.12
+        go-version: 1.15
       id: go
 
     - name: Check out code into the Go module directory

README.md

@@ -52,6 +52,8 @@ Now restart he service with following command
 make restart-service SERVICE=posts
 ```
 
+You will also need to install go protobuf dependency along with [grpc-gateway](https://github.com/grpc-ecosystem/grpc-gateway) or the code generation on the server side. First you will need to have the protoc compiler for protobuf files. You can installit following [this](https://developers.google.com/protocol-buffers/docs/gotutorial#compiling-your-protocol-buffers) guide. After that install grpc-gateway and its required dependencies from [here](https://github.com/grpc-ecosystem/grpc-gateway). With all the dependencies out of the way, you should be ready to go.
+
 ### Architecture
 Zwitter is composed of five different microservice components. These services are containerized using docker and can be run using docker-composer to start the whole system.
 
@@ -99,7 +101,6 @@ Available commands
 
 api                            Auto-generate grpc go sources
 clean                          Clean all build products
-client                         Build the client binary
 dep                            Download go dependencies
 docker-build                   Build the docker image of the service
 docker-run                     Build and run the service in a docker container

auth/Makefile

@@ -1,14 +1,13 @@
 SERVER_OUT := "bin/server"
-CLIENT_OUT := "bin/client"
 API_OUT := "api/authpb/api.pb.go"
 API_REST_OUT := "api/authpb/api.pb.gw.go"
 PKG := "github.com/dpakach/zwitter/auth"
 SERVER_PKG_BUILD := "${PKG}/server"
-CLIENT_PKG_BUILD := "${PKG}/client"
 PKG_LIST := $(shell go list ${PKG}/... | grep -v /vendor/)
 VERSION := 1.0
+GOPATH ?= '${HOME}/go'
 
-.PHONY: all api server client
+.PHONY: all api server
 
 all: server
 
@@ -17,7 +16,8 @@ api/authpb/api.pb.go: api/auth_api.proto
 		-I/usr/local/include \
 		-I${GOPATH}/src \
 		-I${GOPATH}/src/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis \
-		--go_out=plugins=grpc:api \
+		--go_out=api \
+		--go-grpc_out=api \
 		api/auth_api.proto
 
 api/authpb/api.pb.gw.go: api/auth_api.proto
@@ -33,7 +33,7 @@ swagger: api
 		-I/usr/local/include \
 		-I${GOPATH}/src \
 		-I${GOPATH}/src/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis \
-		--swagger_out=logtostderr=true:./swagger \
+		--openapiv2_out=logtostderr=true:./swagger \
 		api/auth_api.proto
 
 docs: swagger ## Generate swagger documentation files
@@ -46,11 +46,8 @@ dep: ## Download go dependencies
 server: dep ## Build the server binary
 	@go build -v -o $(SERVER_OUT) $(SERVER_PKG_BUILD)
 
-client: dep ## Build the client binary
-	@go build -v -o $(CLIENT_OUT) $(CLIENT_PKG_BUILD)
-
 clean: ## Clean all build products
-	@rm -rf $(SERVER_OUT) $(CLIENT_OUT)
+	@rm -rf $(SERVER_OUT)
 
 docker-build: ## Build the docker image of the service
 	docker build -t zwiter/auth:$(VERSION) --build-arg service_name=auth -f ../service/Dockerfile  .. --no-cache