Dump additional apis (#3684)
* ✨ Allow JSON generation for all API Signed-off-by: Alexandre Franke <alexandre.franke@matrix.org> * 👷 Export AS API JSON Signed-off-by: Alexandre Franke <alexandre.franke@matrix.org> * ✨ Handle missing security definitions Signed-off-by: Alexandre Franke <alexandre.franke@matrix.org> * 👷 Export Push Gateway API JSON Signed-off-by: Alexandre Franke <alexandre.franke@matrix.org> * 🎨 Improve identation Signed-off-by: Alexandre Franke <alexandre.franke@matrix.org> * 🐛 Fix successive reference handling Fixes #3689 Signed-off-by: Alexandre Franke <alexandre.franke@matrix.org> * 👷 Export Server-Server API JSON Signed-off-by: Alexandre Franke <alexandre.franke@matrix.org> * 📝 Remove obsolete comment Signed-off-by: Alexandre Franke <alexandre.franke@matrix.org> * 🐛 Make properties objects, as they MUST be Signed-off-by: Alexandre Franke <alexandre.franke@matrix.org> * Revert "👷 Export Server-Server API JSON" This reverts commit 061f91c2cbcb6dff35c74177226da106826b4214. Co-authored-by: Alexandre Franke <alexandre.franke@matrix.org>
This commit is contained in:
parent
0f9eadd1a1
commit
de9cf76a57
9 changed files with 67 additions and 31 deletions
|
@ -37,11 +37,18 @@ def resolve_references(path, schema):
|
|||
# do $ref first
|
||||
if '$ref' in schema:
|
||||
value = schema['$ref']
|
||||
previous_path = path
|
||||
path = os.path.join(os.path.dirname(path), value)
|
||||
with open(path, encoding="utf-8") as f:
|
||||
ref = yaml.safe_load(f)
|
||||
result = resolve_references(path, ref)
|
||||
del schema['$ref']
|
||||
try:
|
||||
with open(path, encoding="utf-8") as f:
|
||||
ref = yaml.safe_load(f)
|
||||
result = resolve_references(path, ref)
|
||||
del schema['$ref']
|
||||
path = previous_path
|
||||
except FileNotFoundError:
|
||||
print("Resolving {}".format(schema))
|
||||
print("File not found: {}".format(path))
|
||||
result = {}
|
||||
else:
|
||||
result = {}
|
||||
|
||||
|
@ -87,11 +94,24 @@ parser.add_argument(
|
|||
%(default)s""",
|
||||
)
|
||||
parser.add_argument(
|
||||
"--client_release", "-c", metavar="LABEL",
|
||||
"--spec-release", "-r", metavar="LABEL",
|
||||
default="unstable",
|
||||
help="""The client-server release version to generate for. Default:
|
||||
help="""The spec release version to generate for. Default:
|
||||
%(default)s""",
|
||||
)
|
||||
available_apis = {
|
||||
"client-server": "Matrix Client-Server API",
|
||||
"server-server": "Matrix Server-Server API",
|
||||
"application-service": "Matrix Application Service API",
|
||||
"identity": "Matrix Identity Service API",
|
||||
"push-gateway": "Matrix Push Gateway API",
|
||||
}
|
||||
parser.add_argument(
|
||||
"--api",
|
||||
default="client-server",
|
||||
choices=available_apis,
|
||||
help="""The API to generate for. Default: %(default)s""",
|
||||
)
|
||||
parser.add_argument(
|
||||
"-o", "--output",
|
||||
default=os.path.join(scripts_dir, "swagger", "api-docs.json"),
|
||||
|
@ -100,7 +120,8 @@ parser.add_argument(
|
|||
args = parser.parse_args()
|
||||
|
||||
output_file = os.path.abspath(args.output)
|
||||
release_label = args.client_release
|
||||
release_label = args.spec_release
|
||||
selected_api = args.api
|
||||
|
||||
major_version = release_label
|
||||
match = re.match("^(r\d+)(\.\d+)*$", major_version)
|
||||
|
@ -119,18 +140,20 @@ output = {
|
|||
# The servers value will be picked up by RapiDoc to provide a way
|
||||
# to switch API servers. Useful when one wants to test compliance
|
||||
# of their server with the API.
|
||||
"servers": [{
|
||||
"url": "https://{homeserver_address}/",
|
||||
"variables": {
|
||||
"homeserver_address": {
|
||||
"default": "matrix-client.matrix.org",
|
||||
"description": "The base URL for your homeserver",
|
||||
}
|
||||
"servers": [
|
||||
{
|
||||
"url": "https://{homeserver_address}/",
|
||||
"variables": {
|
||||
"homeserver_address": {
|
||||
"default": "matrix-client.matrix.org",
|
||||
"description": "The base URL for your homeserver",
|
||||
}
|
||||
},
|
||||
}
|
||||
}],
|
||||
],
|
||||
"schemes": ["https"],
|
||||
"info": {
|
||||
"title": "Matrix Client-Server API",
|
||||
"title": available_apis[selected_api],
|
||||
"version": release_label,
|
||||
},
|
||||
"securityDefinitions": {},
|
||||
|
@ -138,15 +161,17 @@ output = {
|
|||
"swagger": "2.0",
|
||||
}
|
||||
|
||||
cs_api_dir = os.path.join(api_dir, 'client-server')
|
||||
with open(os.path.join(cs_api_dir, 'definitions',
|
||||
'security.yaml')) as f:
|
||||
output['securityDefinitions'] = yaml.safe_load(f)
|
||||
selected_api_dir = os.path.join(api_dir, selected_api)
|
||||
try:
|
||||
with open(os.path.join(selected_api_dir, 'definitions', 'security.yaml')) as f:
|
||||
output['securityDefinitions'] = yaml.safe_load(f)
|
||||
except FileNotFoundError:
|
||||
print("No security definitions available for this API")
|
||||
|
||||
for filename in os.listdir(cs_api_dir):
|
||||
for filename in os.listdir(selected_api_dir):
|
||||
if not filename.endswith(".yaml"):
|
||||
continue
|
||||
filepath = os.path.join(cs_api_dir, filename)
|
||||
filepath = os.path.join(selected_api_dir, filename)
|
||||
|
||||
print("Reading swagger API: %s" % filepath)
|
||||
with open(filepath, "r") as f:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue