From 124ce3df504baafff9950053ab386e782abc6eee Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Thu, 20 Apr 2023 09:31:52 -0400 Subject: [PATCH] rgw/dbstore: stop storing RGWUserInfo::assumed_role_arn Signed-off-by: Casey Bodley (cherry picked from commit 9da31205051db56edade69b1cec3a05e162b7a9b) --- src/rgw/driver/dbstore/common/dbstore.h | 9 ++++----- src/rgw/driver/dbstore/dbstore_main.cc | 2 -- src/rgw/driver/dbstore/sqlite/sqliteDB.cc | 5 ----- src/rgw/driver/dbstore/tests/dbstore_tests.cc | 7 ------- 4 files changed, 4 insertions(+), 19 deletions(-) diff --git a/src/rgw/driver/dbstore/common/dbstore.h b/src/rgw/driver/dbstore/common/dbstore.h index b4a7ca057b3..b26cc116e82 100644 --- a/src/rgw/driver/dbstore/common/dbstore.h +++ b/src/rgw/driver/dbstore/common/dbstore.h @@ -193,7 +193,6 @@ struct DBOpUserPrepareInfo { static constexpr const char* user_quota = ":user_quota"; static constexpr const char* type = ":type"; static constexpr const char* mfa_ids = ":mfa_ids"; - static constexpr const char* assumed_role_arn = ":assumed_role_arn"; static constexpr const char* user_attrs = ":user_attrs"; static constexpr const char* user_ver = ":user_vers"; static constexpr const char* user_ver_tag = ":user_ver_tag"; @@ -725,10 +724,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() {} @@ -746,8 +745,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/driver/dbstore/dbstore_main.cc b/src/rgw/driver/dbstore/dbstore_main.cc index 08724d8227e..4fff38ced27 100644 --- a/src/rgw/driver/dbstore/dbstore_main.cc +++ b/src/rgw/driver/dbstore/dbstore_main.cc @@ -50,7 +50,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"); @@ -73,7 +72,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/driver/dbstore/sqlite/sqliteDB.cc b/src/rgw/driver/dbstore/sqlite/sqliteDB.cc index b0ced456a3c..dc244c07b34 100644 --- a/src/rgw/driver/dbstore/sqlite/sqliteDB.cc +++ b/src/rgw/driver/dbstore/sqlite/sqliteDB.cc @@ -395,8 +395,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); @@ -1179,9 +1177,6 @@ int SQLInsertUser::Bind(const DoutPrefixProvider *dpp, struct DBOpParams *params SQL_BIND_INDEX(dpp, stmt, index, p_params.op.user.mfa_ids, 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, 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, sdb); SQL_ENCODE_BLOB_PARAM(dpp, stmt, index, params->op.user.user_attrs, sdb); diff --git a/src/rgw/driver/dbstore/tests/dbstore_tests.cc b/src/rgw/driver/dbstore/tests/dbstore_tests.cc index e87002f61b5..27edb7b8573 100644 --- a/src/rgw/driver/dbstore/tests/dbstore_tests.cc +++ b/src/rgw/driver/dbstore/tests/dbstore_tests.cc @@ -147,7 +147,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"); @@ -171,7 +170,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(); @@ -199,7 +197,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(); @@ -227,7 +224,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(); @@ -253,7 +249,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(); @@ -284,7 +279,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"); @@ -336,7 +330,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(); -- 2.39.5