From: Casey Bodley <cbodley@redhat.com>
Date: Thu, 20 Apr 2023 13:32:08 +0000 (-0400)
Subject: rgw: remove RGWUserInfo::assumed_role_arn
X-Git-Tag: v16.2.15~86^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c79ccbe8bc75087ef5abfbcde821fc993dd10bd2;p=ceph.git

rgw: remove RGWUserInfo::assumed_role_arn

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit af5f9cabb90e574c6fab33f1c9273cc868c6da22)

Conflicts:
	src/rgw/rgw_common.h (trivial)
---

diff --git a/src/rgw/rgw_common.h b/src/rgw/rgw_common.h
index a068f145596..94e2978faac 100644
--- a/src/rgw/rgw_common.h
+++ b/src/rgw/rgw_common.h
@@ -685,7 +685,6 @@ struct RGWUserInfo
   RGWQuotaInfo user_quota;
   uint32_t type;
   set<string> mfa_ids;
-  string assumed_role_arn;
 
   RGWUserInfo()
     : suspended(0),
@@ -750,7 +749,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);
   }
@@ -834,6 +836,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) {