rgw/sal: remove load_account_role_by_name()

Signed-off-by: Casey Bodley <cbodley@redhat.com>

diff --git a/src/rgw/driver/rados/rgw_sal_rados.cc b/src/rgw/driver/rados/rgw_sal_rados.cc
index b809a32c71633c26892226ea80973c6d6ffd698d..4aeb4b797740acb7964eea9509394253aeb1725f 100644 (file)
--- a/src/rgw/driver/rados/rgw_sal_rados.cc
+++ b/src/rgw/driver/rados/rgw_sal_rados.cc
@@ -1200,26 +1200,6 @@ int RadosStore::load_owner_by_email(const DoutPrefixProvider* dpp,
   return 0;
 }
 
-int RadosStore::load_account_role_by_name(const DoutPrefixProvider* dpp,
-                                          optional_yield y,
-                                          std::string_view account_id,
-                                          std::string_view rolename,
-                                          std::unique_ptr<RGWRole>* role)
-{
-  RGWRoleInfo info;
-  info.account_id = account_id;
-  info.name = rolename;
-  auto p = get_role(info);
-  int r = p->get(dpp, y);
-  if (r < 0) {
-    ldpp_dout(dpp, 20) << "failed to load account role " << rolename
-        << ": " << cpp_strerror(r) << dendl;
-    return r;
-  }
-  *role = std::move(p);
-  return 0;
-}
-
 int RadosStore::count_account_roles(const DoutPrefixProvider* dpp,
                                     optional_yield y,
                                     std::string_view account_id,

diff --git a/src/rgw/driver/rados/rgw_sal_rados.h b/src/rgw/driver/rados/rgw_sal_rados.h
index 759bfad54ced23deb7bcae5971e7dade7a48c368..edd977fcb3384640d1c4b9a8daf8ad2cc0889669 100644 (file)
--- a/src/rgw/driver/rados/rgw_sal_rados.h
+++ b/src/rgw/driver/rados/rgw_sal_rados.h
@@ -196,11 +196,6 @@ class RadosStore : public StoreDriver {
                             std::string_view email,
                             rgw_owner& owner) override;
 
-    int load_account_role_by_name(const DoutPrefixProvider* dpp,
-                                  optional_yield y,
-                                  std::string_view account_id,
-                                  std::string_view name,
-                                  std::unique_ptr<RGWRole>* role) override;
     int count_account_roles(const DoutPrefixProvider* dpp,
                             optional_yield y,
                             std::string_view account_id,

diff --git a/src/rgw/rgw_sal.h b/src/rgw/rgw_sal.h
index 01d06205f1651c26b5c07646d945bdf4c380bd47..fd0bb5bdade91f1d4bd90f641056cf3dc661a08f 100644 (file)
--- a/src/rgw/rgw_sal.h
+++ b/src/rgw/rgw_sal.h
@@ -358,12 +358,6 @@ class Driver {
                                     std::string_view email,
                                     rgw_owner& owner) = 0;
 
-    /** Load an account's role by name. */
-    virtual int load_account_role_by_name(const DoutPrefixProvider* dpp,
-                                          optional_yield y,
-                                          std::string_view account_id,
-                                          std::string_view name,
-                                          std::unique_ptr<RGWRole>* role) = 0;
     /** Count the number of roles belonging to the given account. */
     virtual int count_account_roles(const DoutPrefixProvider* dpp,
                                     optional_yield y,

diff --git a/src/rgw/rgw_sal_dbstore.cc b/src/rgw/rgw_sal_dbstore.cc
index e2873fb71badc4b497f7fc4954d78905f38457b3..d10b1652c4312c6cf4ad55d76a4780563afbf949 100644 (file)
--- a/src/rgw/rgw_sal_dbstore.cc
+++ b/src/rgw/rgw_sal_dbstore.cc
@@ -1620,15 +1620,6 @@ namespace rgw::sal {
     return 0;
   }
 
-  int DBStore::load_account_role_by_name(const DoutPrefixProvider* dpp,
-                                         optional_yield y,
-                                         std::string_view account_id,
-                                         std::string_view name,
-                                         std::unique_ptr<RGWRole>* role)
-  {
-    return -ENOTSUP;
-  }
-
   int DBStore::count_account_roles(const DoutPrefixProvider* dpp,
                                    optional_yield y,
                                    std::string_view account_id,

diff --git a/src/rgw/rgw_sal_dbstore.h b/src/rgw/rgw_sal_dbstore.h
index bc037688eb6b6e507443b59ce23eaade5386b6f3..4df5a55b975d2ce7919486c1c0801457cffd672d 100644 (file)
--- a/src/rgw/rgw_sal_dbstore.h
+++ b/src/rgw/rgw_sal_dbstore.h
@@ -795,11 +795,6 @@ public:
                               std::string_view email,
                               rgw_owner& owner) override;
 
-      int load_account_role_by_name(const DoutPrefixProvider* dpp,
-                                    optional_yield y,
-                                    std::string_view account_id,
-                                    std::string_view name,
-                                    std::unique_ptr<RGWRole>* role) override;
       int count_account_roles(const DoutPrefixProvider* dpp,
                               optional_yield y,
                               std::string_view account_id,

diff --git a/src/rgw/rgw_sal_filter.cc b/src/rgw/rgw_sal_filter.cc
index ddcde348821f39310c2bdfdd32f51f04adcea92c..0485ad96a12be8f09ce66320cd1ee2fd7395d317 100644 (file)
--- a/src/rgw/rgw_sal_filter.cc
+++ b/src/rgw/rgw_sal_filter.cc
@@ -243,15 +243,6 @@ int FilterDriver::load_owner_by_email(const DoutPrefixProvider* dpp,
   return next->load_owner_by_email(dpp, y, email, owner);
 }
 
-int FilterDriver::load_account_role_by_name(const DoutPrefixProvider* dpp,
-                                            optional_yield y,
-                                            std::string_view account_id,
-                                            std::string_view name,
-                                            std::unique_ptr<RGWRole>* role)
-{
-  return next->load_account_role_by_name(dpp, y, account_id, name, role);
-}
-
 int FilterDriver::count_account_roles(const DoutPrefixProvider* dpp,
                                       optional_yield y,
                                       std::string_view account_id,

diff --git a/src/rgw/rgw_sal_filter.h b/src/rgw/rgw_sal_filter.h
index fde1a4dda9511b17cb6cf3c988d4001b48f2f75f..39bb1af10f756464b395a861bdbbd482c2f4a60e 100644 (file)
--- a/src/rgw/rgw_sal_filter.h
+++ b/src/rgw/rgw_sal_filter.h
@@ -206,11 +206,6 @@ public:
                           optional_yield y,
                           std::string_view email,
                           rgw_owner& owner) override;
-  int load_account_role_by_name(const DoutPrefixProvider* dpp,
-                                optional_yield y,
-                                std::string_view account_id,
-                                std::string_view name,
-                                std::unique_ptr<RGWRole>* role) override;
   int count_account_roles(const DoutPrefixProvider* dpp,
                           optional_yield y,
                           std::string_view account_id,