Adjust Makefile and regenerate protobuf

This commit is contained in:
Juan Pablo Villafáñez
2022-01-13 11:34:38 +01:00
parent b62c9044af
commit e877603d6d
2 changed files with 23 additions and 7 deletions

View File

@@ -163,11 +163,24 @@ go-coverage:
echo -n "% coverage $$mod: "; $(MAKE) --no-print-directory -C $$mod go-coverage; \
done
# bingo creates symlinks from the -l option in GOBIN, from where
# we can easily use it with buf. To have the symlinks inside this
# repo and on a known location, we set GOBIN to .bingo in the root
# of the repository (therefore we need to cd ..)
.PHONY: protoc-deps
protoc-deps: $(BINGO)
@GOPATH="" GOBIN=".bingo" $(BINGO) get -l google.golang.org/protobuf/cmd/protoc-gen-go
@GOPATH="" GOBIN=".bingo" $(BINGO) get -l github.com/asim/go-micro/cmd/protoc-gen-micro/v4
@GOPATH="" GOBIN=".bingo" $(BINGO) get -l github.com/owncloud/protoc-gen-microweb
@GOPATH="" GOBIN=".bingo" $(BINGO) get -l github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2
@GOPATH="" GOBIN=".bingo" $(BINGO) get -l github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc
.PHONY: buf-generate
buf-generate: $(BUF) protoc-deps
cd protogen/proto && $(BUF) generate
.PHONY: protobuf
protobuf:
@for mod in $(OCIS_MODULES); do \
echo -n "% protobuf $$mod: "; $(MAKE) --no-print-directory -C $$mod protobuf; \
done
protobuf: buf-generate
.PHONY: bingo-update
bingo-update: $(BINGO)

View File

@@ -389,7 +389,8 @@
"description": "The id of the group to add a member to",
"in": "path",
"required": true,
"type": "string"
"type": "string",
"pattern": "[^/]+"
},
{
"name": "body",
@@ -435,7 +436,8 @@
"description": "The id of the group to remove a member from",
"in": "path",
"required": true,
"type": "string"
"type": "string",
"pattern": "[^/]+"
},
{
"name": "accountId",
@@ -482,7 +484,8 @@
"description": "The id of the group to list members from",
"in": "path",
"required": true,
"type": "string"
"type": "string",
"pattern": "[^/]+"
},
{
"name": "body",