From 832c10dfe82ea79b0c327e39ad794f4fa869aa4e Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Sat, 24 Jul 2021 14:19:03 +0800 Subject: [PATCH] rgw: drop unused rgw_admin_user.{h,cc} their only consumer was dropped in c89b59428e66ae6d89d1fd27a4280045c57251cb Signed-off-by: Kefu Chai --- src/rgw/rgw_admin_user.cc | 91 --------------------------------------- src/rgw/rgw_admin_user.h | 44 ------------------- 2 files changed, 135 deletions(-) delete mode 100644 src/rgw/rgw_admin_user.cc delete mode 100644 src/rgw/rgw_admin_user.h diff --git a/src/rgw/rgw_admin_user.cc b/src/rgw/rgw_admin_user.cc deleted file mode 100644 index cccc068c297ea..0000000000000 --- a/src/rgw/rgw_admin_user.cc +++ /dev/null @@ -1,91 +0,0 @@ -// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- -// vim: ts=8 sw=2 smarttab ft=cpp - -#include "include/rgw/librgw_admin_user.h" -#include "rgw_admin_user.h" -#include "rgw_user.h" -#include "common/errno.h" - -#define dout_context g_ceph_context -#define dout_subsys ceph_subsys_rgw - -using namespace rgw; - -namespace rgw { - - extern RGWLibAdmin rgw_lib_admin; - -} - -extern "C" { - - int rgw_admin_create_user(librgw_admin_user_t librgw_admin_user, const char *uid, - const char *display_name, const char *access_key, const char* secret_key, - const char *email, const char *caps, - const char *access, bool admin, bool system) - { - RGWUserAdminOpState user_op; - rgw_user user_id; - user_id.from_str(uid); - user_op.set_user_id(user_id); - user_op.set_display_name(display_name); - user_op.user_email = email; - user_op.user_email_specified=true; - user_op.set_access_key(access_key); - user_op.set_secret_key(secret_key); - user_op.set_caps(caps); - if (access) { - uint32_t perm_mask = rgw_str_to_perm(access); - user_op.set_perm(perm_mask); - } - user_op.set_admin(admin); - user_op.set_system(system); - - RGWUser user; - int ret = 0; - ret = user.init(rgw_lib_admin.get_store(), user_op); - if (ret < 0) { - cerr << "user.init failed: " << cpp_strerror(-ret) << std::endl; - return -ret; - } - - std::string err_msg; - ret = user.add(user_op, &err_msg); - if (ret < 0) { - cerr << "could not create user: " << err_msg << std::endl; - if (ret == -ERR_INVALID_TENANT_NAME) - ret = -EINVAL; - - return -ret; - } - - return 0; - } - - int rgw_admin_user_info(librgw_admin_user_t librgw_admin_user, const char *uid, rgw_user_info* user_info) - { - RGWUserAdminOpState user_op; - rgw_user user_id; - user_id.from_str(uid); - user_op.set_user_id(user_id); - - RGWUser user; - int ret = 0; - ret = user.init(rgw_lib_admin.get_store(), user_op); - if (ret < 0) { - cerr << "user.init failed: " << cpp_strerror(-ret) << std::endl; - return -ret; - } - - std::string err_msg; - RGWUserInfo info; - ret = user.info(info, &err_msg); - if (ret < 0) { - cerr << "could not fetch user info: " << err_msg << std::endl; - return -ret; - } - - return 0; - } - -} diff --git a/src/rgw/rgw_admin_user.h b/src/rgw/rgw_admin_user.h deleted file mode 100644 index 905ddcd906505..0000000000000 --- a/src/rgw/rgw_admin_user.h +++ /dev/null @@ -1,44 +0,0 @@ -// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- -// vim: ts=8 sw=2 smarttab ft=cpp - -/* - * create rgw admin user - * - * Copyright (C) 2015 Red Hat, Inc. - * - * This is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1, as published by the Free Software - * Foundation. See file COPYING. - * - */ - -#ifndef RGW_ADMIN_USER_H -#define RGW_ADMIN_USER_H - -#include -#include "common/config.h" - -#include -#include "rgw_sal.h" - -namespace rgw { - - class RGWLibAdmin - { - rgw::sal::Store* store; - boost::intrusive_ptr cct; - - public: - rgw::sal::Store* get_store() - { - return store; - } - - int init(); - int init(std::vector& args); - int stop(); - }; -} - -#endif /*RGW_ADMIN_USER_H */ -- 2.39.5