rgw: only rename AWSv2AuthStrategy -> AWSAuthStrategy.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>

diff --git a/src/rgw/rgw_auth_registry.h b/src/rgw/rgw_auth_registry.h
index 34da8873b10b0bc02a649bf27aadc852481095bc..1d0582cca92d55a43fecfb39cacfac5bc342a24c 100644 (file)
--- a/src/rgw/rgw_auth_registry.h
+++ b/src/rgw/rgw_auth_registry.h
@@ -22,7 +22,7 @@ namespace auth {
  * responsible for handling the dynamic reconfiguration on e.g. realm update. */
 class StrategyRegistry {
   template <class ExtractorT>
-  using s3_strategy_t = rgw::auth::s3::AWSv2AuthStrategy<ExtractorT>;
+  using s3_strategy_t = rgw::auth::s3::AWSAuthStrategy<ExtractorT>;
 
   using s3_main_strategy_t = \
     s3_strategy_t<rgw::auth::s3::AWSGeneralAbstractor>;

diff --git a/src/rgw/rgw_auth_s3.h b/src/rgw/rgw_auth_s3.h
index 9e59d7f6afc7a389661b377e5e88a0e1798ed1d1..f30bdb2faeba45b8817ee7e99199e9a5b38ceda7 100644 (file)
--- a/src/rgw/rgw_auth_s3.h
+++ b/src/rgw/rgw_auth_s3.h
@@ -81,8 +81,8 @@ public:
 
 
 template <class AbstractorT>
-class AWSv2AuthStrategy : public rgw::auth::Strategy,
-                          public rgw::auth::LocalApplier::Factory {
+class AWSAuthStrategy : public rgw::auth::Strategy,
+                        public rgw::auth::LocalApplier::Factory {
   typedef rgw::auth::IdentityApplier::aplptr_t aplptr_t;
 
   static_assert(std::is_base_of<rgw::auth::s3::AWSEngine::VersionAbstractor,
@@ -106,8 +106,8 @@ class AWSv2AuthStrategy : public rgw::auth::Strategy,
   }
 
 public:
-  AWSv2AuthStrategy(CephContext* const cct,
-                    RGWRados* const store)
+  AWSAuthStrategy(CephContext* const cct,
+                  RGWRados* const store)
     : store(store),
       ver_abstractor(cct),
       external_engines(cct, store, &ver_abstractor),
@@ -129,7 +129,7 @@ public:
   }
 
   const char* get_name() const noexcept override {
-    return "rgw::auth::s3::AWSv2AuthStrategy";
+    return "rgw::auth::s3::AWSAuthStrategy";
   }
 };