openstack
/
keystone
Code Issues Proposed changes

Fix typos in ec2 credential policies 

There was a trailing s in two of these policies and it caused the policy
names to mismatch, which causes confusion with the rendered policy files
and potentially causes uses with deprecation logic.

Change-Id: I54021986d17c57d7733d53caa4032c2767eaf25e
(cherry picked from commit 82da8824df)
(cherry picked from commit 6dff22b5ba)
(cherry picked from commit a57ae85c96)
(cherry picked from commit 65c99d6efb)
(cherry picked from commit b38928d0a2)
This commit is contained in:
Lance Bragstad 2021-08-26 14:50:35 +00:00
parent acef9c6072
commit 1558adc73d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
keystone/common/policies/ec2_credential.py
View File

@ -23,12 +23,12 @@ deprecated_ec2_list_credentials = policy.DeprecatedRule(
name=base.IDENTITY % 'ec2_list_credentials',
check_str=base.RULE_ADMIN_OR_OWNER
)
deprecated_ec2_create_credentials = policy.DeprecatedRule(
name=base.IDENTITY % 'ec2_create_credentials',
deprecated_ec2_create_credential = policy.DeprecatedRule(
name=base.IDENTITY % 'ec2_create_credential',
check_str=base.RULE_ADMIN_OR_OWNER
)
deprecated_ec2_delete_credentials = policy.DeprecatedRule(
name=base.IDENTITY % 'ec2_delete_credentials',
deprecated_ec2_delete_credential = policy.DeprecatedRule(
name=base.IDENTITY % 'ec2_delete_credential',
check_str=base.RULE_ADMIN_OR_CREDENTIAL_OWNER
)
@ -67,7 +67,7 @@ ec2_credential_policies = [
description='Create ec2 credential.',
operations=[{'path': '/v3/users/{user_id}/credentials/OS-EC2',
'method': 'POST'}],
deprecated_rule=deprecated_ec2_create_credentials,
deprecated_rule=deprecated_ec2_create_credential,
deprecated_reason=DEPRECATED_REASON,
deprecated_since=versionutils.deprecated.TRAIN
),
@ -79,7 +79,7 @@ ec2_credential_policies = [
operations=[{'path': ('/v3/users/{user_id}/credentials/OS-EC2/'
'{credential_id}'),
'method': 'DELETE'}],
deprecated_rule=deprecated_ec2_delete_credentials,
deprecated_rule=deprecated_ec2_delete_credential,
deprecated_reason=DEPRECATED_REASON,
deprecated_since=versionutils.deprecated.TRAIN
)