From: Casey Bodley <cbodley@redhat.com>
Date: Tue, 13 Feb 2024 15:57:08 +0000 (-0500)
Subject: rgw: move rgw_rest_pubsub.h out of driver/rados/
X-Git-Tag: testing/wip-root-testing-20240411.174241^2~20
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=52bb52a04d4cf1f6cf5fa4cb064dd1993b43c471;p=ceph-ci.git

rgw: move rgw_rest_pubsub.h out of driver/rados/

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 5b2ae726a95c9922a5c5ba984d6e170dd115128b)
---

diff --git a/src/rgw/driver/rados/rgw_rest_pubsub.h b/src/rgw/driver/rados/rgw_rest_pubsub.h
deleted file mode 100644
index 91c39ac1008..00000000000
--- a/src/rgw/driver/rados/rgw_rest_pubsub.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
-// vim: ts=8 sw=2 smarttab
-#pragma once
-
-#include "rgw_rest_s3.h"
-
-// s3 compliant notification handler factory
-class RGWHandler_REST_PSNotifs_S3 : public RGWHandler_REST_S3 {
-protected:
-  int init_permissions(RGWOp* op, optional_yield y) override {return 0;}
-  int read_permissions(RGWOp* op, optional_yield y) override {return 0;}
-  bool supports_quota() override {return false;}
-  RGWOp* op_get() override;
-  RGWOp* op_put() override;
-  RGWOp* op_delete() override;
-public:
-  using RGWHandler_REST_S3::RGWHandler_REST_S3;
-  virtual ~RGWHandler_REST_PSNotifs_S3() = default;
-  // following are used to generate the operations when invoked by another REST handler
-  static RGWOp* create_get_op();
-  static RGWOp* create_put_op();
-  static RGWOp* create_delete_op();
-};
-
-// AWS compliant topics handler factory
-class RGWHandler_REST_PSTopic_AWS : public RGWHandler_REST {
-  const rgw::auth::StrategyRegistry& auth_registry;
-  bufferlist bl_post_body;
-protected:
-  RGWOp* op_post() override;
-public:
-  RGWHandler_REST_PSTopic_AWS(const rgw::auth::StrategyRegistry& _auth_registry,
-                              bufferlist bl_post_body)
-    :  auth_registry(_auth_registry), bl_post_body(std::move(bl_post_body)) {}
-  virtual ~RGWHandler_REST_PSTopic_AWS() = default;
-  int postauth_init(optional_yield) override { return 0; }
-  int authorize(const DoutPrefixProvider* dpp, optional_yield y) override;
-  static bool action_exists(const req_state* s);
-  static bool action_exists(const req_info& info);
-};
-
diff --git a/src/rgw/rgw_rest_pubsub.h b/src/rgw/rgw_rest_pubsub.h
new file mode 100644
index 00000000000..91c39ac1008
--- /dev/null
+++ b/src/rgw/rgw_rest_pubsub.h
@@ -0,0 +1,41 @@
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab
+#pragma once
+
+#include "rgw_rest_s3.h"
+
+// s3 compliant notification handler factory
+class RGWHandler_REST_PSNotifs_S3 : public RGWHandler_REST_S3 {
+protected:
+  int init_permissions(RGWOp* op, optional_yield y) override {return 0;}
+  int read_permissions(RGWOp* op, optional_yield y) override {return 0;}
+  bool supports_quota() override {return false;}
+  RGWOp* op_get() override;
+  RGWOp* op_put() override;
+  RGWOp* op_delete() override;
+public:
+  using RGWHandler_REST_S3::RGWHandler_REST_S3;
+  virtual ~RGWHandler_REST_PSNotifs_S3() = default;
+  // following are used to generate the operations when invoked by another REST handler
+  static RGWOp* create_get_op();
+  static RGWOp* create_put_op();
+  static RGWOp* create_delete_op();
+};
+
+// AWS compliant topics handler factory
+class RGWHandler_REST_PSTopic_AWS : public RGWHandler_REST {
+  const rgw::auth::StrategyRegistry& auth_registry;
+  bufferlist bl_post_body;
+protected:
+  RGWOp* op_post() override;
+public:
+  RGWHandler_REST_PSTopic_AWS(const rgw::auth::StrategyRegistry& _auth_registry,
+                              bufferlist bl_post_body)
+    :  auth_registry(_auth_registry), bl_post_body(std::move(bl_post_body)) {}
+  virtual ~RGWHandler_REST_PSTopic_AWS() = default;
+  int postauth_init(optional_yield) override { return 0; }
+  int authorize(const DoutPrefixProvider* dpp, optional_yield y) override;
+  static bool action_exists(const req_state* s);
+  static bool action_exists(const req_info& info);
+};
+