From: Abhishek Lekshmanan <abhishek@suse.com>
Date: Wed, 4 Sep 2019 16:21:30 +0000 (+0200)
Subject: rgw: iam_policy define action constant numbers in terms of others
X-Git-Tag: v15.1.0~103^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8e57910eaa7e69cce8be314238c5cc71143ff3ea;p=ceph-ci.git

rgw: iam_policy define action constant numbers in terms of others

keeping iam and sts action numbers defined in terms of another constant so that
when a new s3api action is added the modification remains smaller

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
---

diff --git a/src/rgw/rgw_iam_policy.h b/src/rgw/rgw_iam_policy.h
index f6269dbef6a..637942471d0 100644
--- a/src/rgw/rgw_iam_policy.h
+++ b/src/rgw/rgw_iam_policy.h
@@ -103,26 +103,27 @@ static constexpr std::uint64_t s3GetObjectLegalHold = 59;
 static constexpr std::uint64_t s3BypassGovernanceRetention = 60;
 static constexpr std::uint64_t s3All = 61;
 
-static constexpr std::uint64_t iamPutUserPolicy = 62;
-static constexpr std::uint64_t iamGetUserPolicy = 63;
-static constexpr std::uint64_t iamDeleteUserPolicy = 64;
-static constexpr std::uint64_t iamListUserPolicies = 65;
-static constexpr std::uint64_t iamCreateRole = 66;
-static constexpr std::uint64_t iamDeleteRole = 67;
-static constexpr std::uint64_t iamModifyRole = 68;
-static constexpr std::uint64_t iamGetRole = 69;
-static constexpr std::uint64_t iamListRoles = 70;
-static constexpr std::uint64_t iamPutRolePolicy = 71;
-static constexpr std::uint64_t iamGetRolePolicy = 72;
-static constexpr std::uint64_t iamListRolePolicies = 73;
-static constexpr std::uint64_t iamDeleteRolePolicy = 74;
-static constexpr std::uint64_t iamAll = 75;
-static constexpr std::uint64_t stsAssumeRole = 76;
-static constexpr std::uint64_t stsAssumeRoleWithWebIdentity = 77;
-static constexpr std::uint64_t stsGetSessionToken = 78;
-static constexpr std::uint64_t stsAll = 79;
-
-static constexpr std::uint64_t s3Count = s3BypassGovernanceRetention + 1;
+static constexpr std::uint64_t iamPutUserPolicy = s3All + 1;
+static constexpr std::uint64_t iamGetUserPolicy = s3All + 2;
+static constexpr std::uint64_t iamDeleteUserPolicy = s3All + 3;
+static constexpr std::uint64_t iamListUserPolicies = s3All + 4;
+static constexpr std::uint64_t iamCreateRole = s3All + 5;
+static constexpr std::uint64_t iamDeleteRole = s3All + 6;
+static constexpr std::uint64_t iamModifyRole = s3All + 7;
+static constexpr std::uint64_t iamGetRole = s3All + 8;
+static constexpr std::uint64_t iamListRoles = s3All + 9;
+static constexpr std::uint64_t iamPutRolePolicy = s3All + 10;
+static constexpr std::uint64_t iamGetRolePolicy = s3All + 11;
+static constexpr std::uint64_t iamListRolePolicies = s3All + 12;
+static constexpr std::uint64_t iamDeleteRolePolicy = s3All + 13;
+static constexpr std::uint64_t iamAll = s3All + 14;
+
+static constexpr std::uint64_t stsAssumeRole = iamAll + 1;
+static constexpr std::uint64_t stsAssumeRoleWithWebIdentity = iamAll + 2;
+static constexpr std::uint64_t stsGetSessionToken = iamAll + 3;
+static constexpr std::uint64_t stsAll = iamAll + 4;
+
+static constexpr std::uint64_t s3Count = s3All;
 static constexpr std::uint64_t allCount = stsAll + 1;
 
 using Action_t = bitset<allCount>;