From: Casey Bodley Date: Thu, 20 Apr 2023 13:31:52 +0000 (-0400) Subject: rgw/dbstore: stop storing RGWUserInfo::assumed_role_arn X-Git-Tag: v17.2.8~596^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ba8e62e8b0bae6bbc4efa0f2b40777c044e042bf;p=ceph.git rgw/dbstore: stop storing RGWUserInfo::assumed_role_arn Signed-off-by: Casey Bodley (cherry picked from commit 9da31205051db56edade69b1cec3a05e162b7a9b) Conflicts: src/rgw/store/dbstore/common/dbstore.h (no 'static constexpr' keywords) src/rgw/store/dbstore/sqlite/sqliteDB.cc (trivial) --- diff --git a/src/rgw/store/dbstore/common/dbstore.h b/src/rgw/store/dbstore/common/dbstore.h index 9bb61dca7a97..abc304601854 100644 --- a/src/rgw/store/dbstore/common/dbstore.h +++ b/src/rgw/store/dbstore/common/dbstore.h @@ -194,7 +194,6 @@ struct DBOpUserPrepareInfo { string user_quota = ":user_quota"; string type = ":type"; string mfa_ids = ":mfa_ids"; - string assumed_role_arn = ":assumed_role_arn"; string user_attrs = ":user_attrs"; string user_ver = ":user_vers"; string user_ver_tag = ":user_ver_tag"; @@ -685,10 +684,10 @@ class InsertUserOp : virtual public DBOp { AccessKeysID, AccessKeysSecret, AccessKeys, SwiftKeys,\ SubUsers, Suspended, MaxBuckets, OpMask, UserCaps, Admin, \ System, PlacementName, PlacementStorageClass, PlacementTags, \ - BucketQuota, TempURLKeys, UserQuota, Type, MfaIDs, AssumedRoleARN, \ + BucketQuota, TempURLKeys, UserQuota, Type, MfaIDs, \ UserAttrs, UserVersion, UserVersionTag) \ VALUES ({}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, \ - {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {});"; + {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {}, {});"; public: virtual ~InsertUserOp() {} @@ -706,8 +705,8 @@ class InsertUserOp : virtual public DBOp { params.op.user.placement_tags, params.op.user.bucket_quota, params.op.user.temp_url_keys, params.op.user.user_quota, params.op.user.type, params.op.user.mfa_ids, - params.op.user.assumed_role_arn, params.op.user.user_attrs, - params.op.user.user_ver, params.op.user.user_ver_tag); + params.op.user.user_attrs, params.op.user.user_ver, + params.op.user.user_ver_tag); } }; diff --git a/src/rgw/store/dbstore/dbstore_main.cc b/src/rgw/store/dbstore/dbstore_main.cc index 0055191908b8..848c02c12f06 100644 --- a/src/rgw/store/dbstore/dbstore_main.cc +++ b/src/rgw/store/dbstore/dbstore_main.cc @@ -49,7 +49,6 @@ void* process(void *arg) params.op.user.uinfo.user_id.id = user1; params.op.user.uinfo.suspended = 123; params.op.user.uinfo.max_buckets = 456; - params.op.user.uinfo.assumed_role_arn = "role"; params.op.user.uinfo.placement_tags.push_back("tags1"); params.op.user.uinfo.placement_tags.push_back("tags2"); @@ -72,7 +71,6 @@ void* process(void *arg) cout << "tenant: " << params2.op.user.uinfo.user_id.tenant << "\n"; cout << "suspended: " << (int)params2.op.user.uinfo.suspended << "\n"; - cout << "assumed_role_arn: " << params2.op.user.uinfo.assumed_role_arn << "\n"; list::iterator it = params2.op.user.uinfo.placement_tags.begin(); diff --git a/src/rgw/store/dbstore/sqlite/sqliteDB.cc b/src/rgw/store/dbstore/sqlite/sqliteDB.cc index f24eb68b2e25..9861c4261b1b 100644 --- a/src/rgw/store/dbstore/sqlite/sqliteDB.cc +++ b/src/rgw/store/dbstore/sqlite/sqliteDB.cc @@ -330,8 +330,6 @@ static int list_user(const DoutPrefixProvider *dpp, DBOpInfo &op, sqlite3_stmt * SQL_DECODE_BLOB_PARAM(dpp, stmt, MfaIDs, op.user.uinfo.mfa_ids, sdb); - op.user.uinfo.assumed_role_arn = (const char*)sqlite3_column_text(stmt, AssumedRoleARN); - SQL_DECODE_BLOB_PARAM(dpp, stmt, UserAttrs, op.user.user_attrs, sdb); op.user.user_version.ver = sqlite3_column_int(stmt, UserVersion); op.user.user_version.tag = (const char*)sqlite3_column_text(stmt, UserVersionTag); @@ -1110,9 +1108,6 @@ int SQLInsertUser::Bind(const DoutPrefixProvider *dpp, struct DBOpParams *params SQL_BIND_INDEX(dpp, stmt, index, p_params.op.user.mfa_ids.c_str(), sdb); SQL_ENCODE_BLOB_PARAM(dpp, stmt, index, params->op.user.uinfo.mfa_ids, sdb); - SQL_BIND_INDEX(dpp, stmt, index, p_params.op.user.assumed_role_arn.c_str(), sdb); - SQL_BIND_TEXT(dpp, stmt, index, params->op.user.uinfo.assumed_role_arn.c_str(), sdb); - SQL_BIND_INDEX(dpp, stmt, index, p_params.op.user.user_attrs.c_str(), sdb); SQL_ENCODE_BLOB_PARAM(dpp, stmt, index, params->op.user.user_attrs, sdb); diff --git a/src/rgw/store/dbstore/tests/dbstore_tests.cc b/src/rgw/store/dbstore/tests/dbstore_tests.cc index 34bded47edbf..18e87e95d0b8 100644 --- a/src/rgw/store/dbstore/tests/dbstore_tests.cc +++ b/src/rgw/store/dbstore/tests/dbstore_tests.cc @@ -122,7 +122,6 @@ TEST_F(DBStoreTest, InsertUser) { params.op.user.uinfo.user_email = "user1@dbstore.com"; params.op.user.uinfo.suspended = 123; params.op.user.uinfo.max_buckets = 456; - params.op.user.uinfo.assumed_role_arn = "role"; params.op.user.uinfo.placement_tags.push_back("tags"); RGWAccessKey k1("id1", "key1"); RGWAccessKey k2("id2", "key2"); @@ -146,7 +145,6 @@ TEST_F(DBStoreTest, GetUser) { ASSERT_EQ(params.op.user.uinfo.user_id.id, "user_id1"); ASSERT_EQ(params.op.user.uinfo.suspended, 123); ASSERT_EQ(params.op.user.uinfo.max_buckets, 456); - ASSERT_EQ(params.op.user.uinfo.assumed_role_arn, "role"); ASSERT_EQ(params.op.user.uinfo.placement_tags.back(), "tags"); RGWAccessKey k; map::iterator it2 = params.op.user.uinfo.access_keys.begin(); @@ -174,7 +172,6 @@ TEST_F(DBStoreTest, GetUserQuery) { ASSERT_EQ(params.op.user.uinfo.user_id.id, "user_id1"); ASSERT_EQ(params.op.user.uinfo.suspended, 123); ASSERT_EQ(params.op.user.uinfo.max_buckets, 456); - ASSERT_EQ(params.op.user.uinfo.assumed_role_arn, "role"); ASSERT_EQ(params.op.user.uinfo.placement_tags.back(), "tags"); RGWAccessKey k; map::iterator it2 = params.op.user.uinfo.access_keys.begin(); @@ -202,7 +199,6 @@ TEST_F(DBStoreTest, GetUserQueryByEmail) { ASSERT_EQ(uinfo.user_id.id, "user_id1"); ASSERT_EQ(uinfo.suspended, 123); ASSERT_EQ(uinfo.max_buckets, 456); - ASSERT_EQ(uinfo.assumed_role_arn, "role"); ASSERT_EQ(uinfo.placement_tags.back(), "tags"); RGWAccessKey k; map::iterator it2 = uinfo.access_keys.begin(); @@ -228,7 +224,6 @@ TEST_F(DBStoreTest, GetUserQueryByAccessKey) { ASSERT_EQ(uinfo.user_id.id, "user_id1"); ASSERT_EQ(uinfo.suspended, 123); ASSERT_EQ(uinfo.max_buckets, 456); - ASSERT_EQ(uinfo.assumed_role_arn, "role"); ASSERT_EQ(uinfo.placement_tags.back(), "tags"); RGWAccessKey k; map::iterator it2 = uinfo.access_keys.begin(); @@ -259,7 +254,6 @@ TEST_F(DBStoreTest, StoreUser) { uinfo.user_email = "user2@dbstore.com"; uinfo.suspended = 123; uinfo.max_buckets = 456; - uinfo.assumed_role_arn = "role"; uinfo.placement_tags.push_back("tags"); RGWAccessKey k1("id1", "key1"); RGWAccessKey k2("id2", "key2"); @@ -311,7 +305,6 @@ TEST_F(DBStoreTest, GetUserQueryByUserID) { ASSERT_EQ(uinfo.user_id.id, "user_id2"); ASSERT_EQ(uinfo.suspended, 123); ASSERT_EQ(uinfo.max_buckets, 456); - ASSERT_EQ(uinfo.assumed_role_arn, "role"); ASSERT_EQ(uinfo.placement_tags.back(), "tags"); RGWAccessKey k; map::iterator it = uinfo.access_keys.begin();