summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLance Bragstad <lbragstad@gmail.com>2021-08-26 14:50:35 +0000
committerLance Bragstad <lbragstad@gmail.com>2021-10-07 13:29:27 +0000
commit6dff22b5baa1a19842aca435782fe1f9789f72cc (patch)
tree2be2fa11a6e4cf90d3a84883971d20c8cd77a52a
parentcba80e04358fb56918d8ab876fb33183ce1330fc (diff)
downloadkeystone-6dff22b5baa1a19842aca435782fe1f9789f72cc.tar.gz
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 82da8824df0f56ef4e137805bf32d647cef1ea59)
-rw-r--r--keystone/common/policies/ec2_credential.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/keystone/common/policies/ec2_credential.py b/keystone/common/policies/ec2_credential.py
index a210ee917..9e5270922 100644
--- a/keystone/common/policies/ec2_credential.py
+++ b/keystone/common/policies/ec2_credential.py
@@ -31,14 +31,14 @@ deprecated_ec2_list_credentials = policy.DeprecatedRule(
deprecated_reason=DEPRECATED_REASON,
deprecated_since=versionutils.deprecated.TRAIN
)
-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_reason=DEPRECATED_REASON,
deprecated_since=versionutils.deprecated.TRAIN
)
-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,
deprecated_reason=DEPRECATED_REASON,
deprecated_since=versionutils.deprecated.TRAIN
@@ -72,7 +72,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,
),
policy.DocumentedRuleDefault(
name=base.IDENTITY % 'ec2_delete_credential',
@@ -82,7 +82,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,
)
]