rgw/notification: Filter topic list based on uid on radosgw-admin

Signed-off-by: kchheda3 <kchheda3@bloomberg.net>

diff --git a/doc/radosgw/notifications.rst b/doc/radosgw/notifications.rst
index 1cc538432f3dce16d2ffd241c8d6e53250b5e3ee..7f660dd76a3f176817ed8f34ee5b85a52d60b042 100644 (file)
--- a/doc/radosgw/notifications.rst
+++ b/doc/radosgw/notifications.rst
@@ -76,7 +76,7 @@ following command:
 
 .. prompt:: bash #
 
-   radosgw-admin topic list [--tenant={tenant}]
+   radosgw-admin topic list [--tenant={tenant}]  [--uid={user}]
 
 
 Fetch the configuration of a specific topic by running the following command:

diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index 15bdaba87a56e0b201ad24f113bc6725f2f1b450..e47a3b1d470a2f0723da1e07022c351e650cfba2 100644 (file)
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -10511,6 +10511,16 @@ next:
       cerr << "ERROR: could not get topics: " << cpp_strerror(-ret) << std::endl;
       return -ret;
     }
+    if (!rgw::sal::User::empty(user)) {
+      for (auto it = result.topics.cbegin(); it != result.topics.cend();) {
+        const auto& topic = it->second;
+        if (user->get_id() != topic.user) {
+          result.topics.erase(it++);
+        } else {
+          ++it;
+        }
+      }
+    }
     encode_json("result", result, formatter.get());
     formatter->flush(cout);
   }