New layout for proto definitions and generated files (#1427)

* New project layout for proto definitions

Signed-off-by: Annanay <annanay.a@media.net>

* Regenerate grpc code from proto definitions

Signed-off-by: Annanay <annanay.a@media.net>

* Commit Makefile changes, run make protoc

Signed-off-by: Annanay <annanay.a@media.net>

* Fix dependency in gopkg.toml

Signed-off-by: Annanay <annanay.a@media.net>

* Corrected rebase

Signed-off-by: Annanay <annanay.a@media.net>

* Install the right proto bin versions

Signed-off-by: Annanay <annanay.a@media.net>

* Run make fmt

Signed-off-by: Annanay <annanay.a@media.net>

* Revert make fmt changes

Signed-off-by: Annanay <annanay.a@media.net>

Gopkg.toml

@@ -113,7 +113,7 @@ required = [
 
 [[constraint]]
   name = "github.com/gogo/protobuf"
-  revision = "fd9a4790f3963525fb889cc00e0a8f828e0b3a29"
+  revision = "ba06b47c162d49f2af050fb4c75bcbc86a159d5c"
 
 [prune]
   go-tests = true

Makefile

@@ -380,10 +380,10 @@ proto:
 
 	$(PROTOC) \
 		$(PROTO_INCLUDES) \
-		--gogo_out=plugins=grpc,$(PROTO_GOGO_MAPPINGS):$(PWD)/proto-gen/api_v2/ \
-		--grpc-gateway_out=$(PROTO_GOGO_MAPPINGS):$(PWD)/proto-gen/api_v2/ \
-		--swagger_out=$(PWD)/proto-gen/openapi/ \
-		model/proto/api_v2.proto
+		--gogo_out=plugins=grpc,$(PROTO_GOGO_MAPPINGS):$(PWD)/proto-gen/ \
+		--grpc-gateway_out=$(PROTO_GOGO_MAPPINGS):$(PWD)/proto-gen/ \
+		--swagger_out=allow_merge=true:$(PWD)/proto-gen/openapi/ \
+		model/proto/api_v2/*.proto
 
 	$(PROTOC) \
 		-I model/proto \