From: Radoslaw Zarzynski <rzarzynski@mirantis.com>
Date: Fri, 2 Jun 2017 15:01:16 +0000 (+0200)
Subject: rgw: only rename AWSv2AuthStrategy -> AWSAuthStrategy.
X-Git-Tag: v12.1.0~155^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=73e78ae0a279d1afbc6972952376c0e32d2587e7;p=ceph.git

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 34da8873b10b..1d0582cca92d 100644
--- 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 9e59d7f6afc7..f30bdb2faeba 100644
--- 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";
   }
 };