Pull request: openapi: fix more docs issues

Merge in DNS/adguard-home from fix-openapi to master

Squashed commit of the following:

commit bd95a502666372443b937cbcb690e307cd943342
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Jan 14 13:23:37 2021 +0300

    openapi: fix more docs issues
This commit is contained in:
Ainar Garipov 2021-01-14 13:48:52 +03:00
parent 4474e9fcf9
commit f2c6e1c682
3 changed files with 22 additions and 16 deletions

View File

@ -80,6 +80,8 @@ go-lint: ; $(ENV) "$(SHELL)" ./scripts/make/go-lint.sh
go-test: ; $(ENV) "$(SHELL)" ./scripts/make/go-test.sh go-test: ; $(ENV) "$(SHELL)" ./scripts/make/go-test.sh
go-tools: ; $(ENV) "$(SHELL)" ./scripts/make/go-tools.sh go-tools: ; $(ENV) "$(SHELL)" ./scripts/make/go-tools.sh
openapi-lint: ; cd ./openapi/ && $(YARN) test
# TODO(a.garipov): Remove the legacy targets once the build # TODO(a.garipov): Remove the legacy targets once the build
# infrastructure stops using them. # infrastructure stops using them.
dependencies: dependencies:

View File

@ -1514,6 +1514,8 @@
'properties': 'properties':
'domain_or_ip': 'domain_or_ip':
'type': 'integer' 'type': 'integer'
'additionalProperties':
'type': 'integer'
'StatsConfig': 'StatsConfig':
'type': 'object' 'type': 'object'
'description': 'Statistics configuration' 'description': 'Statistics configuration'
@ -2176,8 +2178,6 @@
'items': 'items':
'type': 'string' 'type': 'string'
'whois_info': 'whois_info':
'type': 'array'
'items':
'$ref': '#/components/schemas/WhoisInfo' '$ref': '#/components/schemas/WhoisInfo'
'disallowed': 'disallowed':
'type': 'boolean' 'type': 'boolean'
@ -2193,8 +2193,7 @@
'WhoisInfo': 'WhoisInfo':
'type': 'object' 'type': 'object'
'properties': 'additionalProperties':
'key':
'type': 'string' 'type': 'string'
'Clients': 'Clients':

View File

@ -11,3 +11,8 @@ if [ "$(git diff --cached --name-only -- '*.go' 'go.mod')" ]
then then
make go-lint go-test make go-lint go-test
fi fi
if [ "$(git diff --cached --name-only -- './openapi/openapi.yaml')" ]
then
make openapi-lint
fi