From: Casey Bodley <cbodley@redhat.com>
Date: Wed, 2 Nov 2022 18:56:32 +0000 (-0400)
Subject: rgw: move RGWProcessEnv into new rgw_process_env.h
X-Git-Tag: v18.1.0~650^2~3
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=1f3dfa51c799dab15a9af873e8384af859cab839;p=ceph-ci.git

rgw: move RGWProcessEnv into new rgw_process_env.h

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

diff --git a/src/rgw/rgw_frontend.h b/src/rgw/rgw_frontend.h
index cdb53e3971a..34d3b06586c 100644
--- a/src/rgw/rgw_frontend.h
+++ b/src/rgw/rgw_frontend.h
@@ -12,6 +12,7 @@
 
 #include "rgw_request.h"
 #include "rgw_process.h"
+#include "rgw_process_env.h"
 #include "rgw_realm_reloader.h"
 
 #include "rgw_auth_registry.h"
diff --git a/src/rgw/rgw_process.cc b/src/rgw/rgw_process.cc
index d926a41d5a3..a9a752744d7 100644
--- a/src/rgw/rgw_process.cc
+++ b/src/rgw/rgw_process.cc
@@ -7,6 +7,7 @@
 #include "include/scope_guard.h"
 
 #include <utility>
+#include "rgw_auth_registry.h"
 #include "rgw_dmclock_scheduler.h"
 #include "rgw_rest.h"
 #include "rgw_frontend.h"
diff --git a/src/rgw/rgw_process.h b/src/rgw/rgw_process.h
index 470d8f4246f..9d45362248e 100644
--- a/src/rgw/rgw_process.h
+++ b/src/rgw/rgw_process.h
@@ -6,11 +6,8 @@
 
 #include "rgw_common.h"
 #include "rgw_acl.h"
-#include "rgw_auth_registry.h"
 #include "rgw_user.h"
-#include "rgw_op.h"
 #include "rgw_rest.h"
-#include "rgw_ratelimit.h"
 #include "include/ceph_assert.h"
 
 #include "common/WorkQueue.h"
@@ -24,23 +21,8 @@
 namespace rgw::dmclock {
   class Scheduler;
 }
-namespace rgw::lua {
-  class Background;
-}
-namespace rgw::sal {
-  class LuaManager;
-}
-
-struct RGWProcessEnv {
-  rgw::sal::Driver* driver = nullptr;
-  RGWREST *rest = nullptr;
-  OpsLogSink *olog = nullptr;
-  rgw_auth_registry_ptr_t auth_registry;
-  ActiveRateLimiter* ratelimiting = nullptr;
-  rgw::lua::Background* lua_background = nullptr;
-  std::unique_ptr<rgw::sal::LuaManager> lua_manager;
-};
 
+struct RGWProcessEnv;
 class RGWFrontendConfig;
 class RGWRequest;
 
diff --git a/src/rgw/rgw_process_env.h b/src/rgw/rgw_process_env.h
new file mode 100644
index 00000000000..5648add8649
--- /dev/null
+++ b/src/rgw/rgw_process_env.h
@@ -0,0 +1,31 @@
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab ft=cpp
+
+#pragma once
+
+#include <memory>
+
+class ActiveRateLimiter;
+class OpsLogSink;
+class RGWREST;
+
+namespace rgw::auth {
+  class StrategyRegistry;
+}
+namespace rgw::lua {
+  class Background;
+}
+namespace rgw::sal {
+  class Store;
+  class LuaManager;
+}
+
+struct RGWProcessEnv {
+  rgw::sal::Driver* driver = nullptr;
+  RGWREST *rest = nullptr;
+  OpsLogSink *olog = nullptr;
+  std::unique_ptr<rgw::auth::StrategyRegistry> auth_registry;
+  ActiveRateLimiter* ratelimiting = nullptr;
+  rgw::lua::Background* lua_background = nullptr;
+  std::unique_ptr<rgw::sal::LuaManager> lua_manager;
+};
diff --git a/src/rgw/rgw_realm_reloader.cc b/src/rgw/rgw_realm_reloader.cc
index f966b4b211c..bb82c5ccbb6 100644
--- a/src/rgw/rgw_realm_reloader.cc
+++ b/src/rgw/rgw_realm_reloader.cc
@@ -3,11 +3,12 @@
 
 #include "rgw_realm_reloader.h"
 
+#include "rgw_auth_registry.h"
 #include "rgw_bucket.h"
 #include "rgw_log.h"
 #include "rgw_rest.h"
 #include "rgw_user.h"
-#include "rgw_process.h"
+#include "rgw_process_env.h"
 #include "rgw_sal.h"
 #include "rgw_sal_rados.h"
 
diff --git a/src/rgw/rgw_rest_iam.cc b/src/rgw/rgw_rest_iam.cc
index 029267e67f9..9560e04c82b 100644
--- a/src/rgw/rgw_rest_iam.cc
+++ b/src/rgw/rgw_rest_iam.cc
@@ -3,12 +3,9 @@
 
 #include <boost/tokenizer.hpp>
 
-#include "rgw_rest.h"
+#include "rgw_auth_s3.h"
 #include "rgw_rest_iam.h"
 
-#include "rgw_request.h"
-#include "rgw_process.h"
-
 #include "rgw_rest_role.h"
 #include "rgw_rest_user_policy.h"
 #include "rgw_rest_oidc_provider.h"
diff --git a/src/rgw/rgw_rest_swift.cc b/src/rgw/rgw_rest_swift.cc
index 4e62c3bc15a..8605cf73f2c 100644
--- a/src/rgw/rgw_rest_swift.cc
+++ b/src/rgw/rgw_rest_swift.cc
@@ -21,6 +21,7 @@
 #include "rgw_compression.h"
 
 #include "rgw_auth.h"
+#include "rgw_auth_registry.h"
 #include "rgw_swift_auth.h"
 
 #include "rgw_request.h"
diff --git a/src/test/rgw/test_rgw_iam_policy.cc b/src/test/rgw/test_rgw_iam_policy.cc
index 5d631ebf917..1dceb45c9cc 100644
--- a/src/test/rgw/test_rgw_iam_policy.cc
+++ b/src/test/rgw/test_rgw_iam_policy.cc
@@ -24,8 +24,10 @@
 #include "common/ceph_context.h"
 #include "global/global_init.h"
 #include "rgw_auth.h"
+#include "rgw_auth_registry.h"
 #include "rgw_iam_policy.h"
 #include "rgw_op.h"
+#include "rgw_process_env.h"
 #include "rgw_sal_rados.h"