vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Add a test for operation name collisions and fix the one additional collision found

Browse source
This commit is contained in:
Joseph Schorr 2016-11-10 15:38:27 -05:00
parent 932fa56227
commit aa2704acc7
3 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
endpoints/api/discovery.py
View file

@ -65,6 +65,7 @@ def swagger_route_data(include_internal=False, compact=False):
models = {} models = {}
tags = [] tags = []
tags_added = set() tags_added = set()
operationIds = set()
for rule in app.url_map.iter_rules(): for rule in app.url_map.iter_rules():
endpoint_method = app.view_functions[rule.endpoint] endpoint_method = app.view_functions[rule.endpoint]
@ -125,13 +126,20 @@ def swagger_route_data(include_internal=False, compact=False):
logger.debug('Unable to find method for %s in class %s', method_name, view_class) logger.debug('Unable to find method for %s in class %s', method_name, view_class)
continue continue
operationId = method_metadata(method, 'nickname')
operation_swagger = { operation_swagger = {
'operationId': method_metadata(method, 'nickname'), 'operationId': operationId,
'parameters': [], 'parameters': [],
} }
if operation_swagger['operationId'] is None:
if operationId is None:
continue continue
if operationId in operationIds:
raise Exception('Duplicate operation Id: %s' % operationId)
operationIds.add(operationId)
if not compact: if not compact:
operation_swagger.update({ operation_swagger.update({
'description': method.__doc__.strip() if method.__doc__ else '', 'description': method.__doc__.strip() if method.__doc__ else '',

2
endpoints/api/team.py
View file

@ -361,7 +361,7 @@ class InviteTeamMember(ApiResource):
@path_param('teamname', 'The name of the team') @path_param('teamname', 'The name of the team')
class TeamPermissions(ApiResource): class TeamPermissions(ApiResource):
""" Resource for listing the permissions an org's team has in the system. """ """ Resource for listing the permissions an org's team has in the system. """
@nickname('getTeamPermissions') @nickname('getOrganizationTeamPermissions')
def get(self, orgname, teamname): def get(self, orgname, teamname):
""" Returns the list of repository permissions for the org's team. """ """ Returns the list of repository permissions for the org's team. """
permission = AdministerOrganizationPermission(orgname) permission = AdministerOrganizationPermission(orgname)

2
static/js/services/roles-service.js
View file

@ -80,7 +80,7 @@ angular.module('quay').factory('RolesService', ['UtilService', 'Restangular', 'A
'teamname': entityName 'teamname': entityName
}; };
ApiService.getTeamPermissions(null, params).then(function(resp) { ApiService.getOrganizationTeamPermissions(null, params).then(function(resp) {
callback(resp.permissions); callback(resp.permissions);
}, errorHandler); }, errorHandler);
} else if (entityKind == 'robot') { } else if (entityKind == 'robot') {