From 036d034d667a4cb9a7564c79a53e2644ee50e8c5 Mon Sep 17 00:00:00 2001 From: Daniel Gryniewicz Date: Mon, 26 Sep 2022 12:03:39 -0400 Subject: [PATCH] RGW - Re-do admin API split The mgr instantiation was re-added in the build re-org. Signed-off-by: Daniel Gryniewicz --- src/rgw/CMakeLists.txt | 2 +- src/rgw/rgw_appmain.cc | 14 ++------------ src/rgw/rgw_sal_rados.cc | 2 ++ 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt index 38314c4f1e2..c1971897a2a 100644 --- a/src/rgw/CMakeLists.txt +++ b/src/rgw/CMakeLists.txt @@ -133,6 +133,7 @@ set(librgw_common_srcs rgw_rest_realm.cc rgw_rest_role.cc rgw_rest_s3.cc + rgw_rest_user.cc rgw_s3select.cc rgw_role.cc rgw_sal.cc @@ -317,7 +318,6 @@ set(rgw_a_srcs rgw_rest_sts.cc rgw_rest_swift.cc rgw_rest_usage.cc - rgw_rest_user.cc rgw_signal.cc rgw_swift_auth.cc rgw_usage.cc diff --git a/src/rgw/rgw_appmain.cc b/src/rgw/rgw_appmain.cc index 3f548e0e041..5a9c1641da8 100644 --- a/src/rgw/rgw_appmain.cc +++ b/src/rgw/rgw_appmain.cc @@ -36,7 +36,6 @@ #include "rgw_rest_admin.h" #include "rgw_rest_info.h" #include "rgw_rest_usage.h" -#include "rgw_rest_user.h" #include "rgw_rest_bucket.h" #include "rgw_rest_metadata.h" #include "rgw_rest_log.h" @@ -320,17 +319,8 @@ void rgw::AppMain::cond_init_apis() RGWRESTMgr_Admin *admin_resource = new RGWRESTMgr_Admin; admin_resource->register_resource("info", new RGWRESTMgr_Info); admin_resource->register_resource("usage", new RGWRESTMgr_Usage); - admin_resource->register_resource("user", new RGWRESTMgr_User); - /* XXX dang part of this is RADOS specific */ - admin_resource->register_resource("bucket", new RGWRESTMgr_Bucket); - - /*Registering resource for /admin/metadata */ - admin_resource->register_resource("metadata", new RGWRESTMgr_Metadata); - /* XXX dang ifdef these RADOS ? */ - admin_resource->register_resource("log", new RGWRESTMgr_Log); - admin_resource->register_resource("config", new RGWRESTMgr_Config); - admin_resource->register_resource("realm", new RGWRESTMgr_Realm); - admin_resource->register_resource("ratelimit", new RGWRESTMgr_Ratelimit); + /* Register store-specific admin APIs */ + store->register_admin_apis(admin_resource); rest.register_resource(g_conf()->rgw_admin_entry, admin_resource); } } /* have_http_frontend */ diff --git a/src/rgw/rgw_sal_rados.cc b/src/rgw/rgw_sal_rados.cc index 8f72e222c7c..212e6c175cb 100644 --- a/src/rgw/rgw_sal_rados.cc +++ b/src/rgw/rgw_sal_rados.cc @@ -46,6 +46,7 @@ #include "rgw_rest_config.h" #include "rgw_rest_ratelimit.h" #include "rgw_rest_realm.h" +#include "rgw_rest_user.h" #include "services/svc_sys_obj.h" #include "services/svc_meta.h" #include "services/svc_meta_be_sobj.h" @@ -1429,6 +1430,7 @@ void RadosStore::finalize(void) void RadosStore::register_admin_apis(RGWRESTMgr* mgr) { + mgr->register_resource("user", new RGWRESTMgr_User); mgr->register_resource("bucket", new RGWRESTMgr_Bucket); /*Registering resource for /admin/metadata */ mgr->register_resource("metadata", new RGWRESTMgr_Metadata); -- 2.39.5