Skip to content

Commit

Permalink
rgw: remove RGWUserInfo::assumed_role_arn
Browse files Browse the repository at this point in the history
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit af5f9ca)
  • Loading branch information
cbodley authored and trociny committed Jun 14, 2023
1 parent ba8e62e commit 2ccd2f4
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions src/rgw/rgw_common.h
Original file line number Diff line number Diff line change
Expand Up @@ -754,7 +754,6 @@ struct RGWUserInfo
RGWQuotaInfo user_quota;
uint32_t type;
std::set<std::string> mfa_ids;
std::string assumed_role_arn;

RGWUserInfo()
: suspended(0),
Expand Down Expand Up @@ -819,7 +818,10 @@ struct RGWUserInfo
encode(admin, bl);
encode(type, bl);
encode(mfa_ids, bl);
encode(assumed_role_arn, bl);
{
std::string assumed_role_arn; // removed
encode(assumed_role_arn, bl);
}
encode(user_id.ns, bl);
ENCODE_FINISH(bl);
}
Expand Down Expand Up @@ -903,6 +905,7 @@ struct RGWUserInfo
decode(mfa_ids, bl);
}
if (struct_v >= 21) {
std::string assumed_role_arn; // removed
decode(assumed_role_arn, bl);
}
if (struct_v >= 22) {
Expand Down

0 comments on commit 2ccd2f4

Please sign in to comment.