From 1f5620dee6d10c9f7f7873fdecf457b402d25e1d Mon Sep 17 00:00:00 2001 From: Colleen Murphy Date: Wed, 21 Aug 2019 09:07:42 -0700 Subject: [PATCH] Clean up UserGroups target enforcement callback There is already a module-level target enforcement callback defined that does the same thing, so we don't need to keep a static method defined in the UserGroupsResource class. Change-Id: I6db45aab764a1e56c6cdca56b26b86346d7500f8 --- keystone/api/users.py | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/keystone/api/users.py b/keystone/api/users.py index 3ddcc3291b..90a13ff6df 100644 --- a/keystone/api/users.py +++ b/keystone/api/users.py @@ -287,19 +287,6 @@ class UserGroupsResource(ks_flask.ResourceBase): get_member_from_driver = PROVIDERS.deferred_provider_lookup( api='identity_api', method='get_group') - @staticmethod - def _built_target_attr_enforcement(): - ref = None - if flask.request.view_args: - try: - ref = {'user': PROVIDERS.identity_api.get_user( - flask.request.view_args.get('user_id'))} - except ks_exception.NotFound: # nosec - # Defer existence in the event the user doesn't exist, we'll - # check this later anyway. - pass - return ref - def get(self, user_id): """Get groups for a user. @@ -308,7 +295,7 @@ class UserGroupsResource(ks_flask.ResourceBase): filters = ('name',) hints = self.build_driver_hints(filters) ENFORCER.enforce_call(action='identity:list_groups_for_user', - build_target=self._built_target_attr_enforcement, + build_target=_build_user_target_enforcement, filters=filters) refs = PROVIDERS.identity_api.list_groups_for_user(user_id=user_id, hints=hints)