From: Yehuda Sadeh <yehuda@redhat.com>
Date: Sat, 28 Jul 2018 00:00:55 +0000 (-0700)
Subject: rgw-admin: pubsub topic get command
X-Git-Tag: v14.1.0~616^2~25
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=27ec9c3ddafbfda8d754a0fd85c7668aa9fb61a3;p=ceph.git

rgw-admin: pubsub topic get command

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
---

diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index 470261fa47d3..ff78b9683876 100644
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -537,6 +537,7 @@ enum {
   OPT_RESHARD_STALE_INSTANCES_DELETE,
   OPT_PUBSUB_TOPICS_LIST,
   OPT_PUBSUB_TOPIC_CREATE,
+  OPT_PUBSUB_TOPIC_GET,
   OPT_PUBSUB_TOPIC_RM,
   OPT_PUBSUB_NOTIFICATION_CREATE,
   OPT_PUBSUB_NOTIFICATION_RM,
@@ -1021,6 +1022,8 @@ static int get_cmd(const char *cmd, const char *prev_cmd, const char *prev_prev_
     } else if (strcmp(prev_cmd, "topic") == 0) {
       if (strcmp(cmd, "create") == 0)
         return OPT_PUBSUB_TOPIC_CREATE;
+      if (strcmp(cmd, "get") == 0)
+        return OPT_PUBSUB_TOPIC_GET;
       if (strcmp(cmd, "rm") == 0)
         return OPT_PUBSUB_TOPIC_RM;
     } else if (strcmp(prev_cmd, "notification") == 0) {
@@ -7876,6 +7879,32 @@ next:
     }
   }
 
+  if (opt_cmd == OPT_PUBSUB_TOPIC_GET) {
+    if (get_tier_type(store) != "pubsub") {
+      cerr << "ERROR: only pubsub tier type supports this command" << std::endl;
+      return EINVAL;
+    }
+    if (topic_name.empty()) {
+      cerr << "ERROR: topic name was not provided (via --topic)" << std::endl;
+      return EINVAL;
+    }
+    if (user_id.empty()) {
+      cerr << "ERROR: user id was not provided (via --uid)" << std::endl;
+      return EINVAL;
+    }
+    RGWUserInfo& user_info = user_op.get_user_info();
+    RGWUserPubSub ups(store, user_info.user_id);
+
+    rgw_pubsub_topic_subs topic;
+    ret = ups.get_topic(topic_name, &topic);
+    if (ret < 0) {
+      cerr << "ERROR: could not create topic: " << cpp_strerror(-ret) << std::endl;
+      return -ret;
+    }
+    encode_json("topic", topic, formatter);
+    formatter->flush(cout);
+  }
+
   if (opt_cmd == OPT_PUBSUB_NOTIFICATION_CREATE) {
     if (get_tier_type(store) != "pubsub") {
       cerr << "ERROR: only pubsub tier type supports this command" << std::endl;