From: Shilpa Jagannath <smanjara@redhat.com>
Date: Thu, 23 Oct 2025 22:13:44 +0000 (-0400)
Subject: rgw: fix new_key for swift users.
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4852b6d4745f6ef37c961fdf090dee5560c12e95;p=ceph-ci.git

rgw: fix new_key for swift users.

Signed-off-by: Shilpa Jagannath <smanjara@redhat.com>
(cherry picked from commit 34907631f25f8e7c56be30aa73afb4978056c759)
resolves rhbz#2403487
---

diff --git a/src/rgw/driver/rados/rgw_user.cc b/src/rgw/driver/rados/rgw_user.cc
index dba2276623a..7329fd9f83c 100644
--- a/src/rgw/driver/rados/rgw_user.cc
+++ b/src/rgw/driver/rados/rgw_user.cc
@@ -627,6 +627,8 @@ int RGWAccessKeyPool::generate_key(const DoutPrefixProvider *dpp, RGWUserAdminOp
   }
 
   // finally create the new key
+  new_key.id = id;
+  new_key.key = key;
 
   if (op_state.create_date) {
     new_key.create_date = *op_state.create_date;
@@ -640,8 +642,6 @@ int RGWAccessKeyPool::generate_key(const DoutPrefixProvider *dpp, RGWUserAdminOp
       new_key = op_state.op_master_key;
       access_keys->emplace(new_key.id, new_key);
     } else {
-      new_key.id = id;
-      new_key.key = key;
       access_keys->emplace(id, new_key);
       op_state.op_master_key = new_key;
     }