diff --git a/glance/policies/base.py b/glance/policies/base.py index 4013341ec9..5d27041f83 100644 --- a/glance/policies/base.py +++ b/glance/policies/base.py @@ -26,12 +26,12 @@ PROJECT_READER = 'role:reader and project_id:%(project_id)s' IMAGE_MEMBER_CHECK = 'project_id:%(member_id)s' # Check if the visibility of the image supplied in the target matches # "community" -COMMUNITY_VISIBILITY_CHECK = '"community":%(visibility)s' +COMMUNITY_VISIBILITY_CHECK = "'community':%(visibility)s" # Check if the visibility of the resource supplied in the target matches # "public" -PUBLIC_VISIBILITY_CHECK = '"public":%(visibility)s' +PUBLIC_VISIBILITY_CHECK = "'public':%(visibility)s" # Check if the visibility of the image supplied in the target matches "shared" -SHARED_VISIBILITY_CHECK = '"shared":%(visibility)s' +SHARED_VISIBILITY_CHECK = "'shared':%(visibility)s" PROJECT_MEMBER_OR_IMAGE_MEMBER_OR_COMMUNITY_OR_PUBLIC_OR_SHARED = ( f'role:member and (project_id:%(project_id)s or {IMAGE_MEMBER_CHECK} ' diff --git a/glance/tests/unit/test_policy.py b/glance/tests/unit/test_policy.py index bdfab871d5..5c52eedf8a 100644 --- a/glance/tests/unit/test_policy.py +++ b/glance/tests/unit/test_policy.py @@ -1088,9 +1088,9 @@ class TestDefaultPolicyCheckStrings(base.IsolatedUnitTest): def test_project_member_download_image_check_string(self): expected = ( - 'role:member and (project_id:%(project_id)s or ' - 'project_id:%(member_id)s or "community":%(visibility)s or ' - '"public":%(visibility)s or "shared":%(visibility)s)' + "role:member and (project_id:%(project_id)s or " + "project_id:%(member_id)s or 'community':%(visibility)s or " + "'public':%(visibility)s or 'shared':%(visibility)s)" ) self.assertEqual( expected, @@ -1108,9 +1108,9 @@ class TestDefaultPolicyCheckStrings(base.IsolatedUnitTest): def test_project_reader_get_image_check_string(self): expected = ( - 'role:reader and (project_id:%(project_id)s or ' - 'project_id:%(member_id)s or "community":%(visibility)s or ' - '"public":%(visibility)s or "shared":%(visibility)s)' + "role:reader and (project_id:%(project_id)s or " + "project_id:%(member_id)s or \'community\':%(visibility)s or " + "'public':%(visibility)s or 'shared':%(visibility)s)" ) self.assertEqual( expected,