update openapi

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2022-02-02 00:13:17 +03:00
parent a51c1fc628
commit 99369de1ee
4 changed files with 8599 additions and 5 deletions
--- a/generate.go
+++ b/generate.go
@@ -4,11 +4,8 @@ package main
 //go:generate protoc -I. -I./api --go_out=paths=source_relative:. ./api/http.proto
 //go:generate protoc -I. -I./api --go_out=paths=source_relative:. ./api/field_behavior.proto
 //go:generate protoc -I. -I./api --go_out=paths=source_relative:. ./api/httpbody.proto
-<<<<<<< HEAD
 //go:generate protoc -I. -I./api --go_out=paths=source_relative:. ./api/micro.proto
-=======
 //go:generate protoc -I. -I./api --go_out=paths=source_relative:. ./api/client.proto
->>>>>>> 75c244f1a60f (update)
 //go:generate protoc -I. -I./openapiv2 --go_out=paths=source_relative:. ./openapiv2/annotations.proto
 //go:generate protoc -I. -I./openapiv2 --go_out=paths=source_relative:. ./openapiv2/openapiv2.proto
 //go:generate protoc -I. -I./openapiv3 --go_out=paths=source_relative:. ./openapiv3/annotations.proto