Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

check-openapi: Fix lint errors and remove lint exclusion. 

Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
This commit is contained in:
Anders Kaseorg 2020-02-06 02:23:22 +00:00 committed by Tim Abbott
parent b3f63262af
commit 811e128787
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
tools/check-openapi
View File

@ -1,16 +1,16 @@
#!/usr/bin/env node
var SwaggerParser = require('swagger-parser'),
_ = require('underscore');
const SwaggerParser = require('swagger-parser');
const _ = require('underscore');
function check_duplicate_operationids(api) {
var operation_ids = [];
function check_duplicate_operationids(file, api) {
const operation_ids = [];
_.each(api.paths, function(endpoint) {
_.each(endpoint, function(value) {
var operation_id = value.operationId;
if(operation_id !== undefined) {
if(operation_ids.indexOf(operation_id) >= 0) {
_.each(api.paths, function (endpoint) {
_.each(endpoint, function (value) {
const operation_id = value.operationId;
if (operation_id !== undefined) {
if (operation_ids.indexOf(operation_id) >= 0) {
console.error('In', file + ':');
console.error('Duplicate operationId:', operation_id);
process.exitCode = 1;
@ -24,14 +24,14 @@ function check_duplicate_operationids(api) {
function validate_swagger(file) {
SwaggerParser.validate(file)
.then(function(api) {
.then(function (api) {
// Let's make sure that there aren't any duplicate operationids,
// until this issue is fixed:
// https://github.com/BigstickCarpet/swagger-parser/issues/68
check_duplicate_operationids(api);
check_duplicate_operationids(file, api);
return;
})
.catch(function(err) {
.catch(function (err) {
// There is something wrong. Display the validation errors
console.error('In', file + ':');
console.error(err.message);
@ -42,10 +42,9 @@ function validate_swagger(file) {
// Iterate through the changed files, passed in the arguments.
// The two first arguments are the call to the Node interpreter and this
// script, hence the starting point at 2.
for(var i = 2; i < process.argv.length; i++) {
var file = process.argv[i];
for (const file of process.argv.slice(2)) {
// Run the validator only for YAML files inside static/swagger
if(file.startsWith('static/swagger')) {
if (file.startsWith('static/swagger')) {
validate_swagger(file);
}
}

1
tools/linter_lib/exclude.py
View File

@ -10,7 +10,6 @@ EXCLUDED_FILES = [
# newlines; there's nothing other than trailing newlines we'd be
# checking for in these anyway.
"locale",
"tools/check-openapi",
]
PUPPET_CHECK_RULES_TO_EXCLUDE = [