diff options
| author | Zuul <zuul@review.opendev.org> | 2021-10-12 21:50:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-10-12 21:50:29 +0000 |
| commit | 46fb37112cb95c1dae8fe732cfa7df69eaee5e93 (patch) | |
| tree | aea2822a6b022f3bcfbe1e0e1918c06836a5eb2f | |
| parent | 5e288201950d032178b20843a87609d47b6636fb (diff) | |
| parent | 37696e8c5557c4a100445d919931a390cd2df507 (diff) | |
| download | glance-46fb37112cb95c1dae8fe732cfa7df69eaee5e93.tar.gz | |
Merge "Use single quotes in image policies"
| -rw-r--r-- | glance/policies/base.py | 6 | ||||
| -rw-r--r-- | glance/tests/unit/test_policy.py | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/glance/policies/base.py b/glance/policies/base.py index 4013341ec..5d27041f8 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 bdfab871d..5c52eedf8 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, |